Skip to content

Commit 1168ce0

Browse files
committed
Add PHPCS config
1 parent 56da4a3 commit 1168ce0

11 files changed

Lines changed: 51 additions & 19 deletions

composer.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"data-values/geo": "~2.0|~1.0|~0.1",
3737
"data-values/number": ">=0.1 <0.9",
3838
"data-values/time": "~0.2",
39-
"phpunit/phpunit": "~4.8"
39+
"phpunit/phpunit": "~4.8",
40+
"wikibase/wikibase-codesniffer": "^0.1.0"
4041
},
4142
"suggest": {
4243
"data-values/geo": "Needed for deserialization of geographical values",
@@ -62,7 +63,15 @@
6263
"vendor/bin/phpunit"
6364
],
6465
"ci": [
65-
"@test"
66+
"@test",
67+
"@cs"
68+
],
69+
"cs": [
70+
"@phpcs"
71+
],
72+
"phpcs": [
73+
"phpcs -ps"
6674
]
75+
6776
}
6877
}

phpcs.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<ruleset name="WikibaseDataModelServices">
3+
<rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase" />
4+
5+
<rule ref="Generic.Files.LineLength">
6+
<properties>
7+
<property name="lineLimit" value="120" />
8+
</properties>
9+
</rule>
10+
11+
<rule ref="Generic.Arrays.DisallowLongArraySyntax.Found">
12+
<exclude name="Generic.Arrays.DisallowLongArraySyntax.Found" />
13+
</rule>
14+
15+
<file>.</file>
16+
</ruleset>

src/Deserializers/SnakDeserializer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ private function newValueSnak( array $serialization ) {
120120
private function deserializeDataValue( $serialization ) {
121121
try {
122122
return $this->dataValueDeserializer->deserialize( $serialization );
123-
}
124-
catch ( DeserializationException $ex ) {
123+
} catch ( DeserializationException $ex ) {
125124
$error = isset( $serialization['error'] ) ? $serialization['error'] : $ex->getMessage();
126125
return new UnDeserializableValue( $serialization['value'], $serialization['type'], $error );
127126
}

tests/integration/SnakSerializationRoundtripTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private function getSnakDeserializer( array $dataValueClasses = array() ) {
4040
*/
4141
public function testSnakSerializationRoundtrips( Snak $snak ) {
4242
$serializer = $this->getSnakSerializer();
43-
$deserializer = $this->getSnakDeserializer( array (
43+
$deserializer = $this->getSnakDeserializer( array(
4444
'string' => StringValue::class,
4545
) );
4646

@@ -66,7 +66,7 @@ public function snakProvider() {
6666

6767
public function testUnDeserializableValueToStringValueRoundtrip() {
6868
$serializer = $this->getSnakSerializer();
69-
$deserializer = $this->getSnakDeserializer( array (
69+
$deserializer = $this->getSnakDeserializer( array(
7070
'string' => StringValue::class,
7171
) );
7272

tests/unit/Deserializers/DispatchableDeserializerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class DispatchableDeserializerTest extends PHPUnit_Framework_TestCase {
1616
/**
1717
* @return DispatchableDeserializer
1818
*/
19-
protected abstract function buildDeserializer();
19+
abstract protected function buildDeserializer();
2020

2121
public function testImplementsDispatchableDeserializerInterface() {
2222
$this->assertInstanceOf( DispatchableDeserializer::class, $this->buildDeserializer() );
@@ -32,7 +32,7 @@ public function testIsDeserializerForReturnsTrue( $deserializable ) {
3232
/**
3333
* @return array[] things that are deserialized by the deserializer
3434
*/
35-
public abstract function deserializableProvider();
35+
abstract public function deserializableProvider();
3636

3737
/**
3838
* @dataProvider nonDeserializableProvider
@@ -54,7 +54,7 @@ public function testDeserializeThrowsDeserializationException( $nonDeserializabl
5454
/**
5555
* @return array[] things that aren't deserialized by the deserializer
5656
*/
57-
public abstract function nonDeserializableProvider();
57+
abstract public function nonDeserializableProvider();
5858

5959
/**
6060
* @dataProvider deserializationProvider
@@ -66,6 +66,6 @@ public function testDeserialization( $object, $serialization ) {
6666
/**
6767
* @return array[] an array of array( object deserialized, serialization )
6868
*/
69-
public abstract function deserializationProvider();
69+
abstract public function deserializationProvider();
7070

7171
}

tests/unit/Deserializers/SnakDeserializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function buildDeserializer() {
3131
->will( $this->returnValue( new PropertyId( 'P42' ) ) );
3232

3333
return new SnakDeserializer(
34-
new DataValueDeserializer( array (
34+
new DataValueDeserializer( array(
3535
'string' => StringValue::class,
3636
) ),
3737
$entityIdDeserializerMock

tests/unit/Deserializers/StatementDeserializerTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,11 @@ public function testQualifiersOrderDeserialization() {
310310
) ) ) );
311311

312312
$referencesDeserializerMock = $this->getMock( Deserializer::class );
313-
$statementDeserializer = new StatementDeserializer( $snakDeserializerMock, $snaksDeserializerMock, $referencesDeserializerMock );
313+
$statementDeserializer = new StatementDeserializer(
314+
$snakDeserializerMock,
315+
$snaksDeserializerMock,
316+
$referencesDeserializerMock
317+
);
314318

315319
$statement = new Statement( new PropertyNoValueSnak( 42 ) );
316320
$statement->setQualifiers( new SnakList( array(

tests/unit/SerializerFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function testFactoryCreateWithUnexpectedValue() {
120120
public function testNewSnakListSerializerWithUseObjectsForMaps() {
121121
$factory = new SerializerFactory( new DataValueSerializer(), SerializerFactory::OPTION_OBJECTS_FOR_MAPS );
122122
$serializer = $factory->newSnakListSerializer();
123-
$this->assertAttributeSame( true, 'useObjectsForMaps' , $serializer );
123+
$this->assertAttributeSame( true, 'useObjectsForMaps', $serializer );
124124
}
125125

126126
public function testNewTypedSnakSerializer() {

tests/unit/Serializers/DispatchableSerializerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class DispatchableSerializerTest extends PHPUnit_Framework_TestCase {
1616
/**
1717
* @return DispatchableSerializer
1818
*/
19-
protected abstract function buildSerializer();
19+
abstract protected function buildSerializer();
2020

2121
public function testImplementsDispatchableSerializerInterface() {
2222
$this->assertInstanceOf( DispatchableSerializer::class, $this->buildSerializer() );
@@ -32,7 +32,7 @@ public function testIsSerializerForReturnsTrue( $serializable ) {
3232
/**
3333
* @return array[] things that are serialized by the serializer
3434
*/
35-
public abstract function serializableProvider();
35+
abstract public function serializableProvider();
3636

3737
/**
3838
* @dataProvider nonSerializableProvider
@@ -52,7 +52,7 @@ public function testSerializeThrowsUnsupportedObjectException( $nonSerializable
5252
/**
5353
* @return array[] things that aren't serialized by the serializer
5454
*/
55-
public abstract function nonSerializableProvider();
55+
abstract public function nonSerializableProvider();
5656

5757
/**
5858
* @dataProvider serializationProvider
@@ -64,6 +64,6 @@ public function testSerialization( $serialization, $object ) {
6464
/**
6565
* @return array[] an array of array( serialization, object to serialize)
6666
*/
67-
public abstract function serializationProvider();
67+
abstract public function serializationProvider();
6868

6969
}

tests/unit/Serializers/StatementSerializerTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,11 @@ public function testQualifiersOrderSerialization() {
215215
->will( $this->returnValue( array() ) );
216216

217217
$referencesSerializerMock = $this->getMock( Serializer::class );
218-
$statementSerializer = new StatementSerializer( $snakSerializerMock, $snaksSerializerMock, $referencesSerializerMock );
218+
$statementSerializer = new StatementSerializer(
219+
$snakSerializerMock,
220+
$snaksSerializerMock,
221+
$referencesSerializerMock
222+
);
219223

220224
$statement = new Statement( new PropertyNoValueSnak( 42 ) );
221225
$statement->setQualifiers( new SnakList( array(

0 commit comments

Comments
 (0)