Merged branch '1.2' into 1.3

ezsystems · Jun 2, 2021 · 8768a71 · 8768a71
2 parents 2c7468c + cca1119
commit 8768a71
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 2 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Routing/JsRouting/ExposedRoutesExtractor.php b/eZ/Bundle/EzPublishCoreBundle/Routing/JsRouting/ExposedRoutesExtractor.php
@@ -15,6 +15,8 @@
 /**
  * Decorator of FOSJsRouting routes extractor.
  * Ensures that base URL contains the SiteAccess part when applicable.
+ *
+ * @internal
  */
 class ExposedRoutesExtractor implements ExposedRoutesExtractorInterface
 {
@@ -44,9 +46,13 @@ public function getRoutes(): RouteCollection
      */
     public function getBaseUrl(): string
     {
-        $masterRequest = $this->requestStack->getMasterRequest();
         $baseUrl = $this->innerExtractor->getBaseUrl();
-        $siteAccess = $masterRequest->attributes->get('siteaccess');
+        $request = $this->requestStack->getMasterRequest();
+        if ($request === null) {
+            return $baseUrl;
+        }
+
+        $siteAccess = $request->attributes->get('siteaccess');
         if ($siteAccess instanceof SiteAccess && $siteAccess->matcher instanceof SiteAccess\URILexer) {
             $baseUrl .= $siteAccess->matcher->analyseLink('');
         }

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/Routing/JsRouting/ExposedRoutesExtractorTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/Routing/JsRouting/ExposedRoutesExtractorTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace eZ\Bundle\EzPublishCoreBundle\Tests\Routing\JsRouting;
+
+use eZ\Bundle\EzPublishCoreBundle\Routing\JsRouting\ExposedRoutesExtractor;
+use eZ\Publish\Core\MVC\Symfony\SiteAccess;
+use FOS\JsRoutingBundle\Extractor\ExposedRoutesExtractorInterface;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @covers \eZ\Bundle\EzPublishCoreBundle\Routing\JsRouting\ExposedRoutesExtractor
+ *
+ * @internal
+ */
+final class ExposedRoutesExtractorTest extends TestCase
+{
+    private const BASE_URL = '/foo';
+
+    public function getDataForTestGetBaseUrl(): iterable
+    {
+        yield 'CLI' => [
+            // no master request in a stack
+            null,
+            self::BASE_URL,
+        ];
+
+        yield 'No SiteAccess' => [
+            new Request(),
+            self::BASE_URL,
+        ];
+
+        $siteAccess = new SiteAccess(
+            'test',
+            SiteAccess\Matcher\HostText::class,
+            new SiteAccess\Matcher\HostText([])
+        );
+        yield 'SiteAccess w/o URI Lexer matcher' => [
+            new Request([], [], ['siteaccess' => $siteAccess]),
+            self::BASE_URL,
+        ];
+
+        $siteAccess = new SiteAccess(
+            'test',
+            SiteAccess\Matcher\URIText::class,
+            new SiteAccess\Matcher\URIText(['prefix' => 'bar'])
+        );
+        yield 'SiteAccess with URI Lexer matcher' => [
+            new Request([], [], ['siteaccess' => $siteAccess]),
+            self::BASE_URL . '/bar/',
+        ];
+    }
+
+    /**
+     * @dataProvider getDataForTestGetBaseUrl
+     */
+    public function testGetBaseUrl(?Request $masterRequest, string $expectedBaseUrl): void
+    {
+        $innerExtractor = $this->createMock(ExposedRoutesExtractorInterface::class);
+        $requestStack = $this->createMock(RequestStack::class);
+
+        $innerExtractor->method('getBaseUrl')->willReturn(self::BASE_URL);
+        $requestStack->method('getMasterRequest')->willReturn($masterRequest);
+
+        $extractor = new ExposedRoutesExtractor($innerExtractor, $requestStack);
+
+        self::assertSame($expectedBaseUrl, $extractor->getBaseUrl());
+    }
+}