From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 26 Sep 2015 15:20:18 +0000 (+0000)
Subject: Merge "Re-enable Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines"
X-Git-Tag: 1.31.0-rc.0~9803
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=dd3c4f3a6f5ed08d561dd1a23fea1f9bc80d1af9;hp=0b3e3b76228cbefdc622aee74e8b72e997bcf6bb;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/deferred/DataUpdate.php b/includes/deferred/DataUpdate.php
index f5d6845deb..9cbb62f273 100644
--- a/includes/deferred/DataUpdate.php
+++ b/includes/deferred/DataUpdate.php
@@ -152,4 +152,5 @@ interface EnqueueableDataUpdate {
 	 * Push the update into the job queue
 	 */
 	public function enqueueUpdate();
-}
\ No newline at end of file
+}
+
diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksDeletionUpdate.php
index bbdfcf1705..7351e4cedc 100644
--- a/includes/deferred/LinksDeletionUpdate.php
+++ b/includes/deferred/LinksDeletionUpdate.php
@@ -102,4 +102,5 @@ class LinksDeletionUpdate extends SqlDataUpdate {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 72e11dbb7e..d98ca797ea 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -538,9 +538,11 @@ abstract class Installer {
 		global $wgAutoloadClasses;
 		$wgAutoloadClasses = array();
 
+		// @codingStandardsIgnoreStart
 		// LocalSettings.php should not call functions, except wfLoadSkin/wfLoadExtensions
 		// Define the required globals here, to ensure, the functions can do it work correctly.
 		global $wgExtensionDirectory, $wgStyleDirectory;
+		// @codingStandardsIgnoreEnd
 
 		MediaWiki\suppressWarnings();
 		$_lsExists = file_exists( "$IP/LocalSettings.php" );
diff --git a/languages/messages/MessagesDty.php b/languages/messages/MessagesDty.php
index f90746c91c..937b1bc507 100644
--- a/languages/messages/MessagesDty.php
+++ b/languages/messages/MessagesDty.php
@@ -8,4 +8,5 @@
  *
  */
 
-$fallback = 'ne';
\ No newline at end of file
+$fallback = 'ne';
+
diff --git a/phpcs.xml b/phpcs.xml
index 08ea1833a5..69e988bf3d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -9,13 +9,10 @@
 		<exclude name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis"/>
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
 		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
-		<exclude name="MediaWiki.VariableAnalysis.UnusedGlobalVariables"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
 		<exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
 		<exclude name="PSR2.Methods.MethodDeclaration.AbstractAfterVisibility"/>
-		<exclude name="Generic.Files.EndFileNewline.NotFound"/>
 		<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
-		<exclude name="PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"/>
 		<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/>
 		<exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
 	</rule>
diff --git a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
index a618889c09..adcbe74c4b 100644
--- a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
@@ -145,4 +145,5 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
 			)
 		);
 	}
-}
\ No newline at end of file
+}
+
diff --git a/tests/phpunit/includes/utils/BatchRowUpdateTest.php b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
index a2b35f39de..4684658a9d 100644
--- a/tests/phpunit/includes/utils/BatchRowUpdateTest.php
+++ b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
@@ -23,7 +23,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase {
 		$writer->write( $updates );
 	}
 
-	static protected function mockUpdate( array $changes ) {
+	protected static function mockUpdate( array $changes ) {
 		static $i = 0;
 		return array(
 			'primaryKey' => array( 'event_id' => $i++ ),
@@ -53,7 +53,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase {
 		$this->assertEquals( count( $response ) - 1, $pos );
 	}
 
-	static public function provider_readerGetPrimaryKey() {
+	public static function provider_readerGetPrimaryKey() {
 		$row = array(
 			'id_field' => 42,
 			'some_col' => 'dvorak',
@@ -84,7 +84,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase {
 		$this->assertEquals( $expected, $reader->extractPrimaryKeys( (object) $row ), $message );
 	}
 
-	static public function provider_readerSetFetchColumns() {
+	public static function provider_readerSetFetchColumns() {
 		return array(
 
 			array(
@@ -136,7 +136,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase {
 		$reader->rewind();
 	}
 
-	static public function provider_readerSelectConditions() {
+	public static function provider_readerSelectConditions() {
 		return array(
 
 			array(