Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366749 )
Change subject: Re-enable
MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis
......................................................................
Re-enable MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis
Change-Id: If1acb7ead75c8f160686621618342d6751705e44
---
M phpcs.xml
M tests/InitialiseSettingsTest.php
M tests/ThrottleTest.php
M tests/cirrusTest.php
M tests/noc-conf/NOCDblistTest.php
M w/health-check.php
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
8 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/49/366749/1
diff --git a/phpcs.xml b/phpcs.xml
index b3fab17..aac88e4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -23,7 +23,6 @@
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment"
/>
<exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis" />
<exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis"
/>
- <exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis" />
<exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.UnnecessarySpaceBetweenParentheses"
/>
</rule>
<file>.</file>
diff --git a/tests/InitialiseSettingsTest.php b/tests/InitialiseSettingsTest.php
index 986e296..5a29481 100644
--- a/tests/InitialiseSettingsTest.php
+++ b/tests/InitialiseSettingsTest.php
@@ -5,7 +5,7 @@
///
/// wgLogoHD
///
- public function testLogoHD () {
+ public function testLogoHD() {
$requiredKeys = $this->getRequiredLogoHDKeys();
$wgConf = $this->loadWgConf( 'unittest' );
@@ -15,7 +15,7 @@
}
}
- public function getRequiredLogoHDKeys () {
+ public function getRequiredLogoHDKeys() {
return [ '1.5x', '2x' ];
}
diff --git a/tests/ThrottleTest.php b/tests/ThrottleTest.php
index 4bba3a6..2bb0e43 100644
--- a/tests/ThrottleTest.php
+++ b/tests/ThrottleTest.php
@@ -4,7 +4,7 @@
/**
* @dataProvider provideRules
*/
- public function testThrottlingExceptionsKeys ( $rule ) {
+ public function testThrottlingExceptionsKeys( $rule ) {
$validParameters =
self::getThrottlingExceptionsValidParameters();
foreach ( $rule as $key => $value ) {
@@ -18,7 +18,7 @@
/**
* @dataProvider provideRules
*/
- public function testIfThrottlingExceptionsContainTheRequiredParameters
( $rule ) {
+ public function testIfThrottlingExceptionsContainTheRequiredParameters(
$rule ) {
$keys = array_keys( $rule );
$this->assertContains( 'from', $keys, "Throttle rule required
parameter missing: from" );
$this->assertContains( 'to', $keys, "Throttle rule required
parameter missing: to" );
@@ -27,9 +27,9 @@
/**
* @dataProvider provideRules
*/
- public function testIfThrottlingExceptionsDontContainBothRangeAndIP (
$rule ) {
+ public function testIfThrottlingExceptionsDontContainBothRangeAndIP(
$rule ) {
$keys = array_keys( $rule );
- $this->assertFalse (
+ $this->assertFalse(
in_array( 'IP', $keys ) &&
in_array( 'range', $keys ),
"Throttle rules can apply to range(s) or IP(s) but not
both"
@@ -40,7 +40,7 @@
* @dataProvider provideRules
* @depends testIfThrottlingExceptionsContainTheRequiredParameters
*/
- public function testThrottlingExceptionsValues ( $rule ) {
+ public function testThrottlingExceptionsValues( $rule ) {
foreach ( $rule as $key => $value ) {
// Parses date
// strtotime returns false when the string can't be
parsed.
@@ -79,7 +79,7 @@
}
}
- protected static function getThrottlingExceptionsValidParameters () {
+ protected static function getThrottlingExceptionsValidParameters() {
return [
'from',
'to',
@@ -90,7 +90,7 @@
];
}
- public function provideRules () {
+ public function provideRules() {
require __DIR__ . '/../wmf-config/throttle.php';
$rules = [];
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 06f5b16..6117e08 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -34,7 +34,7 @@
$this->assertCount( 2, $config['wgCirrusSearchReplicas'] );
$this->assertCount( 2,
$config['wgCirrusSearchClientSideConnectTimeout'] );
- foreach ( array_keys ( $config['wgCirrusSearchClusters'] ) as
$cluster ) {
+ foreach ( array_keys( $config['wgCirrusSearchClusters'] ) as
$cluster ) {
$this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchShardCount'] );
$this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchReplicas'] );
$this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchClientSideConnectTimeout'] );
diff --git a/tests/noc-conf/NOCDblistTest.php b/tests/noc-conf/NOCDblistTest.php
index 6a6726d..a10e8d7 100644
--- a/tests/noc-conf/NOCDblistTest.php
+++ b/tests/noc-conf/NOCDblistTest.php
@@ -1,7 +1,7 @@
<?php
class NocDblistTest extends PHPUnit_Framework_TestCase {
- public function testNocDblists () {
+ public function testNocDblists() {
$common = dirname( dirname( __DIR__ ) );
$dblistsDir = "$common/dblists/";
$nocConfDir = "$common/docroot/noc/conf/";
diff --git a/w/health-check.php b/w/health-check.php
index 52a1b20..5c5c8e3 100644
--- a/w/health-check.php
+++ b/w/health-check.php
@@ -3,7 +3,7 @@
# Work out the number of physical processors
-if ( !file_exists ( '/proc/cpuinfo' ) ) {
+if ( !file_exists( '/proc/cpuinfo' ) ) {
echo "Can't get CPU information, as procfs isn't mounted or
/proc/cpuinfo isn't available on this system.\n";
exit;
}
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 10c29ba..b892780 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -352,7 +352,7 @@
$wgHooks['ImportSources'][] = 'wmfImportSources';
// Reenable Preview and Changes tabs for wikieditor preview
-$wgHiddenPrefs = array_diff ( $wgHiddenPrefs, [ 'wikieditor-preview' ] );
+$wgHiddenPrefs = array_diff( $wgHiddenPrefs, [ 'wikieditor-preview' ] );
// MultimediaViewer is a dependency of 3d extension
if ( $wmgUse3d && $wmgUseMultimediaViewer ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 037588b..dd60c67 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -964,7 +964,7 @@
}
if ( $wmgUseGlobalBlocking ) {
- wfLoadExtension ( 'GlobalBlocking' );
+ wfLoadExtension( 'GlobalBlocking' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
$wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
@@ -2374,7 +2374,7 @@
$wgExtendedLoginCookieExpiration = 365 * 86400;
if ( $wmgUseMath ) {
- wfLoadExtension ( 'Math' );
+ wfLoadExtension( 'Math' );
$wgTexvc = '/usr/bin/texvc';
$wgMathTexvcCheckExecutable = '/usr/bin/texvccheck';
--
To view, visit https://gerrit.wikimedia.org/r/366749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1acb7ead75c8f160686621618342d6751705e44
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
