[DeadCode] Skip nullable array on not empty on RemoveUnusedNonEmptyAr…

…rayBeforeForeachRector (#2935) * [DeadCode] Skip nullable array on not empty on RemoveUnusedNonEmptyArrayBeforeForeachRector * Fixed 🎉 * clean up * clean up * eol
rectorphp · Sep 18, 2022 · 4923a14 · 4923a14
1 parent 5f05178
commit 4923a14
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/...veUnusedNonEmptyArrayBeforeForeachRector/Fixture/skip_nullable_array_on_not_empty.php.inc b/...veUnusedNonEmptyArrayBeforeForeachRector/Fixture/skip_nullable_array_on_not_empty.php.inc
@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\Fixture;
+
+class SkipNullableArrayOnNotEmpty
+{
+    public function getPrice()
+    {
+        $tierPrices = random_int(0, 1) ? [] : null;
+
+        if (! empty($tierPrices)) {
+            foreach ($tierPrices as $tierPrice) {
+                if ($tierPrice >= 0) {
+                    return $tierPrice;
+                }
+            }
+        }
+
+        return 0.0;
+    }
+}
diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -10,10 +10,11 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\If_;
+use PHPStan\Analyser\Scope;
 use PHPStan\Type\ArrayType;
 use Rector\Core\NodeManipulator\IfManipulator;
 use Rector\Core\Php\ReservedKeywordAnalyzer;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\DeadCode\NodeManipulator\CountManipulator;
 use Rector\DeadCode\UselessIfCondBeforeForeachDetector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -23,7 +24,7 @@
 /**
  * @see \Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\RemoveUnusedNonEmptyArrayBeforeForeachRectorTest
  */
-final class RemoveUnusedNonEmptyArrayBeforeForeachRector extends AbstractRector
+final class RemoveUnusedNonEmptyArrayBeforeForeachRector extends AbstractScopeAwareRector
 {
     public function __construct(
         private readonly CountManipulator $countManipulator,
@@ -83,9 +84,9 @@ public function getNodeTypes(): array
      * @param If_ $node
      * @return Stmt[]|Foreach_|null
      */
-    public function refactor(Node $node): array|Node|null
+    public function refactorWithScope(Node $node, Scope $scope): array|Node|null
     {
-        if (! $this->isUselessBeforeForeachCheck($node)) {
+        if (! $this->isUselessBeforeForeachCheck($node, $scope)) {
             return null;
         }
 
@@ -105,7 +106,7 @@ public function refactor(Node $node): array|Node|null
         return $stmt;
     }
 
-    private function isUselessBeforeForeachCheck(If_ $if): bool
+    private function isUselessBeforeForeachCheck(If_ $if, Scope $scope): bool
     {
         if (! $this->ifManipulator->isIfWithOnly($if, Foreach_::class)) {
             return false;
@@ -126,7 +127,7 @@ private function isUselessBeforeForeachCheck(If_ $if): bool
             return true;
         }
 
-        if ($this->uselessIfCondBeforeForeachDetector->isMatchingNotEmpty($if, $foreachExpr)) {
+        if ($this->uselessIfCondBeforeForeachDetector->isMatchingNotEmpty($if, $foreachExpr, $scope)) {
             return true;
         }
 

diff --git a/rules/DeadCode/UselessIfCondBeforeForeachDetector.php b/rules/DeadCode/UselessIfCondBeforeForeachDetector.php
@@ -14,16 +14,15 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\If_;
+use PHPStan\Analyser\Scope;
 use PHPStan\Type\ArrayType;
 use Rector\Core\NodeAnalyzer\ParamAnalyzer;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
-use Rector\NodeTypeResolver\NodeTypeResolver;
 
 final class UselessIfCondBeforeForeachDetector
 {
     public function __construct(
-        private readonly NodeTypeResolver $nodeTypeResolver,
         private readonly NodeComparator $nodeComparator,
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly ParamAnalyzer $paramAnalyzer
@@ -34,7 +33,7 @@ public function __construct(
      * Matches:
      * !empty($values)
      */
-    public function isMatchingNotEmpty(If_ $if, Expr $foreachExpr): bool
+    public function isMatchingNotEmpty(If_ $if, Expr $foreachExpr, Scope $scope): bool
     {
         $cond = $if->cond;
         if (! $cond instanceof BooleanNot) {
@@ -53,7 +52,7 @@ public function isMatchingNotEmpty(If_ $if, Expr $foreachExpr): bool
         }
 
         // is array though?
-        $arrayType = $this->nodeTypeResolver->getType($empty->expr);
+        $arrayType = $scope->getType($empty->expr);
         if (! $arrayType instanceof ArrayType) {
             return false;
         }