Merge branch '6.4' into 7.1

* 6.4:
  fix Twig 3.12 compatibility
  [Translation] Review Serbian translations
  Fix typos
  [DependencyInjection] Fix error message typo in YamlFileLoader
  Fix typo in exception message langage to language

Author: xabbuh

src/Symfony/Bridge/Twig/Node/DumpNode.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Node;
@@ -32,7 +33,12 @@ public function __construct(
             $nodes['values'] = $values;
         }
 
-        parent::__construct($nodes, [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct($nodes, [], $lineno);
+        } else {
+            parent::__construct($nodes, [], $lineno, $tag);
+        }
+
         $this->varPrefix = $varPrefix;
     }
 

src/Symfony/Bridge/Twig/Node/FormThemeNode.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Twig\Node;
 
 use Symfony\Component\Form\FormRenderer;
+use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Node;
@@ -24,7 +25,11 @@ final class FormThemeNode extends Node
 {
     public function __construct(Node $form, Node $resources, int $lineno, ?string $tag = null, bool $only = false)
     {
-        parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno);
+        } else {
+            parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void

src/Symfony/Bridge/Twig/Node/StopwatchNode.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AssignNameExpression;
@@ -26,7 +27,11 @@ final class StopwatchNode extends Node
 {
     public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, ?string $tag = null)
     {
-        parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);
+        } else {
+            parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void

src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
@@ -24,7 +25,11 @@ final class TransDefaultDomainNode extends Node
 {
     public function __construct(AbstractExpression $expr, int $lineno = 0, ?string $tag = null)
     {
-        parent::__construct(['expr' => $expr], [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct(['expr' => $expr], [], $lineno);
+        } else {
+            parent::__construct(['expr' => $expr], [], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void

src/Symfony/Bridge/Twig/Node/TransNode.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
@@ -42,7 +43,11 @@ public function __construct(Node $body, ?Node $domain = null, ?AbstractExpressio
             $nodes['locale'] = $locale;
         }
 
-        parent::__construct($nodes, [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct($nodes, [], $lineno);
+        } else {
+            parent::__construct($nodes, [], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void

src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\Node\FormThemeNode;
 use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
+use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Environment;
 use Twig\Loader\LoaderInterface;
 use Twig\Node\Expression\ArrayExpression;
@@ -35,6 +36,10 @@ public function testCompile($source, $expected)
         $stream = $env->tokenize($source);
         $parser = new Parser($env);
 
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            $expected->setNodeTag('form_theme');
+        }
+
         $expected->setSourceContext($source);
 
         $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));

src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php

@@ -45,7 +45,7 @@ public function getFunctions(): array
 
             new ExpressionFunction('env', fn ($arg) => sprintf('$container->getEnv(%s)', $arg), function (array $variables, $value) {
                 if (!$this->getEnv) {
-                    throw new LogicException('You need to pass a getEnv closure to the expression langage provider to use the "env" function.');
+                    throw new LogicException('You need to pass a getEnv closure to the expression language provider to use the "env" function.');
                 }
 
                 return ($this->getEnv)($value);

src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

@@ -562,7 +562,7 @@ private function parseDefinition(string $id, array|string|null $service, string
                 }
 
                 if (\is_string($k)) {
-                    throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
+                    throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forget a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
                 }
 
                 if (isset($call['method']) && \is_string($call['method'])) {

src/Symfony/Component/Routing/Loader/AttributeFileLoader.php

@@ -76,7 +76,7 @@ protected function findClass(string $file): string|false
         $tokens = token_get_all(file_get_contents($file));
 
         if (1 === \count($tokens) && \T_INLINE_HTML === $tokens[0][0]) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forgot to add the "<?php" start tag at the beginning of the file?', $file));
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forget to add the "<?php" start tag at the beginning of the file?', $file));
         }
 
         $nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];

src/Symfony/Component/Routing/Tests/Loader/AttributeFileLoaderTest.php

@@ -54,7 +54,7 @@ public function testLoadTraitWithClassConstant()
     public function testLoadFileWithoutStartTag()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Did you forgot to add the "<?php" start tag at the beginning of the file?');
+        $this->expectExceptionMessage('Did you forget to add the "<?php" start tag at the beginning of the file?');
         $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
     }