Update Twig extensions to work with Twig v3

meinfernbus · May 20, 2022 · a5ed707 · a5ed707
1 parent 4f0e466
commit a5ed707
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ Include the Google Analytics Async template in the `head` tag or just before the
 With twig:
 
 ```twig
-    {% include "GoogleBundle:Analytics:async.html.twig" %}
+    {% include "@Google/Analytics/async.html.twig" %}
 ```
 
 #### Features

diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": ">=7.2",
+        "twig/twig": "^2.0|^3.0",
         "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0",
         "symfony/http-kernel": "^3.4 || ^4.4 || ^5.0",
         "symfony/config": "^3.4 || ^4.4 || ^5.0"

diff --git a/src/Extension/AdwordsExtension.php b/src/Extension/AdwordsExtension.php
@@ -4,8 +4,9 @@
 
 use AntiMattr\GoogleBundle\Helper\AdwordsHelper;
 use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
 
-class AdwordsExtension extends AbstractExtension implements \Twig_Extension_GlobalsInterface
+class AdwordsExtension extends AbstractExtension implements GlobalsInterface
 {
     private $adwordsHelper;
 
@@ -14,7 +15,7 @@ public function __construct(AdwordsHelper $adwordsHelper)
         $this->adwordsHelper = $adwordsHelper;
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return [
             'google_adwords' => $this->adwordsHelper,
@@ -26,7 +27,7 @@ public function getGlobals()
      *
      * @return string The extension name
      */
-    public function getName()
+    public function getName(): string
     {
         return 'google_adwords';
     }

diff --git a/src/Extension/AnalyticsExtension.php b/src/Extension/AnalyticsExtension.php
@@ -4,8 +4,9 @@
 
 use AntiMattr\GoogleBundle\Helper\AnalyticsHelper;
 use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
 
-class AnalyticsExtension extends AbstractExtension implements \Twig_Extension_GlobalsInterface
+class AnalyticsExtension extends AbstractExtension implements GlobalsInterface
 {
     private $analyticsHelper;
 
@@ -14,7 +15,7 @@ public function __construct(AnalyticsHelper $analyticsHelper)
         $this->analyticsHelper = $analyticsHelper;
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return [
             'google_analytics' => $this->analyticsHelper,
@@ -26,7 +27,7 @@ public function getGlobals()
      *
      * @return string The extension name
      */
-    public function getName()
+    public function getName(): string
     {
         return 'google_analytics';
     }

diff --git a/src/Extension/MapsExtension.php b/src/Extension/MapsExtension.php
@@ -4,8 +4,9 @@
 
 use AntiMattr\GoogleBundle\Helper\MapsHelper;
 use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
 
-class MapsExtension extends AbstractExtension implements \Twig_Extension_GlobalsInterface
+class MapsExtension extends AbstractExtension implements GlobalsInterface
 {
     private $mapsHelper;
 
@@ -14,7 +15,7 @@ public function __construct(MapsHelper $mapsHelper)
         $this->mapsHelper = $mapsHelper;
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return [
             'google_maps' => $this->mapsHelper,
@@ -26,7 +27,7 @@ public function getGlobals()
      *
      * @return string The extension name
      */
-    public function getName()
+    public function getName(): string
     {
         return 'google_maps';
     }

diff --git a/src/Extension/TagManagerExtension.php b/src/Extension/TagManagerExtension.php
@@ -4,11 +4,12 @@
 
 use AntiMattr\GoogleBundle\Helper\TagManagerHelper;
 use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
 
 /**
  * Tag Manager Extension
  */
-class TagManagerExtension extends AbstractExtension implements \Twig_Extension_GlobalsInterface
+class TagManagerExtension extends AbstractExtension implements GlobalsInterface
 {
     private $tagManagerHelper;
 
@@ -23,7 +24,7 @@ public function __construct(TagManagerHelper $tagManagerHelper)
     /**
      * @return array
      */
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return [
             'google_tag_manager' => $this->tagManagerHelper,
@@ -35,7 +36,7 @@ public function getGlobals()
      *
      * @return string The extension name
      */
-    public function getName()
+    public function getName(): string
     {
         return 'google_tag_manager';
     }