php 8 and symfony 6 update (#47)

* php 8 and symfony 6 update * php 8 and symfony 6 update
xyNNN · Nov 16, 2022 · f503fe2 · f503fe2
1 parent 082b585
commit f503fe2
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 298 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,8 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
+  - 8.0
+  - 8.1
 
 sudo: false
 dist: xenial

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -23,17 +23,11 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('google_tag_manager');
 
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC layer for symfony/config 4.1 and older
-            $rootNode = $treeBuilder->root('google_tag_manager');
-        }
-
+        $rootNode = $treeBuilder->getRootNode();
         $rootNode
             ->children()
                 ->booleanNode('enabled')->end()

diff --git a/DependencyInjection/GoogleTagManagerExtension.php b/DependencyInjection/GoogleTagManagerExtension.php
@@ -10,6 +10,7 @@
 
 namespace Xynnn\GoogleTagManagerBundle\DependencyInjection;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -24,8 +25,9 @@ class GoogleTagManagerExtension extends Extension
 {
     /**
      * {@inheritdoc}
+     * @throws Exception
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
@@ -41,7 +43,7 @@ public function load(array $configs, ContainerBuilder $container)
     /**
      * @return string
      */
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'google_tag_manager';
     }

diff --git a/EventListener/GoogleTagManagerListener.php b/EventListener/GoogleTagManagerListener.php
@@ -15,36 +15,36 @@ class GoogleTagManagerListener
     /**
      * @var Environment
      */
-    private $environment;
+    private Environment $environment;
 
     /**
      * @var GoogleTagManagerExtension
      */
-    private $extension;
+    private GoogleTagManagerExtension $extension;
 
     /**
      * @var bool
      */
-    private $autoAppend;
+    private bool $autoAppend;
 
     /**
      * @param Environment $environment
      * @param GoogleTagManagerExtension $extension
      * @param bool $autoAppend
      */
-    public function __construct(Environment $environment, GoogleTagManagerExtension $extension, $autoAppend)
+    public function __construct(Environment $environment, GoogleTagManagerExtension $extension, bool $autoAppend)
     {
         $this->environment = $environment;
         $this->extension = $extension;
-        $this->autoAppend = (bool)$autoAppend;
+        $this->autoAppend = $autoAppend;
     }
 
     /**
      * @param mixed $event FilterResponseEvent before Symfony 5 and ResponseEvent afterwards
      *
      * @return bool
      */
-    public function onKernelResponse($event)
+    public function onKernelResponse(mixed $event): bool
     {
         if (!$this->allowRender($event)) {
             return false;
@@ -83,7 +83,7 @@ public function onKernelResponse($event)
      *
      * @return bool
      */
-    private function allowRender($event)
+    private function allowRender(mixed $event): bool
     {
         // not configured to append automatically
         if (!$this->autoAppend) {

diff --git a/Helper/GoogleTagManagerHelper.php b/Helper/GoogleTagManagerHelper.php
@@ -23,7 +23,7 @@ class GoogleTagManagerHelper extends Helper implements GoogleTagManagerHelperInt
     /**
      * @var GoogleTagManagerInterface
      */
-    private $service;
+    private GoogleTagManagerInterface $service;
 
     /**
      * @param GoogleTagManagerInterface $service
@@ -33,90 +33,57 @@ public function __construct(GoogleTagManagerInterface $service)
         $this->service = $service;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function enable()
+    public function enable(): void
     {
         $this->service->enable();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function disable()
+    public function disable(): void
     {
         $this->service->disable();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
         return $this->service->isEnabled();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
+    public function getId(): string
     {
         return $this->service->getId();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setId($id)
+    public function setId($id): void
     {
         $this->service->setId($id);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getData()
+    public function getData(): array
     {
         return $this->service->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function hasData()
+    public function hasData(): bool
     {
         return $this->service->hasData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPush()
+    public function getPush(): array
     {
         return $this->service->getPush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
+    public function getName(): string
     {
         return 'google_tag_manager';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setAdditionalParameters($additionalParameters)
+    public function setAdditionalParameters($additionalParameters): void
     {
         $this->service->setAdditionalParameters($additionalParameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAdditionalParameters()
+    public function getAdditionalParameters(): string
     {
         return $this->service->getAdditionalParameters();
     }

diff --git a/Helper/GoogleTagManagerHelperInterface.php b/Helper/GoogleTagManagerHelperInterface.php
@@ -19,55 +19,23 @@
  */
 interface GoogleTagManagerHelperInterface extends HelperInterface
 {
-    /**
-     * @return void
-     */
-    public function enable();
+    public function enable(): void;
 
-    /**
-     * @return void
-     */
-    public function disable();
+    public function disable(): void;
 
-    /**
-     * @return bool
-     */
-    public function isEnabled();
+    public function isEnabled(): bool;
 
-    /**
-     * @return string
-     */
-    public function getId();
+    public function getId(): string;
 
-    /**
-     * @param string $id
-     * @return void
-     */
-    public function setId($id);
+    public function setId(string $id): void;
 
-    /**
-     * @return array
-     */
-    public function getData();
+    public function getData(): array;
 
-    /**
-     * @return bool
-     */
-    public function hasData();
+    public function hasData(): bool;
 
-    /**
-     * @return array
-     */
-    public function getPush();
+    public function getPush(): array;
 
-    /**
-     * @param string $additionalParameters
-     * @return void
-     */
-    public function setAdditionalParameters($additionalParameters);
+    public function setAdditionalParameters(string $additionalParameters): void;
 
-    /**
-     * @return string
-     */
-    public function getAdditionalParameters();
+    public function getAdditionalParameters(): string;
 }