From 3a6fc5e96c02650dc08cd414f8c9ad0de48f89bc Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sat, 26 Sep 2015 16:53:01 +0100
Subject: [PATCH] Re-enable Squiz.WhiteSpace.ScopeClosingBrace.Indent

Change-Id: I743c4ce019321d631c0a11ee2112fe9aa8ba4c5d
---
 phpcs.xml                                            |  1 -
 tests/phpunit/includes/content/CssContentTest.php    |  2 +-
 .../includes/filerepo/MigrateFileRepoLayoutTest.php  | 12 ++++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index 03b2af2443..9d05cc9a60 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,7 +11,6 @@
 		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
 		<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
-		<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/>
 		<exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
 	</rule>
 	<file>.</file>
diff --git a/tests/phpunit/includes/content/CssContentTest.php b/tests/phpunit/includes/content/CssContentTest.php
index c4d87c24f7..59bfb03cc3 100644
--- a/tests/phpunit/includes/content/CssContentTest.php
+++ b/tests/phpunit/includes/content/CssContentTest.php
@@ -111,7 +111,7 @@ class CssContentTest extends JavaScriptContentTest {
 		);
 	}
 
-		public static function dataEquals() {
+	public static function dataEquals() {
 		return array(
 			array( new CssContent( 'hallo' ), null, false ),
 			array( new CssContent( 'hallo' ), new CssContent( 'hallo' ), true ),
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 551d3a7661..0368219132 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -64,12 +64,12 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
 
 	protected function deleteFilesRecursively( $directory ) {
 		foreach ( glob( $directory . '/*' ) as $file ) {
-	    	if ( is_dir( $file ) ) {
-	    		$this->deleteFilesRecursively( $file );
-	    	} else {
-	    		unlink( $file );
-	    	}
-	  	}
+			if ( is_dir( $file ) ) {
+				$this->deleteFilesRecursively( $file );
+			} else {
+				unlink( $file );
+			}
+		}
 
 	  	rmdir( $directory );
 	}
-- 
2.20.1