Merge pull request #12 from mhujer/twig-3.0

Twig 3.0 support
mhujer · Nov 23, 2019 · 1365d16 · 1365d16
2 parents 29b3e84 + a5d0cb9
commit 1365d16
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Twig/Extension/BreadcrumbsExtension.php b/Twig/Extension/BreadcrumbsExtension.php
@@ -3,13 +3,16 @@
 namespace WhiteOctober\BreadcrumbsBundle\Twig\Extension;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 use WhiteOctober\BreadcrumbsBundle\Model\Breadcrumbs;
 use WhiteOctober\BreadcrumbsBundle\Model\SingleBreadcrumb;
 
 /**
  * Provides an extension for Twig to output breadcrumbs
  */
-class BreadcrumbsExtension extends \Twig_Extension
+class BreadcrumbsExtension extends AbstractExtension
 {
     protected $container;
     protected $breadcrumbs;
@@ -26,9 +29,9 @@ public function __construct(ContainerInterface $container)
     public function getFunctions()
     {
         return array(
-            new \Twig_SimpleFunction("wo_breadcrumbs", array($this, "getBreadcrumbs")),
-            new \Twig_SimpleFunction("wo_breadcrumbs_exists", array($this, "hasBreadcrumbs")),
-            new \Twig_SimpleFunction("wo_render_breadcrumbs", array($this, "renderBreadcrumbs"), array("is_safe" => array("html"))),
+            new TwigFunction("wo_breadcrumbs", array($this, "getBreadcrumbs")),
+            new TwigFunction("wo_breadcrumbs_exists", array($this, "hasBreadcrumbs")),
+            new TwigFunction("wo_render_breadcrumbs", array($this, "renderBreadcrumbs"), array("is_safe" => array("html"))),
         );
     }
 
@@ -38,7 +41,7 @@ public function getFunctions()
     public function getFilters()
     {
         return array(
-            new \Twig_SimpleFilter("wo_is_final_breadcrumb", array($this, "isLastBreadcrumb")),
+            new TwigFilter("wo_is_final_breadcrumb", array($this, "isLastBreadcrumb")),
         );
     }
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "symfony/translation-contracts": "^1.1|^2.0",
         "symfony/twig-bridge": "^4.3.1|^5.0",
         "symfony/twig-bundle": "^4.3|^5.0",
-        "twig/twig": "<3.0"
+        "twig/twig": "^1.38.1|^2.7.1|^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.3",