fix redirector state check (#151)

* fix redirector state check * remove legacy mode check from profiler, fixes #150
dachcom-digital · Oct 13, 2023 · 6aaabd3 · 6aaabd3
1 parent fac7a85
commit 6aaabd3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 32 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,9 @@
 # Upgrade Notes
 
+## 5.0.1
+- Remove `isEnabled` and `setEnabled` from redirector adapter since disabled services aren't available anymore [#149](https://github.com/dachcom-digital/pimcore-i18n/issues/149)
+- Remove legacy mode check in profiler [#150](https://github.com/dachcom-digital/pimcore-i18n/issues/150)
+
 ## Migrating from Version 4.x to Version 5.0
 
 ### Global Changes

diff --git a/src/Adapter/Redirector/AbstractRedirector.php b/src/Adapter/Redirector/AbstractRedirector.php
@@ -6,21 +6,10 @@
 
 abstract class AbstractRedirector implements RedirectorInterface
 {
-    protected bool $enabled = true;
     protected array $config = [];
     protected ?string $name;
     protected array $decision = [];
 
-    public function isEnabled(): bool
-    {
-        return $this->enabled;
-    }
-
-    public function setEnabled(bool $enabled): void
-    {
-        $this->enabled = $enabled;
-    }
-
     public function getConfig(): array
     {
         return $this->config;

diff --git a/src/Adapter/Redirector/RedirectorInterface.php b/src/Adapter/Redirector/RedirectorInterface.php
@@ -6,10 +6,6 @@
 
 interface RedirectorInterface
 {
-    public function isEnabled(): bool;
-
-    public function setEnabled(bool $enabled): void;
-
     public function getName(): string;
 
     public function setName(string $name): void;

diff --git a/src/DependencyInjection/Compiler/RedirectorAdapterPass.php b/src/DependencyInjection/Compiler/RedirectorAdapterPass.php
@@ -34,6 +34,7 @@ public function process(ContainerBuilder $container): void
         }
 
         foreach ($services as $service) {
+
             $serviceAlias = $service['alias'];
             $available = isset($redirectorRegistry[$serviceAlias]) ? $redirectorRegistry[$serviceAlias]['enabled'] : true;
 
@@ -44,7 +45,6 @@ public function process(ContainerBuilder $container): void
             $definition->addMethodCall('register', [$service['reference'], $serviceAlias]);
 
             $service['definition']->addMethodCall('setName', [$serviceAlias]);
-            $service['definition']->addMethodCall('setEnabled', [$available]);
             $service['definition']->addMethodCall('setConfig', [$redirectorRegistry[$serviceAlias]['config'] ?? []]);
         }
     }

diff --git a/src/EventListener/DetectorListener.php b/src/EventListener/DetectorListener.php
@@ -101,13 +101,12 @@ public function onKernelResponse(ResponseEvent $event): void
             return;
         }
 
-        $cookieRedirector = $this->redirectorRegistry->get('cookie');
-
         //check if we're allowed to bake a cookie at the first place!
-        if (false === $cookieRedirector->isEnabled()) {
+        if (!$this->redirectorRegistry->has('cookie')) {
             return;
         }
 
+        $cookieRedirector = $this->redirectorRegistry->get('cookie');
         $cookieHelper = new CookieHelper($cookieRedirector->getConfig()['cookie']);
 
         $i18nContext = $this->i18nContextResolver->getContext($event->getRequest());

diff --git a/src/Registry/RedirectorRegistry.php b/src/Registry/RedirectorRegistry.php
@@ -48,14 +48,6 @@ public function get(string $alias): RedirectorInterface
      */
     public function all(): array
     {
-        $list = [];
-        foreach ($this->adapter as $adapter) {
-            if (!$adapter->isEnabled()) {
-                continue;
-            }
-            $list[] = $adapter;
-        }
-
-        return $list;
+        return array_values($this->adapter);
     }
 }
diff --git a/templates/profiler/data_collector.html.twig b/templates/profiler/data_collector.html.twig
@@ -12,10 +12,6 @@
                 <b>zone id</b>
                 <span>{{ collector.zoneId }}</span>
             </div>
-            <div class="sf-toolbar-info-piece">
-                <b>mode</b>
-                <span>{{ collector.i18nMode }}</span>
-            </div>
             <div class="sf-toolbar-info-piece">
                 <b>current locale</b>
                 <span>{{ collector.locale }}</span>