RemoveUnusedNonEmptyArrayBeforeForeachRector: ignore phpdoc types (#5169

) * RemoveUnusedNonEmptyArrayBeforeForeachRector: ignore phpdoc types * Update property_foreach.php.inc * Update property_foreach.php.inc * fix
rectorphp · Oct 14, 2023 · c639ef8 · c639ef8
1 parent d55a35b
commit c639ef8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/.../Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/Fixture/property_foreach.php.inc b/.../Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/Fixture/property_foreach.php.inc
@@ -4,12 +4,7 @@ namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeac
 
 final class PropertyForeach
 {
-    private $items = [];
-
-    public function __construct(array $items)
-    {
-        $this->items = $items;
-    }
+    private array $items = [];
 
     public function run()
     {
@@ -28,12 +23,7 @@ namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeac
 
 final class PropertyForeach
 {
-    private $items = [];
-
-    public function __construct(array $items)
-    {
-        $this->items = $items;
-    }
+    private array $items = [];
 
     public function run()
     {

diff --git a/...ptyArrayBeforeForeachRector/Fixture/skip_if_non_empty_and_bigger_than_zero_phpdoc.php.inc b/...ptyArrayBeforeForeachRector/Fixture/skip_if_non_empty_and_bigger_than_zero_phpdoc.php.inc
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\Fixture;
+
+final class SkipIfNonEmptyAndBiggerThanZeroPhpdoc
+{
+    /**
+     * @param array $items
+     */
+    public function run($items)
+    {
+        if ($items && count($items) > 0) {
+            foreach ($items as $item) {
+                echo $item;
+            }
+        }
+    }
+}
+
+?>
diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -111,6 +111,11 @@ private function isUselessBeforeForeachCheck(If_ $if, Scope $scope): bool
             if (is_string($variableName) && $this->reservedKeywordAnalyzer->isNativeVariable($variableName)) {
                 return false;
             }
+
+            $ifType = $scope->getNativeType($foreachExpr);
+            if (!$ifType->isArray()->yes()) {
+                return false;
+            }
         }
 
         $ifCond = $if->cond;
@@ -121,7 +126,7 @@ private function isUselessBeforeForeachCheck(If_ $if, Scope $scope): bool
         if (($ifCond instanceof Variable || $this->propertyFetchAnalyzer->isPropertyFetch($ifCond))
             && $this->nodeComparator->areNodesEqual($ifCond, $foreachExpr)
         ) {
-            $ifType = $scope->getType($ifCond);
+            $ifType = $scope->getNativeType($ifCond);
             return $ifType->isArray()
                 ->yes();
         }