Merge pull request #13 from Troopers/feature/twig2.0

Compatibility with twig >2.0
Troopers · May 21, 2017 · 1b8dc11 · 1b8dc11
2 parents 3c7fa9f + d405ef4
commit 1b8dc11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Twig/AsseticInjectorTokenParser.php b/Twig/AsseticInjectorTokenParser.php
@@ -17,6 +17,7 @@
 use Symfony\Bundle\AsseticBundle\Twig\AsseticNode;
 use Symfony\Bundle\AsseticBundle\Twig\AsseticTokenParser as BaseAsseticTokenParser;
 use Symfony\Component\Templating\TemplateNameParserInterface;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
 
 /**
  * Assetic token parser.
@@ -60,19 +61,15 @@ public function parse(\Twig_Token $token)
             // check the bundle
             $templateRef = null;
             try {
-                $templateRef = $this->templateNameParser->parse($this->parser->getStream()->getFilename());
+                $templateRef = $this->templateNameParser->parse($this->parser->getStream()->getSourceContext()->getName());
             } catch (\RuntimeException $e) {
                 // this happens when the filename isn't a Bundle:* url
                 // and it contains ".."
             } catch (\InvalidArgumentException $e) {
                 // this happens when the filename isn't a Bundle:* url
                 // but an absolute path instead
             }
-            try {
-                $bundle = $templateRef ? $templateRef->get('bundle') : null;
-            } catch (\InvalidArgumentException $e) {
-                $bundle = null;
-            }
+            $bundle = $templateRef instanceof TemplateReference ? $templateRef->get('bundle') : null;
             if ($bundle && !in_array($bundle, $this->enabledBundles)) {
                 throw new InvalidBundleException($bundle, "the {% {$this->getTag()} %} tag", $templateRef->getLogicalName(), $this->enabledBundles);
             }
@@ -81,7 +78,7 @@ public function parse(\Twig_Token $token)
         return $this->parseAndInject($token);
     }
 
-    protected function createNode(AssetInterface $asset, \Twig_NodeInterface $body, array $inputs, array $filters, $name, array $attributes = [], $lineno = 0, $tag = null)
+    protected function createNode(AssetInterface $asset, \Twig_Node $body, array $inputs, array $filters, $name, array $attributes = [], $lineno = 0, $tag = null)
     {
         return new AsseticNode($asset, $body, $inputs, $filters, $name, $attributes, $lineno, $tag);
     }

diff --git a/composer.json b/composer.json
@@ -16,7 +16,9 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=5.3.2",
+        "symfony/assetic-bundle": "~2.7",
+        "twig/twig": "~2.0"
     },
     "autoload": {
         "psr-0": { "Troopers\\AsseticInjectorBundle": "" }