Merge pull request #228 from wmde/phpcs

Add PHPCS config

Author: Ladsgroup

composer.json

@@ -36,7 +36,8 @@
 		"data-values/geo": "~2.0|~1.0|~0.1",
 		"data-values/number": ">=0.1 <0.9",
 		"data-values/time": "~0.2",
-		"phpunit/phpunit": "~4.8"
+		"phpunit/phpunit": "~4.8",
+		"wikibase/wikibase-codesniffer": "^0.1.0"
 	},
 	"suggest": {
 		"data-values/geo": "Needed for deserialization of geographical values",
@@ -62,7 +63,15 @@
 			"vendor/bin/phpunit"
 		],
 		"ci": [
-			"@test"
+			"@test",
+			"@cs"
+		],
+		"cs": [
+			"@phpcs"
+		],
+		"phpcs": [
+			"phpcs -ps"
 		]
+
 	}
 }

phpcs.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="WikibaseDataModelServices">
+	<rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase" />
+
+	<rule ref="Generic.Files.LineLength">
+		<properties>
+			<property name="lineLimit" value="120" />
+		</properties>
+	</rule>
+
+	<rule ref="Generic.Arrays.DisallowLongArraySyntax.Found">
+		<exclude name="Generic.Arrays.DisallowLongArraySyntax.Found" />
+	</rule>
+
+	<file>.</file>
+</ruleset>

src/Deserializers/SnakDeserializer.php

@@ -120,8 +120,7 @@ private function newValueSnak( array $serialization ) {
 	private function deserializeDataValue( $serialization ) {
 		try {
 			return $this->dataValueDeserializer->deserialize( $serialization );
-		}
-		catch ( DeserializationException $ex ) {
+		} catch ( DeserializationException $ex ) {
 			$error = isset( $serialization['error'] ) ? $serialization['error'] : $ex->getMessage();
 			return new UnDeserializableValue( $serialization['value'], $serialization['type'], $error );
 		}

tests/integration/SnakSerializationRoundtripTest.php

@@ -40,7 +40,7 @@ private function getSnakDeserializer( array $dataValueClasses = array() ) {
 	 */
 	public function testSnakSerializationRoundtrips( Snak $snak ) {
 		$serializer = $this->getSnakSerializer();
-		$deserializer = $this->getSnakDeserializer( array (
+		$deserializer = $this->getSnakDeserializer( array(
 			'string' => StringValue::class,
 		) );
 
@@ -66,7 +66,7 @@ public function snakProvider() {
 
 	public function testUnDeserializableValueToStringValueRoundtrip() {
 		$serializer = $this->getSnakSerializer();
-		$deserializer = $this->getSnakDeserializer( array (
+		$deserializer = $this->getSnakDeserializer( array(
 			'string' => StringValue::class,
 		) );
 

tests/unit/Deserializers/DispatchableDeserializerTest.php

@@ -16,7 +16,7 @@ abstract class DispatchableDeserializerTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @return DispatchableDeserializer
 	 */
-	protected abstract function buildDeserializer();
+	abstract protected function buildDeserializer();
 
 	public function testImplementsDispatchableDeserializerInterface() {
 		$this->assertInstanceOf( DispatchableDeserializer::class, $this->buildDeserializer() );
@@ -32,7 +32,7 @@ public function testIsDeserializerForReturnsTrue( $deserializable ) {
 	/**
 	 * @return array[] things that are deserialized by the deserializer
 	 */
-	public abstract function deserializableProvider();
+	abstract public function deserializableProvider();
 
 	/**
 	 * @dataProvider nonDeserializableProvider
@@ -54,7 +54,7 @@ public function testDeserializeThrowsDeserializationException( $nonDeserializabl
 	/**
 	 * @return array[] things that aren't deserialized by the deserializer
 	 */
-	public abstract function nonDeserializableProvider();
+	abstract public function nonDeserializableProvider();
 
 	/**
 	 * @dataProvider deserializationProvider
@@ -66,6 +66,6 @@ public function testDeserialization( $object, $serialization ) {
 	/**
 	 * @return array[] an array of array( object deserialized, serialization )
 	 */
-	public abstract function deserializationProvider();
+	abstract public function deserializationProvider();
 
 }

tests/unit/Deserializers/SnakDeserializerTest.php

@@ -31,7 +31,7 @@ protected function buildDeserializer() {
 			->will( $this->returnValue( new PropertyId( 'P42' ) ) );
 
 		return new SnakDeserializer(
-			new DataValueDeserializer( array (
+			new DataValueDeserializer( array(
 				'string' => StringValue::class,
 			) ),
 			$entityIdDeserializerMock

tests/unit/Deserializers/StatementDeserializerTest.php

@@ -310,7 +310,11 @@ public function testQualifiersOrderDeserialization() {
 			) ) ) );
 
 		$referencesDeserializerMock = $this->getMock( Deserializer::class );
-		$statementDeserializer = new StatementDeserializer( $snakDeserializerMock, $snaksDeserializerMock, $referencesDeserializerMock );
+		$statementDeserializer = new StatementDeserializer(
+			$snakDeserializerMock,
+			$snaksDeserializerMock,
+			$referencesDeserializerMock
+		);
 
 		$statement = new Statement( new PropertyNoValueSnak( 42 ) );
 		$statement->setQualifiers( new SnakList( array(

tests/unit/SerializerFactoryTest.php

@@ -120,7 +120,7 @@ public function testFactoryCreateWithUnexpectedValue() {
 	public function testNewSnakListSerializerWithUseObjectsForMaps() {
 		$factory = new SerializerFactory( new DataValueSerializer(), SerializerFactory::OPTION_OBJECTS_FOR_MAPS );
 		$serializer = $factory->newSnakListSerializer();
-		$this->assertAttributeSame( true, 'useObjectsForMaps' , $serializer );
+		$this->assertAttributeSame( true, 'useObjectsForMaps', $serializer );
 	}
 
 	public function testNewTypedSnakSerializer() {

tests/unit/Serializers/DispatchableSerializerTest.php

@@ -16,7 +16,7 @@ abstract class DispatchableSerializerTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @return DispatchableSerializer
 	 */
-	protected abstract function buildSerializer();
+	abstract protected function buildSerializer();
 
 	public function testImplementsDispatchableSerializerInterface() {
 		$this->assertInstanceOf( DispatchableSerializer::class, $this->buildSerializer() );
@@ -32,7 +32,7 @@ public function testIsSerializerForReturnsTrue( $serializable ) {
 	/**
 	 * @return array[] things that are serialized by the serializer
 	 */
-	public abstract function serializableProvider();
+	abstract public function serializableProvider();
 
 	/**
 	 * @dataProvider nonSerializableProvider
@@ -52,7 +52,7 @@ public function testSerializeThrowsUnsupportedObjectException( $nonSerializable
 	/**
 	 * @return array[] things that aren't serialized by the serializer
 	 */
-	public abstract function nonSerializableProvider();
+	abstract public function nonSerializableProvider();
 
 	/**
 	 * @dataProvider serializationProvider
@@ -64,6 +64,6 @@ public function testSerialization( $serialization, $object ) {
 	/**
 	 * @return array[] an array of array( serialization, object to serialize)
 	 */
-	public abstract function serializationProvider();
+	abstract public function serializationProvider();
 
 }

tests/unit/Serializers/StatementSerializerTest.php

@@ -215,7 +215,11 @@ public function testQualifiersOrderSerialization() {
 			->will( $this->returnValue( array() ) );
 
 		$referencesSerializerMock = $this->getMock( Serializer::class );
-		$statementSerializer = new StatementSerializer( $snakSerializerMock, $snaksSerializerMock, $referencesSerializerMock );
+		$statementSerializer = new StatementSerializer(
+			$snakSerializerMock,
+			$snaksSerializerMock,
+			$referencesSerializerMock
+		);
 
 		$statement = new Statement( new PropertyNoValueSnak( 42 ) );
 		$statement->setQualifiers( new SnakList( array(