Merge pull request #243 from wmde/release270

Make compatible with serialization/serialization 4.x

Author: mariushoch

RELEASE-NOTES.md

@@ -4,6 +4,7 @@
 
 * Improved documentation of `SerializerFactory::newEntitySerializer` as well as
   `DeserializerFactory::newEntityDeserializer`.
+* Added compatibility with Serialization 4.x
 
 ## 2.6.0 (2017-09-18)
 

composer.json

@@ -29,7 +29,7 @@
 	"require": {
 		"php": ">=5.5.9",
 		"wikibase/data-model": "~7.0|~6.0|~5.0|~4.2",
-		"serialization/serialization": "~3.1",
+		"serialization/serialization": "~4.0|~3.1",
 		"data-values/serialization": "~1.0"
 	},
 	"require-dev": {
@@ -51,7 +51,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.6.x-dev"
+			"dev-master": "2.7.x-dev"
 		}
 	},
 	"scripts": {

tests/integration/SnakSerializationRoundtripTest.php

@@ -87,8 +87,15 @@ public function testStringValueToUnDeserializableValueRoundtrip() {
 		$serialization = $serializer->serialize( $goodSnak );
 		$newSnak = $deserializer->deserialize( $serialization );
 
-		$badSnak = new PropertyValueSnak( 42, new UnDeserializableValue( 'Yay', 'string', '' ) );
-		$this->assertEquals( $badSnak, $newSnak );
+		/** @var PropertyValueSnak $newSnak */
+		$this->assertInstanceOf( PropertyValueSnak::class, $newSnak );
+		$this->assertSame( 'P42', $newSnak->getPropertyId()->getSerialization() );
+
+		/** @var UnDeserializableValue $newValue */
+		$newValue = $newSnak->getDataValue();
+		$this->assertInstanceOf( UnDeserializableValue::class, $newValue );
+		$this->assertSame( 'Yay', $newValue->getValue() );
+		$this->assertSame( 'string', $newValue->getTargetType() );
 	}
 
 }