Updated Rector to commit 7129067a8a

7129067a8a [CodeQuality] Fix default array param in CallableThisArrayToAnonymousFunctionRector (#2527)

rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php

@@ -161,6 +161,7 @@ CODE_SAMPLE
                     $lastCase = new Case_($matchArmCond);
                     $switchCases[] = $lastCase;
                 }
+                /** @var Case_ $lastCase */
                 $lastCase->stmts = $this->createSwitchStmts($node, $matchArm, $parentNode);
             } else {
                 $stmts = $this->createSwitchStmts($node, $matchArm, $parentNode);

rules/Php72/NodeFactory/AnonymousFunctionFactory.php

@@ -12,7 +12,6 @@ use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\ClosureUse;
-use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
@@ -37,15 +36,14 @@ use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\VoidType;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\PhpParser\AstResolver;
-use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PhpParser\Node\NodeFactory;
 use Rector\Core\PhpParser\Parser\InlineCodeParser;
 use Rector\Core\PhpParser\Parser\SimplePhpParser;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\Php72\NodeManipulator\ClosureNestedUsesDecorator;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 use ReflectionParameter;
@@ -90,19 +88,14 @@ final class AnonymousFunctionFactory
     private $simplePhpParser;
     /**
      * @readonly
-     * @var \Rector\Core\PhpParser\Comparing\NodeComparator
+     * @var \Rector\Php72\NodeManipulator\ClosureNestedUsesDecorator
      */
-    private $nodeComparator;
+    private $closureNestedUsesDecorator;
     /**
      * @readonly
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;
-    /**
-     * @readonly
-     * @var \Rector\Core\Contract\PhpParser\NodePrinterInterface
-     */
-    private $nodePrinter;
     /**
      * @readonly
      * @var \Symplify\PackageBuilder\Reflection\PrivatesAccessor
@@ -113,7 +106,7 @@ final class AnonymousFunctionFactory
      * @var \Rector\Core\PhpParser\Parser\InlineCodeParser
      */
     private $inlineCodeParser;
-    public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, NodeFactory $nodeFactory, StaticTypeMapper $staticTypeMapper, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, SimplePhpParser $simplePhpParser, NodeComparator $nodeComparator, AstResolver $astResolver, NodePrinterInterface $nodePrinter, PrivatesAccessor $privatesAccessor, InlineCodeParser $inlineCodeParser)
+    public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, NodeFactory $nodeFactory, StaticTypeMapper $staticTypeMapper, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, SimplePhpParser $simplePhpParser, ClosureNestedUsesDecorator $closureNestedUsesDecorator, AstResolver $astResolver, PrivatesAccessor $privatesAccessor, InlineCodeParser $inlineCodeParser)
     {
         $this->nodeNameResolver = $nodeNameResolver;
         $this->betterNodeFinder = $betterNodeFinder;
@@ -121,9 +114,8 @@ final class AnonymousFunctionFactory
         $this->staticTypeMapper = $staticTypeMapper;
         $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
         $this->simplePhpParser = $simplePhpParser;
-        $this->nodeComparator = $nodeComparator;
+        $this->closureNestedUsesDecorator = $closureNestedUsesDecorator;
         $this->astResolver = $astResolver;
-        $this->nodePrinter = $nodePrinter;
         $this->privatesAccessor = $privatesAccessor;
         $this->inlineCodeParser = $inlineCodeParser;
     }
@@ -141,7 +133,7 @@ final class AnonymousFunctionFactory
             $anonymousFunctionNode->static = $static;
         }
         foreach ($useVariables as $useVariable) {
-            $anonymousFunctionNode = $this->applyNestedUses($anonymousFunctionNode, $useVariable);
+            $anonymousFunctionNode = $this->closureNestedUsesDecorator->applyNestedUses($anonymousFunctionNode, $useVariable);
             $anonymousFunctionNode->uses[] = new ClosureUse($useVariable);
         }
         if ($returnTypeNode instanceof Node) {
@@ -154,9 +146,8 @@ final class AnonymousFunctionFactory
     {
         /** @var FunctionVariantWithPhpDocs $functionVariantWithPhpDoc */
         $functionVariantWithPhpDoc = ParametersAcceptorSelector::selectSingle($phpMethodReflection->getVariants());
-        $anonymousFunction = new Closure();
         $newParams = $this->createParams($phpMethodReflection, $functionVariantWithPhpDoc->getParameters());
-        $anonymousFunction->params = $newParams;
+        $anonymousFunction = new Closure(['params' => $newParams]);
         $innerMethodCall = $this->createInnerMethodCall($phpMethodReflection, $expr, $newParams);
         if ($innerMethodCall === null) {
             return null;
@@ -202,63 +193,6 @@ final class AnonymousFunctionFactory
         }, $variables);
         return $anonymousFunction;
     }
-    /**
-     * @param ClosureUse[] $uses
-     * @return ClosureUse[]
-     */
-    private function cleanClosureUses(array $uses) : array
-    {
-        $uniqueUses = [];
-        foreach ($uses as $use) {
-            if (!\is_string($use->var->name)) {
-                continue;
-            }
-            $variableName = $use->var->name;
-            if (\array_key_exists($variableName, $uniqueUses)) {
-                continue;
-            }
-            $uniqueUses[$variableName] = $use;
-        }
-        return \array_values($uniqueUses);
-    }
-    private function applyNestedUses(Closure $anonymousFunctionNode, Variable $useVariable) : Closure
-    {
-        $parent = $this->betterNodeFinder->findParentType($useVariable, Closure::class);
-        if (!$parent instanceof Closure) {
-            return $anonymousFunctionNode;
-        }
-        $paramNames = $this->nodeNameResolver->getNames($parent->params);
-        if ($this->nodeNameResolver->isNames($useVariable, $paramNames)) {
-            return $anonymousFunctionNode;
-        }
-        $anonymousFunctionNode = clone $anonymousFunctionNode;
-        while ($parent instanceof Closure) {
-            $parentOfParent = $this->betterNodeFinder->findParentType($parent, Closure::class);
-            $uses = [];
-            while ($parentOfParent instanceof Closure) {
-                $uses = $this->collectUsesEqual($parentOfParent, $uses, $useVariable);
-                $parentOfParent = $this->betterNodeFinder->findParentType($parentOfParent, Closure::class);
-            }
-            $uses = \array_merge($parent->uses, $uses);
-            $uses = $this->cleanClosureUses($uses);
-            $parent->uses = $uses;
-            $parent = $this->betterNodeFinder->findParentType($parent, Closure::class);
-        }
-        return $anonymousFunctionNode;
-    }
-    /**
-     * @param ClosureUse[] $uses
-     * @return ClosureUse[]
-     */
-    private function collectUsesEqual(Closure $closure, array $uses, Variable $useVariable) : array
-    {
-        foreach ($closure->params as $param) {
-            if ($this->nodeComparator->areNodesEqual($param->var, $useVariable)) {
-                $uses[] = new ClosureUse($param->var);
-            }
-        }
-        return $uses;
-    }
     /**
      * @param Param[] $paramNodes
      * @return string[]
@@ -345,8 +279,17 @@ final class AnonymousFunctionFactory
         if (!$parameterReflection->getDefaultValue() instanceof Type) {
             return;
         }
-        $printDefaultValue = $this->nodePrinter->print($classMethod->params[$key]->default);
-        $param->default = new ConstFetch(new Name($printDefaultValue));
+        $paramDefaultExpr = $classMethod->params[$key]->default;
+        if (!$paramDefaultExpr instanceof Expr) {
+            return;
+        }
+        // reset original node, to allow the printer to re-use the expr
+        $paramDefaultExpr->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+        $this->simpleCallableNodeTraverser->traverseNodesWithCallable($paramDefaultExpr, function (Node $node) : Node {
+            $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+            return $node;
+        });
+        $param->default = $paramDefaultExpr;
     }
     /**
      * @param Param[] $params
@@ -387,7 +330,10 @@ final class AnonymousFunctionFactory
             return null;
         }
         $name = new Name($className);
-        return $name->isSpecialClassName() ? $name : new FullyQualified($className);
+        if ($name->isSpecialClassName()) {
+            return $name;
+        }
+        return new FullyQualified($className);
     }
     /**
      * @return \PhpParser\Node\Expr\New_|\PhpParser\Node\Expr|null

rules/Php72/NodeManipulator/ClosureNestedUsesDecorator.php

@@ -0,0 +1,92 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Php72\NodeManipulator;
+
+use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Expr\ClosureUse;
+use PhpParser\Node\Expr\Variable;
+use Rector\Core\PhpParser\Comparing\NodeComparator;
+use Rector\Core\PhpParser\Node\BetterNodeFinder;
+use Rector\NodeNameResolver\NodeNameResolver;
+final class ClosureNestedUsesDecorator
+{
+    /**
+     * @readonly
+     * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
+     */
+    private $betterNodeFinder;
+    /**
+     * @readonly
+     * @var \Rector\NodeNameResolver\NodeNameResolver
+     */
+    private $nodeNameResolver;
+    /**
+     * @readonly
+     * @var \Rector\Core\PhpParser\Comparing\NodeComparator
+     */
+    private $nodeComparator;
+    public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, NodeComparator $nodeComparator)
+    {
+        $this->betterNodeFinder = $betterNodeFinder;
+        $this->nodeNameResolver = $nodeNameResolver;
+        $this->nodeComparator = $nodeComparator;
+    }
+    public function applyNestedUses(Closure $anonymousFunctionNode, Variable $useVariable) : Closure
+    {
+        $parent = $this->betterNodeFinder->findParentType($useVariable, Closure::class);
+        if (!$parent instanceof Closure) {
+            return $anonymousFunctionNode;
+        }
+        $paramNames = $this->nodeNameResolver->getNames($parent->params);
+        if ($this->nodeNameResolver->isNames($useVariable, $paramNames)) {
+            return $anonymousFunctionNode;
+        }
+        $anonymousFunctionNode = clone $anonymousFunctionNode;
+        while ($parent instanceof Closure) {
+            $parentOfParent = $this->betterNodeFinder->findParentType($parent, Closure::class);
+            $uses = [];
+            while ($parentOfParent instanceof Closure) {
+                $uses = $this->collectUsesEqual($parentOfParent, $uses, $useVariable);
+                $parentOfParent = $this->betterNodeFinder->findParentType($parentOfParent, Closure::class);
+            }
+            $uses = \array_merge($parent->uses, $uses);
+            $uses = $this->cleanClosureUses($uses);
+            $parent->uses = $uses;
+            $parent = $this->betterNodeFinder->findParentType($parent, Closure::class);
+        }
+        return $anonymousFunctionNode;
+    }
+    /**
+     * @param ClosureUse[] $uses
+     * @return ClosureUse[]
+     */
+    private function collectUsesEqual(Closure $closure, array $uses, Variable $useVariable) : array
+    {
+        foreach ($closure->params as $param) {
+            if ($this->nodeComparator->areNodesEqual($param->var, $useVariable)) {
+                $uses[] = new ClosureUse($param->var);
+            }
+        }
+        return $uses;
+    }
+    /**
+     * @param ClosureUse[] $uses
+     * @return ClosureUse[]
+     */
+    private function cleanClosureUses(array $uses) : array
+    {
+        $uniqueUses = [];
+        foreach ($uses as $use) {
+            if (!\is_string($use->var->name)) {
+                continue;
+            }
+            $variableName = $use->var->name;
+            if (\array_key_exists($variableName, $uniqueUses)) {
+                continue;
+            }
+            $uniqueUses[$variableName] = $use;
+        }
+        return \array_values($uniqueUses);
+    }
+}

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = 'b31c654ccac891899d577fe8b938f460b5aab420';
+    public const PACKAGE_VERSION = '7129067a8ae2b3cd3f3866f4b58592928963bab6';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2022-06-17 18:40:33';
+    public const RELEASE_DATE = '2022-06-17 21:19:34';
     /**
      * @var int
      */

vendor/autoload.php

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

vendor/composer/autoload_classmap.php

@@ -2469,6 +2469,7 @@ return array(
     'Rector\\Php71\\Rector\\TryCatch\\MultiExceptionCatchRector' => $baseDir . '/rules/Php71/Rector/TryCatch/MultiExceptionCatchRector.php',
     'Rector\\Php71\\ValueObject\\TwoNodeMatch' => $baseDir . '/rules/Php71/ValueObject/TwoNodeMatch.php',
     'Rector\\Php72\\NodeFactory\\AnonymousFunctionFactory' => $baseDir . '/rules/Php72/NodeFactory/AnonymousFunctionFactory.php',
+    'Rector\\Php72\\NodeManipulator\\ClosureNestedUsesDecorator' => $baseDir . '/rules/Php72/NodeManipulator/ClosureNestedUsesDecorator.php',
     'Rector\\Php72\\Rector\\Assign\\ListEachRector' => $baseDir . '/rules/Php72/Rector/Assign/ListEachRector.php',
     'Rector\\Php72\\Rector\\Assign\\ReplaceEachAssignmentWithKeyCurrentRector' => $baseDir . '/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php',
     'Rector\\Php72\\Rector\\FuncCall\\CreateFunctionToAnonymousFunctionRector' => $baseDir . '/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitbe88ff28d0a64de61be744151b1f5636
+class ComposerAutoloaderInit9e65b461ee35181bfb5655862c382102
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInitbe88ff28d0a64de61be744151b1f5636
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitbe88ff28d0a64de61be744151b1f5636', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9e65b461ee35181bfb5655862c382102', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitbe88ff28d0a64de61be744151b1f5636', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9e65b461ee35181bfb5655862c382102', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitbe88ff28d0a64de61be744151b1f5636::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit9e65b461ee35181bfb5655862c382102::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitbe88ff28d0a64de61be744151b1f5636::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit9e65b461ee35181bfb5655862c382102::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirebe88ff28d0a64de61be744151b1f5636($fileIdentifier, $file);
+            composerRequire9e65b461ee35181bfb5655862c382102($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInitbe88ff28d0a64de61be744151b1f5636
  * @param string $file
  * @return void
  */
-function composerRequirebe88ff28d0a64de61be744151b1f5636($fileIdentifier, $file)
+function composerRequire9e65b461ee35181bfb5655862c382102($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 ComposerStaticInitbe88ff28d0a64de61be744151b1f5636
+class ComposerStaticInit9e65b461ee35181bfb5655862c382102
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -2770,6 +2770,7 @@ class ComposerStaticInitbe88ff28d0a64de61be744151b1f5636
         'Rector\\Php71\\Rector\\TryCatch\\MultiExceptionCatchRector' => __DIR__ . '/../..' . '/rules/Php71/Rector/TryCatch/MultiExceptionCatchRector.php',
         'Rector\\Php71\\ValueObject\\TwoNodeMatch' => __DIR__ . '/../..' . '/rules/Php71/ValueObject/TwoNodeMatch.php',
         'Rector\\Php72\\NodeFactory\\AnonymousFunctionFactory' => __DIR__ . '/../..' . '/rules/Php72/NodeFactory/AnonymousFunctionFactory.php',
+        'Rector\\Php72\\NodeManipulator\\ClosureNestedUsesDecorator' => __DIR__ . '/../..' . '/rules/Php72/NodeManipulator/ClosureNestedUsesDecorator.php',
         'Rector\\Php72\\Rector\\Assign\\ListEachRector' => __DIR__ . '/../..' . '/rules/Php72/Rector/Assign/ListEachRector.php',
         'Rector\\Php72\\Rector\\Assign\\ReplaceEachAssignmentWithKeyCurrentRector' => __DIR__ . '/../..' . '/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php',
         'Rector\\Php72\\Rector\\FuncCall\\CreateFunctionToAnonymousFunctionRector' => __DIR__ . '/../..' . '/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php',
@@ -3396,9 +3397,9 @@ class ComposerStaticInitbe88ff28d0a64de61be744151b1f5636
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitbe88ff28d0a64de61be744151b1f5636::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitbe88ff28d0a64de61be744151b1f5636::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitbe88ff28d0a64de61be744151b1f5636::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit9e65b461ee35181bfb5655862c382102::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit9e65b461ee35181bfb5655862c382102::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit9e65b461ee35181bfb5655862c382102::$classMap;
 
         }, null, ClassLoader::class);
     }