Merge "Re-enable MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis"

maintenance/populateContentModel.php

@@ -178,7 +178,7 @@ class PopulateContentModel extends Maintenance {
 					if ( $dbFormat === $defaultFormat ) {
 						$toSave[$defaultModel][] = $row->{$key};
 					} else { // non-default format, just update now
-						$this->output( "Updating model to match format for $table $id of $title... ");
+						$this->output( "Updating model to match format for $table $id of $title... " );
 						$dbw->update(
 							$table,
 							array( $model_column => $defaultModel ),

phpcs.xml

@@ -5,7 +5,6 @@
 		<exclude name="Generic.Files.LineLength"/>
 		<exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
 		<exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix"/>
-		<exclude name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis"/>
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
 		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>

tests/phpunit/includes/WikiMapTest.php

@@ -62,7 +62,7 @@ class WikiMapTest extends MediaWikiLangTestCase {
 	public function provideMakeForeignLink() {
 		return array(
 			'unknown' => array( false, 'xyzzy', 'Foo' ),
-			'enwiki' => array( '<a class="external" rel="nofollow" href="http://en.example.org/w/Foo">Foo</a>', 'enwiki', 'Foo',  ),
+			'enwiki' => array( '<a class="external" rel="nofollow" href="http://en.example.org/w/Foo">Foo</a>', 'enwiki', 'Foo' ),
 			'ruwiki' => array( '<a class="external" rel="nofollow" href="//ru.example.org/wiki/%D0%A4%D1%83">вар</a>', 'ruwiki', 'Фу', 'вар' ),
 		);
 	}
@@ -77,7 +77,7 @@ class WikiMapTest extends MediaWikiLangTestCase {
 	public function provideForeignUserLink() {
 		return array(
 			'unknown' => array( false, 'xyzzy', 'Foo' ),
-			'enwiki' => array( '<a class="external" rel="nofollow" href="http://en.example.org/w/User:Foo">User:Foo</a>', 'enwiki', 'Foo',  ),
+			'enwiki' => array( '<a class="external" rel="nofollow" href="http://en.example.org/w/User:Foo">User:Foo</a>', 'enwiki', 'Foo' ),
 			'ruwiki' => array( '<a class="external" rel="nofollow" href="//ru.example.org/wiki/User:%D0%A4%D1%83">вар</a>', 'ruwiki', 'Фу', 'вар' ),
 		);
 	}
@@ -92,7 +92,7 @@ class WikiMapTest extends MediaWikiLangTestCase {
 	public function provideGetForeignURL() {
 		return array(
 			'unknown' => array( false, 'xyzzy', 'Foo' ),
-			'enwiki' => array( 'http://en.example.org/w/Foo', 'enwiki', 'Foo',  ),
+			'enwiki' => array( 'http://en.example.org/w/Foo', 'enwiki', 'Foo' ),
 			'ruwiki with fragement' => array( '//ru.example.org/wiki/%D0%A4%D1%83#%D0%B2%D0%B0%D1%80', 'ruwiki', 'Фу', 'вар' ),
 		);
 	}

tests/phpunit/includes/content/JavaScriptContentTest.php

@@ -253,7 +253,7 @@ class JavaScriptContentTest extends TextContentTest {
 	 * @covers JavaScriptContent::updateRedirect
 	 * @dataProvider provideUpdateRedirect
 	 */
-	public function testUpdateRedirect( $oldText, $expectedText) {
+	public function testUpdateRedirect( $oldText, $expectedText ) {
 		$this->setMwGlobals( array(
 			'wgServer' => '//example.org',
 			'wgScriptPath' => '/w/index.php',

tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php

@@ -99,7 +99,7 @@ class FileBackendDBRepoWrapperTest extends MediaWikiTestCase {
 			->will( $this->returnValue( '96246614d75ba1703bdfd5d7660bb57407aaf5d9' ) );
 
 		$backendMock->expects( $this->once() )
-			->method( 'getFileContentsMulti')
+			->method( 'getFileContentsMulti' )
 			->will( $this->returnValue( array( $sha1Path => 'foo' ) ) );
 
 		$result = $wrapperMock->getFileContentsMulti( array( 'srcs' => array( $filenamePath ) ) );

tests/phpunit/includes/media/WebPTest.php

@@ -24,7 +24,7 @@ class WebPHandlerTest extends MediaWikiTestCase {
 			array( "\x52\x49\x46\x46\x90\x68\x01\x00\x57\x45\x42\x50\x56\x50\x38\x4C\x83\x68\x01\x00\x2F\x8F\x01\x4B\x10\x8D\x38\x6C\xDB\x46\x92\xE0\xE0\x82\x7B\x6C",
 				array( 'compression' => 'lossless', 'width' => 400, 'height' => 301 ) ),
 			array( "\x52\x49\x46\x46\x64\x5B\x00\x00\x57\x45\x42\x50\x56\x50\x38\x58\x0A\x00\x00\x00\x10\x00\x00\x00\x8F\x01\x00\x2C\x01\x00\x41\x4C\x50\x48\xE5\x0E",
-				array( 'compression' => 'unknown', 'animated' => false, 'transparency' => true, 'width' => 400, 'height' => 301) ),
+				array( 'compression' => 'unknown', 'animated' => false, 'transparency' => true, 'width' => 400, 'height' => 301 ) ),
 			array( "\x52\x49\x46\x46\xA8\x72\x00\x00\x57\x45\x42\x50\x56\x50\x38\x4C\x9B\x72\x00\x00\x2F\x81\x81\x62\x10\x8D\x40\x8C\x24\x39\x6E\x73\x73\x38\x01\x96",
 				array( 'compression' => 'lossless', 'width' => 386, 'height' => 395 ) ),
 			array( "\x52\x49\x46\x46\xE0\x42\x00\x00\x57\x45\x42\x50\x56\x50\x38\x58\x0A\x00\x00\x00\x10\x00\x00\x00\x81\x01\x00\x8A\x01\x00\x41\x4C\x50\x48\x56\x10",
@@ -50,9 +50,9 @@ class WebPHandlerTest extends MediaWikiTestCase {
 			array( "\x52\x49\x46\x46\x7A\x19\x03\x00\x57\x45\x42\x50\x56\x50\x38\x20\x6E\x19\x03\x00\xB2\xF8\x09\x9D\x01\x2A\x00\x05\xD0\x02\x3E\xAD\x46\x99\x4A\xA5",
 				array( 'compression' => 'lossy', 'width' => 1280, 'height' => 720 ) ),
 			array( "\x52\x49\x46\x46\x44\xB3\x02\x00\x57\x45\x42\x50\x56\x50\x38\x20\x38\xB3\x02\x00\x52\x57\x06\x9D\x01\x2A\x00\x04\x04\x03\x3E\xA5\x44\x96\x49\x26",
-				array( 'compression' => 'lossy', 'width' => 1024, 'height' => 772) ),
+				array( 'compression' => 'lossy', 'width' => 1024, 'height' => 772 ) ),
 			array( "\x52\x49\x46\x46\x02\x43\x01\x00\x57\x45\x42\x50\x56\x50\x38\x20\xF6\x42\x01\x00\x12\xC0\x05\x9D\x01\x2A\x00\x04\xF0\x02\x3E\x79\x34\x93\x47\xA4",
-				array( 'compression' => 'lossy', 'width' => 1024, 'height' => 752) ),
+				array( 'compression' => 'lossy', 'width' => 1024, 'height' => 752 ) ),
 
 			// Animated file from https://groups.google.com/a/chromium.org/d/topic/blink-dev/Y8tRC4mdQz8/discussion
 			array( "\x52\x49\x46\x46\xD0\x0B\x02\x00\x57\x45\x42\x50\x56\x50\x38\x58\x0A\x00\x00\x00\x12\x00\x00\x00\x3F\x01\x00\x3F\x01\x00\x41\x4E",