Update Twig from 1.35.0 to 1.42.4 (PHP 5.5 is now required!)

This fixes some errors on PHP 7.4 and contains even more fixes
Also bumped PHP version to 5.5 as Twig requires it.

system/libs/Twig/Node/Expression/Binary/AbstractBinary.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+use Twig\Node\Expression\AbstractExpression;
+
+abstract class AbstractBinary extends AbstractExpression
+{
+    public function __construct(\Twig_NodeInterface $left, \Twig_NodeInterface $right, $lineno)
+    {
+        parent::__construct(['left' => $left, 'right' => $right], [], $lineno);
+    }
+
+    public function compile(Compiler $compiler)
+    {
+        $compiler
+            ->raw('(')
+            ->subcompile($this->getNode('left'))
+            ->raw(' ')
+        ;
+        $this->operator($compiler);
+        $compiler
+            ->raw(' ')
+            ->subcompile($this->getNode('right'))
+            ->raw(')')
+        ;
+    }
+
+    abstract public function operator(Compiler $compiler);
+}
+
+class_alias('Twig\Node\Expression\Binary\AbstractBinary', 'Twig_Node_Expression_Binary');

system/libs/Twig/Node/Expression/Binary/AddBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Add extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class AddBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('+');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Add', 'Twig\Node\Expression\Binary\AddBinary', false);
+class_alias('Twig\Node\Expression\Binary\AddBinary', 'Twig_Node_Expression_Binary_Add');

system/libs/Twig/Node/Expression/Binary/AndBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_And extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class AndBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('&&');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_And', 'Twig\Node\Expression\Binary\AndBinary', false);
+class_alias('Twig\Node\Expression\Binary\AndBinary', 'Twig_Node_Expression_Binary_And');

system/libs/Twig/Node/Expression/Binary/BitwiseAndBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_BitwiseAnd extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class BitwiseAndBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('&');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_BitwiseAnd', 'Twig\Node\Expression\Binary\BitwiseAndBinary', false);
+class_alias('Twig\Node\Expression\Binary\BitwiseAndBinary', 'Twig_Node_Expression_Binary_BitwiseAnd');

system/libs/Twig/Node/Expression/Binary/BitwiseOrBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_BitwiseOr extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class BitwiseOrBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('|');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_BitwiseOr', 'Twig\Node\Expression\Binary\BitwiseOrBinary', false);
+class_alias('Twig\Node\Expression\Binary\BitwiseOrBinary', 'Twig_Node_Expression_Binary_BitwiseOr');

system/libs/Twig/Node/Expression/Binary/BitwiseXorBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_BitwiseXor extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class BitwiseXorBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('^');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_BitwiseXor', 'Twig\Node\Expression\Binary\BitwiseXorBinary', false);
+class_alias('Twig\Node\Expression\Binary\BitwiseXorBinary', 'Twig_Node_Expression_Binary_BitwiseXor');

system/libs/Twig/Node/Expression/Binary/ConcatBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Concat extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class ConcatBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('.');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Concat', 'Twig\Node\Expression\Binary\ConcatBinary', false);
+class_alias('Twig\Node\Expression\Binary\ConcatBinary', 'Twig_Node_Expression_Binary_Concat');

system/libs/Twig/Node/Expression/Binary/DivBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Div extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class DivBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('/');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Div', 'Twig\Node\Expression\Binary\DivBinary', false);
+class_alias('Twig\Node\Expression\Binary\DivBinary', 'Twig_Node_Expression_Binary_Div');

system/libs/Twig/Node/Expression/Binary/EndsWithBinary.php

@@ -8,9 +8,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_EndsWith extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class EndsWithBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $left = $compiler->getVarName();
         $right = $compiler->getVarName();
@@ -23,10 +28,10 @@ class Twig_Node_Expression_Binary_EndsWith extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_EndsWith', 'Twig\Node\Expression\Binary\EndsWithBinary', false);
+class_alias('Twig\Node\Expression\Binary\EndsWithBinary', 'Twig_Node_Expression_Binary_EndsWith');

system/libs/Twig/Node/Expression/Binary/EqualBinary.php

@@ -8,12 +8,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Equal extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class EqualBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('==');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Equal', 'Twig\Node\Expression\Binary\EqualBinary', false);
+class_alias('Twig\Node\Expression\Binary\EqualBinary', 'Twig_Node_Expression_Binary_Equal');

system/libs/Twig/Node/Expression/Binary/FloorDivBinary.php

@@ -8,19 +8,24 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_FloorDiv extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class FloorDivBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $compiler->raw('(int) floor(');
         parent::compile($compiler);
         $compiler->raw(')');
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('/');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_FloorDiv', 'Twig\Node\Expression\Binary\FloorDivBinary', false);
+class_alias('Twig\Node\Expression\Binary\FloorDivBinary', 'Twig_Node_Expression_Binary_FloorDiv');

system/libs/Twig/Node/Expression/Binary/GreaterBinary.php

@@ -8,12 +8,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Greater extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class GreaterBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('>');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Greater', 'Twig\Node\Expression\Binary\GreaterBinary', false);
+class_alias('Twig\Node\Expression\Binary\GreaterBinary', 'Twig_Node_Expression_Binary_Greater');

system/libs/Twig/Node/Expression/Binary/GreaterEqual.php

@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_GreaterEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>=');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_GreaterEqual', 'Twig\Node\Expression\Binary\GreaterEqualBinary', false);

system/libs/Twig/Node/Expression/Binary/GreaterEqualBinary.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class GreaterEqualBinary extends AbstractBinary
+{
+    public function operator(Compiler $compiler)
+    {
+        return $compiler->raw('>=');
+    }
+}
+
+class_alias('Twig\Node\Expression\Binary\GreaterEqualBinary', 'Twig_Node_Expression_Binary_GreaterEqual');

system/libs/Twig/Node/Expression/Binary/InBinary.php

@@ -8,9 +8,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_In extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class InBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $compiler
             ->raw('twig_in_filter(')
@@ -21,10 +26,10 @@ class Twig_Node_Expression_Binary_In extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('in');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_In', 'Twig\Node\Expression\Binary\InBinary', false);
+class_alias('Twig\Node\Expression\Binary\InBinary', 'Twig_Node_Expression_Binary_In');

system/libs/Twig/Node/Expression/Binary/LessBinary.php

@@ -8,12 +8,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Less extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class LessBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('<');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Less', 'Twig\Node\Expression\Binary\LessBinary', false);
+class_alias('Twig\Node\Expression\Binary\LessBinary', 'Twig_Node_Expression_Binary_Less');

system/libs/Twig/Node/Expression/Binary/LessEqual.php

@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_LessEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<=');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_LessEqual', 'Twig\Node\Expression\Binary\LessEqualBinary', false);

system/libs/Twig/Node/Expression/Binary/LessEqualBinary.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class LessEqualBinary extends AbstractBinary
+{
+    public function operator(Compiler $compiler)
+    {
+        return $compiler->raw('<=');
+    }
+}
+
+class_alias('Twig\Node\Expression\Binary\LessEqualBinary', 'Twig_Node_Expression_Binary_LessEqual');

system/libs/Twig/Node/Expression/Binary/MatchesBinary.php

@@ -8,9 +8,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Matches extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class MatchesBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $compiler
             ->raw('preg_match(')
@@ -21,10 +26,10 @@ class Twig_Node_Expression_Binary_Matches extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Matches', 'Twig\Node\Expression\Binary\MatchesBinary', false);
+class_alias('Twig\Node\Expression\Binary\MatchesBinary', 'Twig_Node_Expression_Binary_Matches');

system/libs/Twig/Node/Expression/Binary/ModBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Mod extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class ModBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('%');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Mod', 'Twig\Node\Expression\Binary\ModBinary', false);
+class_alias('Twig\Node\Expression\Binary\ModBinary', 'Twig_Node_Expression_Binary_Mod');

system/libs/Twig/Node/Expression/Binary/MulBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Mul extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class MulBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('*');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Mul', 'Twig\Node\Expression\Binary\MulBinary', false);
+class_alias('Twig\Node\Expression\Binary\MulBinary', 'Twig_Node_Expression_Binary_Mul');

system/libs/Twig/Node/Expression/Binary/NotEqualBinary.php

@@ -8,12 +8,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_NotEqual extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class NotEqualBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('!=');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_NotEqual', 'Twig\Node\Expression\Binary\NotEqualBinary', false);
+class_alias('Twig\Node\Expression\Binary\NotEqualBinary', 'Twig_Node_Expression_Binary_NotEqual');

system/libs/Twig/Node/Expression/Binary/NotInBinary.php

@@ -8,9 +8,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_NotIn extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class NotInBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $compiler
             ->raw('!twig_in_filter(')
@@ -21,10 +26,10 @@ class Twig_Node_Expression_Binary_NotIn extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('not in');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_NotIn', 'Twig\Node\Expression\Binary\NotInBinary', false);
+class_alias('Twig\Node\Expression\Binary\NotInBinary', 'Twig_Node_Expression_Binary_NotIn');

system/libs/Twig/Node/Expression/Binary/OrBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Or extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class OrBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('||');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Or', 'Twig\Node\Expression\Binary\OrBinary', false);
+class_alias('Twig\Node\Expression\Binary\OrBinary', 'Twig_Node_Expression_Binary_Or');

system/libs/Twig/Node/Expression/Binary/PowerBinary.php

@@ -8,11 +8,16 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class PowerBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
-        if (PHP_VERSION_ID >= 50600) {
+        if (\PHP_VERSION_ID >= 50600) {
             return parent::compile($compiler);
         }
 
@@ -25,10 +30,10 @@ class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('**');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Power', 'Twig\Node\Expression\Binary\PowerBinary', false);
+class_alias('Twig\Node\Expression\Binary\PowerBinary', 'Twig_Node_Expression_Binary_Power');

system/libs/Twig/Node/Expression/Binary/RangeBinary.php

@@ -8,9 +8,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Range extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class RangeBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $compiler
             ->raw('range(')
@@ -21,10 +26,10 @@ class Twig_Node_Expression_Binary_Range extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('..');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Range', 'Twig\Node\Expression\Binary\RangeBinary', false);
+class_alias('Twig\Node\Expression\Binary\RangeBinary', 'Twig_Node_Expression_Binary_Range');

system/libs/Twig/Node/Expression/Binary/StartsWithBinary.php

@@ -8,9 +8,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_StartsWith extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class StartsWithBinary extends AbstractBinary
 {
-    public function compile(Twig_Compiler $compiler)
+    public function compile(Compiler $compiler)
     {
         $left = $compiler->getVarName();
         $right = $compiler->getVarName();
@@ -23,10 +28,10 @@ class Twig_Node_Expression_Binary_StartsWith extends Twig_Node_Expression_Binary
         ;
     }
 
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_StartsWith', 'Twig\Node\Expression\Binary\StartsWithBinary', false);
+class_alias('Twig\Node\Expression\Binary\StartsWithBinary', 'Twig_Node_Expression_Binary_StartsWith');

system/libs/Twig/Node/Expression/Binary/SubBinary.php

@@ -9,12 +9,17 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class Twig_Node_Expression_Binary_Sub extends Twig_Node_Expression_Binary
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+
+class SubBinary extends AbstractBinary
 {
-    public function operator(Twig_Compiler $compiler)
+    public function operator(Compiler $compiler)
     {
         return $compiler->raw('-');
     }
 }
 
-class_alias('Twig_Node_Expression_Binary_Sub', 'Twig\Node\Expression\Binary\SubBinary', false);
+class_alias('Twig\Node\Expression\Binary\SubBinary', 'Twig_Node_Expression_Binary_Sub');