Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366747 )
Change subject: Re-enable Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed
......................................................................
Re-enable Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed
Change-Id: Id96d0f6d09a2af739c6f6cf6d52d84014078042d
---
M docroot/search.wikimedia.org/index.php
M errorpages/hhvm-fatal-error.php
M phpcs.xml
M wmf-config/CirrusSearch-labs.php
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/db-eqiad.php
M wmf-config/wikitech.php
9 files changed, 67 insertions(+), 70 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/47/366747/1
diff --git a/docroot/search.wikimedia.org/index.php
b/docroot/search.wikimedia.org/index.php
index 51c0a35..5b67c89 100644
--- a/docroot/search.wikimedia.org/index.php
+++ b/docroot/search.wikimedia.org/index.php
@@ -84,7 +84,7 @@
// Confirm return result was format we expect
// for opensearch...
if( is_array( $suggest ) && count( $suggest ) >= 2
- && is_string( $suggest[0] ) && is_array( $suggest[1] ) ) {
+ && is_string( $suggest[0] ) && is_array( $suggest[1] ) ) {
$returnedTerm = $suggest[0];
$results = $suggest[1];
} else {
diff --git a/errorpages/hhvm-fatal-error.php b/errorpages/hhvm-fatal-error.php
index 2851889..f0842f3 100644
--- a/errorpages/hhvm-fatal-error.php
+++ b/errorpages/hhvm-fatal-error.php
@@ -25,25 +25,25 @@
<p>If you report this error to the Wikimedia System Administrators, please
include the details below.</p>
<p class="text-muted"><code>
PHP fatal error<?php
- // Guard against "Cannot modify header information - headers already sent"
warning
- if ( !headers_sent() ) {
- header( 'HTTP/1.1 500 Internal Server Error' );
- }
- $err = error_get_last() ?: [ 'message' => '(no error)' ];
- $message = $err['message'];
- # error_get_last() doesn't return a fully populated array in HHVM,
- # capture file and line manually
- if ( preg_match( '/#0\\s+(\\S+?)\\((\\d+)\\)/', $message, $matches ) ) {
- echo ' ' . htmlspecialchars( $matches[1] ) . ' line ' . $matches[2];
- }
- $parts = explode( "\n", $message );
- $message = $parts[0];
- $message = preg_replace( "/^.*?exception '.*?' with message
'(.*?)'.*$/im", '\1', $message );
+ // Guard against "Cannot modify header information - headers already
sent" warning
+ if ( !headers_sent() ) {
+ header( 'HTTP/1.1 500 Internal Server Error' );
+ }
+ $err = error_get_last() ?: [ 'message' => '(no error)' ];
+ $message = $err['message'];
+ # error_get_last() doesn't return a fully populated array in HHVM,
+ # capture file and line manually
+ if ( preg_match( '/#0\\s+(\\S+?)\\((\\d+)\\)/', $message, $matches ) ) {
+ echo ' ' . htmlspecialchars( $matches[1] ) . ' line ' . $matches[2];
+ }
+ $parts = explode( "\n", $message );
+ $message = $parts[0];
+ $message = preg_replace( "/^.*?exception '.*?' with message
'(.*?)'.*$/im", '\1', $message );
- // Increment a counter.
- $sock = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
- $stat = 'MediaWiki.errors.fatal:1|c';
- @socket_sendto( $sock, $stat, strlen( $stat ), 0, 'statsd.eqiad.wmnet',
8125 );
+ // Increment a counter.
+ $sock = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
+ $stat = 'MediaWiki.errors.fatal:1|c';
+ @socket_sendto( $sock, $stat, strlen( $stat ), 0, 'statsd.eqiad.wmnet',
8125 );
?>: <br/>
<?php echo htmlspecialchars( $message ); ?>
diff --git a/phpcs.xml b/phpcs.xml
index d2e3ee2..b3fab17 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -59,9 +59,6 @@
<rule ref="PSR2.Classes.PropertyDeclaration.ScopeMissing">
<severity>0</severity>
</rule>
- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed">
- <severity>0</severity>
- </rule>
<rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
<severity>0</severity>
</rule>
@@ -81,7 +78,7 @@
<severity>0</severity>
</rule>
- <exclude-pattern>.git/</exclude-pattern>
+ <exclude-pattern>\.git/</exclude-pattern>
<exclude-pattern>vendor/</exclude-pattern>
<exclude-pattern>multiversion/</exclude-pattern>
<exclude-pattern>wmf-config/PrivateSettings.php</exclude-pattern>
diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php
index b8603c3..0fc8ba5 100644
--- a/wmf-config/CirrusSearch-labs.php
+++ b/wmf-config/CirrusSearch-labs.php
@@ -36,20 +36,20 @@
$wgCirrusSearchEnableSearchLogging = true;
$wgCirrusSearchLanguageToWikiMap = [
- 'ar' => 'ar',
- 'de' => 'de',
- 'en' => 'en',
- 'es' => 'es',
- 'fa' => 'fa',
- 'he' => 'he',
- 'hi' => 'hi',
- 'ja' => 'ja',
- 'ko' => 'ko',
- 'ru' => 'ru',
- 'sq' => 'sq',
- 'uk' => 'uk',
- 'zh-cn' => 'zh',
- 'zh-tw' => 'zh',
+ 'ar' => 'ar',
+ 'de' => 'de',
+ 'en' => 'en',
+ 'es' => 'es',
+ 'fa' => 'fa',
+ 'he' => 'he',
+ 'hi' => 'hi',
+ 'ja' => 'ja',
+ 'ko' => 'ko',
+ 'ru' => 'ru',
+ 'sq' => 'sq',
+ 'uk' => 'uk',
+ 'zh-cn' => 'zh',
+ 'zh-tw' => 'zh',
];
# Force the number of replicas to 1 max for the beta cluster
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index f2299d5..10c29ba 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -160,7 +160,7 @@
// Enable Flickr uploads on commons beta T86120
if ( $wgDBname == 'commonswiki' ) {
$wgGroupPermissions['user']['upload'] = true;
- $wgGroupPermissions['user']['upload_by_url'] = true;
+ $wgGroupPermissions['user']['upload_by_url'] = true;
} else { // Use InstantCommons on all betawikis except commonswiki
$wgUseInstantCommons = true;
}
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f874565..037588b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1905,10 +1905,10 @@
// Not a fundraising chapter in 2013+ due to FR regulations
//'FR',
//'GP', 'MQ', 'GF', 'RE', 'YT', 'PM',
- //'NC', 'PF', 'WF', 'BL', 'MF', 'TF',
+ //'NC', 'PF', 'WF', 'BL', 'MF', 'TF',
// === Blacklisted countries
- 'BY', 'CD', 'CI', 'CU', 'IQ', 'IR', 'KP', 'LB', 'LY', 'MM',
'SD', 'SO', 'SY', 'YE', 'ZW',
+ 'BY', 'CD', 'CI', 'CU', 'IQ', 'IR', 'KP', 'LB',
'LY', 'MM', 'SD', 'SO', 'SY', 'YE', 'ZW',
];
$wgLandingCheckPriorityURLBase =
"//wikimediafoundation.org/wiki/Special:LandingCheck";
$wgLandingCheckNormalURLBase =
"//donate.wikimedia.org/wiki/Special:LandingCheck";
@@ -2359,10 +2359,10 @@
// Serve 'Powered by MediaWiki' badge from /static/images instead of
// $wgResourceBasePath so we can set far-future expires.
$wgFooterIcons['poweredby']['mediawiki']['src'] =
- '/static/images/poweredby_mediawiki_88x31.png';
+ '/static/images/poweredby_mediawiki_88x31.png';
$wgFooterIcons['poweredby']['mediawiki']['srcset'] =
- '/static/images/poweredby_mediawiki_132x47.png 1.5x, ' .
- '/static/images/poweredby_mediawiki_176x62.png 2x';
+ '/static/images/poweredby_mediawiki_132x47.png 1.5x, ' .
+ '/static/images/poweredby_mediawiki_176x62.png 2x';
if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) &&
$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) {
$wgCookieSecure = true;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index a587923..418177e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1199,7 +1199,7 @@
# wgLogoHD @{
// Alternate logos for high-resolution displays.
'wgLogoHD' => [
- # Wikipedia
+ # Wikipedia
'abwiki' => [ '1.5x' => '/static/images/project-logos/abwiki-1.5x.png',
'2x' => '/static/images/project-logos/abwiki-2x.png' ], // T150618
'acewiki' => [ '1.5x' =>
'/static/images/project-logos/acewiki-1.5x.png', '2x' =>
'/static/images/project-logos/acewiki-2x.png' ], // T150618
'adywiki' => [ '1.5x' =>
'/static/images/project-logos/adywiki-1.5x.png', '2x' =>
'/static/images/project-logos/adywiki-2x.png' ], // T150618
@@ -1462,8 +1462,8 @@
'zhwiki' => [ '1.5x' => '/static/images/project-logos/zhwiki-1.5x.png',
'2x' => '/static/images/project-logos/zhwiki-2x.png' ],
'zh_yuewiki' => [ '1.5x' =>
'/static/images/project-logos/zh_yuewiki-1.5x.png', '2x' =>
'/static/images/project-logos/zh_yuewiki-2x.png' ], // T150618
- # Wiktionary
- 'amwiktionary' => [ '1.5x' =>
'/static/images/project-logos/amwiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/amwiktionary-2x.png' ], // T150618
+ # Wiktionary
+ 'amwiktionary' => [ '1.5x' =>
'/static/images/project-logos/amwiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/amwiktionary-2x.png' ], // T150618
'arwiktionary' => [ '1.5x' =>
'/static/images/project-logos/arwiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/arwiktionary-2x.png' ], // T150618
'azwiktionary' => [ '1.5x' =>
'/static/images/project-logos/azwiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/azwiktionary-2x.png' ], // T150618
'bewiktionary' => [ '1.5x' =>
'/static/images/project-logos/bewiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/bewiktionary-2x.png' ], // T150618
@@ -1537,8 +1537,8 @@
'viwiktionary' => [ '1.5x' =>
'/static/images/project-logos/viwiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/viwiktionary-2x.png' ],
'wawiktionary' => [ '1.5x' =>
'/static/images/project-logos/wawiktionary-1.5x.png', '2x' =>
'/static/images/project-logos/wawiktionary-2x.png' ], // T150618
- # Wikiquote
- 'cawikiquote' => [ '1.5x' =>
'/static/images/project-logos/cawikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/cawikiquote-2x.png' ], // T150618
+ # Wikiquote
+ 'cawikiquote' => [ '1.5x' =>
'/static/images/project-logos/cawikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/cawikiquote-2x.png' ], // T150618
'cswikiquote' => [ '1.5x' =>
'/static/images/project-logos/cswikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/cswikiquote-2x.png' ], // T150618
'enwikiquote' => [ '1.5x' =>
'/static/images/project-logos/enwikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/enwikiquote-2x.png' ], // T150618
'eowikiquote' => [ '1.5x' =>
'/static/images/project-logos/eowikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/eowikiquote-2x.png' ], // T150618
@@ -1555,12 +1555,12 @@
'viwikiquote' => [ '1.5x' =>
'/static/images/project-logos/viwikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/viwikiquote-2x.png' ],
'zhwikiquote' => [ '1.5x' =>
'/static/images/project-logos/zhwikiquote-1.5x.png', '2x' =>
'/static/images/project-logos/zhwikiquote-2x.png' ], // T150618
- # Wikibooks
+ # Wikibooks
'eswikibooks' => [ '1.5x' =>
'/static/images/project-logos/eswikibooks-1.5x.png', '2x' =>
'/static/images/project-logos/eswikibooks-2x.png'], // T170248
'srwikibooks' => [ '1.5x' =>
'/static/images/project-logos/srwikibooks-1.5x.png', '2x' =>
'/static/images/project-logos/srwikibooks-2x.png'], // T159534
'viwikibooks' => [ '1.5x' =>
'/static/images/project-logos/viwikibooks-1.5x.png', '2x' =>
'/static/images/project-logos/viwikibooks-2x.png' ],
- # Wikisource
+ # Wikisource
'cswikisource' => [ '1.5x' =>
'/static/images/project-logos/cswikisource-1.5x.png', '2x' =>
'/static/images/project-logos/cswikisource-2x.png' ], // T150618
'nowikisource' => [ '1.5x' =>
'/static/images/project-logos/nowikisource-1.5x.png', '2x' =>
'/static/images/project-logos/nowikisource-2x.png' ], // T167192
'pawikisource' => [ '1.5x' =>
'/static/images/project-logos/pawikisource-1.5x.png', '2x' =>
'/static/images/project-logos/pawikisource-2x.png' ], // T149522
@@ -1583,19 +1583,19 @@
'slwikiversity' => [ '1.5x' =>
'/static/images/project-logos/slwikiversity-1.5x.png', '2x' =>
'/static/images/project-logos/slwikiversity-2x.png' ], // T150618
'svwikiversity' => [ '1.5x' =>
'/static/images/project-logos/svwikiversity-1.5x.png', '2x' =>
'/static/images/project-logos/svwikiversity-2x.png' ],
- # Wikivoyage
+ # Wikivoyage
'cswikivoyage' => [ '1.5x' =>
'/static/images/project-logos/cswikivoyage-1.5x.png', '2x' =>
'/static/images/project-logos/cswikivoyage-2x.png' ], // T150618
'fiwikivoyage' => [ '1.5x' =>
'/static/images/project-logos/fiwikivoyage-1.5x.png', '2x' =>
'/static/images/project-logos/fiwikivoyage-2x.png' ],
'viwikivoyage' => [ '1.5x' =>
'/static/images/project-logos/viwikivoyage-1.5x.png', '2x' =>
'/static/images/project-logos/viwikivoyage-2x.png' ], // T151570
- # Chapter wikis
+ # Chapter wikis
'ecwikimedia' => [ '1.5x' =>
'/static/images/project-logos/ecwikimedia-1.5x.png', '2x' =>
'/static/images/project-logos/ecwikimedia-2x.png'], // T135521
'maiwikimedia' => [ '1.5x' =>
'/static/images/project-logos/maiwikimedia-1.5x.png', '2x' =>
'/static/images/project-logos/maiwikimedia-2x.png' ],
'ptwikimedia' => [ '1.5x' =>
'/static/images/project-logos/ptwikimedia-1.5x.png', '2x' =>
'/static/images/project-logos/ptwikimedia-2x.png'], // T126832
'trwikimedia' => [ '1.5x' =>
'/static/images/project-logos/trwikimedia-1.5x.png', '2x' =>
'/static/images/project-logos/trwikimedia-2x.png'],
'wbwikimedia' => [ '1.5x' =>
'/static/images/project-logos/wbwikimedia-1.5x.png', '2x' =>
'/static/images/project-logos/wbwikimedia-2x.png' ], // T162510
- # Special wikis
+ # Special wikis
'arbcom_dewiki' => ['1.5x' =>
'/static/images/project-logos/arbcom_dewiki-1.5x.png', '2x' =>
'/static/images/project-logos/arbcom_dewiki-2x.png'], // T166947
'arbcom_cswiki' => ['1.5x' =>
'/static/images/project-logos/arbcom_cswiki-1.5x.png', '2x' =>
'/static/images/project-logos/arbcom_cswiki-2x.png'], // T151731
'donatewiki' => [ '1.5x' =>
'/static/images/project-logos/donatewiki-1.5x.png', '2x' =>
'/static/images/project-logos/donatewiki-2x.png' ],
@@ -8335,7 +8335,7 @@
],
'+etwiki' => [
'autopatrolled' => [ 'autopatrol' => true ], // T150852
- ],
+ ],
'+fawiki' => [
'*' => [ 'createpage' => false ], // T29195
'user' => [ 'move-categorypages' => false ], // T67728
@@ -10228,7 +10228,7 @@
'bureaucrat' => [ 'interface-editor' ], // T41690
],
'+uawikimedia' => [
- 'bureaucrat' => [ 'translationadmin' ], // T131731
+ 'bureaucrat' => [ 'translationadmin' ], // T131731
],
'+ukwiki' => [
'sysop' => [ 'patroller', 'rollbacker', 'accountcreator',
'filemover' ], // T104034, T119636
@@ -19099,16 +19099,16 @@
'wmgCirrusSearchEnableArchive' => [
'default' => false,
'testwiki' => true,
- 'mediawikiwiki' => true,
- 'cawiki' => true,
- 'itwiki' => true,
- 'ruwiki' => true,
- 'fawiki' => true,
- 'dewiki' => true,
- 'frwiki' => true,
- 'plwiki' => true,
- 'arwiki' => true,
- 'enwiki' => true,
+ 'mediawikiwiki' => true,
+ 'cawiki' => true,
+ 'itwiki' => true,
+ 'ruwiki' => true,
+ 'fawiki' => true,
+ 'dewiki' => true,
+ 'frwiki' => true,
+ 'plwiki' => true,
+ 'arwiki' => true,
+ 'enwiki' => true,
],
'wmgUseDynamicSidebar' => [
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 9d27143..e51820b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -582,7 +582,7 @@
'db2072' => '10.192.16.37', # do not remove or comment out
'virt1000' => '208.80.154.18', # do not remove or comment out
'silver' => '208.80.154.136', # do not remove or comment out
- 'labtestweb2001' => '208.80.153.14', # do not remove or comment out
+ 'labtestweb2001' => '208.80.153.14', # do not remove or comment
out
],
'externalLoads' => [
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index d49316d..3282c7a 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -18,10 +18,10 @@
switch( $wgDBname ) {
case 'labswiki' :
$wgLDAPServerNames = [ 'labs' => 'ldap-labs.eqiad.wikimedia.org' ];
- break;
+ break;
case 'labtestwiki' :
$wgLDAPServerNames = [ 'labs' => 'labtestservices2001.wikimedia.org' ];
- break;
+ break;
}
$wgLDAPSearchAttributes = [ 'labs' => 'cn'];
$wgLDAPBaseDNs = [ 'labs' => 'dc=wikimedia,dc=org' ];
@@ -74,7 +74,7 @@
'servers' => [ 'primary' => 'labcontrol1001.wikimedia.org' ],
'soa' => [ 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ],
];
- break;
+ break;
case 'labtestwiki' :
$wgOpenStackManagerNovaIdentityURI =
'http://labtestcontrol2001.wikimedia.org:35357/v2.0';
$wgOpenStackManagerNovaIdentityV3URI =
'http://labtestcontrol2001.wikimedia.org:35357/v3';
@@ -83,7 +83,7 @@
'servers' => [ 'primary' => 'labtestcontrol2001.wikimedia.org'
],
'soa' => [ 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ],
];
- break;
+ break;
}
$wgOpenStackManagerNovaKeypairStorage = 'ldap';
$wgOpenStackManagerLDAPDomain = 'labs';
--
To view, visit https://gerrit.wikimedia.org/r/366747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id96d0f6d09a2af739c6f6cf6d52d84014078042d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
