twig 2 support

MatTheCat · Jan 6, 2017 · 991befa · 991befa
1 parent 31da4bf
commit 991befa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "twig/twig": "~1.12"
+        "twig/twig": "~2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2"

diff --git a/lib/Twig/Extension/WhitespaceCollapser.php b/lib/Twig/Extension/WhitespaceCollapser.php
@@ -33,9 +33,4 @@ public function getDefault()
     {
         return $this->default;
     }
-
-    public function getName()
-    {
-        return 'whitespace_collapser';
-    }
 }
diff --git a/lib/Twig/Node/WhitespaceCollapse.php b/lib/Twig/Node/WhitespaceCollapse.php
@@ -4,7 +4,7 @@
 
 class WhitespaceCollapse extends \Twig_Node
 {
-    public function __construct($value, \Twig_NodeInterface $body, $lineno, $tag = 'whitespacecollapse')
+    public function __construct($value, \Twig_Node $body, $lineno, $tag = 'whitespacecollapse')
     {
         parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
     }

diff --git a/lib/Twig/NodeVisitor/WhitespaceCollapser.php b/lib/Twig/NodeVisitor/WhitespaceCollapser.php
@@ -2,7 +2,8 @@
 
 namespace MatTheCat\Twig\NodeVisitor;
 
-use MatTheCat\Twig\Node\WhitespaceCollapse;
+use MatTheCat\Twig\Extension\WhitespaceCollapser as WhitespaceCollapseExtension;
+use MatTheCat\Twig\Node\WhitespaceCollapse as WhitespaceCollapseNode;
 
 class WhitespaceCollapser extends \Twig_BaseNodeVisitor
 {
@@ -17,16 +18,16 @@ protected function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
             $this->statusStack[] = isset($this->blocks[$node->getAttribute('name')]) ?
                 $this->blocks[$node->getAttribute('name')] :
                 $this->needCollapsing();
-        } elseif ($node instanceof WhitespaceCollapse) {
+        } elseif ($node instanceof WhitespaceCollapseNode) {
             $this->statusStack[] = $node->getAttribute('value');
-        } elseif ($env->hasExtension('whitespace_collapser')) {
+        } elseif ($env->hasExtension(WhitespaceCollapseExtension::class)) {
             /** @var \MatTheCat\Twig\Extension\WhitespaceCollapser $extension */
-            $extension = $env->getExtension('whitespace_collapser');
+            $extension = $env->getExtension(WhitespaceCollapseExtension::class);
             $extensionDefault = $extension->getDefault();
 
             if ($node instanceof \Twig_Node_Module) {
                 if (is_array($extensionDefault)) {
-                    $filename = $node->getAttribute('filename');
+                    $filename = $node->getTemplateName();
                     if (substr($filename, -5) === '.twig') {
                         $filename = substr($filename, 0, -5);
                     }
@@ -46,7 +47,7 @@ protected function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
 
     protected function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
     {
-        if ($node instanceof WhitespaceCollapse || $node instanceof \Twig_Node_Block || $node instanceof \Twig_Node_AutoEscape) {
+        if ($node instanceof WhitespaceCollapseNode || $node instanceof \Twig_Node_Block || $node instanceof \Twig_Node_AutoEscape) {
             array_pop($this->statusStack);
         } elseif ($node instanceof \Twig_Node_BlockReference) {
             $this->blocks[$node->getAttribute('name')] = $this->needCollapsing();

diff --git a/lib/Twig/TokenParser/WhitespaceCollapse.php b/lib/Twig/TokenParser/WhitespaceCollapse.php
@@ -16,7 +16,7 @@ public function parse(\Twig_Token $token)
         } else {
             $expr = $this->parser->getExpressionParser()->parseExpression();
             if (!$expr instanceof \Twig_Node_Expression_Constant) {
-                throw new \Twig_Error_Syntax('State must be a Boolean.', $stream->getCurrent()->getLine(), $stream->getFilename());
+                throw new \Twig_Error_Syntax('State must be a Boolean.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getPath());
             }
             $value = $expr->getAttribute('value');
         }