[MediaWiki-commits] [Gerrit] Drop dead and redundant special page code - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Drop dead and redundant special page code
..
Drop dead and redundant special page code
* SpecialPage::execute() is not supposed to return anything.
Warning, this possibly causes the only WikibaseQuery special page to
fail, please merge https://github.com/wmde/WikibaseQuery/pull/60 too!
* Drop redundant SpecialItemResolver class, all methods and properties
do exist in the base class. Warning, please have a look at the
message used in the ...->outputHeader( ... ) call, it changes from
"-summary" to "wikibase--summary" now. But none of these
messages exist for these 3 special pages so it should not make a
difference.
* Special page names are canonical, never multi-byte, right? No need
to use Language::lc(), strtolower() is enough.
* Drop unused $subPage property.
* Add some docs.
* Fix wrong visibility level for getGroupName().
Change-Id: Iff0728ccaef50ec41dd7a58a431aee6ceec2a493
---
M client/includes/specials/SpecialUnconnectedPages.php
M repo/includes/specials/SpecialDispatchStats.php
M repo/includes/specials/SpecialEntitiesWithoutPage.php
M repo/includes/specials/SpecialEntityData.php
M repo/includes/specials/SpecialGoToLinkedPage.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialItemDisambiguation.php
D repo/includes/specials/SpecialItemResolver.php
M repo/includes/specials/SpecialItemsWithoutSitelinks.php
M repo/includes/specials/SpecialListDatatypes.php
M repo/includes/specials/SpecialMergeItems.php
M repo/includes/specials/SpecialModifyEntity.php
M repo/includes/specials/SpecialMyLanguageFallbackChain.php
M repo/includes/specials/SpecialNewEntity.php
M repo/includes/specials/SpecialWikibasePage.php
M repo/includes/specials/SpecialWikibaseQueryPage.php
16 files changed, 73 insertions(+), 143 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/specials/SpecialUnconnectedPages.php
b/client/includes/specials/SpecialUnconnectedPages.php
index 455ad48..460472f 100644
--- a/client/includes/specials/SpecialUnconnectedPages.php
+++ b/client/includes/specials/SpecialUnconnectedPages.php
@@ -53,11 +53,18 @@
parent::__construct( 'UnconnectedPages' );
}
- public function getGroupName() {
+ /**
+* @see SpecialPage::getGroupName
+*
+* @return string
+*/
+ protected function getGroupName() {
return 'wikibaseclient';
}
/**
+* @see SpecialPage::getDescription
+*
* @return string
*/
public function getDescription() {
@@ -73,13 +80,11 @@
/**
* @see SpecialPage::execute
*
-* @param null|string $subPage
+* @param string|null $subPage
*/
public function execute( $subPage ) {
$this->setHeaders();
-
- $contLang = $this->getContext()->getLanguage();
- $this->outputHeader( $contLang->lc( 'wikibase-' .
$this->getName() ) . '-summary' );
+ $this->outputHeader( 'wikibase-' . strtolower( $this->getName()
) . '-summary' );
// If the user is authorized, display the page, if not, show an
error.
if ( !$this->userCanExecute( $this->getUser() ) ) {
diff --git a/repo/includes/specials/SpecialDispatchStats.php
b/repo/includes/specials/SpecialDispatchStats.php
index b040cad..050124e 100644
--- a/repo/includes/specials/SpecialDispatchStats.php
+++ b/repo/includes/specials/SpecialDispatchStats.php
@@ -56,6 +56,11 @@
) );
}
+ /**
+* @see SpecialWikibasePage::execute
+*
+* @param string|null $subPage
+*/
public function execute( $subPage ) {
parent::execute( $subPage );
diff --git a/repo/includes/specials/SpecialEntitiesWithoutPage.php
b/repo/includes/specials/SpecialEntitiesWithoutPage.php
index e66e0ba..9975f0f 100644
--- a/repo/includes/specials/SpecialEntitiesWithoutPage.php
+++ b/repo/includes/specials/SpecialEntitiesWithoutPage.php
@@ -75,11 +75,11 @@
* @see SpecialWikibasePage::execute
*
* @since 0.4
+*
+* @param string|null $subPage
*/
public function execute( $subPage ) {
- if ( !parent::execute( $subPage ) ) {
- return false;
- }
+ parent::execute( $subPage );
$this->prepareArguments( $subPage );
$this->setForm();
@@ -87,8 +87,6 @@
if ( $this->language !== '' ) {
$this->showQuery();
}
-
- return true;
}
/**
diff --git a/repo/includes/specials/SpecialEntityData.php
b/repo/includes/specials/SpecialEntityData.php
index dbc3a06..f9571fb 100644
---
[MediaWiki-commits] [Gerrit] Drop dead and redundant special page code - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179114
Change subject: Drop dead and redundant special page code
..
Drop dead and redundant special page code
* SpecialPage::execute() is not supposed to return anything.
Warning, this possibly causes the only WikibaseQuery special page to
fail, please merge https://github.com/wmde/WikibaseQuery/pull/60 too!
* Drop redundant SpecialItemResolver class, all methods and properties
do exist in the base class. Warning, please have a look at the
message used in the ...->outputHeader( ... ) call, it changes from
"-summary" to "wikibase--summary" now. But none of these
messages exist for these 3 special pages so it should not make a
difference.
* Special page names are canonical, never multi-byte, right? No need
to use Language::lc(), strtolower() is enough.
* Drop unused $subPage property.
* Add some docs.
Change-Id: Iff0728ccaef50ec41dd7a58a431aee6ceec2a493
---
M client/includes/specials/SpecialUnconnectedPages.php
M repo/includes/specials/SpecialDispatchStats.php
M repo/includes/specials/SpecialEntitiesWithoutPage.php
M repo/includes/specials/SpecialEntityData.php
M repo/includes/specials/SpecialGoToLinkedPage.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialItemDisambiguation.php
D repo/includes/specials/SpecialItemResolver.php
M repo/includes/specials/SpecialItemsWithoutSitelinks.php
M repo/includes/specials/SpecialListDatatypes.php
M repo/includes/specials/SpecialMergeItems.php
M repo/includes/specials/SpecialModifyEntity.php
M repo/includes/specials/SpecialMyLanguageFallbackChain.php
M repo/includes/specials/SpecialNewEntity.php
M repo/includes/specials/SpecialWikibasePage.php
M repo/includes/specials/SpecialWikibaseQueryPage.php
16 files changed, 70 insertions(+), 140 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/14/179114/1
diff --git a/client/includes/specials/SpecialUnconnectedPages.php
b/client/includes/specials/SpecialUnconnectedPages.php
index 455ad48..29e6eec 100644
--- a/client/includes/specials/SpecialUnconnectedPages.php
+++ b/client/includes/specials/SpecialUnconnectedPages.php
@@ -53,11 +53,18 @@
parent::__construct( 'UnconnectedPages' );
}
+ /**
+* @see SpecialPage::getGroupName
+*
+* @return string
+*/
public function getGroupName() {
return 'wikibaseclient';
}
/**
+* @see SpecialPage::getDescription
+*
* @return string
*/
public function getDescription() {
@@ -73,13 +80,11 @@
/**
* @see SpecialPage::execute
*
-* @param null|string $subPage
+* @param string|null $subPage
*/
public function execute( $subPage ) {
$this->setHeaders();
-
- $contLang = $this->getContext()->getLanguage();
- $this->outputHeader( $contLang->lc( 'wikibase-' .
$this->getName() ) . '-summary' );
+ $this->outputHeader( 'wikibase-' . strtolower( $this->getName()
) . '-summary' );
// If the user is authorized, display the page, if not, show an
error.
if ( !$this->userCanExecute( $this->getUser() ) ) {
diff --git a/repo/includes/specials/SpecialDispatchStats.php
b/repo/includes/specials/SpecialDispatchStats.php
index b040cad..050124e 100644
--- a/repo/includes/specials/SpecialDispatchStats.php
+++ b/repo/includes/specials/SpecialDispatchStats.php
@@ -56,6 +56,11 @@
) );
}
+ /**
+* @see SpecialWikibasePage::execute
+*
+* @param string|null $subPage
+*/
public function execute( $subPage ) {
parent::execute( $subPage );
diff --git a/repo/includes/specials/SpecialEntitiesWithoutPage.php
b/repo/includes/specials/SpecialEntitiesWithoutPage.php
index e66e0ba..9975f0f 100644
--- a/repo/includes/specials/SpecialEntitiesWithoutPage.php
+++ b/repo/includes/specials/SpecialEntitiesWithoutPage.php
@@ -75,11 +75,11 @@
* @see SpecialWikibasePage::execute
*
* @since 0.4
+*
+* @param string|null $subPage
*/
public function execute( $subPage ) {
- if ( !parent::execute( $subPage ) ) {
- return false;
- }
+ parent::execute( $subPage );
$this->prepareArguments( $subPage );
$this->setForm();
@@ -87,8 +87,6 @@
if ( $this->language !== '' ) {
$this->showQuery();
}
-
- return true;
}
/**
diff --git a/repo/includes/specials/SpecialEntityData.php
b/repo/includes/specials/SpecialEntityData.php
index dbc3a06..f9571fb 100644
--- a/repo/includes/specials/
