jenkins-bot has submitted this change and it was merged.
Change subject: Re-enable disabled MediaWiki code sniffer rules
......................................................................
Re-enable disabled MediaWiki code sniffer rules
Change-Id: If5e02e18a5b567befb64414e1706d7f8162d6731
---
M client/WikibaseClient.datatypes.php
M client/includes/Changes/WikiPageUpdater.php
M client/includes/specials/SpecialPagesWithBadges.php
M client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
M client/tests/phpunit/includes/recentchanges/ExternalChangeFactoryTest.php
M
client/tests/phpunit/includes/recentchanges/RecentChangesDuplicateDetectorTest.php
M client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
M lib/includes/formatters/DispatchingSnakFormatter.php
M lib/tests/phpunit/formatters/MessageSnakFormatterTest.php
M phpcs.xml
M repo/includes/api/EditEntity.php
M repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
13 files changed, 16 insertions(+), 29 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.datatypes.php
b/client/WikibaseClient.datatypes.php
index 2e977a4..e62c5ea 100644
--- a/client/WikibaseClient.datatypes.php
+++ b/client/WikibaseClient.datatypes.php
@@ -88,4 +88,4 @@
),
);
-});
+} );
diff --git a/client/includes/Changes/WikiPageUpdater.php
b/client/includes/Changes/WikiPageUpdater.php
index 98e120e..8890d43 100644
--- a/client/includes/Changes/WikiPageUpdater.php
+++ b/client/includes/Changes/WikiPageUpdater.php
@@ -125,7 +125,9 @@
$rc = $this->recentChangeFactory->newRecentChange(
$change, $title, $rcAttribs );
- if ( $this->recentChangesDuplicateDetector &&
$this->recentChangesDuplicateDetector->changeExists( $rc ) ) {
+ if ( $this->recentChangesDuplicateDetector
+ &&
$this->recentChangesDuplicateDetector->changeExists( $rc )
+ ) {
wfDebugLog( __CLASS__, __FUNCTION__ . ":
skipping duplicate RC entry for " . $title->getFullText() );
} else {
wfDebugLog( __CLASS__, __FUNCTION__ . ": saving
RC entry for " . $title->getFullText() );
diff --git a/client/includes/specials/SpecialPagesWithBadges.php
b/client/includes/specials/SpecialPagesWithBadges.php
index 3257c76..0fe4074 100644
--- a/client/includes/specials/SpecialPagesWithBadges.php
+++ b/client/includes/specials/SpecialPagesWithBadges.php
@@ -243,7 +243,7 @@
* @return array
*/
public function linkParameters() {
- return array( 'badge' => $this->badgeId->getSerialization() );
+ return array( 'badge' => $this->badgeId->getSerialization() );
}
/**
diff --git a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
index 8612e7b..7119bf6 100644
--- a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
+++ b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
@@ -332,7 +332,7 @@
array(
new PageEntityUsages( 1, array(
$q1SitelinkUsage ) ),
),
- array( EntityUsage::SITELINK_USAGE ),
+ array( EntityUsage::SITELINK_USAGE ),
array( $page1Q1Usages, $page2Q1Usages ),
$changeFactory->newFromUpdate( ItemChange::UPDATE,
$this->getItemWithSiteLinks( $q1, array(
'enwiki' => '1' ) ),
diff --git a/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
b/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
index c80af27..fa517e5 100644
--- a/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
@@ -221,7 +221,7 @@
$this->assertDiffsEqual( $expectedValue, $actual[$key],
$currentPath );
}
- $extraKeys = array_diff( array_keys( $actual), array_keys(
$expected ) );
+ $extraKeys = array_diff( array_keys( $actual ), array_keys(
$expected ) );
$this->assertEquals( array(), $extraKeys, $path . " extra keys"
);
}
diff --git
a/client/tests/phpunit/includes/recentchanges/ExternalChangeFactoryTest.php
b/client/tests/phpunit/includes/recentchanges/ExternalChangeFactoryTest.php
index 55eabff..3e385d6 100644
--- a/client/tests/phpunit/includes/recentchanges/ExternalChangeFactoryTest.php
+++ b/client/tests/phpunit/includes/recentchanges/ExternalChangeFactoryTest.php
@@ -259,8 +259,8 @@
'user_text' => 'Cat',
'bot' => 0,
'comment' => strval( $comment ),
- )
- );
+ )
+ );
}
/**
diff --git
a/client/tests/phpunit/includes/recentchanges/RecentChangesDuplicateDetectorTest.php
b/client/tests/phpunit/includes/recentchanges/RecentChangesDuplicateDetectorTest.php
index 840331c..62ffcaa 100644
---
a/client/tests/phpunit/includes/recentchanges/RecentChangesDuplicateDetectorTest.php
+++
b/client/tests/phpunit/includes/recentchanges/RecentChangesDuplicateDetectorTest.php
@@ -135,7 +135,7 @@
$change = $this->newChange( $changeData );
- $this->assertEquals( $expected, $detector->changeExists(
$change ), 'changeExists()' );
+ $this->assertEquals( $expected, $detector->changeExists(
$change ), 'changeExists()' );
}
private function newChange( array $changeData ) {
diff --git a/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
b/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
index 5590fd9..20b0fd0 100644
--- a/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
+++ b/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
@@ -102,11 +102,11 @@
$title = Title::makeTitle( NS_MAIN, 'Bar' );
- $expected = array (
+ $expected = array(
'type' => 'wikibase-addUsagesForPage',
'namespace' => NS_MAIN,
'title' => 'Bar',
- 'params' => array (
+ 'params' => array(
'pageId' => 18,
'usages' => array( $usage->asArray() )
),
diff --git a/lib/includes/formatters/DispatchingSnakFormatter.php
b/lib/includes/formatters/DispatchingSnakFormatter.php
index dc2db52..081b1a1 100644
--- a/lib/includes/formatters/DispatchingSnakFormatter.php
+++ b/lib/includes/formatters/DispatchingSnakFormatter.php
@@ -109,7 +109,7 @@
public function formatSnak( Snak $snak ) {
$snakType = $snak->getType();
- if ( isset( $this->formattersBySnakType[$snakType] ) ) {
+ if ( isset( $this->formattersBySnakType[$snakType] ) ) {
$formatter = $this->formattersBySnakType[$snakType];
return $formatter->formatSnak( $snak );
}
diff --git a/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php
b/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php
index 93048e6..8efb338 100644
--- a/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php
@@ -36,7 +36,7 @@
*/
private function getFormatter( $snakType, $format ) {
$message = $this->getMockBuilder( 'Message' )
- ->setConstructorArgs( array( 'message') )
+ ->setConstructorArgs( array( 'message' ) )
->getMock();
foreach ( array( 'parse', 'text', 'plain' ) as $method ) {
diff --git a/phpcs.xml b/phpcs.xml
index dbba1b6..2d97ece 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -27,25 +27,10 @@
<rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
- <!-- FIXME: This is part of the MediaWiki rule set and should be fixed.
-->
- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed">
- <severity>0</severity>
- </rule>
-
- <!-- FIXME: All these disabled MediaWiki rules indicate errors that
should be fixed. -->
<rule
ref="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment">
<severity>0</severity>
</rule>
<rule
ref="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment">
- <severity>0</severity>
- </rule>
- <rule
ref="MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis">
- <severity>0</severity>
- </rule>
- <rule
ref="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis">
- <severity>0</severity>
- </rule>
- <rule
ref="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis">
<severity>0</severity>
</rule>
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index b1e74b5..7d52727 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -271,7 +271,7 @@
$summary->setAction( $params['clear'] === false ?
'update' : 'override' );
} else {
$summary->setAction( 'create' );
- }#
+ }
return $summary;
}
diff --git a/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
b/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
index d950bb4..3ddec9c 100644
--- a/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
+++ b/repo/tests/phpunit/includes/store/sql/SqlChangeStoreTest.php
@@ -138,7 +138,7 @@
$change->setField( 'time', wfTimestampNow() );
$store = new SqlChangeStore( wfGetLB() );
- $store->saveChange( $change );#
+ $store->saveChange( $change );
$expected = array(
'change_id' => (string)$change->getId(),
'change_type' => 'wikibase-item~add',
--
To view, visit https://gerrit.wikimedia.org/r/250003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5e02e18a5b567befb64414e1706d7f8162d6731
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
