Fix preview webspace without theme (#25)

sulu · Mar 4, 2021 · 14381cc · 14381cc
1 parent 9818b4d
commit 14381cc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/EventListener/SetThemeEventListener.php b/EventListener/SetThemeEventListener.php
@@ -60,7 +60,11 @@ public function setActiveThemeOnRequest(RequestEvent $event): void
      */
     public function setActiveThemeOnPreviewPreRender(PreRenderEvent $event): void
     {
-        $theme = $this->themeRepository->findOneByName($event->getAttribute('webspace')->getTheme());
+        $themeName = $event->getAttribute('webspace')->getTheme();
+        if (null === $themeName) {
+            return;
+        }
+        $theme = $this->themeRepository->findOneByName($themeName);
         if (null !== $theme) {
             $this->themeContext->setTheme($theme);
         }

diff --git a/Tests/Unit/EventListener/SetThemeEventListenerTest.php b/Tests/Unit/EventListener/SetThemeEventListenerTest.php
@@ -173,4 +173,24 @@ public function testEventListenerOnPreview(): void
 
         $this->assertSame($theme->reveal(), $this->themeContext->getTheme());
     }
+
+    public function testEventListenerOnPreviewNoTheme(): void
+    {
+        /** @var Webspace|ObjectProphecy webspace */
+        $webspace = $this->prophesize(Webspace::class);
+        $webspace->getTheme()->willReturn(null);
+
+        /** @var RequestAttributes|ObjectProphecy $attributes */
+        $attributes = $this->prophesize(RequestAttributes::class);
+        $attributes->getAttribute('webspace', null)->willReturn($webspace->reveal());
+
+        $this->themeRepository->findOneByName('theme/name')
+            ->shouldNotBeCalled();
+
+        $this->listener->setActiveThemeOnPreviewPreRender(
+            new PreRenderEvent($attributes->reveal())
+        );
+
+        $this->assertNull($this->themeContext->getTheme());
+    }
 }