replaced deprecated global Twig classes with namespaced classes (#12)

* replaced deprecated global Twig classes with namespaced classes * updated minimum twig version to be compatible with namespaced classes
yannickl88 · Mar 25, 2019 · 682d856 · 682d856
1 parent 31dfe75
commit 682d856
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "phpunit/phpunit":     "^4.8.35|^6.0",
         "symfony/twig-bundle": "^3.3|^4.0",
         "symfony/yaml":        "^3.3|^4.0",
-        "twig/twig":           "^1.23.1|^2.0"
+        "twig/twig":           "^1.38.1|^2.7.2"
     },
     "minimum-stability": "dev",
     "prefer-stable":     true,

diff --git a/src/Twig/FeaturesExtension.php b/src/Twig/FeaturesExtension.php
@@ -1,12 +1,14 @@
 <?php
 namespace Yannickl88\FeaturesBundle\Twig;
 
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 use Yannickl88\FeaturesBundle\Feature\FeatureContainerInterface;
 
 /**
- * Twig extention for feature support in twig templates.
+ * Twig extension for feature support in twig templates.
  */
-class FeaturesExtension extends \Twig_Extension
+class FeaturesExtension extends AbstractExtension
 {
     /**
      * @var FeatureContainerInterface
@@ -27,7 +29,7 @@ public function __construct(FeatureContainerInterface $container)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('feature', function ($tag) {
+            new TwigFunction('feature', function ($tag) {
                 return $this->container->get($tag)->isActive();
             }),
         ];

diff --git a/test/Twig/FeaturesExtensionTest.php b/test/Twig/FeaturesExtensionTest.php
@@ -2,6 +2,7 @@
 namespace Yannickl88\FeaturesBundle\Twig;
 
 use PHPUnit\Framework\TestCase;
+use Twig\TwigFunction;
 use Yannickl88\FeaturesBundle\Feature\Feature;
 use Yannickl88\FeaturesBundle\Feature\FeatureContainerInterface;
 
@@ -26,7 +27,7 @@ protected function setUp()
 
     public function testGetFunctions()
     {
-        /* @var $functions \Twig_SimpleFunction[] */
+        /* @var $functions TwigFunction[] */
         $functions = $this->features_extension->getFunctions();
         $feature   = $this->prophesize(Feature::class);