From ca4be89baf72ce56b0a57e604bddfcf7ecff8f27 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Fri, 20 Dec 2019 08:43:03 +0000
Subject: [PATCH] Use namespaces Twig classes

---
 Tests/Twig/PhumborExtensionTest.php |  8 --------
 Twig/PhumborExtension.php           | 17 ++++++-----------
 composer.json                       |  3 +++
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Tests/Twig/PhumborExtensionTest.php b/Tests/Twig/PhumborExtensionTest.php
index 1155fcb..8d7ada2 100644
--- 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
index a600359..7c31780 100644
--- 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
index 336e360..46dc67c 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,9 @@
         "twig/extensions": "~1.0",
         "phpunit/phpunit": "~4.8|~5.7"
     },
+    "conflict": {
+        "twig/twig": "<1.34"
+    },
     "autoload": {
         "psr-0": { "Jb\\Bundle\\PhumborBundle": "" }
     },