diff --git a/core/.deprecation-ignore.txt b/core/.deprecation-ignore.txt index 82ebb8206240eabe8d2ad6cd9eead1ef63ccba7b..4ccb3b3d71b54c33b75d24706017860bc960b7c7 100644 --- a/core/.deprecation-ignore.txt +++ b/core/.deprecation-ignore.txt @@ -33,5 +33,4 @@ %Since twig/twig 3.12: Not passing an instance of "TwigFunction" when creating a "add_component_context" function of type "Twig\\Node\\Expression\\FunctionExpression" is deprecated.% %Since twig/twig 3.12: Not passing an instance of "TwigFunction" when creating a "render_var" function of type "Twig\\Node\\Expression\\FunctionExpression" is deprecated.% %Since twig/twig 3.12: Not passing an instance of "TwigFunction" when creating a "validate_component_props" function of type "Twig\\Node\\Expression\\FunctionExpression" is deprecated.% -%Since twig/twig 3.12: The "tag" constructor argument of the "Drupal\\Core\\Template\\TwigNodeTrans" class is deprecated and ignored% %Since twig/twig 3.12: Twig Filter "spaceless" is deprecated% diff --git a/core/lib/Drupal/Core/Template/TwigNodeTrans.php b/core/lib/Drupal/Core/Template/TwigNodeTrans.php index 09f66ea4f1bf564aa07608e3f94bbe0648d7489b..0ac6b93ed5a8fc788bb68d1e122a923adac929e4 100644 --- a/core/lib/Drupal/Core/Template/TwigNodeTrans.php +++ b/core/lib/Drupal/Core/Template/TwigNodeTrans.php @@ -32,7 +32,7 @@ class TwigNodeTrans extends Node { /** * {@inheritdoc} */ - public function __construct(Node $body, ?Node $plural = NULL, ?AbstractExpression $count = NULL, ?AbstractExpression $options = NULL, $lineno = 0, $tag = NULL) { + public function __construct(Node $body, ?Node $plural = NULL, ?AbstractExpression $count = NULL, ?AbstractExpression $options = NULL, $lineno = 0) { $nodes['body'] = $body; if ($count !== NULL) { $nodes['count'] = $count; @@ -43,7 +43,7 @@ public function __construct(Node $body, ?Node $plural = NULL, ?AbstractExpressio if ($options !== NULL) { $nodes['options'] = $options; } - parent::__construct($nodes, [], $lineno, $tag); + parent::__construct($nodes, [], $lineno); } /** diff --git a/core/lib/Drupal/Core/Template/TwigTransTokenParser.php b/core/lib/Drupal/Core/Template/TwigTransTokenParser.php index 93e4fdcfe3f213b682386e542fd983a4d6d52c22..0d764c36f90cce986c50fe346d42694c1e7516d0 100644 --- a/core/lib/Drupal/Core/Template/TwigTransTokenParser.php +++ b/core/lib/Drupal/Core/Template/TwigTransTokenParser.php @@ -56,7 +56,7 @@ public function parse(Token $token) { $this->checkTransString($body, $lineno); - $node = new TwigNodeTrans($body, $plural, $count, $options, $lineno, $this->getTag()); + $node = new TwigNodeTrans($body, $plural, $count, $options, $lineno); return $node; }