Merge pull request #195 from wmde/release220

Release 2.2.0

Author: Benestar

RELEASE-NOTES.md

@@ -1,5 +1,9 @@
 # Wikibase DataModel Serialization release notes
 
+## 2.2.0 (2016-03-11)
+
+* Added compatibility with Wikibase DataModel 6.x
+
 ## 2.1.0 (2016-02-18)
 
 * Added `newItemSerializer` and `newPropertySerializer` to `SerializerFactory`

composer.json

@@ -47,7 +47,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.1.x-dev"
+			"dev-master": "2.2.x-dev"
 		}
 	},
 	"scripts": {

mediawiki-extension.json

@@ -6,7 +6,7 @@
 	],
 	"url": "https://github.com/wmde/WikibaseDataModelSerialization",
 	"description": "Serializers and deserializers for the Wikibase DataModel",
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"type": "wikibase",
 	"license-name": "GPL-2.0+",
 	"manifest_version": 1

src/DeserializerFactory.php

@@ -54,7 +54,7 @@ public function __construct(
 	}
 
 	/**
-	 * Returns a Deserializer that can deserialize Entity objects.
+	 * Returns a Deserializer that can deserialize Item and Property objects.
 	 *
 	 * @return DispatchableDeserializer
 	 */

src/SerializerFactory.php

@@ -94,7 +94,7 @@ private function shouldSerializeReferenceSnaksWithHash() {
 	}
 
 	/**
-	 * Returns a Serializer that can serialize Entity objects.
+	 * Returns a Serializer that can serialize Item and Property objects.
 	 *
 	 * @return Serializer
 	 */

tests/integration/EntityDeserializationCompatibilityTest.php

@@ -48,7 +48,7 @@ public function testGivenEntitySerialization_entityIsReturned( $fileName, $seria
 		$this->assertInstanceOf(
 			'Wikibase\DataModel\Entity\EntityDocument',
 			$entity,
-			'Deserialization of ' . $fileName . ' should lead to an Entity instance'
+			'Deserialization of ' . $fileName . ' should lead to an EntityDocument instance'
 		);
 	}