Commit 8b7350e2 authored by catch's avatar catch
Browse files

Issue #3477374 by finnsky, longwave, bbrala: Fix "The "tag" constructor... 

Issue #3477374 by finnsky, longwave, bbrala: Fix "The "tag" constructor argument of the "Drupal\\Core\\Template\\TwigNodeTrans" class is deprecated and ignored"

(cherry picked from commit cec21638)
parent 6ed1d153

core/.deprecation-ignore.txt

+0 −1
Original line number Diff line number Diff line
@@ -68,5 +68,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%

core/lib/Drupal/Core/Template/TwigNodeTrans.php

+2 −2
Original line number Diff line number Diff line
@@ -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);

  }



  /**

core/lib/Drupal/Core/Template/TwigTransTokenParser.php

+1 −1
Original line number Diff line number Diff line
@@ -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;

  }