Merge pull request #15 from mpdude/twig-namespaces

Use namespaced Twig classes
jbouzekri · Dec 20, 2019 · 49fce38 · 49fce38
2 parents 4ced82c + ca4be89
commit 49fce38
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/Tests/Twig/PhumborExtensionTest.php b/Tests/Twig/PhumborExtensionTest.php
@@ -56,14 +56,6 @@ public function testGetFunctions()
         $this->assertEquals(count($this->extension->getFunctions()), 1);
     }
 
-    /**
-     * Test twig getName
-     */
-    public function testGetName()
-    {
-        $this->assertEquals($this->extension->getName(), 'phumbor_extension');
-    }
-
     /**
      * Test twig get filters
      */

diff --git a/Twig/PhumborExtension.php b/Twig/PhumborExtension.php
@@ -3,13 +3,16 @@
 namespace Jb\Bundle\PhumborBundle\Twig;
 
 use Jb\Bundle\PhumborBundle\Transformer\BaseTransformer;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 
 /**
  * Description of PhumborExtension
  *
  * @author jobou
  */
-class PhumborExtension extends \Twig_Extension
+class PhumborExtension extends AbstractExtension
 {
     /**
      * @var \Jb\Bundle\PhumborBundle\Transformer\BaseTransformer
@@ -32,7 +35,7 @@ public function __construct(BaseTransformer $transformer)
     public function getFilters()
     {
         return array(
-            new \Twig_SimpleFilter('thumbor', array($this, 'transform')),
+            new TwigFilter('thumbor', array($this, 'transform')),
         );
     }
 
@@ -42,7 +45,7 @@ public function getFilters()
     public function getFunctions()
     {
         return array(
-            new \Twig_SimpleFunction('thumbor', array($this, 'transform')),
+            new TwigFunction('thumbor', array($this, 'transform')),
         );
     }
 
@@ -59,12 +62,4 @@ public function transform($orig, $transformation = null, $overrides = array())
     {
         return $this->transformer->transform($orig, $transformation, $overrides);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return 'phumbor_extension';
-    }
 }
diff --git a/composer.json b/composer.json
@@ -16,6 +16,9 @@
         "phpunit/phpunit": "^7.0",
         "twig/extensions": "~1.0"
     },
+    "conflict": {
+        "twig/twig": "<1.34"
+    },
     "autoload": {
         "psr-4": { "Jb\\Bundle\\PhumborBundle\\": "" }
     }