Merge branch 'fix-deprecation'

Fix deprecations in Twig 1.26, resolves #5

Author: Sander Marechal

composer.json

@@ -7,10 +7,10 @@
     "require": {
         "php": "^5.5|^7.0",
         "ext-intl": "*",
-        "symfony/options-resolver": "~2.3|~3.0",
-        "symfony/property-access": "~2.3|~3.0",
-        "twig/extensions": "~1.2",
-        "twig/twig": "~1.23"
+        "symfony/options-resolver": "^2.3|^3.0",
+        "symfony/property-access": "^2.3|^3.0",
+        "twig/extensions": "^1.4",
+        "twig/twig": "^1.26"
     },
     "license": "MIT",
     "authors": [

src/Twig/GridExtension.php

@@ -64,12 +64,4 @@ public function getTokenParsers()
             new GridThemeTokenParser(),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'grid';
-    }
 }

src/Twig/Node/GridThemeNode.php

@@ -24,9 +24,11 @@ public function __construct(\Twig_Node $grid, \Twig_Node $resources, $lineno, $t
      */
     public function compile(\Twig_Compiler $compiler)
     {
+        $class = \Prezent\Grid\Twig\GridExtension::class;
+
         $compiler
             ->addDebugInfo($this)
-            ->write('$this->env->getExtension(\'grid\')->renderer->setTheme(')
+            ->write('$this->env->getExtension(\''.$class.'\')->renderer->setTheme(')
             ->subcompile($this->getNode('grid'))
             ->raw(', ')
             ->subcompile($this->getNode('resources'))

src/Twig/Node/RenderBlockNode.php

@@ -14,9 +14,10 @@ public function compile(\Twig_Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
         $arguments = iterator_to_array($this->getNode('arguments'));
+        $class = \Prezent\Grid\Twig\GridExtension::class;
 
         $compiler
-            ->write('$this->env->getExtension(\'grid\')->renderer->renderBlock(')
+            ->write('$this->env->getExtension(\''.$class.'\')->renderer->renderBlock(')
             ->raw('\''.$this->getAttribute('name').'\', ')
             ->subcompile($arguments[0]);
 

src/Twig/Node/RenderItemBlockNode.php

@@ -14,9 +14,10 @@ public function compile(\Twig_Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
         $arguments = iterator_to_array($this->getNode('arguments'));
+        $class = \Prezent\Grid\Twig\GridExtension::class;
 
         $compiler
-            ->write('$this->env->getExtension(\'grid\')->renderer->renderBlock(')
+            ->write('$this->env->getExtension(\''.$class.'\')->renderer->renderBlock(')
             ->raw('\''.$this->getAttribute('name').'\'');
 
         foreach ($arguments as $argument) {