Merge pull request #82 from wmde/dm4

Use DataModel 4.0 and DataModelServices 1.0
wmde · Jul 29, 2015 · 224ca20 · 224ca20
2 parents 8800d64 + 63999cc
commit 224ca20
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -106,7 +106,12 @@ Wikibase Internal Serialization has been written by [Jeroen De Dauw]
 
 ## Release notes
 
-### 1.4 (2015-06-12)
+## 1.5.0 (2015-07-29)
+
+* Added compatibility with Wikibase DataModel 4.x
+* Removed compatibility with Wikibase DataModel 3.x
+
+### 1.4.0 (2015-06-12)
 
 * Added compatibility with DataModel 3.x
 * Deprecated `LegacyDeserializerFactory::newClaimDeserializer` in favour of `LegacyDeserializerFactory::newStatementDeserializer`

diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
 	},
 	"require": {
 		"php": ">=5.3.0",
-		"wikibase/data-model": "~3.0",
+		"wikibase/data-model": "~4.0",
+		"wikibase/data-model-services": "~1.0",
 		"wikibase/data-model-serialization": "~1.4",
 		"serialization/serialization": "~3.2"
 	},
@@ -46,7 +47,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.4.x-dev"
+			"dev-master": "1.5.x-dev"
 		}
 	},
 	"scripts": {

diff --git a/mediawiki.php b/mediawiki.php
@@ -4,7 +4,7 @@
 	$GLOBALS['wgExtensionCredits']['wikibase']['WikibaseInternalSerialization'] = array(
 		'path' => __DIR__,
 		'name' => 'Wikibase Internal Serialization',
-		'version' => '1.4',
+		'version' => '1.5',
 		'author' => array(
 			'[https://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]',
 		),

diff --git a/src/DeserializerFactory.php b/src/DeserializerFactory.php
@@ -4,7 +4,7 @@
 
 use Deserializers\Deserializer;
 use Wikibase\DataModel\DeserializerFactory as CurrentDeserializerFactory;
-use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Services\EntityId\EntityIdParser;
 use Wikibase\InternalSerialization\Deserializers\EntityDeserializer;
 use Wikibase\InternalSerialization\Deserializers\StatementDeserializer;
 

diff --git a/src/Deserializers/LegacyEntityIdDeserializer.php b/src/Deserializers/LegacyEntityIdDeserializer.php
@@ -6,9 +6,9 @@
 use Deserializers\Exceptions\DeserializationException;
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\LegacyIdInterpreter;
+use Wikibase\DataModel\Services\EntityId\EntityIdParser;
+use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
 
 /**
  * @licence GNU GPL v2+

diff --git a/src/LegacyDeserializerFactory.php b/src/LegacyDeserializerFactory.php
@@ -3,7 +3,7 @@
 namespace Wikibase\InternalSerialization;
 
 use Deserializers\Deserializer;
-use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Services\EntityId\EntityIdParser;
 use Wikibase\InternalSerialization\Deserializers\LegacyEntityDeserializer;
 use Wikibase\InternalSerialization\Deserializers\LegacyEntityIdDeserializer;
 use Wikibase\InternalSerialization\Deserializers\LegacyFingerprintDeserializer;

diff --git a/tests/integration/TestFactoryBuilder.php b/tests/integration/TestFactoryBuilder.php
@@ -6,7 +6,7 @@
 use DataValues\Serializers\DataValueSerializer;
 use DataValues\StringValue;
 use PHPUnit_Framework_TestCase;
-use Wikibase\DataModel\Entity\BasicEntityIdParser;
+use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
 use Wikibase\InternalSerialization\DeserializerFactory;
 use Wikibase\InternalSerialization\LegacyDeserializerFactory;
 use Wikibase\InternalSerialization\SerializerFactory;

diff --git a/tests/unit/Deserializers/LegacyEntityIdDeserializerTest.php b/tests/unit/Deserializers/LegacyEntityIdDeserializerTest.php
@@ -3,10 +3,10 @@
 namespace Tests\Wikibase\InternalSerialization\Deserializers;
 
 use Deserializers\Deserializer;
-use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
 use Wikibase\InternalSerialization\Deserializers\LegacyEntityIdDeserializer;
 
 /**

diff --git a/tests/unit/Deserializers/LegacyItemDeserializerTest.php b/tests/unit/Deserializers/LegacyItemDeserializerTest.php
@@ -3,8 +3,8 @@
 namespace Tests\Wikibase\InternalSerialization\Deserializers;
 
 use Deserializers\Deserializer;
-use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\InternalSerialization\Deserializers\LegacyStatementDeserializer;

diff --git a/tests/unit/Deserializers/LegacyPropertyDeserializerTest.php b/tests/unit/Deserializers/LegacyPropertyDeserializerTest.php
@@ -3,8 +3,8 @@
 namespace Tests\Wikibase\InternalSerialization\Deserializers;
 
 use Deserializers\Deserializer;
-use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
 use Wikibase\InternalSerialization\Deserializers\LegacyEntityIdDeserializer;
 use Wikibase\InternalSerialization\Deserializers\LegacyFingerprintDeserializer;
 use Wikibase\InternalSerialization\Deserializers\LegacyPropertyDeserializer;