Updated Rector to commit 3be6fd7636ee24d82606f6166f94d8372fee800d

rectorphp/rector-src@3be6fd7 Clean up repetitive recursive call and flag on ArrayKeyFirstLastRector (#6889)

Author: TomasVotruba

vendor/composer/installed.json

@@ -1866,12 +1866,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
-                "reference": "2867ceffdc0deb13e0a129ab3eb300ad304df96f"
+                "reference": "9cb58c14bf2ec834b72bcceaf0dc1de9d920bc05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/2867ceffdc0deb13e0a129ab3eb300ad304df96f",
-                "reference": "2867ceffdc0deb13e0a129ab3eb300ad304df96f",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/9cb58c14bf2ec834b72bcceaf0dc1de9d920bc05",
+                "reference": "9cb58c14bf2ec834b72bcceaf0dc1de9d920bc05",
                 "shasum": ""
             },
             "require": {
@@ -1900,7 +1900,7 @@
                 "tomasvotruba\/unused-public": "^2.0",
                 "tracy\/tracy": "^2.10"
             },
-            "time": "2025-05-09T07:59:03+00:00",
+            "time": "2025-05-09T12:54:05+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {

vendor/composer/installed.php

@@ -9,7 +9,7 @@
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 020b7c1'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 2b141c8'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 462d1a9'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 2867cef'));
+    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 020b7c1'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 2b141c8'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 462d1a9'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 9cb58c1'));
     private function __construct()
     {
     }

vendor/rector/extension-installer/src/GeneratedConfig.php

@@ -14,6 +14,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Type\ObjectType;
 use Rector\Symfony\Symfony73\NodeAnalyzer\LocalArrayMethodCallableMatcher;
 use Rector\Symfony\Symfony73\NodeRemover\ReturnEmptyArrayMethodRemover;
 /**
@@ -39,7 +40,7 @@ public function __construct(LocalArrayMethodCallableMatcher $localArrayMethodCal
         $this->returnEmptyArrayMethodRemover = $returnEmptyArrayMethodRemover;
         $this->reflectionProvider = $reflectionProvider;
     }
-    public function transformClassGetMethodToAttributeMarker(Class_ $class, string $methodName, string $attributeClass) : bool
+    public function transformClassGetMethodToAttributeMarker(Class_ $class, string $methodName, string $attributeClass, ObjectType $objectType) : bool
     {
         // check if attribute even exists
         if (!$this->reflectionProvider->hasClass($attributeClass)) {
@@ -63,13 +64,16 @@ public function transformClassGetMethodToAttributeMarker(Class_ $class, string $
                 if (!$arrayItem->value instanceof New_) {
                     continue;
                 }
+                if ($arrayItem->value->isFirstClassCallable()) {
+                    continue;
+                }
                 $new = $arrayItem->value;
                 if (\count($new->getArgs()) !== 2) {
                     continue;
                 }
                 $secondArg = $new->getArgs()[1];
                 if ($this->isLocalCallable($secondArg->value)) {
-                    $localMethodName = $this->localArrayMethodCallableMatcher->match($secondArg->value);
+                    $localMethodName = $this->localArrayMethodCallableMatcher->match($secondArg->value, $objectType);
                     if (!\is_string($localMethodName)) {
                         continue;
                     }

vendor/rector/rector-symfony/rules/Symfony73/GetMethodToAsTwigAttributeTransformer.php

@@ -6,29 +6,33 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\String_;
+use PHPStan\Type\ObjectType;
+use Rector\NodeTypeResolver\NodeTypeResolver;
 final class LocalArrayMethodCallableMatcher
 {
-    public function match(Expr $expr) : ?string
+    /**
+     * @readonly
+     */
+    private NodeTypeResolver $nodeTypeResolver;
+    public function __construct(NodeTypeResolver $nodeTypeResolver)
+    {
+        $this->nodeTypeResolver = $nodeTypeResolver;
+    }
+    public function match(Expr $expr, ObjectType $objectType) : ?string
     {
         if ($expr instanceof MethodCall) {
             if (!$expr->name instanceof Identifier) {
                 return null;
             }
+            if (!$this->nodeTypeResolver->isObjectType($expr->var, $objectType)) {
+                return null;
+            }
             return $expr->name->toString();
         }
         if ($expr instanceof Array_) {
-            $firstItem = $expr->items[0];
-            if (!$firstItem->value instanceof Variable) {
-                return null;
-            }
-            $methodName = $firstItem->value->name;
-            if (!\is_string($methodName)) {
-                return null;
-            }
-            if ($methodName !== 'this') {
+            if (!$this->nodeTypeResolver->isObjectType($expr->items[0]->value, $objectType)) {
                 return null;
             }
             $secondItem = $expr->items[1];

vendor/rector/rector-symfony/rules/Symfony73/NodeAnalyzer/LocalArrayMethodCallableMatcher.php

@@ -77,7 +77,7 @@ public function refactor(Node $node) : ?Class_
         if (!$this->isObjectType($node, $twigExtensionObjectType)) {
             return null;
         }
-        $hasChanged = $this->getMethodToAsTwigAttributeTransformer->transformClassGetMethodToAttributeMarker($node, 'getFilters', TwigClass::AS_TWIG_FILTER_ATTRIBUTE);
+        $hasChanged = $this->getMethodToAsTwigAttributeTransformer->transformClassGetMethodToAttributeMarker($node, 'getFilters', TwigClass::AS_TWIG_FILTER_ATTRIBUTE, $twigExtensionObjectType);
         if ($hasChanged) {
             return $node;
         }

vendor/rector/rector-symfony/rules/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector.php

@@ -73,10 +73,11 @@ public function refactor(Node $node) : ?Class_
         if ($node->isAbstract() || $node->isAnonymous()) {
             return null;
         }
-        if (!$this->isObjectType($node, new ObjectType(TwigClass::TWIG_EXTENSION))) {
+        $twigExtensionObjectType = new ObjectType(TwigClass::TWIG_EXTENSION);
+        if (!$this->isObjectType($node, $twigExtensionObjectType)) {
             return null;
         }
-        $hasChanged = $this->getMethodToAsTwigAttributeTransformer->transformClassGetMethodToAttributeMarker($node, 'getFunctions', TwigClass::AS_TWIG_FUNCTION_ATTRIBUTE);
+        $hasChanged = $this->getMethodToAsTwigAttributeTransformer->transformClassGetMethodToAttributeMarker($node, 'getFunctions', TwigClass::AS_TWIG_FUNCTION_ATTRIBUTE, $twigExtensionObjectType);
         if (!$hasChanged) {
             return null;
         }