Merge pull request #300 from W0rma/fix-twig-deprecations

Fix twig deprecations
willdurand · Nov 29, 2019 · 3311722 · 3311722
2 parents d37bd93 + e425060
commit 3311722
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "symfony/yaml": "~3.0 || ~4.0 || ~5.0",
         "symfony/routing": "~3.0 || ~4.0 || ~5.0",
         "pagerfanta/pagerfanta": "~1.0",
-        "twig/twig": "^1.12 || ^2.0"
+        "twig/twig": "^1.34 || ^2.0 || ^3.0"
     },
     "suggest": {
         "symfony/yaml": "To use yaml based configuration.",

diff --git a/src/Twig/Extension/LinkExtension.php b/src/Twig/Extension/LinkExtension.php
@@ -5,8 +5,10 @@
 namespace Hateoas\Twig\Extension;
 
 use Hateoas\Helper\LinkHelper;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
-class LinkExtension extends \Twig_Extension
+class LinkExtension extends AbstractExtension
 {
     /**
      * @var LinkHelper
@@ -24,7 +26,7 @@ public function __construct(LinkHelper $linkHelper)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('link_href', [$this->linkHelper, 'getLinkHref']),
+            new TwigFunction('link_href', [$this->linkHelper, 'getLinkHref']),
         ];
     }
 

diff --git a/tests/Hateoas/Tests/Twig/Extension/LinkExtensionIntegrationTest.php b/tests/Hateoas/Tests/Twig/Extension/LinkExtensionIntegrationTest.php
@@ -7,8 +7,9 @@
 use Hateoas\HateoasBuilder;
 use Hateoas\Twig\Extension\LinkExtension;
 use Hateoas\UrlGenerator\CallableUrlGenerator;
+use Twig\Test\IntegrationTestCase;
 
-class LinkExtensionIntegrationTest extends \Twig_Test_IntegrationTestCase
+class LinkExtensionIntegrationTest extends IntegrationTestCase
 {
     public function getExtensions()
     {