Fixing deprecated notices from Twig 1.27

symfony · Nov 11, 2016 · db798d2 · db798d2
1 parent aa5b4f8
commit db798d2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/Tests/Controller/AsseticControllerTest.php b/Tests/Controller/AsseticControllerTest.php
@@ -27,7 +27,7 @@ protected function setUp()
             $this->markTestSkipped('Assetic is not available.');
         }
 
-        $this->request = $this->getMock('Symfony\\Component\\HttpFoundation\\Request');
+        $this->request = $this->getMock('Symfony\\Component\\HttpFoundation\\Request', array('getETags', 'getMethod'));
         $this->headers = $this->getMock('Symfony\\Component\\HttpFoundation\\ParameterBag');
         $this->request->headers = $this->headers;
         $this->am = $this->getMockBuilder('Assetic\\Factory\\LazyAssetManager')
@@ -36,8 +36,8 @@ protected function setUp()
         $this->cache = $this->getMock('Assetic\\Cache\\CacheInterface');
 
         $this->request->expects($this->any())
-            ->method('isMethodSafe')
-            ->will($this->returnValue(true));
+            ->method('getMethod')
+            ->willReturn('GET');
 
         $this->controller = new AsseticController($this->am, $this->cache);
     }

diff --git a/Tests/Resources/config/config.yml b/Tests/Resources/config/config.yml
@@ -4,8 +4,8 @@ framework:
     templating:    { engines: ['twig', 'php'] }
 
 twig:
-    debug:            %kernel.debug%
-    strict_variables: %kernel.debug%
+    debug:            '%kernel.debug%'
+    strict_variables: '%kernel.debug%'
 
 assetic:
     use_controller: true
@@ -27,7 +27,7 @@ assetic:
         sass:
             apply_to: '\.sass$'
         yui_css:
-            jar: %kernel.root_dir/java/yui-compressor-2.4.6.jar
+            jar: '%kernel.root_dir/java/yui-compressor-2.4.6.jar'
     twig:
         functions:
             yui_css: { output: css/*.css }
diff --git a/Twig/AsseticNode.php b/Twig/AsseticNode.php
@@ -25,21 +25,21 @@ protected function compileAssetUrl(\Twig_Compiler $compiler, AssetInterface $ass
     {
         $vars = array();
         foreach ($asset->getVars() as $var) {
-            $vars[] = new \Twig_Node_Expression_Constant($var, $this->getLine());
+            $vars[] = new \Twig_Node_Expression_Constant($var, $this->getTemplateLine());
 
             // Retrieves values of assetic vars from the context, $context['assetic']['vars'][$var].
             $vars[] = new \Twig_Node_Expression_GetAttr(
                 new \Twig_Node_Expression_GetAttr(
-                    new \Twig_Node_Expression_Name('assetic', $this->getLine()),
-                    new \Twig_Node_Expression_Constant('vars', $this->getLine()),
-                    new \Twig_Node_Expression_Array(array(), $this->getLine()),
+                    new \Twig_Node_Expression_Name('assetic', $this->getTemplateLine()),
+                    new \Twig_Node_Expression_Constant('vars', $this->getTemplateLine()),
+                    new \Twig_Node_Expression_Array(array(), $this->getTemplateLine()),
                     \Twig_Template::ARRAY_CALL,
-                    $this->getLine()
+                    $this->getTemplateLine()
                 ),
-                new \Twig_Node_Expression_Constant($var, $this->getLine()),
-                new \Twig_Node_Expression_Array(array(), $this->getLine()),
+                new \Twig_Node_Expression_Constant($var, $this->getTemplateLine()),
+                new \Twig_Node_Expression_Array(array(), $this->getTemplateLine()),
                 \Twig_Template::ARRAY_CALL,
-                $this->getLine()
+                $this->getTemplateLine()
             );
         }
         $compiler
@@ -52,16 +52,16 @@ protected function compileAssetUrl(\Twig_Compiler $compiler, AssetInterface $ass
 
     private function getPathFunction($name, array $vars = array())
     {
-        $nodes = array(new \Twig_Node_Expression_Constant('_assetic_'.$name, $this->getLine()));
+        $nodes = array(new \Twig_Node_Expression_Constant('_assetic_'.$name, $this->getTemplateLine()));
 
         if (!empty($vars)) {
-            $nodes[] = new \Twig_Node_Expression_Array($vars, $this->getLine());
+            $nodes[] = new \Twig_Node_Expression_Array($vars, $this->getTemplateLine());
         }
 
         return new \Twig_Node_Expression_Function(
             'path',
             new \Twig_Node($nodes),
-            $this->getLine()
+            $this->getTemplateLine()
         );
     }
 
@@ -70,13 +70,13 @@ private function getAssetFunction($path)
         $arguments = array($path);
 
         if ($this->hasAttribute('package')) {
-            $arguments[] = new \Twig_Node_Expression_Constant($this->getAttribute('package'), $this->getLine());
+            $arguments[] = new \Twig_Node_Expression_Constant($this->getAttribute('package'), $this->getTemplateLine());
         }
 
         return new \Twig_Node_Expression_Function(
             'asset',
             new \Twig_Node($arguments),
-            $this->getLine()
+            $this->getTemplateLine()
         );
     }
 }

diff --git a/Twig/AsseticTokenParser.php b/Twig/AsseticTokenParser.php
@@ -46,7 +46,7 @@ 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 ".."

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "symfony/dependency-injection": "~2.3|~3.0",
         "symfony/console": "~2.3|~3.0",
         "symfony/yaml": "~2.3|~3.0",
-        "kriswallsmith/assetic": "~1.3"
+        "kriswallsmith/assetic": "~1.4"
     },
     "require-dev": {
         "patchwork/jsqueeze": "~1.0",
@@ -30,7 +30,7 @@
         "symfony/phpunit-bridge": "~2.7|~3.0"
     },
     "conflict": {
-        "twig/twig": "<1.20",
+        "twig/twig": "<1.27",
         "kriswallsmith/spork": "<=0.2"
     },
     "suggest": {