Merge pull request #773 from wmde/wikibaseCs03

Update the Wikibase CodeSniffer rule set to version 0.3

Author: lucaswerkmeister

phpcs.xml .phpcs.xmlphpcs.xml renamed to .phpcs.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="WikibaseDataModel">
-	<rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase">
-		<exclude name="PSR2.Methods.MethodDeclaration" />
-	</rule>
+<ruleset>
+	<rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase" />
 
 	<rule ref="Generic.Files.LineLength">
 		<properties>

composer.json

@@ -31,7 +31,7 @@
 		"ockcyp/covers-validator": "~0.4.0",
 		"phpmd/phpmd": "~2.3",
 		"phpunit/phpunit": "~4.8",
-		"wikibase/wikibase-codesniffer": "^0.1.0"
+		"wikibase/wikibase-codesniffer": "^0.3.0"
 	},
 	"autoload": {
 		"files" : [

src/Entity/EntityId.php

@@ -43,7 +43,7 @@ public function __construct( $serialization ) {
 		self::assertValidSerialization( $serialization );
 		$this->serialization = self::normalizeIdSerialization( $serialization );
 
-		list ( $this->repositoryName, $this->localPart ) = self::extractRepositoryNameAndLocalPart( $serialization );
+		list( $this->repositoryName, $this->localPart ) = self::extractRepositoryNameAndLocalPart( $serialization );
 	}
 
 	private static function assertValidSerialization( $serialization ) {
@@ -63,7 +63,7 @@ private static function assertValidSerialization( $serialization ) {
 	/**
 	 * @return string
 	 */
-	public abstract function getEntityType();
+	abstract public function getEntityType();
 
 	/**
 	 * @return string

src/Entity/ItemId.php

@@ -83,7 +83,7 @@ public function serialize() {
 	public function unserialize( $serialized ) {
 		$array = json_decode( $serialized );
 		$this->serialization = is_array( $array ) ? $array[1] : $serialized;
-		list ( $this->repositoryName, $this->localPart ) =
+		list( $this->repositoryName, $this->localPart ) =
 			self::extractRepositoryNameAndLocalPart( $this->serialization );
 	}
 

src/Entity/PropertyId.php

@@ -83,7 +83,7 @@ public function serialize() {
 	public function unserialize( $serialized ) {
 		$array = json_decode( $serialized );
 		$this->serialization = is_array( $array ) ? $array[1] : $serialized;
-		list ( $this->repositoryName, $this->localPart ) =
+		list( $this->repositoryName, $this->localPart ) =
 			self::extractRepositoryNameAndLocalPart( $this->serialization );
 	}
 

src/ReferenceList.php

@@ -281,7 +281,7 @@ public function equals( $target ) {
 		}
 
 		return $target instanceof self
-		       && $this->getValueHash() === $target->getValueHash();
+			&& $this->getValueHash() === $target->getValueHash();
 	}
 
 	/**

tests/unit/Entity/ItemTest.php

@@ -448,25 +448,25 @@ public function testSetDescription( $languageCode, $description, $moarText = 'oh
 	public function aliasesProvider() {
 		return [
 			[ [
-				       'en' => [ [ 'spam' ] ]
-			       ] ],
+				'en' => [ [ 'spam' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar', 'baz' ] ]
-			       ] ],
+				'en' => [ [ 'foo', 'bar', 'baz' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar' ], [ 'baz', 'spam' ] ]
-			       ] ],
+				'en' => [ [ 'foo', 'bar' ], [ 'baz', 'spam' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar', 'baz' ] ],
-				       'de' => [ [ 'foobar' ], [ 'baz' ] ],
-			       ] ],
+				'en' => [ [ 'foo', 'bar', 'baz' ] ],
+				'de' => [ [ 'foobar' ], [ 'baz' ] ],
+			] ],
 			// with duplicates
 			[ [
-				       'en' => [ [ 'spam', 'ham', 'ham' ] ]
-			       ] ],
+				'en' => [ [ 'spam', 'ham', 'ham' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar' ], [ 'bar', 'spam' ] ]
-			       ] ],
+				'en' => [ [ 'foo', 'bar' ], [ 'bar', 'spam' ] ],
+			] ],
 		];
 	}
 

tests/unit/Entity/PropertyTest.php

@@ -325,25 +325,25 @@ public function testSetDescription( $languageCode, $description, $moarText = 'oh
 	public function aliasesProvider() {
 		return [
 			[ [
-				       'en' => [ [ 'spam' ] ]
-			       ] ],
+				'en' => [ [ 'spam' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar', 'baz' ] ]
-			       ] ],
+				'en' => [ [ 'foo', 'bar', 'baz' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar' ], [ 'baz', 'spam' ] ]
-			       ] ],
+				'en' => [ [ 'foo', 'bar' ], [ 'baz', 'spam' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar', 'baz' ] ],
-				       'de' => [ [ 'foobar' ], [ 'baz' ] ],
-			       ] ],
+				'en' => [ [ 'foo', 'bar', 'baz' ] ],
+				'de' => [ [ 'foobar' ], [ 'baz' ] ],
+			] ],
 			// with duplicates
 			[ [
-				       'en' => [ [ 'spam', 'ham', 'ham' ] ]
-			       ] ],
+				'en' => [ [ 'spam', 'ham', 'ham' ] ],
+			] ],
 			[ [
-				       'en' => [ [ 'foo', 'bar' ], [ 'bar', 'spam' ] ]
-			       ] ],
+				'en' => [ [ 'foo', 'bar' ], [ 'bar', 'spam' ] ],
+			] ],
 		];
 	}