PageModel is not optional

AlexejKossmann · Jul 9, 2020 · 4692bcc · 4692bcc
1 parent 793b3d5
commit 4692bcc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/core-bundle/src/Controller/Page/RootController.php b/core-bundle/src/Controller/Page/RootController.php
@@ -72,7 +72,7 @@ public function getUrlSuffixes(): array
         ;
     }
 
-    public function supportsContentComposition(PageModel $pageModel = null): bool
+    public function supportsContentComposition(PageModel $pageModel): bool
     {
         return false;
     }

diff --git a/core-bundle/src/Routing/Page/CompositionAwareInterface.php b/core-bundle/src/Routing/Page/CompositionAwareInterface.php
@@ -23,8 +23,8 @@ interface CompositionAwareInterface
      * Most Contao page types do support composition. Pages that do not support composition
      * can be structural (e.g. a redirect page) or functional (e.g. an XML sitemap).
      *
-     * The optional $pageModel might tell if a particular page supports composition,
+     * The $pageModel might tell if a particular page supports composition,
      * for example a 404 page that redirects cannot have articles, but a regular 404 does.
      */
-    public function supportsContentComposition(PageModel $pageModel = null): bool;
+    public function supportsContentComposition(PageModel $pageModel): bool;
 }
diff --git a/core-bundle/src/Routing/Page/PageRegistry.php b/core-bundle/src/Routing/Page/PageRegistry.php
@@ -73,7 +73,10 @@ public function supportsContentComposition(PageModel $pageModel): bool
             return true;
         }
 
-        return $this->compositionAware[$pageModel->type]->supportsContentComposition($pageModel);
+        /** @var CompositionAwareInterface $service */
+        $service = $this->compositionAware[$pageModel->type];
+
+        return $service->supportsContentComposition($pageModel);
     }
 
     public function add(string $type, RouteConfig $config, PageRouteEnhancerInterface $routeEnhancer = null, CompositionAwareInterface $compositionAware = null): self

diff --git a/core-bundle/tests/Controller/Page/RootControllerTest.php b/core-bundle/tests/Controller/Page/RootControllerTest.php
@@ -153,6 +153,9 @@ public function testReturnsUrlSuffixesFromDatabase(): void
 
     public function testDoesNotSupportContentComposition(): void
     {
-        $this->assertFalse($this->controller->supportsContentComposition());
+        /** @var PageModel&MockObject $page */
+        $page = $this->mockClassWithProperties(PageModel::class);
+
+        $this->assertFalse($this->controller->supportsContentComposition($page));
     }
 }