Add ForElseNode to avoid deprecation notice in Twig 3.19+

squirrelphp · Jan 30, 2025 · b71c2b5 · b71c2b5
1 parent 72c4f38
commit b71c2b5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": ">=8.0.2",
-        "twig/twig": "^3.15"
+        "twig/twig": "^3.19"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.0",

diff --git a/src/TokenParser/ForeachTokenParser.php b/src/TokenParser/ForeachTokenParser.php
@@ -4,6 +4,7 @@
 
 use Twig\Lexer;
 use Twig\Node\Expression\Variable\AssignContextVariable;
+use Twig\Node\ForElseNode;
 use Twig\Node\ForNode;
 use Twig\Node\Node;
 use Twig\Node\Nodes;
@@ -27,7 +28,7 @@ public function parse(Token $token): Node
         $body = $this->parser->subparse([$this, 'decideForeachFork']);
         if ($stream->next()->getValue() === 'else') {
             $stream->expect(Token::BLOCK_END_TYPE);
-            $else = $this->parser->subparse([$this, 'decideForeachEnd'], true);
+            $else = new ForElseNode($this->parser->subparse([$this, 'decideForeachEnd'], true), $stream->getCurrent()->getLine());
         } else {
             $else = null;
         }

diff --git a/tools/phpstan-baseline.php b/tools/phpstan-baseline.php
@@ -1,12 +1,6 @@
 <?php declare(strict_types = 1);
 
 $ignoreErrors = [];
-$ignoreErrors[] = [
-	'message' => '#^Method Squirrel\\\\TwigPhpSyntax\\\\PhpSyntaxExtension\\:\\:getOperators\\(\\) has invalid return type Twig\\\\Extension\\\\OperatorPrecedenceChange\\.$#',
-	'identifier' => 'class.notFound',
-	'count' => 2,
-	'path' => __DIR__ . '/../src/PhpSyntaxExtension.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method Squirrel\\\\TwigPhpSyntax\\\\PhpSyntaxExtension\\:\\:validateType\\(\\) should return bool\\|float\\|int\\|string\\|null but returns mixed\\.$#',
 	'identifier' => 'return.type',

diff --git a/tools/psalm-baseline.xml b/tools/psalm-baseline.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
-  <file src="src/TokenParser/BreakOrContinueTokenParser.php">
-    <InternalMethod>
-      <code><![CDATA[getSourceContext]]></code>
-      <code><![CDATA[getSourceContext]]></code>
-      <code><![CDATA[getSourceContext]]></code>
-    </InternalMethod>
-  </file>
-</files>
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0"/>