add explicit attribute name arg, to improve context

TomasVotruba · TomasVotruba · commit 5ea0c4099132 · 2025-12-16T14:39:52.000+01:00
diff --git a/rules-tests/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector/Fixture/some_get_filters.php.inc b/rules-tests/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector/Fixture/some_get_filters.php.inc
@@ -29,7 +29,7 @@ use Twig\Extension\AbstractExtension;
 
 final class SomeGetFilter
 {
-    #[\Twig\Attribute\AsTwigFilter('some_filter')]
+    #[\Twig\Attribute\AsTwigFilter(name: 'some_filter')]
     public function someFilter($value)
     {
         return $value;
diff --git a/rules-tests/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector/Fixture/with_first_class_callable_filter.php.inc b/rules-tests/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector/Fixture/with_first_class_callable_filter.php.inc
@@ -41,19 +41,19 @@ use Twig\Extension\AbstractExtension;
 
 final class WithFirstClassCallableFilter
 {
-    #[\Twig\Attribute\AsTwigFilter('some_filter')]
+    #[\Twig\Attribute\AsTwigFilter(name: 'some_filter')]
     public function someFilter($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('another_filter')]
+    #[\Twig\Attribute\AsTwigFilter(name: 'another_filter')]
     public function anotherFilter($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('third_filter')]
+    #[\Twig\Attribute\AsTwigFilter(name: 'third_filter')]
     public function thirdFilter($value)
     {
         return $value;
diff --git a/rules-tests/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector/Fixture/with_options_argument.php.inc b/rules-tests/Symfony73/Rector/Class_/GetFiltersToAsTwigFilterAttributeRector/Fixture/with_options_argument.php.inc
@@ -82,49 +82,49 @@ use Twig\Extension\AbstractExtension;
 
 final class WithOptionsParameter
 {
-    #[\Twig\Attribute\AsTwigFilter('with_environment', needsEnvironment: true)]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_environment', needsEnvironment: true)]
     public function withEnvironment(Environment $env, $value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_context', needsContext: true)]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_context', needsContext: true)]
     public function withContext(array $context, $value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_charset', needsCharset: true)]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_charset', needsCharset: true)]
     public function withCharset(string $charset, $value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_pre_escape', preEscape: 'html')]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_pre_escape', preEscape: 'html')]
     public function withPreEscape($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_preserves_safety', preservesSafety: ['html'])]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_preserves_safety', preservesSafety: ['html'])]
     public function withPreservesSafety($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]
     public function withSafeCallback($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]
     public function withDeprecationInfo($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFilter('with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true, preEscape: 'html', preservesSafety: ['html'])]
+    #[\Twig\Attribute\AsTwigFilter(name: 'with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true, preEscape: 'html', preservesSafety: ['html'])]
     public function withEverything(string $charset, Environment $env, array $context, $value)
     {
         return $value;
diff --git a/rules-tests/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector/Fixture/some_get_functions.php.inc b/rules-tests/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector/Fixture/some_get_functions.php.inc
@@ -41,19 +41,19 @@ use Twig\Extension\AbstractExtension;
 
 final class SomeGetFunctions
 {
-    #[\Twig\Attribute\AsTwigFunction('some_function')]
+    #[\Twig\Attribute\AsTwigFunction(name: 'some_function')]
     public function someFunction($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('another_function')]
+    #[\Twig\Attribute\AsTwigFunction(name: 'another_function')]
     public function anotherFunction($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('third_function')]
+    #[\Twig\Attribute\AsTwigFunction(name: 'third_function')]
     public function thirdFunction($value)
     {
         return $value;
diff --git a/rules-tests/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector/Fixture/with_options_argument.php.inc b/rules-tests/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector/Fixture/with_options_argument.php.inc
@@ -70,37 +70,37 @@ use Twig\Extension\AbstractExtension;
 
 final class WithOptionsParameter
 {
-    #[\Twig\Attribute\AsTwigFunction('with_environment', needsEnvironment: true)]
+    #[\Twig\Attribute\AsTwigFunction(name: 'with_environment', needsEnvironment: true)]
     public function withEnvironment(Environment $env, $value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('with_context', needsContext: true)]
+    #[\Twig\Attribute\AsTwigFunction(name: 'with_context', needsContext: true)]
     public function withContext(array $context, $value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('with_charset', needsCharset: true)]
+    #[\Twig\Attribute\AsTwigFunction(name: 'with_charset', needsCharset: true)]
     public function withCharset(string $charset, $value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]
+    #[\Twig\Attribute\AsTwigFunction(name: 'with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]
     public function withSafeCallback($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]
+    #[\Twig\Attribute\AsTwigFunction(name: 'with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]
     public function withDeprecationInfo($value)
     {
         return $value;
     }
 
-    #[\Twig\Attribute\AsTwigFunction('with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true)]
+    #[\Twig\Attribute\AsTwigFunction(name: 'with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true)]
     public function withEverything(string $charset, Environment $env, array $context, $value)
     {
         return $value;
diff --git a/rules/Symfony73/GetMethodToAsTwigAttributeTransformer.php b/rules/Symfony73/GetMethodToAsTwigAttributeTransformer.php
@@ -127,6 +127,8 @@ public function transformClassGetMethodToAttributeMarker(
                     // remove old new function instance
                     unset($returnArray->items[$key]);
 
+                    $nameArg->name = new Identifier('name');
+
                     $hasChanged = true;
                 }
             }
diff --git a/rules/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector.php b/rules/Symfony73/Rector/Class_/GetFunctionsToAsTwigFunctionAttributeRector.php
@@ -52,13 +52,12 @@ public function localMethod(Environment $env, $value)
 CODE_SAMPLE
                     ,
                     <<<'CODE_SAMPLE'
-use Twig\Extension\AbstractExtension;
 use Twig\Attribute\AsTwigFunction;
 use Twig\Environment;
 
-class SomeClass extends AbstractExtension
+class SomeClass
 {
-    #[AsTwigFunction('function_name', needsEnvironment: true)]
+    #[AsTwigFunction(name: 'function_name', needsEnvironment: true)]
     public function localMethod(Environment $env, $value)
     {
         return $value;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ use Twig\Extension\AbstractExtension;`
`29`	`29`
`30`	`30`	`final class SomeGetFilter`
`31`	`31`	`{`
`32`		`- #[\Twig\Attribute\AsTwigFilter('some_filter')]`
	`32`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'some_filter')]`
`33`	`33`	`public function someFilter($value)`
`34`	`34`	`{`
`35`	`35`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -41,19 +41,19 @@ use Twig\Extension\AbstractExtension;`
`41`	`41`
`42`	`42`	`final class WithFirstClassCallableFilter`
`43`	`43`	`{`
`44`		`- #[\Twig\Attribute\AsTwigFilter('some_filter')]`
	`44`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'some_filter')]`
`45`	`45`	`public function someFilter($value)`
`46`	`46`	`{`
`47`	`47`	`return $value;`
`48`	`48`	`}`
`49`	`49`
`50`		`- #[\Twig\Attribute\AsTwigFilter('another_filter')]`
	`50`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'another_filter')]`
`51`	`51`	`public function anotherFilter($value)`
`52`	`52`	`{`
`53`	`53`	`return $value;`
`54`	`54`	`}`
`55`	`55`
`56`		`- #[\Twig\Attribute\AsTwigFilter('third_filter')]`
	`56`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'third_filter')]`
`57`	`57`	`public function thirdFilter($value)`
`58`	`58`	`{`
`59`	`59`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -82,49 +82,49 @@ use Twig\Extension\AbstractExtension;`
`82`	`82`
`83`	`83`	`final class WithOptionsParameter`
`84`	`84`	`{`
`85`		`- #[\Twig\Attribute\AsTwigFilter('with_environment', needsEnvironment: true)]`
	`85`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_environment', needsEnvironment: true)]`
`86`	`86`	`public function withEnvironment(Environment $env, $value)`
`87`	`87`	`{`
`88`	`88`	`return $value;`
`89`	`89`	`}`
`90`	`90`
`91`		`- #[\Twig\Attribute\AsTwigFilter('with_context', needsContext: true)]`
	`91`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_context', needsContext: true)]`
`92`	`92`	`public function withContext(array $context, $value)`
`93`	`93`	`{`
`94`	`94`	`return $value;`
`95`	`95`	`}`
`96`	`96`
`97`		`- #[\Twig\Attribute\AsTwigFilter('with_charset', needsCharset: true)]`
	`97`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_charset', needsCharset: true)]`
`98`	`98`	`public function withCharset(string $charset, $value)`
`99`	`99`	`{`
`100`	`100`	`return $value;`
`101`	`101`	`}`
`102`	`102`
`103`		`- #[\Twig\Attribute\AsTwigFilter('with_pre_escape', preEscape: 'html')]`
	`103`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_pre_escape', preEscape: 'html')]`
`104`	`104`	`public function withPreEscape($value)`
`105`	`105`	`{`
`106`	`106`	`return $value;`
`107`	`107`	`}`
`108`	`108`
`109`		`- #[\Twig\Attribute\AsTwigFilter('with_preserves_safety', preservesSafety: ['html'])]`
	`109`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_preserves_safety', preservesSafety: ['html'])]`
`110`	`110`	`public function withPreservesSafety($value)`
`111`	`111`	`{`
`112`	`112`	`return $value;`
`113`	`113`	`}`
`114`	`114`
`115`		`- #[\Twig\Attribute\AsTwigFilter('with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]`
	`115`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]`
`116`	`116`	`public function withSafeCallback($value)`
`117`	`117`	`{`
`118`	`118`	`return $value;`
`119`	`119`	`}`
`120`	`120`
`121`		`- #[\Twig\Attribute\AsTwigFilter('with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]`
	`121`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]`
`122`	`122`	`public function withDeprecationInfo($value)`
`123`	`123`	`{`
`124`	`124`	`return $value;`
`125`	`125`	`}`
`126`	`126`
`127`		`- #[\Twig\Attribute\AsTwigFilter('with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true, preEscape: 'html', preservesSafety: ['html'])]`
	`127`	`+ #[\Twig\Attribute\AsTwigFilter(name: 'with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true, preEscape: 'html', preservesSafety: ['html'])]`
`128`	`128`	`public function withEverything(string $charset, Environment $env, array $context, $value)`
`129`	`129`	`{`
`130`	`130`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -70,37 +70,37 @@ use Twig\Extension\AbstractExtension;`
`70`	`70`
`71`	`71`	`final class WithOptionsParameter`
`72`	`72`	`{`
`73`		`- #[\Twig\Attribute\AsTwigFunction('with_environment', needsEnvironment: true)]`
	`73`	`+ #[\Twig\Attribute\AsTwigFunction(name: 'with_environment', needsEnvironment: true)]`
`74`	`74`	`public function withEnvironment(Environment $env, $value)`
`75`	`75`	`{`
`76`	`76`	`return $value;`
`77`	`77`	`}`
`78`	`78`
`79`		`- #[\Twig\Attribute\AsTwigFunction('with_context', needsContext: true)]`
	`79`	`+ #[\Twig\Attribute\AsTwigFunction(name: 'with_context', needsContext: true)]`
`80`	`80`	`public function withContext(array $context, $value)`
`81`	`81`	`{`
`82`	`82`	`return $value;`
`83`	`83`	`}`
`84`	`84`
`85`		`- #[\Twig\Attribute\AsTwigFunction('with_charset', needsCharset: true)]`
	`85`	`+ #[\Twig\Attribute\AsTwigFunction(name: 'with_charset', needsCharset: true)]`
`86`	`86`	`public function withCharset(string $charset, $value)`
`87`	`87`	`{`
`88`	`88`	`return $value;`
`89`	`89`	`}`
`90`	`90`
`91`		`- #[\Twig\Attribute\AsTwigFunction('with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]`
	`91`	`+ #[\Twig\Attribute\AsTwigFunction(name: 'with_safe_callback', isSafeCallback: [self::class, 'checkSafeCallback'])]`
`92`	`92`	`public function withSafeCallback($value)`
`93`	`93`	`{`
`94`	`94`	`return $value;`
`95`	`95`	`}`
`96`	`96`
`97`		`- #[\Twig\Attribute\AsTwigFunction('with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]`
	`97`	`+ #[\Twig\Attribute\AsTwigFunction(name: 'with_deprecation_info', deprecationInfo: new DeprecatedCallableInfo('package', 'version'))]`
`98`	`98`	`public function withDeprecationInfo($value)`
`99`	`99`	`{`
`100`	`100`	`return $value;`
`101`	`101`	`}`
`102`	`102`
`103`		`- #[\Twig\Attribute\AsTwigFunction('with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true)]`
	`103`	`+ #[\Twig\Attribute\AsTwigFunction(name: 'with_everything', isSafe: ['html'], needsContext: true, needsCharset: true, needsEnvironment: true)]`
`104`	`104`	`public function withEverything(string $charset, Environment $env, array $context, $value)`
`105`	`105`	`{`
`106`	`106`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,8 @@ public function transformClassGetMethodToAttributeMarker(`
`127`	`127`	`// remove old new function instance`
`128`	`128`	`unset($returnArray->items[$key]);`
`129`	`129`
	`130`	`+ $nameArg->name = new Identifier('name');`
	`131`	`+`
`130`	`132`	`$hasChanged = true;`
`131`	`133`	`}`
`132`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,12 @@ public function localMethod(Environment $env, $value)`
`52`	`52`	`CODE_SAMPLE`
`53`	`53`	`,`
`54`	`54`	`<<<'CODE_SAMPLE'`
`55`		`-use Twig\Extension\AbstractExtension;`
`56`	`55`	`use Twig\Attribute\AsTwigFunction;`
`57`	`56`	`use Twig\Environment;`
`58`	`57`
`59`		`-class SomeClass extends AbstractExtension`
	`58`	`+class SomeClass`
`60`	`59`	`{`
`61`		`- #[AsTwigFunction('function_name', needsEnvironment: true)]`
	`60`	`+ #[AsTwigFunction(name: 'function_name', needsEnvironment: true)]`
`62`	`61`	`public function localMethod(Environment $env, $value)`
`63`	`62`	`{`
`64`	`63`	`return $value;`