From 0c321e4f585856f587828ceaafed5db71ddca534 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Fri, 24 Jul 2020 09:51:24 +0200 Subject: [PATCH] Use Request::getBaseUrl() --- core-bundle/src/Controller/BackendPreviewController.php | 2 +- .../tests/Controller/BackendPreviewControllerTest.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-bundle/src/Controller/BackendPreviewController.php b/core-bundle/src/Controller/BackendPreviewController.php index 736b5db2460..13bdafdba82 100644 --- a/core-bundle/src/Controller/BackendPreviewController.php +++ b/core-bundle/src/Controller/BackendPreviewController.php @@ -90,6 +90,6 @@ public function __invoke(Request $request): Response return new RedirectResponse($targetUrl); } - return new RedirectResponse($this->previewScript ?: '/'); + return new RedirectResponse($request->getBaseUrl().'/'); } } diff --git a/core-bundle/tests/Controller/BackendPreviewControllerTest.php b/core-bundle/tests/Controller/BackendPreviewControllerTest.php index 53ea6395cc5..7ac85d4b764 100644 --- a/core-bundle/tests/Controller/BackendPreviewControllerTest.php +++ b/core-bundle/tests/Controller/BackendPreviewControllerTest.php @@ -105,7 +105,7 @@ public function testDispatchesPreviewUrlConvertEvent(): void public function testRedirectsToRootPage(): void { $controller = new BackendPreviewController( - '', + '/', $this->createMock(FrontendPreviewAuthenticator::class), new EventDispatcher(), $this->mockAuthorizationChecker() @@ -121,7 +121,7 @@ public function testRedirectsToRootPage(): void public function testRedirectsToRootPageWitPreviewScript(): void { $controller = new BackendPreviewController( - 'preview.php', + 'preview.php/', $this->createMock(FrontendPreviewAuthenticator::class), new EventDispatcher(), $this->mockAuthorizationChecker() @@ -131,7 +131,7 @@ public function testRedirectsToRootPageWitPreviewScript(): void $response = $controller($this->mockRequest()); $this->assertInstanceOf(RedirectResponse::class, $response); - $this->assertSame('preview.php', $response->getTargetUrl()); + $this->assertSame('preview.php/', $response->getTargetUrl()); } /**