fix tests

dachcom-digital · Oct 8, 2023 · ba9dfd0 · ba9dfd0
1 parent 828b9f3
commit ba9dfd0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/Adapter/Redirector/AbstractRedirector.php b/src/Adapter/Redirector/AbstractRedirector.php
@@ -29,8 +29,10 @@ public function getConfig(): array
     public function setConfig(array $config): void
     {
         $configResolver = $this->getConfigResolver();
-        if (null === $configResolver && !empty($config)) {
-            throw new \Exception(sprintf('redirector adapter "%s" has a config, but no config resolver was provided.', $this->getName()));
+        if (null === $configResolver) {
+            if (!empty($config)) {
+                throw new \Exception(sprintf('redirector adapter "%s" has a config, but no config resolver was provided.', $this->getName()));
+            }
         } else {
             $this->config = $configResolver->resolve($config);
         }

diff --git a/src/Adapter/Redirector/CookieRedirector.php b/src/Adapter/Redirector/CookieRedirector.php
@@ -8,15 +8,11 @@
 
 class CookieRedirector extends AbstractRedirector
 {
-    protected CookieHelper $cookieHelper;
-
-    public function __construct()
-    {
-        $this->cookieHelper = new CookieHelper($this->config['cookie']);
-    }
 
     public function makeDecision(RedirectorBag $redirectorBag): void
     {
+        $cookieHelper = new CookieHelper($this->config['cookie']);
+
         if ($this->lastRedirectorWasSuccessful($redirectorBag) === true) {
             return;
         }
@@ -28,7 +24,7 @@ public function makeDecision(RedirectorBag $redirectorBag): void
         $language = null;
 
         $request = $redirectorBag->getRequest();
-        $redirectCookie = $this->cookieHelper->get($request);
+        $redirectCookie = $cookieHelper->get($request);
 
         //if no cookie available the validation fails.
         if (is_array($redirectCookie) && !empty($redirectCookie['url'])) {

diff --git a/src/DependencyInjection/Compiler/RedirectorAdapterPass.php b/src/DependencyInjection/Compiler/RedirectorAdapterPass.php
@@ -15,7 +15,7 @@ public function process(ContainerBuilder $container): void
         $definition = $container->getDefinition(RedirectorRegistry::class);
         $registry = $container->getParameter('i18n.registry');
 
-        $redirectorRegistry = $registry['redirector'] ?? [];
+        $redirectorRegistry = $registry['redirector'];
 
         foreach ($container->findTaggedServiceIds('i18n.adapter.redirector', true) as $serviceId => $attributes) {
             $priority = $attributes[0]['priority'] ?? 0;