From 8882634112e45466cc6fcebb1be3d788b2afbf78 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sat, 26 Sep 2015 18:04:00 +0100
Subject: [PATCH] Re-enable
 MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect

Change-Id: I1b756909a1080108c5147d46950f826871ef6dc1
---
 includes/HttpFunctions.php                      | 2 +-
 phpcs.xml                                       | 1 -
 tests/phpunit/includes/libs/RunningStatTest.php | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 5d46b5e3d9..ad5aeb3edc 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -897,7 +897,7 @@ class PhpHttpRequest extends MWHttpRequest {
 			) );
 		}
 
-		foreach( $certLocations as $key => $cert ) {
+		foreach ( $certLocations as $key => $cert ) {
 			if ( is_dir( $cert ) ) {
 				$certOptions['capath'] = $cert;
 				break;
diff --git a/phpcs.xml b/phpcs.xml
index 8a28177316..7076f60017 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,6 @@
 		<exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
 		<exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix"/>
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
-		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
 		<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
 	</rule>
 	<file>.</file>
diff --git a/tests/phpunit/includes/libs/RunningStatTest.php b/tests/phpunit/includes/libs/RunningStatTest.php
index edfaf162c7..35a8e4ffac 100644
--- a/tests/phpunit/includes/libs/RunningStatTest.php
+++ b/tests/phpunit/includes/libs/RunningStatTest.php
@@ -23,7 +23,7 @@ class RunningStatTest extends PHPUnit_Framework_TestCase {
 	 */
 	public function testRunningStatAccuracy() {
 		$rstat = new RunningStat();
-		foreach( $this->points as $point ) {
+		foreach ( $this->points as $point ) {
 			$rstat->push( $point );
 		}
 
@@ -51,7 +51,7 @@ class RunningStatTest extends PHPUnit_Framework_TestCase {
 	public function testRunningStatMerge() {
 		$expected = new RunningStat();
 
-		foreach( $this->points as $point ) {
+		foreach ( $this->points as $point ) {
 			$expected->push( $point );
 		}
 
@@ -60,13 +60,13 @@ class RunningStatTest extends PHPUnit_Framework_TestCase {
 
 		// Accumulate the first half into one RunningStat object
 		$first = new RunningStat();
-		foreach( $sets[0] as $point ) {
+		foreach ( $sets[0] as $point ) {
 			$first->push( $point );
 		}
 
 		// Accumulate the second half into another RunningStat object
 		$second = new RunningStat();
-		foreach( $sets[1] as $point ) {
+		foreach ( $sets[1] as $point ) {
 			$second->push( $point );
 		}
 
-- 
2.20.1