Replace internal class used from Twig

Author: iquito

src/ExpressionParser/BinaryOperatorExpressionParser.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Squirrel\TwigPhpSyntax\ExpressionParser;
+
+use Twig\ExpressionParser\AbstractExpressionParser;
+use Twig\ExpressionParser\InfixAssociativity;
+use Twig\ExpressionParser\InfixExpressionParserInterface;
+use Twig\Node\Expression\AbstractExpression;
+use Twig\Node\Expression\Binary\AbstractBinary;
+use Twig\Parser;
+use Twig\Token;
+
+class BinaryOperatorExpressionParser extends AbstractExpressionParser implements InfixExpressionParserInterface
+{
+    public function __construct(
+        /** @var class-string<AbstractBinary> $nodeClass */
+        private string $nodeClass,
+        private string $name,
+        private int $precedence,
+        private InfixAssociativity $associativity = InfixAssociativity::Left,
+    ) {
+    }
+
+    /**
+     * @return AbstractBinary
+     */
+    public function parse(Parser $parser, AbstractExpression $left, Token $token): AbstractExpression
+    {
+        $right = $parser->parseExpression($this->getAssociativity() === InfixAssociativity::Left ? $this->getPrecedence() + 1 : $this->getPrecedence());
+
+        return new ($this->nodeClass)($left, $right, $token->getLine());
+    }
+
+    public function getAssociativity(): InfixAssociativity
+    {
+        return $this->associativity;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getPrecedence(): int
+    {
+        return $this->precedence;
+    }
+}

src/PhpSyntaxExtension.php

@@ -2,6 +2,7 @@
 
 namespace Squirrel\TwigPhpSyntax;
 
+use Squirrel\TwigPhpSyntax\ExpressionParser\BinaryOperatorExpressionParser;
 use Squirrel\TwigPhpSyntax\Operator\NotSameAsBinary;
 use Squirrel\TwigPhpSyntax\Operator\SameAsBinary;
 use Squirrel\TwigPhpSyntax\Test\ArrayTest;
@@ -17,7 +18,6 @@
 use Squirrel\TwigPhpSyntax\TokenParser\BreakTokenParser;
 use Squirrel\TwigPhpSyntax\TokenParser\ContinueTokenParser;
 use Squirrel\TwigPhpSyntax\TokenParser\ForeachTokenParser;
-use Twig\ExpressionParser\Infix\BinaryOperatorExpressionParser;
 use Twig\Extension\AbstractExtension;
 use Twig\Node\Expression\Binary\AndBinary;
 use Twig\Node\Expression\Binary\OrBinary;

tools/psalm-baseline.xml

@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
-  <file src="src/PhpSyntaxExtension.php">
-    <InternalClass>
-      <code><![CDATA[new BinaryOperatorExpressionParser(AndBinary::class, '&&', 15)]]></code>
-      <code><![CDATA[new BinaryOperatorExpressionParser(NotSameAsBinary::class, '!==', 20)]]></code>
-      <code><![CDATA[new BinaryOperatorExpressionParser(OrBinary::class, '||', 10)]]></code>
-      <code><![CDATA[new BinaryOperatorExpressionParser(SameAsBinary::class, '===', 20)]]></code>
-    </InternalClass>
-    <InternalMethod>
-      <code><![CDATA[new BinaryOperatorExpressionParser(AndBinary::class, '&&', 15)]]></code>
-      <code><![CDATA[new BinaryOperatorExpressionParser(NotSameAsBinary::class, '!==', 20)]]></code>
-      <code><![CDATA[new BinaryOperatorExpressionParser(OrBinary::class, '||', 10)]]></code>
-      <code><![CDATA[new BinaryOperatorExpressionParser(SameAsBinary::class, '===', 20)]]></code>
-    </InternalMethod>
+  <file src="src/ExpressionParser/BinaryOperatorExpressionParser.php">
+    <UnsafeInstantiation>
+      <code><![CDATA[new ($this->nodeClass)($left, $right, $token->getLine())]]></code>
+    </UnsafeInstantiation>
   </file>
 </files>