[MediaWiki-commits] [Gerrit] More consistent variable naming, e.g. $languageCode - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: More consistent variable naming, e.g. $languageCode
..
More consistent variable naming, e.g. $languageCode
* Renamed some variables, e.g. $language if it does not contain a
Language object.
* Make use of PHP 5.3's short ?: operator.
* Made some stuff private that just does not need to be protected.
Change-Id: I0cb5068d72bb64578ee1e721720e16bae7916b47
---
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/includes/specials/SpecialModifyTerm.php
M repo/includes/specials/SpecialNewEntity.php
M repo/includes/specials/SpecialSetAliases.php
M repo/includes/specials/SpecialSetDescription.php
M repo/includes/specials/SpecialSetLabel.php
9 files changed, 124 insertions(+), 127 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, but someone else must approve
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index 60408f0..e4a8d0d 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -32,14 +32,15 @@
class WikibaseLuaBindingsTest extends \PHPUnit_Framework_TestCase {
public function testConstructor() {
- $wikibaseLibrary = $this-getWikibaseLibraryImplementation();
+ $wikibaseLuaBindings = $this-getWikibaseLuaBindings();
+
$this-assertInstanceOf(
'Wikibase\Client\Scribunto\WikibaseLuaBindings',
- $wikibaseLibrary
+ $wikibaseLuaBindings
);
}
- private function getWikibaseLibraryImplementation(
+ private function getWikibaseLuaBindings(
EntityLookup $entityLookup = null,
UsageAccumulator $usageAccumulator = null
) {
@@ -68,7 +69,7 @@
return new WikibaseLuaBindings(
new BasicEntityIdParser(),
- $entityLookup ? $entityLookup : new MockRepository(),
+ $entityLookup ?: new MockRepository(),
$siteLinkTable,
new LanguageFallbackChainFactory(),
$language, // language
@@ -92,9 +93,9 @@
*/
public function testGetEntity( array $expected, Item $item,
EntityLookup $entityLookup ) {
$prefixedId = $item-getId()-getSerialization();
- $wikibaseLibrary = $this-getWikibaseLibraryImplementation(
$entityLookup );
+ $wikibaseLuaBindings = $this-getWikibaseLuaBindings(
$entityLookup );
- $entityArr = $wikibaseLibrary-getEntity( $prefixedId );
+ $entityArr = $wikibaseLuaBindings-getEntity( $prefixedId );
$actual = is_array( $entityArr ) ? array_keys( $entityArr ) :
array();
$this-assertEquals( $expected, $actual );
}
@@ -107,9 +108,9 @@
$entityLookup-putEntity( $item );
$usages = new HashUsageAccumulator();
- $wikibaseLibrary = $this-getWikibaseLibraryImplementation(
$entityLookup, $usages );
+ $wikibaseLuaBindings = $this-getWikibaseLuaBindings(
$entityLookup, $usages );
- $wikibaseLibrary-getEntity( $itemId-getSerialization() );
+ $wikibaseLuaBindings-getEntity( $itemId-getSerialization() );
$this-assertTrue( $this-hasUsage( $usages-getUsages(),
$item-getId(), EntityUsage::ALL_USAGE ), 'all usage' );
}
@@ -130,21 +131,22 @@
public function testGetEntityId() {
$usages = new HashUsageAccumulator();
- $wikibaseLibrary = $this-getWikibaseLibraryImplementation(
null, $usages );
+ $wikibaseLuaBindings = $this-getWikibaseLuaBindings( null,
$usages );
- $itemId = $wikibaseLibrary-getEntityId( 'Rome' );
+ $itemId = $wikibaseLuaBindings-getEntityId( 'Rome' );
$this-assertEquals( 'Q33' , $itemId );
$this-assertTrue( $this-hasUsage( $usages-getUsages(), new
ItemId( $itemId ), EntityUsage::TITLE_USAGE ), 'title usage' );
$this-assertFalse( $this-hasUsage( $usages-getUsages(), new
ItemId( $itemId ), EntityUsage::SITELINK_USAGE ), 'sitelink usage' );
- $itemId = $wikibaseLibrary-getEntityId( 'Barcelona' );
+ $itemId = $wikibaseLuaBindings-getEntityId( 'Barcelona' );
$this-assertSame( null, $itemId );
}
public function
[MediaWiki-commits] [Gerrit] More consistent variable naming, e.g. $languageCode - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172572
Change subject: More consistent variable naming, e.g. $languageCode
..
More consistent variable naming, e.g. $languageCode
* Renamed some variables, e.g. $language if it does not contain a
Language object.
* Make use of PHP 5.3's short ?: operator.
* Made some stuff private that just does not need to be protected.
Change-Id: I0cb5068d72bb64578ee1e721720e16bae7916b47
---
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/includes/specials/SpecialModifyTerm.php
M repo/includes/specials/SpecialNewEntity.php
M repo/includes/specials/SpecialSetAliases.php
M repo/includes/specials/SpecialSetDescription.php
M repo/includes/specials/SpecialSetLabel.php
9 files changed, 78 insertions(+), 81 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/72/172572/1
diff --git
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index 236fe9d..2c7e1f4 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -56,7 +56,7 @@
return new WikibaseLuaBindings(
new BasicEntityIdParser(),
- $entityLookup ? $entityLookup : new MockRepository(),
+ $entityLookup ?: new MockRepository(),
$siteLinkTable,
new LanguageFallbackChainFactory(),
$language, // language
diff --git
a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
index 4662ee6..db85aef 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
@@ -39,7 +39,7 @@
return new WikibaseLuaEntityBindings(
$this-newSnakFormatterMock(),
- $entityLookup ? $entityLookup : new MockRepository(),
+ $entityLookup ?: new MockRepository(),
'enwiki',
$language // language
);
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index e274cd1..abf92d7 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -75,12 +75,12 @@
* Initialize essential settings for this special page.
* may be used by unit tests to override global settings.
*
-* @param $normalizeItemByTitlePageNames
-* @param $siteLinkGroups
+* @param bool $normalizeItemByTitlePageNames
+* @param string[] $siteLinkGroups
*/
public function initSettings(
$normalizeItemByTitlePageNames,
- $siteLinkGroups
+ array $siteLinkGroups
) {
$this-normalizeItemByTitlePageNames =
$normalizeItemByTitlePageNames;
$this-groups = $siteLinkGroups;
@@ -170,7 +170,7 @@
* @param string $siteId
* @param string $page
*/
- protected function switchForm( $siteId, $page ) {
+ private function switchForm( $siteId, $page ) {
if ( $this-sites-getSites()-hasSite( $siteId ) ) {
$site = $this-sites-getSite( $siteId );
$siteExists = in_array( $site-getGroup(),
$this-groups );
@@ -246,8 +246,8 @@
Html::openElement( 'div' )
. $this-msg( 'wikibase-itembytitle-create' )
-params(
- wfUrlencode( $siteId ? $siteId
: '' ),
- wfUrlencode( $page ? $page : ''
)
+ wfUrlencode( $siteId ?: '' ),
+ wfUrlencode( $page ?: '' )
)
-parse()
. Html::closeElement( 'div' )
diff --git a/repo/includes/specials/SpecialItemDisambiguation.php
b/repo/includes/specials/SpecialItemDisambiguation.php
index 7dc0843..a01ab73 100644
--- a/repo/includes/specials/SpecialItemDisambiguation.php
+++ b/repo/includes/specials/SpecialItemDisambiguation.php
@@ -54,7 +54,6 @@
* @since 0.1
*/
public function
