IBX-6504: Minor refactoring

ezsystems · Oct 19, 2023 · 05d8a8e · 05d8a8e
1 parent 87489f2
commit 05d8a8e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/eZ/Publish/Core/MVC/Symfony/Routing/UrlAliasRouter.php b/eZ/Publish/Core/MVC/Symfony/Routing/UrlAliasRouter.php
@@ -316,7 +316,7 @@ public function generate(string $name, array $parameters = [], int $referenceTyp
 
                 $location = $parameters['location'] ?? $this->locationService->loadLocation(
                     $parameters['locationId'],
-                    isset($parameters['forcedLanguage']) ? [$parameters['forcedLanguage']] : null
+                    isset($parameters['forcedLanguageCode']) ? [$parameters['forcedLanguageCode']] : null
                 );
                 unset($parameters['location'], $parameters['locationId'], $parameters['viewType'], $parameters['layout']);
 

diff --git a/eZ/Publish/Core/MVC/Symfony/Templating/Tests/Twig/Extension/RoutingExtensionTest.php b/eZ/Publish/Core/MVC/Symfony/Templating/Tests/Twig/Extension/RoutingExtensionTest.php
@@ -8,9 +8,11 @@
 
 namespace eZ\Publish\Core\MVC\Symfony\Templating\Tests\Twig\Extension;
 
+use eZ\Publish\API\Repository\LocationService;
 use eZ\Publish\API\Repository\Values\Content\Content as APIContent;
 use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 use eZ\Publish\API\Repository\Values\Content\Location as APILocation;
+use eZ\Publish\Core\Helper\ContentPreviewHelper;
 use eZ\Publish\Core\MVC\Symfony\Routing\Generator\RouteReferenceGenerator;
 use eZ\Publish\Core\MVC\Symfony\Routing\Generator\RouteReferenceGeneratorInterface;
 use eZ\Publish\Core\MVC\Symfony\Routing\RouteReference;
@@ -32,7 +34,9 @@ protected function getExtensions(): array
         return [
             new RoutingExtension(
                 $this->getRouteReferenceGenerator(),
-                $this->getUrlGenerator()
+                $this->getUrlGenerator(),
+                $this->createMock(ContentPreviewHelper::class),
+                $this->createMock(LocationService::class),
             ),
         ];
     }

diff --git a/eZ/Publish/Core/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php b/eZ/Publish/Core/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php
@@ -114,15 +114,25 @@ private function generateUrlForObject(object $object, array $parameters, int $re
     {
         if ($object instanceof Location) {
             $routeName = UrlAliasRouter::URL_ALIAS_ROUTE_NAME;
+            $forcedLanguageCode = $this->getForcedLanguageCodeBasedOnPreview();
+            if ($forcedLanguageCode !== null) {
+                $parameters += [
+                    'forcedLanguageCode' => $forcedLanguageCode,
+                ];
+            }
             $parameters += [
                 'locationId' => $object->id,
-                'forcedLanguage' => $this->getForcedLanguageCodeBasedOnPreview(),
             ];
         } elseif ($object instanceof Content || $object instanceof ContentInfo) {
             $routeName = UrlAliasRouter::URL_ALIAS_ROUTE_NAME;
+            $forcedLanguageCode = $this->getForcedLanguageCodeBasedOnPreview();
+            if ($forcedLanguageCode !== null) {
+                $parameters += [
+                    'forcedLanguageCode' => $forcedLanguageCode,
+                ];
+            }
             $parameters += [
                 'contentId' => $object->id,
-                'forcedLanguage' => $this->getForcedLanguageCodeBasedOnPreview(),
             ];
         } elseif ($object instanceof RouteReference) {
             $routeName = $object->getRoute();
@@ -142,7 +152,7 @@ private function generateUrlForObject(object $object, array $parameters, int $re
      */
     private function getForcedLanguageCodeBasedOnPreview(): ?string
     {
-        if ($this->contentPreviewHelper->isPreviewActive() === false) {
+        if ($this->contentPreviewHelper->isPreviewActive() !== true) {
             return null;
         }