Skip to content

Update PageFactory type signatures to match changes in silverorange/site@15 #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gauthierm wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update PageFactory type signatures to match changes in silverorange/site@15 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Store/StoreArticlePageFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion Store/StorePageFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down