Skip to content

Commit 022c336

Browse files
thiemowmdemanicki
authored andcommitted
Release 2.6.0 (#237)
1 parent 500dd7f commit 022c336

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

RELEASE-NOTES.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
# Wikibase DataModel Serialization release notes
22

3+
## 2.6.0 (2017-09-18)
4+
5+
* Added compatibility with DataValues Number 0.9
6+
37
## 2.5.0 (2017-08-30)
48

59
* Removed MediaWiki integration files
610
* Added compatibility with DataValues Geo 2.x
711
* Deprecated `SerializerFactory` options
812
`OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH`,
913
`OPTION_SERIALIZE_QUALIFIER_SNAKS_WITHOUT_HASH` and
10-
`OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH`,
11-
and added `OPTION_SERIALIZE_SNAKS_WITHOUT_HASH` instead
14+
`OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH`.
15+
* Added `SerializerFactory::OPTION_SERIALIZE_SNAKS_WITHOUT_HASH`.
1216

1317
## 2.4.0 (2017-03-16)
1418

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
"extra": {
5353
"branch-alias": {
54-
"dev-master": "2.5.x-dev"
54+
"dev-master": "2.6.x-dev"
5555
}
5656
},
5757
"scripts": {

phpcs.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<ruleset name="WikibaseDataModelServices">
3-
<rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase" />
3+
<rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase" />
44

55
<rule ref="Generic.Files.LineLength">
66
<properties>
7-
<property name="lineLimit" value="120" />
7+
<property name="lineLimit" value="108" />
88
</properties>
99
</rule>
1010

tests/unit/Deserializers/StatementDeserializerTest.php

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
class StatementDeserializerTest extends DispatchableDeserializerTest {
2222

2323
protected function buildDeserializer() {
24-
$snakDeserializerMock = $this->getMock( Deserializer::class );
25-
$snakDeserializerMock->expects( $this->any() )
24+
$snakDeserializer = $this->getMock( Deserializer::class );
25+
$snakDeserializer->expects( $this->any() )
2626
->method( 'deserialize' )
2727
->with( $this->equalTo( [
2828
'snaktype' => 'novalue',
2929
'property' => 'P42'
3030
] ) )
3131
->will( $this->returnValue( new PropertyNoValueSnak( 42 ) ) );
3232

33-
$snaksDeserializerMock = $this->getMock( Deserializer::class );
34-
$snaksDeserializerMock->expects( $this->any() )
33+
$snakListDeserializer = $this->getMock( Deserializer::class );
34+
$snakListDeserializer->expects( $this->any() )
3535
->method( 'deserialize' )
3636
->with( $this->equalTo( [
3737
'P42' => [
@@ -45,13 +45,17 @@ protected function buildDeserializer() {
4545
new PropertyNoValueSnak( 42 )
4646
] ) ) );
4747

48-
$referencesDeserializerMock = $this->getMock( Deserializer::class );
49-
$referencesDeserializerMock->expects( $this->any() )
48+
$referenceListDeserializer = $this->getMock( Deserializer::class );
49+
$referenceListDeserializer->expects( $this->any() )
5050
->method( 'deserialize' )
5151
->with( $this->equalTo( [] ) )
5252
->will( $this->returnValue( new ReferenceList() ) );
5353

54-
return new StatementDeserializer( $snakDeserializerMock, $snaksDeserializerMock, $referencesDeserializerMock );
54+
return new StatementDeserializer(
55+
$snakDeserializer,
56+
$snakListDeserializer,
57+
$referenceListDeserializer
58+
);
5559
}
5660

5761
public function deserializableProvider() {
@@ -353,7 +357,10 @@ public function testQualifiersOrderDeserialization() {
353357
'type' => 'claim'
354358
];
355359

356-
$this->assertEquals( $statement->getHash(), $statementDeserializer->deserialize( $serialization )->getHash() );
360+
$this->assertSame(
361+
$statement->getHash(),
362+
$statementDeserializer->deserialize( $serialization )->getHash()
363+
);
357364
}
358365

359366
public function testQualifiersOrderDeserializationWithTypeError() {

0 commit comments

Comments
 (0)