OXDEV-10175 Fix failing tests and deprecations

Author: AshrafOxid

CHANGELOG-2.x.md

@@ -14,6 +14,9 @@
 ### Fixed
 - Rendering template extensions for module templates
 
+### Deprecated
+- Node `$tag` constructor parameter
+
 ### Removed
 - PHP v8.2 support
 - PHPUnit v11 support

src/Node/CaptureNode.php

@@ -30,13 +30,15 @@ class CaptureNode extends Node
      */
     private $variableName;
 
+    /**
+     * @deprecated $tag will be removed in next major version, the tag is now automatically set by the Parser.
+     */
     public function __construct(string $attributeName, string $variableName, Node $body, int $line, ?string $tag = null)
     {
         parent::__construct(
             ['body' => $body],
             ['attributeName' => $attributeName, 'variableName' => $variableName],
-            $line,
-            $tag
+            $line
         );
     }
 

src/Node/HasRightsNode.php

@@ -14,9 +14,12 @@
 
 class HasRightsNode extends Node
 {
-    public function __construct(Node $body, Node $parameters, int $lineno, $tag = 'hasrights')
+    /**
+     * @deprecated $tag will be removed in next major version, the tag is now automatically set by the Parser.
+     */
+    public function __construct(Node $body, Node $parameters, int $lineno, ?string $tag = null)
     {
-        parent::__construct(['body' => $body, 'parameters' => $parameters], [], $lineno, $tag);
+        parent::__construct(['body' => $body, 'parameters' => $parameters], [], $lineno);
     }
 
     /**

src/Node/IfContentNode.php

@@ -15,14 +15,17 @@
 
 class IfContentNode extends Node
 {
-    public function __construct(Node $body, array $reference, Node $variable, int $lineno, string $tag = 'ifcontent')
+    /**
+     * @deprecated $tag will be removed in next major version, the tag is now automatically set by the Parser.
+     */
+    public function __construct(Node $body, array $reference, Node $variable, int $lineno, ?string $tag = null)
     {
         $nodes = [
                      'body' => $body,
                      'variable' => $variable
                  ] + $reference;
 
-        parent::__construct($nodes, [], $lineno, $tag);
+        parent::__construct($nodes, [], $lineno);
     }
 
     /**

src/TokenParser/CaptureTokenParser.php

@@ -38,7 +38,7 @@ public function parse(Token $token): CaptureNode
         $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        return new CaptureNode($attributeName, $variableName, $body, $token->getLine(), $this->getTag());
+        return new CaptureNode($attributeName, $variableName, $body, $token->getLine());
     }
 
     /**

src/TokenParser/HasRightsTokenParser.php

@@ -56,7 +56,7 @@ public function parse(Token $token)
             $stream->expect(Token::BLOCK_END_TYPE);
         }
 
-        return new $this->nodeClass($body, $variables, $lineno, $this->getTag());
+        return new $this->nodeClass($body, $variables, $lineno);
     }
 
     /**

src/TokenParser/IfContentTokenParser.php

@@ -11,7 +11,7 @@
 
 use OxidEsales\Twig\Node\IfContentNode;
 use Twig\Error\SyntaxError;
-use Twig\Node\Expression\AssignNameExpression;
+use Twig\Node\Expression\Variable\AssignContextVariable;
 use Twig\Node\Node;
 use Twig\TokenParser\AbstractTokenParser;
 use Twig\Token;
@@ -48,14 +48,14 @@ public function parse(Token $token): IfContentNode
             /** @var Node $variable */
             $variable = $this->parser->getExpressionParser()->parseAssignmentExpression();
         } else {
-            $variable = new AssignNameExpression('oCont', $lineno);
+            $variable = new AssignContextVariable('oCont', $lineno);
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);
         $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        return new IfContentNode($body, $reference, $variable, $lineno, $this->getTag());
+        return new IfContentNode($body, $reference, $variable, $lineno);
     }
 
     /**

tests/Integration/Extensions/IncludeContentExtensionTest.php

@@ -9,7 +9,7 @@
 
 namespace OxidEsales\Twig\Tests\Integration\Extensions;
 
-use OxidEsales\EshopCommunity\Application\Model\Content;
+use OxidEsales\Eshop\Application\Model\Content;
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\Html\HtmlSanitizerInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\ContentFactory;

tests/Unit/Loader/CmsLoaderTest.php

@@ -9,7 +9,7 @@
 
 namespace OxidEsales\Twig\Tests\Unit\Loader;
 
-use OxidEsales\EshopCommunity\Application\Model\Content;
+use OxidEsales\Eshop\Application\Model\Content;
 use OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\ContentFactory;
 use OxidEsales\Twig\Loader\CmsLoader;
 use OxidEsales\Twig\Loader\CmsTemplateNameParser;

tests/Unit/Node/CaptureNodeTest.php

@@ -68,7 +68,6 @@ public static function compileDataProvider(): array
                     variableName: 'foo',
                     body: $body,
                     line: 1,
-                    tag: 'capture'
                 ),
                 self::EXPECTED_NAME_ATTRIBUTE_SOURCE,
             ],
@@ -78,7 +77,6 @@ public static function compileDataProvider(): array
                     variableName: 'foo',
                     body: $body,
                     line: 1,
-                    tag: 'capture'
                 ),
                 self::EXPECTED_ASSIGN_ATTRIBUTE_SOURCE,
             ],
@@ -88,7 +86,6 @@ public static function compileDataProvider(): array
                     variableName: 'foo',
                     body: $body,
                     line: 1,
-                    tag: 'capture'
                 ),
                 self::EXPECTED_APPEND_ATTRIBUTE_SOURCE,
             ]