Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227427
Change subject: Move Lib LegacySerializers to Repo
......................................................................
Move Lib LegacySerializers to Repo
Their only use is in REPO and AFAIK
we need to keep these! :)
Change-Id: I5f7a09b8a2b55c31885b2b873793a32fd8e6ba30
---
M docs/options.wiki
M repo/config/Wikibase.default.php
M repo/includes/WikibaseRepo.php
R repo/includes/serializers/LegacyInternalClaimSerializer.php
R repo/includes/serializers/LegacyInternalEntitySerializer.php
M repo/tests/phpunit/includes/DefaultRepoSettingsTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/content/EntityHandlerTest.php
8 files changed, 16 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/27/227427/1
diff --git a/docs/options.wiki b/docs/options.wiki
index 740bd2a..715f27a 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -57,7 +57,7 @@
:;length: the maximum length of the string, in characters.
:Default: <code>array( 'length' => 250 )</code>
;useRedirectTargetColumn: Whether to use the epp_redirect_target column in the
wb_entity_per_page table for detecting redirects. True per default, can be set
to false in an environment where the necessary database update can't be
deployed right away. To set up the table manually, run
repo/sql/AddEppRedirectTarget.sql to create it, then use
repo/maintenance/rebuildEntityPerPage.php to rebuild the table if neccessary.
-;internalEntitySerializerClass: The class name of a serializer that is to be
used when serializing entities for storage. Defaults to null, causing the
default entity serializer from the SerializerFactory to be used. Should be set
to Wikibase\Lib\Serializers\LegacyInternalEntitySerializer for compatibility
with client wikis that run older code.
+;internalEntitySerializerClass: The class name of a serializer that is to be
used when serializing entities for storage. Defaults to null, causing the
default entity serializer from the SerializerFactory to be used. Should be set
to Wikibase\Repo\Serializers\LegacyInternalEntitySerializer for compatibility
with client wikis that run older code.
;transformLegacyFormatOnExport: Whether entity revisions stored in a legacy
format should be converted on the fly while exporting. Enabled per default, if
internalEntitySerializerClass is not set, and disable by default if
internalEntitySerializerClass is set. Must be disabled if
internalEntitySerializerClass is set to the legacy serializer.
;subscriptionLookupMode: how the repo determines which clients need to be
notified about changes to which entity (see also the
useLegacyChangesSubscription setting in the client). Possible values:
:;<code>'sitelinks'</code>: Use only sitelinks from the wb_items_per_site
table to track subscriptions (legacy mode).
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index e368888..f06090d 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -70,11 +70,11 @@
},
// Can be used to override the serialization used for storage.
- // Typical value:
Wikibase\Lib\Serializers\LegacyInternalEntitySerializer
+ // Typical value:
Wikibase\Repo\Serializers\LegacyInternalEntitySerializer
'internalEntitySerializerClass' => null,
// Can be used to override the serialization used for storage.
- // Typical value:
Wikibase\Lib\Serializers\LegacyInternalClaimSerializer
+ // Typical value:
Wikibase\Repo\Serializers\LegacyInternalClaimSerializer
'internalClaimSerializerClass' => null,
'transformLegacyFormatOnExport' => function( SettingsArray
$settings ) {
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 81fe49a..06da582 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1064,7 +1064,7 @@
}
return array(
-
'Wikibase\Lib\Serializers\LegacyInternalEntitySerializer',
+
'Wikibase\Repo\Serializers\LegacyInternalEntitySerializer',
'isBlobUsingLegacyFormat'
);
}
diff --git a/lib/includes/serializers/LegacyInternalClaimSerializer.php
b/repo/includes/serializers/LegacyInternalClaimSerializer.php
similarity index 93%
rename from lib/includes/serializers/LegacyInternalClaimSerializer.php
rename to repo/includes/serializers/LegacyInternalClaimSerializer.php
index 5e1fcee..c3fccc5 100644
--- a/lib/includes/serializers/LegacyInternalClaimSerializer.php
+++ b/repo/includes/serializers/LegacyInternalClaimSerializer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Serializers;
+namespace Wikibase\Repo\Serializers;
use InvalidArgumentException;
use Serializers\Serializer;
diff --git a/lib/includes/serializers/LegacyInternalEntitySerializer.php
b/repo/includes/serializers/LegacyInternalEntitySerializer.php
similarity index 97%
rename from lib/includes/serializers/LegacyInternalEntitySerializer.php
rename to repo/includes/serializers/LegacyInternalEntitySerializer.php
index c33bea2..7660704 100644
--- a/lib/includes/serializers/LegacyInternalEntitySerializer.php
+++ b/repo/includes/serializers/LegacyInternalEntitySerializer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Serializers;
+namespace Wikibase\Repo\Serializers;
use InvalidArgumentException;
use Serializers\Serializer as NewStyleSerializer;
diff --git a/repo/tests/phpunit/includes/DefaultRepoSettingsTest.php
b/repo/tests/phpunit/includes/DefaultRepoSettingsTest.php
index e6a4074..34cce5c 100644
--- a/repo/tests/phpunit/includes/DefaultRepoSettingsTest.php
+++ b/repo/tests/phpunit/includes/DefaultRepoSettingsTest.php
@@ -23,7 +23,7 @@
public function
testDefaultTransformLegacyFormatOnExport_WithInternalSerializerSet() {
$nonDefaultSettings = require __DIR__ .
'/../../../config/Wikibase.default.php';
- $serializerClass =
'Wikibase\Lib\Serializers\LegacyInternalEntitySerializer';
+ $serializerClass =
'Wikibase\Repo\Serializers\LegacyInternalEntitySerializer';
$nonDefaultSettings['internalEntitySerializerClass'] =
$serializerClass;
$settings = $this->newSettingsArray( $nonDefaultSettings );
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 1c735b5..33d5534 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -214,7 +214,10 @@
public function testNewItemHandler_badSerializerSetting() {
$wikibaseRepo = $this->getWikibaseRepo();
$wikibaseRepo->getSettings()->setSetting(
'transformLegacyFormatOnExport', true );
- $wikibaseRepo->getSettings()->setSetting(
'internalEntitySerializerClass',
'Wikibase\Lib\Serializers\LegacyInternalEntitySerializer' );
+ $wikibaseRepo->getSettings()->setSetting(
+ 'internalEntitySerializerClass',
+
'Wikibase\Repo\Serializers\LegacyInternalEntitySerializer'
+ );
$this->setExpectedException( 'RuntimeException' );
$wikibaseRepo->newItemHandler();
@@ -223,7 +226,10 @@
public function testNewPropertyHandler_badSerializerSetting() {
$wikibaseRepo = $this->getWikibaseRepo();
$wikibaseRepo->getSettings()->setSetting(
'transformLegacyFormatOnExport', true );
- $wikibaseRepo->getSettings()->setSetting(
'internalEntitySerializerClass',
'Wikibase\Lib\Serializers\LegacyInternalEntitySerializer' );
+ $wikibaseRepo->getSettings()->setSetting(
+ 'internalEntitySerializerClass',
+
'Wikibase\Repo\Serializers\LegacyInternalEntitySerializer'
+ );
$this->setExpectedException( 'RuntimeException' );
$wikibaseRepo->newPropertyHandler();
diff --git a/repo/tests/phpunit/includes/content/EntityHandlerTest.php
b/repo/tests/phpunit/includes/content/EntityHandlerTest.php
index ee399cd..6ff35ce 100644
--- a/repo/tests/phpunit/includes/content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/EntityHandlerTest.php
@@ -13,7 +13,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\EntityContent;
use Wikibase\InternalSerialization\SerializerFactory;
-use Wikibase\Lib\Serializers\LegacyInternalEntitySerializer;
+use Wikibase\Repo\Serializers\LegacyInternalEntitySerializer;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Repo\Content\EntityHandler;
use Wikibase\Repo\WikibaseRepo;
--
To view, visit https://gerrit.wikimedia.org/r/227427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f7a09b8a2b55c31885b2b873793a32fd8e6ba30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
