Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f09249c54d49 · 2024-04-16T18:27:14.000+02:00
* 6.4:
  Fix CI
  Bump ext-redis in CI on PHP &gt;= 8.4
  Adjust pretty name of closures on PHP 8.4
  implement NodeVisitorInterface instead of extending AbstractNodeVisitor
  sync .github/expected-missing-return-types.diff
  skip test assertions that are no longer valid with PHP &gt;= 8.2.18/8.3.5
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -50,7 +50,7 @@ jobs:
           coverage: "none"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
-          extensions: "${{ env.extensions }}"
+          extensions: "${{ matrix.extensions || env.extensions }}"
           tools: flex
 
       - name: Configure environment
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -23,12 +23,12 @@
 use Twig\Node\ModuleNode;
 use Twig\Node\Node;
 use Twig\Node\SetNode;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
+final class TranslationDefaultDomainNodeVisitor implements NodeVisitorInterface
 {
     private Scope $scope;
 
@@ -37,7 +37,7 @@ public function __construct()
         $this->scope = new Scope();
     }
 
-    protected function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         if ($node instanceof BlockNode || $node instanceof ModuleNode) {
             $this->scope = $this->scope->enter();
@@ -83,7 +83,7 @@ protected function doEnterNode(Node $node, Environment $env): Node
         return $node;
     }
 
-    protected function doLeaveNode(Node $node, Environment $env): ?Node
+    public function leaveNode(Node $node, Environment $env): ?Node
     {
         if ($node instanceof TransDefaultDomainNode) {
             return null;
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -18,14 +18,14 @@
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Expression\FunctionExpression;
 use Twig\Node\Node;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * TranslationNodeVisitor extracts translation messages.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-final class TranslationNodeVisitor extends AbstractNodeVisitor
+final class TranslationNodeVisitor implements NodeVisitorInterface
 {
     public const UNDEFINED_DOMAIN = '_undefined';
 
@@ -49,7 +49,7 @@ public function getMessages(): array
         return $this->messages;
     }
 
-    protected function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         if (!$this->enabled) {
             return $node;
@@ -98,7 +98,7 @@ protected function doEnterNode(Node $node, Environment $env): Node
         return $node;
     }
 
-    protected function doLeaveNode(Node $node, Environment $env): ?Node
+    public function leaveNode(Node $node, Environment $env): ?Node
     {
         return $node;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -393,7 +393,7 @@ private function getCallableData(mixed $callable): array
             $data['type'] = 'closure';
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return $data;
             }
             $data['name'] = $r->name;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -403,7 +403,7 @@ protected function describeCallable(mixed $callable, array $options = []): void
             $string .= "\n- Type: `closure`";
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 $this->write($string."\n");
 
                 return;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -649,7 +649,7 @@ private function formatCallable(mixed $callable): string
 
         if ($callable instanceof \Closure) {
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return 'Closure()';
             }
             if ($class = $r->getClosureCalledClass()) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -581,7 +581,7 @@ private function getCallableDocument(mixed $callable): \DOMDocument
             $callableXML->setAttribute('type', 'closure');
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return $dom;
             }
             $callableXML->setAttribute('name', $r->name);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -214,7 +214,7 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
 
             if (\is_array($controller) && [0, 1] === array_keys($controller) && $this === $controller[0]) {
                 $route->setDefault('_controller', ['kernel', $controller[1]]);
-            } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure}')) {
+            } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure')) {
                 $route->setDefault('_controller', ['kernel', $r->name]);
             }
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
@@ -238,7 +238,7 @@ private function formatCallable(mixed $callable): string
 
         if ($callable instanceof \Closure) {
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return 'Closure()';
             }
             if ($class = $r->getClosureCalledClass()) {
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
@@ -31,7 +31,9 @@ public function testCreateConnection(string $dsn, string $expectedClass)
             self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
 
-        $mock = self::getObjectForTrait(RedisTrait::class);
+        $mock = new class () {
+            use RedisTrait;
+        };
         $connection = $mock::createConnection($dsn);
 
         self::assertInstanceOf($expectedClass, $connection);
@@ -43,7 +45,9 @@ public function testUrlDecodeParameters()
             self::markTestSkipped('REDIS_AUTHENTICATED_HOST env var is not defined.');
         }
 
-        $mock = self::getObjectForTrait(RedisTrait::class);
+        $mock = new class () {
+            use RedisTrait;
+        };
         $connection = $mock::createConnection('redis://:p%40ssword@'.getenv('REDIS_AUTHENTICATED_HOST'));
 
         self::assertInstanceOf(\Redis::class, $connection);
@@ -100,7 +104,9 @@ public function testPconnectSelectsCorrectDatabase()
         }
 
         try {
-            $mock = self::getObjectForTrait(RedisTrait::class);
+            $mock = new class () {
+                use RedisTrait;
+            };
 
             $dsn = 'redis://'.getenv('REDIS_HOST');
 
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -161,7 +161,7 @@ public function testCallErrorExceptionInfo()
             $this->assertSame('Undefined variable $foo', $e->getMessage());
             $this->assertSame(__FILE__, $e->getFile());
             $this->assertSame(0, $e->getCode());
-            $this->assertSame('Symfony\Component\ErrorHandler\{closure}', $trace[0]['function']);
+            $this->assertStringMatchesFormat('%A{closure%A}', $trace[0]['function']);
             $this->assertSame(ErrorHandler::class, $trace[0]['class']);
             $this->assertSame('triggerNotice', $trace[1]['function']);
             $this->assertSame(__CLASS__, $trace[1]['class']);
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -48,7 +48,7 @@ public function __construct(callable|array $listener, ?string $name, Stopwatch $
             $this->callableRef .= '::'.$listener[1];
         } elseif ($listener instanceof \Closure) {
             $r = new \ReflectionFunction($listener);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 $this->pretty = $this->name = 'closure';
             } elseif ($class = $r->getClosureCalledClass()) {
                 $this->name = $class->name;
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -171,14 +171,14 @@ public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
         }
 
         $finder = new PhpExecutableFinder();
-        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:8057']));
+        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', 'localhost:8057']));
         $process->setWorkingDirectory(__DIR__.'/Fixtures/web');
 
         $process->start();
 
         do {
             usleep(50000);
-        } while (!@fopen('http://127.0.0.1:8057', 'r'));
+        } while (!@fopen('http://localhost:8057', 'r'));
 
         try {
             $sourceFilePath = 'http://localhost:8057/logo_symfony_header.png';
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -240,7 +240,7 @@ private function checkController(Request $request, callable $controller): callab
             $r = new \ReflectionFunction($controller);
             $name = $r->name;
 
-            if (str_contains($name, '{closure}')) {
+            if (str_contains($name, '{closure')) {
                 $name = $class = \Closure::class;
             } elseif ($class = $r->getClosureCalledClass()) {
                 $class = $class->name;
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -469,7 +469,7 @@ private function parseController(array|object|string|null $controller): array|st
                 'line' => $r->getStartLine(),
             ];
 
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return $controller;
             }
             $controller['method'] = $r->name;
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php
@@ -98,7 +98,7 @@ public function getAttributes(?string $className = null): array
         } elseif (\is_string($this->controller) && false !== $i = strpos($this->controller, '::')) {
             $class = new \ReflectionClass(substr($this->controller, 0, $i));
         } else {
-            $class = str_contains($this->controllerReflector->name, '{closure}') ? null : $this->controllerReflector->getClosureCalledClass();
+            $class = str_contains($this->controllerReflector->name, '{closure') ? null : $this->controllerReflector->getClosureCalledClass();
         }
         $this->attributes = [];
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -118,7 +118,7 @@ public static function provideControllerCallables(): array
                 'Closure',
                 fn () => 'foo',
                 [
-                    'class' => __NAMESPACE__.'\{closure}',
+                    'class' => \PHP_VERSION_ID >= 80400 ? sprintf('{closure:%s():%d}', __METHOD__, __LINE__ - 2) : __NAMESPACE__.'\{closure}',
                     'method' => null,
                     'file' => __FILE__,
                     'line' => __LINE__ - 5,
diff --git a/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php b/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php
@@ -32,7 +32,7 @@ public function __construct(callable $handler, array $options = [])
 
         $r = new \ReflectionFunction($handler);
 
-        if (str_contains($r->name, '{closure}')) {
+        if (str_contains($r->name, '{closure')) {
             $this->name = 'Closure';
         } elseif (!$handler = $r->getClosureThis()) {
             $class = $r->getClosureCalledClass();
diff --git a/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php
@@ -143,14 +143,14 @@ public function testFromPathWithUrl()
         }
 
         $finder = new PhpExecutableFinder();
-        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:8057']));
+        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', 'localhost:8057']));
         $process->setWorkingDirectory(__DIR__.'/../Fixtures/web');
         $process->start();
 
         try {
             do {
                 usleep(50000);
-            } while (!@fopen('http://127.0.0.1:8057', 'r'));
+            } while (!@fopen('http://localhost:8057', 'r'));
             $p = DataPart::fromPath($file = 'http://localhost:8057/logo_symfony_header.png');
             $content = file_get_contents($file);
             $this->assertEquals($content, $p->getBody());
diff --git a/src/Symfony/Component/PasswordHasher/Tests/Hasher/NativePasswordHasherTest.php b/src/Symfony/Component/PasswordHasher/Tests/Hasher/NativePasswordHasherTest.php
@@ -103,7 +103,11 @@ public function testBcryptWithNulByte()
         $hasher = new NativePasswordHasher(null, null, 4, \PASSWORD_BCRYPT);
         $plainPassword = "a\0b";
 
-        $this->assertFalse($hasher->verify(password_hash($plainPassword, \PASSWORD_BCRYPT, ['cost' => 4]), $plainPassword));
+        if (\PHP_VERSION_ID < 80218 || \PHP_VERSION_ID >= 80300 && \PHP_VERSION_ID < 80305) {
+            // password_hash() does not accept passwords containing NUL bytes since PHP 8.2.18 and 8.3.5
+            $this->assertFalse($hasher->verify(password_hash($plainPassword, \PASSWORD_BCRYPT, ['cost' => 4]), $plainPassword));
+        }
+
         $this->assertTrue($hasher->verify($hasher->hash($plainPassword), $plainPassword));
     }
 
diff --git a/src/Symfony/Component/PasswordHasher/Tests/Hasher/SodiumPasswordHasherTest.php b/src/Symfony/Component/PasswordHasher/Tests/Hasher/SodiumPasswordHasherTest.php
@@ -78,7 +78,11 @@ public function testBcryptWithNulByte()
         $hasher = new SodiumPasswordHasher(null, null);
         $plainPassword = "a\0b";
 
-        $this->assertFalse($hasher->verify(password_hash($plainPassword, \PASSWORD_BCRYPT, ['cost' => 4]), $plainPassword));
+        if (\PHP_VERSION_ID < 80218 || \PHP_VERSION_ID >= 80300 && \PHP_VERSION_ID < 80305) {
+            // password_hash() does not accept passwords containing NUL bytes since PHP 8.2.18 and 8.3.5
+            $this->assertFalse($hasher->verify(password_hash($plainPassword, \PASSWORD_BCRYPT, ['cost' => 4]), $plainPassword));
+        }
+
         $this->assertTrue($hasher->verify((new NativePasswordHasher(null, null, 4, \PASSWORD_BCRYPT))->hash($plainPassword), $plainPassword));
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -250,7 +250,7 @@ protected function getGroups(array $context): array
     /**
      * Is this attribute allowed?
      */
-    protected function isAllowedAttribute(object|string $classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    protected function isAllowedAttribute(object|string $classOrObject, string $attribute, ?string $format = null, array $context = [])
     {
         $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES];
         if (\in_array($attribute, $ignoredAttributes)) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -158,7 +158,7 @@ protected function setAttributeValue(object $object, string $attribute, mixed $v
         }
     }
 
-    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = [])
     {
         if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) {
             return false;
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -171,7 +171,7 @@ protected function getAllowedAttributes(string|object $classOrObject, array $con
         return $allowedAttributes;
     }
 
-    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = [])
     {
         if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) {
             return false;
diff --git a/src/Symfony/Component/String/LazyString.php b/src/Symfony/Component/String/LazyString.php
@@ -129,7 +129,7 @@ private static function getPrettyName(callable $callback): string
         } elseif ($callback instanceof \Closure) {
             $r = new \ReflectionFunction($callback);
 
-            if (str_contains($r->name, '{closure}') || !$class = $r->getClosureCalledClass()) {
+            if (str_contains($r->name, '{closure') || !$class = $r->getClosureCalledClass()) {
                 return $r->name;
             }
 
diff --git a/src/Symfony/Component/String/Tests/LazyStringTest.php b/src/Symfony/Component/String/Tests/LazyStringTest.php
@@ -39,7 +39,7 @@ public function testReturnTypeError()
         $s = LazyString::fromCallable(fn () => []);
 
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('Return value of '.__NAMESPACE__.'\{closure}() passed to '.LazyString::class.'::fromCallable() must be of the type string, array returned.');
+        $this->expectExceptionMessageMatches('{^Return value of .*\{closure.*\}\(\) passed to '.preg_quote(LazyString::class).'::fromCallable\(\) must be of the type string, array returned\.$}');
 
         (string) $s;
     }
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -42,7 +42,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNe
 
         $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter);
 
-        if (!str_contains($c->name, '{closure}')) {
+        if (!str_contains($c->name, '{closure')) {
             $stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name;
             unset($a[$prefix.'class']);
         }
diff --git a/src/Symfony/Component/Workflow/DataCollector/WorkflowDataCollector.php b/src/Symfony/Component/Workflow/DataCollector/WorkflowDataCollector.php
@@ -171,7 +171,7 @@ private function summarizeListener(callable $callable, ?string $eventName = null
 
         if ($callable instanceof \Closure) {
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 $title = (string) $r;
             } elseif ($class = $r->getClosureCalledClass()) {
                 $title = $class->name.'::'.$r->name.'()';

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@`
`23`	`23`	`use Twig\Node\ModuleNode;`
`24`	`24`	`use Twig\Node\Node;`
`25`	`25`	`use Twig\Node\SetNode;`
`26`		`-use Twig\NodeVisitor\AbstractNodeVisitor;`
	`26`	`+use Twig\NodeVisitor\NodeVisitorInterface;`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @author Fabien Potencier <fabien@symfony.com>`
`30`	`30`	`*/`
`31`		`-final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor`
	`31`	`+final class TranslationDefaultDomainNodeVisitor implements NodeVisitorInterface`
`32`	`32`	`{`
`33`	`33`	`private Scope $scope;`
`34`	`34`
`@@ -37,7 +37,7 @@ public function __construct()`
`37`	`37`	`$this->scope = new Scope();`
`38`	`38`	`}`
`39`	`39`
`40`		`- protected function doEnterNode(Node $node, Environment $env): Node`
	`40`	`+ public function enterNode(Node $node, Environment $env): Node`
`41`	`41`	`{`
`42`	`42`	`if ($node instanceof BlockNode \|\| $node instanceof ModuleNode) {`
`43`	`43`	`$this->scope = $this->scope->enter();`
`@@ -83,7 +83,7 @@ protected function doEnterNode(Node $node, Environment $env): Node`
`83`	`83`	`return $node;`
`84`	`84`	`}`
`85`	`85`
`86`		`- protected function doLeaveNode(Node $node, Environment $env): ?Node`
	`86`	`+ public function leaveNode(Node $node, Environment $env): ?Node`
`87`	`87`	`{`
`88`	`88`	`if ($node instanceof TransDefaultDomainNode) {`
`89`	`89`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@`
`18`	`18`	`use Twig\Node\Expression\FilterExpression;`
`19`	`19`	`use Twig\Node\Expression\FunctionExpression;`
`20`	`20`	`use Twig\Node\Node;`
`21`		`-use Twig\NodeVisitor\AbstractNodeVisitor;`
	`21`	`+use Twig\NodeVisitor\NodeVisitorInterface;`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* TranslationNodeVisitor extracts translation messages.`
`25`	`25`	`*`
`26`	`26`	`* @author Fabien Potencier <fabien@symfony.com>`
`27`	`27`	`*/`
`28`		`-final class TranslationNodeVisitor extends AbstractNodeVisitor`
	`28`	`+final class TranslationNodeVisitor implements NodeVisitorInterface`
`29`	`29`	`{`
`30`	`30`	`public const UNDEFINED_DOMAIN = '_undefined';`
`31`	`31`
`@@ -49,7 +49,7 @@ public function getMessages(): array`
`49`	`49`	`return $this->messages;`
`50`	`50`	`}`
`51`	`51`
`52`		`- protected function doEnterNode(Node $node, Environment $env): Node`
	`52`	`+ public function enterNode(Node $node, Environment $env): Node`
`53`	`53`	`{`
`54`	`54`	`if (!$this->enabled) {`
`55`	`55`	`return $node;`
`@@ -98,7 +98,7 @@ protected function doEnterNode(Node $node, Environment $env): Node`
`98`	`98`	`return $node;`
`99`	`99`	`}`
`100`	`100`
`101`		`- protected function doLeaveNode(Node $node, Environment $env): ?Node`
	`101`	`+ public function leaveNode(Node $node, Environment $env): ?Node`
`102`	`102`	`{`
`103`	`103`	`return $node;`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ private function getCallableData(mixed $callable): array`
`393`	`393`	`$data['type'] = 'closure';`
`394`	`394`
`395`	`395`	`$r = new \ReflectionFunction($callable);`
`396`		`- if (str_contains($r->name, '{closure}')) {`
	`396`	`+ if (str_contains($r->name, '{closure')) {`
`397`	`397`	`return $data;`
`398`	`398`	`}`
`399`	`399`	`$data['name'] = $r->name;`
Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ private function formatCallable(mixed $callable): string`
`649`	`649`
`650`	`650`	`if ($callable instanceof \Closure) {`
`651`	`651`	`$r = new \ReflectionFunction($callable);`
`652`		`- if (str_contains($r->name, '{closure}')) {`
	`652`	`+ if (str_contains($r->name, '{closure')) {`
`653`	`653`	`return 'Closure()';`
`654`	`654`	`}`
`655`	`655`	`if ($class = $r->getClosureCalledClass()) {`
Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ private function getCallableDocument(mixed $callable): \DOMDocument`
`581`	`581`	`$callableXML->setAttribute('type', 'closure');`
`582`	`582`
`583`	`583`	`$r = new \ReflectionFunction($callable);`
`584`		`- if (str_contains($r->name, '{closure}')) {`
	`584`	`+ if (str_contains($r->name, '{closure')) {`
`585`	`585`	`return $dom;`
`586`	`586`	`}`
`587`	`587`	`$callableXML->setAttribute('name', $r->name);`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection`
`214`	`214`
`215`	`215`	`if (\is_array($controller) && [0, 1] === array_keys($controller) && $this === $controller[0]) {`
`216`	`216`	`$route->setDefault('_controller', ['kernel', $controller[1]]);`
`217`		`- } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure}')) {`
	`217`	`+ } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure')) {`
`218`	`218`	`$route->setDefault('_controller', ['kernel', $r->name]);`
`219`	`219`	`}`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ private function formatCallable(mixed $callable): string`
`238`	`238`
`239`	`239`	`if ($callable instanceof \Closure) {`
`240`	`240`	`$r = new \ReflectionFunction($callable);`
`241`		`- if (str_contains($r->name, '{closure}')) {`
	`241`	`+ if (str_contains($r->name, '{closure')) {`
`242`	`242`	`return 'Closure()';`
`243`	`243`	`}`
`244`	`244`	`if ($class = $r->getClosureCalledClass()) {`