From 83b81e598434b70eec107df048969962451fc638 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 20 Mar 2019 07:04:30 -0700 Subject: [PATCH] Fix phpstorm IDEA errors in SkinTemplate Change-Id: Icf2f80f7b1aade61cd0c766113efecae3baf4bd5 --- includes/skins/SkinTemplate.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index c29c9963bf..a9c0993e29 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -171,6 +171,9 @@ class SkinTemplate extends Skin { return $languageLinks; } + /** + * @return QuickTemplate + */ protected function setupTemplateForOutput() { $request = $this->getRequest(); $user = $this->getUser(); @@ -389,8 +392,11 @@ class SkinTemplate extends Skin { if ( $out->isArticle() ) { if ( $this->isRevisionCurrent() ) { if ( $wgMaxCredits != 0 ) { - $tpl->set( 'credits', Action::factory( 'credits', $this->getWikiPage(), - $this->getContext() )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) ); + /** @var CreditsAction $action */ + $action = Action::factory( + 'credits', $this->getWikiPage(), $this->getContext() ); + $tpl->set( 'credits', + $action->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) ); } else { $tpl->set( 'lastmod', $this->lastModified() ); } @@ -526,7 +532,9 @@ class SkinTemplate extends Skin { $html = ''; if ( $personalTools === null ) { - $personalTools = $tpl->getPersonalTools(); + $personalTools = ( $tpl instanceof BaseTemplate ) + ? $tpl->getPersonalTools() + : []; } foreach ( $personalTools as $key => $item ) { @@ -547,7 +555,7 @@ class SkinTemplate extends Skin { $tpl = $this->setupTemplateForOutput(); $tpl->set( 'personal_urls', $this->buildPersonalUrls() ); - return $tpl->getPersonalTools(); + return ( $tpl instanceof BaseTemplate ) ? $tpl->getPersonalTools() : []; } /** -- 2.20.1