Make more tweaks

twigphp · Feb 1, 2025 · b9b198c · b9b198c
1 parent df5904e
commit b9b198c
Show file tree

Hide file tree

Showing 43 changed files with 130 additions and 55 deletions.
diff --git a/src/Operator/Binary/AbstractBinaryOperator.php b/src/Operator/Binary/AbstractBinaryOperator.php
@@ -21,9 +21,7 @@ abstract class AbstractBinaryOperator extends AbstractOperator implements Binary
 {
     public function parse(ExpressionParser $parser, AbstractExpression $left, int $line): AbstractExpression
     {
-        if (!$class = $this->getNodeClass()) {
-            throw new \LogicException(\sprintf('The "%s" %s operator must have a Node class.', $this->getOperator(), $this->getArity()->value));
-        }
+        $class = $this->getNodeClass();
 
         $right = $parser->parseExpression(OperatorAssociativity::Left === $this->getAssociativity() ? $this->getPrecedence() + 1 : $this->getPrecedence());
 
@@ -43,8 +41,5 @@ public function getAssociativity(): OperatorAssociativity
     /**
      * @return class-string<AbstractExpression>
      */
-    protected function getNodeClass(): ?string
-    {
-        return null;
-    }
+    abstract protected function getNodeClass(): string;
 }
diff --git a/src/Operator/Binary/AddBinaryOperator.php b/src/Operator/Binary/AddBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 30;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return AddBinary::class;
     }

diff --git a/src/Operator/Binary/AndBinaryOperator.php b/src/Operator/Binary/AndBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 15;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return AndBinary::class;
     }

diff --git a/src/Operator/Binary/ArrowBinaryOperator.php b/src/Operator/Binary/ArrowBinaryOperator.php
@@ -14,8 +14,11 @@
 use Twig\ExpressionParser;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrowFunctionExpression;
+use Twig\Operator\AbstractOperator;
+use Twig\Operator\OperatorArity;
+use Twig\Operator\OperatorAssociativity;
 
-class ArrowBinaryOperator extends AbstractBinaryOperator
+class ArrowBinaryOperator extends AbstractOperator implements BinaryOperatorInterface
 {
     public function parse(ExpressionParser $parser, AbstractExpression $expr, int $line): AbstractExpression
     {
@@ -32,4 +35,14 @@ public function getPrecedence(): int
     {
         return 250;
     }
+
+    public function getArity(): OperatorArity
+    {
+        return OperatorArity::Binary;
+    }
+
+    public function getAssociativity(): OperatorAssociativity
+    {
+        return OperatorAssociativity::Left;
+    }
 }
diff --git a/src/Operator/Binary/BitwiseAndBinaryOperator.php b/src/Operator/Binary/BitwiseAndBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 18;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return BitwiseAndBinary::class;
     }

diff --git a/src/Operator/Binary/BitwiseOrBinaryOperator.php b/src/Operator/Binary/BitwiseOrBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 16;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return BitwiseOrBinary::class;
     }

diff --git a/src/Operator/Binary/BitwiseXorBinaryOperator.php b/src/Operator/Binary/BitwiseXorBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 17;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return BitwiseXorBinary::class;
     }

diff --git a/src/Operator/Binary/ConcatBinaryOperator.php b/src/Operator/Binary/ConcatBinaryOperator.php
@@ -31,7 +31,7 @@ public function getPrecedenceChange(): ?OperatorPrecedenceChange
         return new OperatorPrecedenceChange('twig/twig', '3.15', 27);
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return ConcatBinary::class;
     }

diff --git a/src/Operator/Binary/DivBinaryOperator.php b/src/Operator/Binary/DivBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 60;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return DivBinary::class;
     }

diff --git a/src/Operator/Binary/DotBinaryOperator.php b/src/Operator/Binary/DotBinaryOperator.php
@@ -21,10 +21,13 @@
 use Twig\Node\Expression\MacroReferenceExpression;
 use Twig\Node\Expression\NameExpression;
 use Twig\Node\Expression\Variable\TemplateVariable;
+use Twig\Operator\AbstractOperator;
+use Twig\Operator\OperatorArity;
+use Twig\Operator\OperatorAssociativity;
 use Twig\Template;
 use Twig\Token;
 
-class DotBinaryOperator extends AbstractBinaryOperator
+class DotBinaryOperator extends AbstractOperator implements BinaryOperatorInterface
 {
     public function parse(ExpressionParser $parser, AbstractExpression $expr, int $line): AbstractExpression
     {
@@ -77,4 +80,14 @@ public function getPrecedence(): int
     {
         return 300;
     }
+
+    public function getArity(): OperatorArity
+    {
+        return OperatorArity::Binary;
+    }
+
+    public function getAssociativity(): OperatorAssociativity
+    {
+        return OperatorAssociativity::Left;
+    }
 }
diff --git a/src/Operator/Binary/ElvisBinaryOperator.php b/src/Operator/Binary/ElvisBinaryOperator.php
@@ -26,7 +26,7 @@ public function getAliases(): array
         return ['? :'];
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return ElvisBinary::class;
     }

diff --git a/src/Operator/Binary/EndsWithBinaryOperator.php b/src/Operator/Binary/EndsWithBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return EndsWithBinary::class;
     }

diff --git a/src/Operator/Binary/EqualBinaryOperator.php b/src/Operator/Binary/EqualBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return EqualBinary::class;
     }

diff --git a/src/Operator/Binary/FilterBinaryOperator.php b/src/Operator/Binary/FilterBinaryOperator.php
@@ -16,9 +16,12 @@
 use Twig\Node\EmptyNode;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ConstantExpression;
+use Twig\Operator\AbstractOperator;
+use Twig\Operator\OperatorArity;
+use Twig\Operator\OperatorAssociativity;
 use Twig\Token;
 
-class FilterBinaryOperator extends AbstractBinaryOperator
+class FilterBinaryOperator extends AbstractOperator implements BinaryOperatorInterface
 {
     private $readyNodes = [];
 
@@ -56,4 +59,14 @@ public function getPrecedence(): int
     {
         return 300;
     }
+
+    public function getArity(): OperatorArity
+    {
+        return OperatorArity::Binary;
+    }
+
+    public function getAssociativity(): OperatorAssociativity
+    {
+        return OperatorAssociativity::Left;
+    }
 }
diff --git a/src/Operator/Binary/FloorDivBinaryOperator.php b/src/Operator/Binary/FloorDivBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 60;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return FloorDivBinary::class;
     }

diff --git a/src/Operator/Binary/FunctionBinaryOperator.php b/src/Operator/Binary/FunctionBinaryOperator.php
@@ -18,8 +18,11 @@
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\MacroReferenceExpression;
 use Twig\Node\Expression\NameExpression;
+use Twig\Operator\AbstractOperator;
+use Twig\Operator\OperatorArity;
+use Twig\Operator\OperatorAssociativity;
 
-class FunctionBinaryOperator extends AbstractBinaryOperator
+class FunctionBinaryOperator extends AbstractOperator implements BinaryOperatorInterface
 {
     private $readyNodes = [];
 
@@ -66,4 +69,14 @@ public function getPrecedence(): int
     {
         return 300;
     }
+
+    public function getArity(): OperatorArity
+    {
+        return OperatorArity::Binary;
+    }
+
+    public function getAssociativity(): OperatorAssociativity
+    {
+        return OperatorAssociativity::Left;
+    }
 }
diff --git a/src/Operator/Binary/GreaterBinaryOperator.php b/src/Operator/Binary/GreaterBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return GreaterBinary::class;
     }

diff --git a/src/Operator/Binary/GreaterEqualBinaryOperator.php b/src/Operator/Binary/GreaterEqualBinaryOperator.php
@@ -15,7 +15,7 @@
 
 class GreaterEqualBinaryOperator extends AbstractBinaryOperator
 {
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return GreaterEqualBinary::class;
     }

diff --git a/src/Operator/Binary/HasEveryBinaryOperator.php b/src/Operator/Binary/HasEveryBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return HasEveryBinary::class;
     }

diff --git a/src/Operator/Binary/HasSomeBinaryOperator.php b/src/Operator/Binary/HasSomeBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return HasSomeBinary::class;
     }

diff --git a/src/Operator/Binary/InBinaryOperator.php b/src/Operator/Binary/InBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return InBinary::class;
     }

diff --git a/src/Operator/Binary/IsBinaryOperator.php b/src/Operator/Binary/IsBinaryOperator.php
@@ -18,10 +18,13 @@
 use Twig\Node\Expression\MacroReferenceExpression;
 use Twig\Node\Expression\NameExpression;
 use Twig\Node\Nodes;
+use Twig\Operator\AbstractOperator;
+use Twig\Operator\OperatorArity;
+use Twig\Operator\OperatorAssociativity;
 use Twig\Token;
 use Twig\TwigTest;
 
-class IsBinaryOperator extends AbstractBinaryOperator
+class IsBinaryOperator extends AbstractOperator implements BinaryOperatorInterface
 {
     private $readyNodes = [];
 
@@ -62,4 +65,14 @@ public function getOperator(): string
     {
         return 'is';
     }
+
+    public function getArity(): OperatorArity
+    {
+        return OperatorArity::Binary;
+    }
+
+    public function getAssociativity(): OperatorAssociativity
+    {
+        return OperatorAssociativity::Left;
+    }
 }
diff --git a/src/Operator/Binary/LessBinaryOperator.php b/src/Operator/Binary/LessBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return LessBinary::class;
     }

diff --git a/src/Operator/Binary/LessEqualBinaryOperator.php b/src/Operator/Binary/LessEqualBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return LessEqualBinary::class;
     }

diff --git a/src/Operator/Binary/MatchesBinaryOperator.php b/src/Operator/Binary/MatchesBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return MatchesBinary::class;
     }

diff --git a/src/Operator/Binary/ModBinaryOperator.php b/src/Operator/Binary/ModBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 60;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return ModBinary::class;
     }

diff --git a/src/Operator/Binary/MulBinaryOperator.php b/src/Operator/Binary/MulBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 60;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return MulBinary::class;
     }

diff --git a/src/Operator/Binary/NotEqualBinaryOperator.php b/src/Operator/Binary/NotEqualBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return NotEqualBinary::class;
     }

diff --git a/src/Operator/Binary/NotInBinaryOperator.php b/src/Operator/Binary/NotInBinaryOperator.php
@@ -25,7 +25,7 @@ public function getPrecedence(): int
         return 20;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return NotInBinary::class;
     }

diff --git a/src/Operator/Binary/NullCoalesceBinaryOperator.php b/src/Operator/Binary/NullCoalesceBinaryOperator.php
@@ -32,7 +32,7 @@ public function getPrecedenceChange(): ?OperatorPrecedenceChange
         return new OperatorPrecedenceChange('twig/twig', '3.15', 5);
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return NullCoalesceBinary::class;
     }

diff --git a/src/Operator/Binary/OrBinaryOperator.php b/src/Operator/Binary/OrBinaryOperator.php
@@ -20,7 +20,7 @@ public function getOperator(): string
         return 'or';
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return OrBinary::class;
     }

diff --git a/src/Operator/Binary/PowerBinaryOperator.php b/src/Operator/Binary/PowerBinaryOperator.php
@@ -26,7 +26,7 @@ public function getPrecedence(): int
         return 200;
     }
 
-    public function getNodeClass(): ?string
+    protected function getNodeClass(): string
     {
         return PowerBinary::class;
     }