From b4b59d77860245f186c749e27134750cbed24686 Mon Sep 17 00:00:00 2001 From: Michael Gauthier Date: Tue, 17 Sep 2024 17:31:42 -0300 Subject: [PATCH] Update PageFactory type signatures to match changes in silverorange/site@15 --- Store/StoreArticlePageFactory.php | 6 +++--- Store/StorePageFactory.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Store/StoreArticlePageFactory.php b/Store/StoreArticlePageFactory.php index a86a3a8f9..3008f0735 100644 --- a/Store/StoreArticlePageFactory.php +++ b/Store/StoreArticlePageFactory.php @@ -25,7 +25,7 @@ public function __construct(SiteApplication $app) // }}} // {{{ protected function isVisible() - protected function isVisible(SiteArticle $article, $source) + protected function isVisible(SiteArticle $article, string $source): bool { $region = $this->app->getRegion(); $sql = sprintf('select count(id) from EnabledArticleView @@ -51,7 +51,7 @@ protected function isVisible(SiteArticle $article, $source) protected function getNotVisiblePage( SiteArticle $article, SiteLayout $layout - ) { + ): SiteAbstractPage { $page = new SitePage($this->app, $layout); $page = $this->decorate($page, 'StoreArticleNotVisiblePage'); $page->setArticle($article); @@ -69,7 +69,7 @@ protected function getNotVisiblePage( * @return SiteArticle the specified article or null if no such article * exists. */ - protected function getArticle($path) + protected function getArticle(string $path):SiteArticle { $article = parent::getArticle($path); $article->setRegion($this->app->getRegion()); diff --git a/Store/StorePageFactory.php b/Store/StorePageFactory.php index f7694ed37..bc62d63e3 100644 --- a/Store/StorePageFactory.php +++ b/Store/StorePageFactory.php @@ -24,7 +24,7 @@ public function __construct(SiteApplication $app) // }}} // {{{ public function resolvePage() - public function resolvePage($source, SiteLayout $layout = null) + public function resolvePage(string $source, ?SiteLayout $layout = null): SiteAbstractPage { $layout = ($layout === null) ? $this->resolveLayout($source) : $layout;