Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed dependence on DataModel Services #83

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -106,6 +106,10 @@ Wikibase Internal Serialization has been written by [Jeroen De Dauw]

## Release notes

## 1.6.0 (2015-08-26)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Three ### please.


* Dropped dependence on Wikibase DataModel Services

## 1.5.0 (2015-07-29)

* Added compatibility with Wikibase DataModel 4.x
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Expand Up @@ -24,8 +24,7 @@
},
"require": {
"php": ">=5.3.0",
"wikibase/data-model": "~4.0",
"wikibase/data-model-services": "~1.0",
"wikibase/data-model": "~4.2",
"wikibase/data-model-serialization": "~1.4",
"serialization/serialization": "~3.2"
},
Expand All @@ -47,7 +46,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.5.x-dev"
"dev-master": "1.6.x-dev"
}
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion mediawiki.php
Expand Up @@ -4,7 +4,7 @@
$GLOBALS['wgExtensionCredits']['wikibase']['WikibaseInternalSerialization'] = array(
'path' => __DIR__,
'name' => 'Wikibase Internal Serialization',
'version' => '1.5',
'version' => '1.6',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]',
),
Expand Down
2 changes: 1 addition & 1 deletion src/DeserializerFactory.php
Expand Up @@ -4,7 +4,7 @@

use Deserializers\Deserializer;
use Wikibase\DataModel\DeserializerFactory as CurrentDeserializerFactory;
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\InternalSerialization\Deserializers\EntityDeserializer;
use Wikibase\InternalSerialization\Deserializers\StatementDeserializer;

Expand Down
4 changes: 2 additions & 2 deletions src/Deserializers/LegacyEntityIdDeserializer.php
Expand Up @@ -7,8 +7,8 @@
use InvalidArgumentException;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\LegacyIdInterpreter;
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;

/**
* @licence GNU GPL v2+
Expand Down
2 changes: 1 addition & 1 deletion src/LegacyDeserializerFactory.php
Expand Up @@ -3,7 +3,7 @@
namespace Wikibase\InternalSerialization;

use Deserializers\Deserializer;
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\InternalSerialization\Deserializers\LegacyEntityDeserializer;
use Wikibase\InternalSerialization\Deserializers\LegacyEntityIdDeserializer;
use Wikibase\InternalSerialization\Deserializers\LegacyFingerprintDeserializer;
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/TestFactoryBuilder.php
Expand Up @@ -6,7 +6,7 @@
use DataValues\Serializers\DataValueSerializer;
use DataValues\StringValue;
use PHPUnit_Framework_TestCase;
use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\InternalSerialization\DeserializerFactory;
use Wikibase\InternalSerialization\LegacyDeserializerFactory;
use Wikibase\InternalSerialization\SerializerFactory;
Expand Down
Expand Up @@ -6,7 +6,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\InternalSerialization\Deserializers\LegacyEntityIdDeserializer;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Deserializers/LegacyItemDeserializerTest.php
Expand Up @@ -4,7 +4,7 @@

use Deserializers\Deserializer;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\InternalSerialization\Deserializers\LegacyStatementDeserializer;
Expand Down
Expand Up @@ -4,7 +4,7 @@

use Deserializers\Deserializer;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\InternalSerialization\Deserializers\LegacyEntityIdDeserializer;
use Wikibase\InternalSerialization\Deserializers\LegacyFingerprintDeserializer;
use Wikibase\InternalSerialization\Deserializers\LegacyPropertyDeserializer;
Expand Down