Merge pull request #82 from lruozzi9/master

Add compatibility with Symfony 5
stefandoorn · May 11, 2021 · 059e730 · 059e730
2 parents 25988c4 + 7b63f53
commit 059e730
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -16,9 +16,8 @@ final class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-
-        $rootNode = $treeBuilder->root('gtm');
+        $treeBuilder = new TreeBuilder('gtm');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

diff --git a/src/EventListener/AddRouteListener.php b/src/EventListener/AddRouteListener.php
@@ -3,7 +3,7 @@
 namespace GtmPlugin\EventListener;
 
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Xynnn\GoogleTagManagerBundle\Service\GoogleTagManagerInterface;
 
 /**
@@ -34,9 +34,9 @@ public function __construct(GoogleTagManagerInterface $googleTagManager, Request
     }
 
     /**
-     * @param GetResponseEvent $event
+     * @param RequestEvent $event
      */
-    public function onKernelRequest(GetResponseEvent $event): void
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $this->request->getCurrentRequest();
 

diff --git a/src/EventListener/ContextListener.php b/src/EventListener/ContextListener.php
@@ -6,7 +6,7 @@
 use Sylius\Component\Channel\Context\ChannelNotFoundException;
 use Sylius\Component\Currency\Context\CurrencyContextInterface;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Xynnn\GoogleTagManagerBundle\Service\GoogleTagManagerInterface;
 
 /**
@@ -55,9 +55,9 @@ public function __construct(
     }
 
     /**
-     * @param GetResponseEvent $event
+     * @param RequestEvent $event
      */
-    public function onKernelRequest(GetResponseEvent $event): void
+    public function onKernelRequest(RequestEvent $event): void
     {
         try {
             $channel = $this->channelContext->getChannel();

diff --git a/src/EventListener/EnvironmentListener.php b/src/EventListener/EnvironmentListener.php
@@ -2,7 +2,7 @@
 
 namespace GtmPlugin\EventListener;
 
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Xynnn\GoogleTagManagerBundle\Service\GoogleTagManagerInterface;
 
 /**
@@ -33,9 +33,9 @@ public function __construct(GoogleTagManagerInterface $googleTagManager, string
     }
 
     /**
-     * @param GetResponseEvent $event
+     * @param RequestEvent $event
      */
-    public function onKernelRequest(GetResponseEvent $event): void
+    public function onKernelRequest(RequestEvent $event): void
     {
         $this->googleTagManager->setData('env', $this->environment);
     }