clean up

dachcom-digital · May 30, 2024 · ccf70ef · ccf70ef
1 parent bc10e83
commit ccf70ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/I18nBundle/Modifier/RouteItem/Type/PimcoreExportDataAwareModifier.php b/src/I18nBundle/Modifier/RouteItem/Type/PimcoreExportDataAwareModifier.php
@@ -22,20 +22,12 @@ public function __construct(protected RequestStack $requestStack)
 
     public function supportParameters(string $type, RouteItemInterface $routeItem, array $parameters, array $context): bool
     {
-        if (!$this->requestStack->getMainRequest() instanceof Request) {
-            return false;
-        }
-
-        return in_array($this->requestStack->getMainRequest()->attributes->get('_route'), self::EXPORT_AWARE_ROUTES, true);
+        return $this->isValidRequest();
     }
 
     public function supportRequest(string $type, RouteItemInterface $routeItem, Request $request, array $context): bool
     {
-        if (!$this->requestStack->getMainRequest() instanceof Request) {
-            return false;
-        }
-
-        return in_array($this->requestStack->getMainRequest()->attributes->get('_route'), self::EXPORT_AWARE_ROUTES, true);
+        return $this->isValidRequest();
     }
 
     public function modifyByParameters(RouteItemInterface $routeItem, array $parameters, array $context): void
@@ -90,4 +82,13 @@ protected function modify(RouteItemInterface $routeItem, Request $request): void
             $routeItem->getRouteParametersBag()->set('_locale', $element->getProperty('language'));
         }
     }
+
+    private function isValidRequest(): bool
+    {
+        if (!$this->requestStack->getMainRequest() instanceof Request) {
+            return false;
+        }
+
+        return in_array($this->requestStack->getMainRequest()->attributes->get('_route'), self::EXPORT_AWARE_ROUTES, true);
+    }
 }
diff --git a/src/I18nBundle/Modifier/RouteItem/Type/PimcoreInlineRendererAwareModifier.php b/src/I18nBundle/Modifier/RouteItem/Type/PimcoreInlineRendererAwareModifier.php
@@ -85,6 +85,10 @@ private function determinateDocumentByRoute(Request $request): ?Document
 
     private function isValidRequest(): bool
     {
+        if (!$this->requestStack->getMainRequest() instanceof Request) {
+            return false;
+        }
+
         return in_array(
             $this->requestStack->getMainRequest()->attributes->get('_route'),
             self::EDIT_AWARE_ROUTES,