From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 29 Jun 2017 01:11:32 +0000 (+0000)
Subject: Merge "Remove space after cast"
X-Git-Tag: 1.31.0-rc.0~2844
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=b3f0a59256a821e9f446d2201b401a77ffb93331;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove space after cast"
---

b3f0a59256a821e9f446d2201b401a77ffb93331
diff --combined phpcs.xml
index 1b22200493,7fb7299de4..7eca9ea505
--- a/phpcs.xml
+++ b/phpcs.xml
@@@ -16,6 -16,7 +16,6 @@@
  		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
  		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
  		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
 -		<exclude name="MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords" />
  		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
  		<exclude name="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine" />
  		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeControlStructureBrace.EmptyLines" />
@@@ -48,9 -49,6 +48,6 @@@
  	<rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
  		<severity>0</severity>
  	</rule>
- 	<rule ref="Generic.Formatting.NoSpaceAfterCast.SpaceFound">
- 		<severity>0</severity>
- 	</rule>
  	<exclude-pattern>node_modules/</exclude-pattern>
  	<exclude-pattern>vendor/</exclude-pattern>
  	<exclude-pattern type="relative">^extensions/</exclude-pattern>
diff --combined tests/phpunit/includes/OutputPageTest.php
index c3ed6dd8a6,ad545443cf..52103f97cc
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@@ -293,7 -293,7 +293,7 @@@ class OutputPageTest extends MediaWikiT
  			[
  				[ 'test.quux', ResourceLoaderModule::TYPE_SCRIPTS ],
  				"<script>(window.RLQ=window.RLQ||[]).push(function(){"
 -					. "mw.test.baz({token:123});mw.loader.state({\"test.quux\":\"ready\"});"
 +					. "mw.test.baz({token:123});\nmw.loader.state({\"test.quux\":\"ready\"});"
  					. "});</script>"
  			],
  		];
@@@ -531,11 -531,11 +531,11 @@@
  	 */
  	public function testGetCategories() {
  		$fakeResultWrapper = new FakeResultWrapper( [
- 			(object) [
+ 			(object)[
  				'pp_value' => 1,
  				'page_title' => 'Test'
  			],
- 			(object) [
+ 			(object)[
  				'page_title' => 'Test2'
  			]
  		] );