From: Reedy <reedy@wikimedia.org>
Date: Sat, 26 Sep 2015 15:02:57 +0000 (+0100)
Subject: Re-enable PSR2.Methods.MethodDeclaration.StaticBeforeVisibility
X-Git-Tag: 1.31.0-rc.0~9804^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=baa88755377606ee794377b89f17b5de53ca3062;p=lhc%2Fweb%2Fwiklou.git

Re-enable PSR2.Methods.MethodDeclaration.StaticBeforeVisibility

Change-Id: Id3e4bc5d7e4d1b8003f9f6b324e2321b5af1771f
---

diff --git a/phpcs.xml b/phpcs.xml
index f34b274edb..5123c0b98a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,7 +15,6 @@
 		<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"/>
 		<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines"/>
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(