Merge pull request #1583 from rectorphp/countnull

Fix CountOnNullRector for nullable and invalid property

packages/NodeTypeResolver/src/NodeTypeResolver.php

@@ -270,6 +270,13 @@ final class NodeTypeResolver
             return true;
         }
 
+        if ($node instanceof PropertyFetch) {
+            // PHPStan false positive, when variable has type[] docblock, but default array is missing
+            if ($this->isPropertyFetchWithArrayDefault($node) === false) {
+                return false;
+            }
+        }
+
         if ($nodeStaticType instanceof MixedType) {
             if ($nodeStaticType->isExplicitMixed()) {
                 return false;

packages/Php/src/Rector/FuncCall/CountOnNullRector.php

@@ -71,7 +71,7 @@ CODE_SAMPLE
             return null;
         }
 
-        if ($this->isNullType($countedNode)) {
+        if ($this->isNullableType($countedNode) || $this->isNullType($countedNode)) {
             $identicalNode = new Identical($countedNode, $this->createNull());
             $ternaryNode = new Ternary($identicalNode, new LNumber(0), $node);
         } else {

packages/Php/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php

@@ -20,7 +20,11 @@ final class CountOnNullRectorTest extends AbstractRectorTestCase
             __DIR__ . '/Fixture/preg_match_array.php.inc',
             __DIR__ . '/Fixture/local_property.php.inc',
             __DIR__ . '/Fixture/double_same_variable.php.inc',
-            __DIR__ . '/Fixture/array_merge.php.inc',
+
+            __DIR__ . '/Fixture/property_with_doc.php.inc',
+            __DIR__ . '/Fixture/nullable_array.php.inc',
+            // skip
+            __DIR__ . '/Fixture/skip_array_merge.php.inc',
         ]);
     }
 

packages/Php/tests/Rector/FuncCall/CountOnNullRector/Fixture/local_property.php.inc

@@ -9,7 +9,7 @@ final class HeaderControl
     /**
      * @var mixed[]
      */
-    private $alsoTitles;
+    private $alsoTitles = [];
 
     /**
      * @var mixed
@@ -42,7 +42,7 @@ final class HeaderControl
     /**
      * @var mixed[]
      */
-    private $alsoTitles;
+    private $alsoTitles = [];
 
     /**
      * @var mixed

packages/Php/tests/Rector/FuncCall/CountOnNullRector/Fixture/nullable_array.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Php\Tests\Rector\FuncCall\CountOnNullRector\Fixture;
+
+final class NullableArray
+{
+    public function number(?array $items)
+    {
+        return count($items);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Php\Tests\Rector\FuncCall\CountOnNullRector\Fixture;
+
+final class NullableArray
+{
+    public function number(?array $items)
+    {
+        return $items === null ? 0 : count($items);
+    }
+}
+
+?>

packages/Php/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_with_doc.php.inc

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Php\Tests\Rector\FuncCall\CountOnNullRector\Fixture;
+
+class PropertyWithDoc
+{
+    /**
+     * @var int[]
+     */
+    private $fail;
+
+    public function run()
+    {
+        return count($this->fail);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Php\Tests\Rector\FuncCall\CountOnNullRector\Fixture;
+
+class PropertyWithDoc
+{
+    /**
+     * @var int[]
+     */
+    private $fail;
+
+    public function run()
+    {
+        return is_array($this->fail) || $this->fail instanceof \Countable ? count($this->fail) : 0;
+    }
+}
+
+?>

packages/Php/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_array_merge.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\Php\Tests\Rector\FuncCall\CountOnNullRector\Fixture;
 
-class ArrayMerge
+class SkipArrayMerge
 {
     public function run(string $string, array $regexes): ?array
     {