jenkins-bot has submitted this change and it was merged.
Change subject: Don't pass a Skin into BeforePageDisplayHandler
......................................................................
Don't pass a Skin into BeforePageDisplayHandler
Simply not needed.
Change-Id: Ib0d25018dbe7e26806b1be849d45e986420fa7c1
---
M client/WikibaseClient.hooks.php
M client/includes/Hooks/BeforePageDisplayHandler.php
M client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
3 files changed, 11 insertions(+), 13 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 2146ad4..1359c70 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -410,7 +410,7 @@
$beforePageDisplayHandler = new BeforePageDisplayHandler(
$namespaceChecker );
$actionName = Action::getActionName( $skin->getContext() );
- $beforePageDisplayHandler->addModules( $out, $skin, $actionName
);
+ $beforePageDisplayHandler->addModules( $out, $actionName );
wfProfileOut( __METHOD__ );
diff --git a/client/includes/Hooks/BeforePageDisplayHandler.php
b/client/includes/Hooks/BeforePageDisplayHandler.php
index 71c3f28..86bd638 100644
--- a/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -3,7 +3,6 @@
namespace Wikibase\Client\Hooks;
use OutputPage;
-use Skin;
use Title;
use User;
use Wikibase\NamespaceChecker;
@@ -32,12 +31,11 @@
* @note in php5, $out is by passed by reference (by default, so &$out
is not needed)
*
* @param OutputPage $out
- * @param Skin $skin
* @param string $actionName
*
* @return bool
*/
- public function addModules( OutputPage $out, Skin $skin, $actionName ) {
+ public function addModules( OutputPage $out, $actionName ) {
$title = $out->getTitle();
if ( !$this->namespaceChecker->isWikibaseEnabled(
$title->getNamespace() ) ) {
@@ -45,7 +43,7 @@
}
$this->addStyleModules( $out, $title, $actionName );
- $this->addJsModules( $out, $skin, $title, $actionName );
+ $this->addJsModules( $out, $title, $actionName );
return true;
}
@@ -64,8 +62,8 @@
}
}
- private function addJsModules( OutputPage $out, Skin $skin, Title
$title, $actionName ) {
- $user = $skin->getContext()->getUser();
+ private function addJsModules( OutputPage $out, Title $title,
$actionName ) {
+ $user = $out->getUser();
if ( $this->hasLinkItemWidget( $user, $out, $title, $actionName
) ) {
// Add the JavaScript which lazy-loads the link item
widget
diff --git
a/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
b/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
index 9b2fc63..d393ce5 100644
--- a/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
+++ b/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
@@ -31,7 +31,7 @@
$namespaceChecker = $this->getNamespaceChecker(
$enabledForNamespace );
$handler = new BeforePageDisplayHandler( $namespaceChecker );
- $handler->addModules( $output, $skin, 'view' );
+ $handler->addModules( $output, 'view' );
$this->assertEquals( $expectedJsModules, $output->getModules(),
'js modules' );
$this->assertEquals( $expectedCssModules,
$output->getModuleStyles(), 'css modules' );
@@ -70,7 +70,7 @@
$namespaceChecker = $this->getNamespaceChecker(
$enabledForNamespace );
$handler = new BeforePageDisplayHandler( $namespaceChecker );
- $handler->addModules( $output, $skin, 'view' );
+ $handler->addModules( $output, 'view' );
$this->assertEquals( $expectedJsModules, $output->getModules(),
'js modules' );
$this->assertEquals( $expectedCssModules,
$output->getModuleStyles(), 'css modules' );
@@ -101,7 +101,7 @@
$namespaceChecker = $this->getNamespaceChecker(
$enabledForNamespace );
$handler = new BeforePageDisplayHandler( $namespaceChecker );
- $handler->addModules( $output, $skin, 'view' );
+ $handler->addModules( $output, 'view' );
$this->assertEquals( $expectedJsModules, $output->getModules(),
'js modules' );
$this->assertEquals( $expectedCssModules,
$output->getModuleStyles(), 'css modules' );
@@ -132,7 +132,7 @@
$namespaceChecker = $this->getNamespaceChecker(
$enabledForNamespace );
$handler = new BeforePageDisplayHandler( $namespaceChecker );
- $handler->addModules( $output, $skin, 'view' );
+ $handler->addModules( $output, 'view' );
$this->assertEquals( $expectedJsModules, $output->getModules(),
'js modules' );
$this->assertEquals( $expectedCssModules,
$output->getModuleStyles(), 'css modules' );
@@ -163,7 +163,7 @@
$namespaceChecker = $this->getNamespaceChecker(
$enabledForNamespace );
$handler = new BeforePageDisplayHandler( $namespaceChecker );
- $handler->addModules( $output, $skin, 'view' );
+ $handler->addModules( $output, 'view' );
$this->assertEquals( $expectedJsModules, $output->getModules(),
'js modules' );
$this->assertEquals( $expectedCssModules,
$output->getModuleStyles(), 'css modules' );
@@ -194,7 +194,7 @@
$namespaceChecker = $this->getNamespaceChecker(
$enabledForNamespace );
$handler = new BeforePageDisplayHandler( $namespaceChecker );
- $handler->addModules( $output, $skin, 'history' );
+ $handler->addModules( $output, 'history' );
$this->assertEquals( $expectedJsModules, $output->getModules(),
'js modules' );
$this->assertEquals( $expectedCssModules,
$output->getModuleStyles(), 'css modules' );
--
To view, visit https://gerrit.wikimedia.org/r/190695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0d25018dbe7e26806b1be849d45e986420fa7c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
