From: Reedy <reedy@wikimedia.org>
Date: Sat, 26 Sep 2015 15:00:56 +0000 (+0100)
Subject: Re-enable Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines
X-Git-Tag: 1.31.0-rc.0~9803^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=0b3e3b76228cbefdc622aee74e8b72e997bcf6bb;p=lhc%2Fweb%2Fwiklou.git

Re-enable Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines

Add extra whitespace line too

Change-Id: Ia33c9b63c36f121e5e9283c6d4a2b024a1821a43
---

diff --git a/phpcs.xml b/phpcs.xml
index f34b274edb..08ea1833a5 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -18,7 +18,6 @@
 		<exclude name="PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"/>
 		<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/>
 		<exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
-		<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines"/>
 	</rule>
 	<file>.</file>
 	<arg name="encoding" value="utf8"/>
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index f0d905e599..fbb398277b 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -323,8 +323,6 @@ class OutputPageTest extends MediaWikiTestCase {
 					array( 'Cookie', array( 'string-contains=phpsessid' ) ),
 					array( 'Cookie', array( 'string-contains=phpsessid' ) ),
 					array( 'Accept-Language', array( 'string-contains=en', 'string-contains=en' ) ),
-
-
 				),
 				'Vary: Cookie, Accept-Language',
 				'X-Vary-Options: Cookie;string-contains=phpsessid,Accept-Language;string-contains=en',
@@ -359,6 +357,7 @@ class NullMessageBlobStore extends MessageBlobStore {
 
 	public function updateMessage( $key ) {
 	}
+
 	public function clear() {
 	}
 }