From: Reedy <reedy@wikimedia.org>
Date: Sat, 26 Sep 2015 16:41:22 +0000 (+0100)
Subject: Re-enable Squiz.WhiteSpace.SemicolonSpacing.Incorrect
X-Git-Tag: 1.31.0-rc.0~9797^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=062af789576c389fa3f77c58d96de8253087a63d;p=lhc%2Fweb%2Fwiklou.git

Re-enable Squiz.WhiteSpace.SemicolonSpacing.Incorrect

Change-Id: Ie86c512fbca07f41b252d95de3ab92da3a050e72
---

diff --git a/phpcs.xml b/phpcs.xml
index d1453e3f9e..9ad543529c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -10,7 +10,6 @@
 		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
 		<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
-		<exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
 	</rule>
 	<file>.</file>
 	<arg name="encoding" value="utf8"/>
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 0368219132..679382b6e3 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -103,7 +103,7 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
 			. '/'
 			. substr( $sha1, 2, 1 )
 			. '/'
-			. $sha1 ;
+			. $sha1;
 
 		$this->assertEquals( file_get_contents( $expectedOriginalFilepath ), $this->text, 'New sha1 file should be exist and have the right contents' );