Updated Rector to commit 139c19cbdf666ce3df7dea712faaf84772f19051

139c19cbdf Fix foreach key evaluation for SimplifyForeachToArrayFilterRector. (#3100)

rules/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector.php

@@ -9,7 +9,6 @@ use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\If_;
@@ -18,6 +17,8 @@ use PHPStan\Type\MixedType;
 use PHPStan\Type\UnionType;
 use Rector\CodeQuality\NodeFactory\ArrayFilterFactory;
 use Rector\Core\Rector\AbstractRector;
+use Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer;
+use Rector\ReadWrite\NodeAnalyzer\ReadExprAnalyzer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
@@ -30,9 +31,21 @@ final class SimplifyForeachToArrayFilterRector extends AbstractRector
      * @var \Rector\CodeQuality\NodeFactory\ArrayFilterFactory
      */
     private $arrayFilterFactory;
-    public function __construct(ArrayFilterFactory $arrayFilterFactory)
+    /**
+     * @readonly
+     * @var \Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer
+     */
+    private $exprUsedInNodeAnalyzer;
+    /**
+     * @readonly
+     * @var \Rector\ReadWrite\NodeAnalyzer\ReadExprAnalyzer
+     */
+    private $readExprAnalyzer;
+    public function __construct(ArrayFilterFactory $arrayFilterFactory, ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer, ReadExprAnalyzer $readExprAnalyzer)
     {
         $this->arrayFilterFactory = $arrayFilterFactory;
+        $this->exprUsedInNodeAnalyzer = $exprUsedInNodeAnalyzer;
+        $this->readExprAnalyzer = $readExprAnalyzer;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -74,6 +87,10 @@ CODE_SAMPLE
         /** @var If_ $ifNode */
         $ifNode = $node->stmts[0];
         $condExpr = $ifNode->cond;
+        $foreachKeyVar = $node->keyVar;
+        if ($foreachKeyVar !== null && $this->shouldSkipForeachKeyUsage($ifNode, $foreachKeyVar)) {
+            return null;
+        }
         if ($condExpr instanceof FuncCall) {
             return $this->refactorFuncCall($ifNode, $condExpr, $node, $foreachValueVar);
         }
@@ -99,6 +116,23 @@ CODE_SAMPLE
         }
         return $ifNode->elseifs !== [];
     }
+    private function shouldSkipForeachKeyUsage(If_ $if, Expr $expr) : bool
+    {
+        if (!$expr instanceof Variable) {
+            return \false;
+        }
+        /** @var Variable[] $keyVarUsage */
+        $keyVarUsage = $this->betterNodeFinder->find($if, function (Node $node) use($expr) : bool {
+            return $this->exprUsedInNodeAnalyzer->isUsed($node, $expr);
+        });
+        $keyVarUsageCount = \count($keyVarUsage);
+        if ($keyVarUsageCount === 1) {
+            /** @var Variable $currentVarUsage */
+            $currentVarUsage = \current($keyVarUsage);
+            return !$this->readExprAnalyzer->isExprRead($currentVarUsage);
+        }
+        return $keyVarUsageCount !== 0;
+    }
     private function isArrayDimFetchInForLoop(Foreach_ $foreach, ArrayDimFetch $arrayDimFetch) : bool
     {
         $loopVar = $foreach->expr;

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '12ea285bcd922dbacaaed44a4819c7ee3477b1c2';
+    public const PACKAGE_VERSION = '139c19cbdf666ce3df7dea712faaf84772f19051';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-12-02 16:36:14';
+    public const RELEASE_DATE = '2022-12-03 06:56:33';
     /**
      * @var int
      */

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit871c16b9fd2cbd18b7fc152f559b8cba::getLoader();
+return ComposerAutoloaderInit11fda1c87505eda717f408f0caeff073::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit871c16b9fd2cbd18b7fc152f559b8cba
+class ComposerAutoloaderInit11fda1c87505eda717f408f0caeff073
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInit871c16b9fd2cbd18b7fc152f559b8cba
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit871c16b9fd2cbd18b7fc152f559b8cba', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit11fda1c87505eda717f408f0caeff073', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit871c16b9fd2cbd18b7fc152f559b8cba', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit11fda1c87505eda717f408f0caeff073', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit11fda1c87505eda717f408f0caeff073::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit11fda1c87505eda717f408f0caeff073::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire871c16b9fd2cbd18b7fc152f559b8cba($fileIdentifier, $file);
+            composerRequire11fda1c87505eda717f408f0caeff073($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInit871c16b9fd2cbd18b7fc152f559b8cba
  * @param string $file
  * @return void
  */
-function composerRequire871c16b9fd2cbd18b7fc152f559b8cba($fileIdentifier, $file)
+function composerRequire11fda1c87505eda717f408f0caeff073($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba
+class ComposerStaticInit11fda1c87505eda717f408f0caeff073
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3023,9 +3023,9 @@ class ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit871c16b9fd2cbd18b7fc152f559b8cba::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit11fda1c87505eda717f408f0caeff073::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit11fda1c87505eda717f408f0caeff073::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit11fda1c87505eda717f408f0caeff073::$classMap;
 
         }, null, ClassLoader::class);
     }