rectorphp · samsonasik · May 9, 2025 · May 9, 2025 · May 9, 2025 · May 9, 2025
diff --git a/.../Class_/GetFunctionsToAsTwigFunctionAttributeRector/Fixture/skip_different_object.php.inc b/.../Class_/GetFunctionsToAsTwigFunctionAttributeRector/Fixture/skip_different_object.php.inc
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Symfony\Tests\Symfony73\Rector\Class_\GetFunctionsToAsTwigFunctionAttributeRector\Fixture;
+
+use Twig\Extension\AbstractExtension;
+
+final class SkipDifferentObject extends AbstractExtension
+{
+    public function getFunctions(): array
+    {
+        return [
+            new \Twig\TwigFunction('some_function', [$differentObject, 'someFunction']),
+            new \Twig\TwigFunction('some_function', $differentObject->someFunction(...)),
+        ];
+    }
+
+    public function someFunction($value)
+    {
+        return $value;
+    }
+}
+
+?>
diff --git a/rules/Symfony73/GetMethodToAsTwigAttributeTransformer.php b/rules/Symfony73/GetMethodToAsTwigAttributeTransformer.php
@@ -15,6 +15,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;
 
@@ -26,14 +27,15 @@
     public function __construct(
         private LocalArrayMethodCallableMatcher $localArrayMethodCallableMatcher,
         private ReturnEmptyArrayMethodRemover $returnEmptyArrayMethodRemover,
-        private ReflectionProvider $reflectionProvider,
+        private ReflectionProvider $reflectionProvider
     ) {
     }
 
     public function transformClassGetMethodToAttributeMarker(
         Class_ $class,
         string $methodName,
-        string $attributeClass
+        string $attributeClass,
+        ObjectType $objectType
     ): bool {
 
         // check if attribute even exists
@@ -64,6 +66,10 @@ public function transformClassGetMethodToAttributeMarker(
                     continue;
                 }
 
+                if ($arrayItem->value->isFirstClassCallable()) {
+                    continue;
+                }
+
                 $new = $arrayItem->value;
                 if (count($new->getArgs()) !== 2) {
                     continue;
@@ -72,7 +78,7 @@ public function transformClassGetMethodToAttributeMarker(
                 $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;
                     }

diff --git a/rules/Symfony73/NodeAnalyzer/LocalArrayMethodCallableMatcher.php b/rules/Symfony73/NodeAnalyzer/LocalArrayMethodCallableMatcher.php
@@ -7,34 +7,34 @@
 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
+final readonly class LocalArrayMethodCallableMatcher
 {
-    public function match(Expr $expr): ?string
+    public function __construct(
+        private NodeTypeResolver $nodeTypeResolver
+    ) {
+    }
+
+    public function match(Expr $expr, ObjectType $objectType): ?string
     {
         if ($expr instanceof MethodCall) {
             if (! $expr->name instanceof Identifier) {
                 return null;
             }
 
-            return $expr->name->toString();
-        }
-
-        if ($expr instanceof Array_) {
-            $firstItem = $expr->items[0];
-            if (! $firstItem->value instanceof Variable) {
+            if (! $this->nodeTypeResolver->isObjectType($expr->var, $objectType)) {
                 return null;
             }
 
-            $methodName = $firstItem->value->name;
-            if (! is_string($methodName)) {
-                return null;
-            }
+            return $expr->name->toString();
+        }
 
-            if ($methodName !== 'this') {
+        if ($expr instanceof Array_) {
+            if (! $this->nodeTypeResolver->isObjectType($expr->items[0]->value, $objectType)) {
                 return null;
             }
 

diff --git a/rules/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector.php b/rules/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector.php
@@ -89,7 +89,8 @@ public function refactor(Node $node): ?Class_
         $hasChanged = $this->getMethodToAsTwigAttributeTransformer->transformClassGetMethodToAttributeMarker(
             $node,
             'getFilters',
-            TwigClass::AS_TWIG_FILTER_ATTRIBUTE
+            TwigClass::AS_TWIG_FILTER_ATTRIBUTE,
+            $twigExtensionObjectType
         );
 
         if ($hasChanged) {

diff --git a/rules/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector.php b/rules/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector.php
@@ -81,14 +81,16 @@ public function refactor(Node $node): ?Class_
             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
+            TwigClass::AS_TWIG_FUNCTION_ATTRIBUTE,
+            $twigExtensionObjectType
         );
 
         if (! $hasChanged) {