Merge "Re-enable Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines"

diff --git a/phpcs.xml b/phpcs.xml
index 2f99807..69e988b 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,7 +15,6 @@
                <exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
                <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 f0d905e..fbb3982 100644 (file)
--- 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() {
        }
 }