jenkins-bot has submitted this change and it was merged.
Change subject: Move Lib Localizer stuff to Repo
......................................................................
Move Lib Localizer stuff to Repo
Only use of this stuff is in repo
Change-Id: I2fad8970931d4956b148da8a07374e46f5278d96
---
M repo/includes/Localizer/ChangeOpValidationExceptionLocalizer.php
R repo/includes/Localizer/DispatchingExceptionLocalizer.php
R repo/includes/Localizer/ExceptionLocalizer.php
R repo/includes/Localizer/GenericExceptionLocalizer.php
R repo/includes/Localizer/MessageExceptionLocalizer.php
R repo/includes/Localizer/ParseExceptionLocalizer.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/ApiErrorReporter.php
M repo/includes/api/ApiHelperFactory.php
M repo/includes/api/ParseValue.php
M repo/includes/specials/SpecialMergeItems.php
M repo/includes/specials/SpecialRedirectEntity.php
R repo/tests/phpunit/includes/Localizer/DispatchingExceptionLocalizerTest.php
R repo/tests/phpunit/includes/Localizer/GenericExceptionLocalizerTest.php
R repo/tests/phpunit/includes/Localizer/MessageExceptionLocalizerTest.php
R repo/tests/phpunit/includes/Localizer/ParseExceptionLocalizerTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
M repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/api/StatementModificationHelperTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
M repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
22 files changed, 34 insertions(+), 35 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Localizer/ChangeOpValidationExceptionLocalizer.php
b/repo/includes/Localizer/ChangeOpValidationExceptionLocalizer.php
index c20418f..d6af9bb 100644
--- a/repo/includes/Localizer/ChangeOpValidationExceptionLocalizer.php
+++ b/repo/includes/Localizer/ChangeOpValidationExceptionLocalizer.php
@@ -7,7 +7,6 @@
use Message;
use ValueFormatters\ValueFormatter;
use Wikibase\ChangeOp\ChangeOpValidationException;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
use Wikibase\Repo\Validators\ValidatorErrorLocalizer;
/**
diff --git a/lib/includes/Localizer/DispatchingExceptionLocalizer.php
b/repo/includes/Localizer/DispatchingExceptionLocalizer.php
similarity index 97%
rename from lib/includes/Localizer/DispatchingExceptionLocalizer.php
rename to repo/includes/Localizer/DispatchingExceptionLocalizer.php
index b466c68..dd0191f 100644
--- a/lib/includes/Localizer/DispatchingExceptionLocalizer.php
+++ b/repo/includes/Localizer/DispatchingExceptionLocalizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Localizer;
+namespace Wikibase\Repo\Localizer;
use Exception;
use InvalidArgumentException;
diff --git a/lib/includes/Localizer/ExceptionLocalizer.php
b/repo/includes/Localizer/ExceptionLocalizer.php
similarity index 96%
rename from lib/includes/Localizer/ExceptionLocalizer.php
rename to repo/includes/Localizer/ExceptionLocalizer.php
index fdacaa7..8d21570 100644
--- a/lib/includes/Localizer/ExceptionLocalizer.php
+++ b/repo/includes/Localizer/ExceptionLocalizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Localizer;
+namespace Wikibase\Repo\Localizer;
use Exception;
use InvalidArgumentException;
diff --git a/lib/includes/Localizer/GenericExceptionLocalizer.php
b/repo/includes/Localizer/GenericExceptionLocalizer.php
similarity index 95%
rename from lib/includes/Localizer/GenericExceptionLocalizer.php
rename to repo/includes/Localizer/GenericExceptionLocalizer.php
index 1fdac61..0860c1c 100644
--- a/lib/includes/Localizer/GenericExceptionLocalizer.php
+++ b/repo/includes/Localizer/GenericExceptionLocalizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Localizer;
+namespace Wikibase\Repo\Localizer;
use Exception;
use Message;
diff --git a/lib/includes/Localizer/MessageExceptionLocalizer.php
b/repo/includes/Localizer/MessageExceptionLocalizer.php
similarity index 96%
rename from lib/includes/Localizer/MessageExceptionLocalizer.php
rename to repo/includes/Localizer/MessageExceptionLocalizer.php
index cc9d071..2cfbd78 100644
--- a/lib/includes/Localizer/MessageExceptionLocalizer.php
+++ b/repo/includes/Localizer/MessageExceptionLocalizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Localizer;
+namespace Wikibase\Repo\Localizer;
use Exception;
use InvalidArgumentException;
diff --git a/lib/includes/Localizer/ParseExceptionLocalizer.php
b/repo/includes/Localizer/ParseExceptionLocalizer.php
similarity index 97%
rename from lib/includes/Localizer/ParseExceptionLocalizer.php
rename to repo/includes/Localizer/ParseExceptionLocalizer.php
index d1f14fd..c470d1b 100644
--- a/lib/includes/Localizer/ParseExceptionLocalizer.php
+++ b/repo/includes/Localizer/ParseExceptionLocalizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib\Localizer;
+namespace Wikibase\Repo\Localizer;
use Exception;
use InvalidArgumentException;
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index e35b879..3d75f71 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -45,11 +45,11 @@
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
use Wikibase\Lib\FormatterLabelDescriptionLookupFactory;
use Wikibase\Lib\LanguageNameLookup;
-use Wikibase\Lib\Localizer\DispatchingExceptionLocalizer;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
-use Wikibase\Lib\Localizer\GenericExceptionLocalizer;
-use Wikibase\Lib\Localizer\MessageExceptionLocalizer;
-use Wikibase\Lib\Localizer\ParseExceptionLocalizer;
+use Wikibase\Repo\Localizer\DispatchingExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\GenericExceptionLocalizer;
+use Wikibase\Repo\Localizer\MessageExceptionLocalizer;
+use Wikibase\Repo\Localizer\ParseExceptionLocalizer;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
use Wikibase\Lib\Parsers\SuffixEntityIdParser;
diff --git a/repo/includes/api/ApiErrorReporter.php
b/repo/includes/api/ApiErrorReporter.php
index 3b64cbc..73243f6 100644
--- a/repo/includes/api/ApiErrorReporter.php
+++ b/repo/includes/api/ApiErrorReporter.php
@@ -10,7 +10,7 @@
use LogicException;
use Message;
use Status;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
/**
* ApiErrorReporter is a component for API modules that handles
diff --git a/repo/includes/api/ApiHelperFactory.php
b/repo/includes/api/ApiHelperFactory.php
index 7cae4a3..8a73eda 100644
--- a/repo/includes/api/ApiHelperFactory.php
+++ b/repo/includes/api/ApiHelperFactory.php
@@ -9,7 +9,7 @@
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\EditEntityFactory;
use Wikibase\EntityFactory;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\SummaryFormatter;
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index ca108bb..d615343 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -17,7 +17,7 @@
use ValueValidators\Error;
use ValueValidators\NullValidator;
use ValueValidators\ValueValidator;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
use Wikibase\Repo\DataTypeValidatorFactory;
use Wikibase\Repo\ValueParserFactory;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/specials/SpecialMergeItems.php
b/repo/includes/specials/SpecialMergeItems.php
index 660ec29..8c3cef8 100644
--- a/repo/includes/specials/SpecialMergeItems.php
+++ b/repo/includes/specials/SpecialMergeItems.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
use Wikibase\EntityRevision;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
use Wikibase\Lib\UserInputException;
use Wikibase\Repo\Interactors\ItemMergeInteractor;
use Wikibase\Repo\Interactors\TokenCheckInteractor;
diff --git a/repo/includes/specials/SpecialRedirectEntity.php
b/repo/includes/specials/SpecialRedirectEntity.php
index 8d432fb..2a1bd6e 100644
--- a/repo/includes/specials/SpecialRedirectEntity.php
+++ b/repo/includes/specials/SpecialRedirectEntity.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
use Wikibase\Lib\UserInputException;
use Wikibase\Repo\Interactors\RedirectCreationInteractor;
use Wikibase\Repo\Interactors\TokenCheckInteractor;
diff --git a/lib/tests/phpunit/Localizer/DispatchingExceptionLocalizerTest.php
b/repo/tests/phpunit/includes/Localizer/DispatchingExceptionLocalizerTest.php
similarity index 86%
rename from lib/tests/phpunit/Localizer/DispatchingExceptionLocalizerTest.php
rename to
repo/tests/phpunit/includes/Localizer/DispatchingExceptionLocalizerTest.php
index 35b6c62..c66e2df 100644
--- a/lib/tests/phpunit/Localizer/DispatchingExceptionLocalizerTest.php
+++
b/repo/tests/phpunit/includes/Localizer/DispatchingExceptionLocalizerTest.php
@@ -5,13 +5,13 @@
use Exception;
use RuntimeException;
use ValueParsers\ParseException;
-use Wikibase\Lib\Localizer\DispatchingExceptionLocalizer;
-use Wikibase\Lib\Localizer\GenericExceptionLocalizer;
-use Wikibase\Lib\Localizer\MessageExceptionLocalizer;
-use Wikibase\Lib\Localizer\ParseExceptionLocalizer;
+use Wikibase\Repo\Localizer\DispatchingExceptionLocalizer;
+use Wikibase\Repo\Localizer\GenericExceptionLocalizer;
+use Wikibase\Repo\Localizer\MessageExceptionLocalizer;
+use Wikibase\Repo\Localizer\ParseExceptionLocalizer;
/**
- * @covers Wikibase\Lib\Localizer\DispatchingExceptionLocalizer
+ * @covers Wikibase\Repo\Localizer\DispatchingExceptionLocalizer
*
* @group Wikibase
* @group WikibaseLib
diff --git a/lib/tests/phpunit/Localizer/GenericExceptionLocalizerTest.php
b/repo/tests/phpunit/includes/Localizer/GenericExceptionLocalizerTest.php
similarity index 89%
rename from lib/tests/phpunit/Localizer/GenericExceptionLocalizerTest.php
rename to
repo/tests/phpunit/includes/Localizer/GenericExceptionLocalizerTest.php
index 7695947..358f92c 100644
--- a/lib/tests/phpunit/Localizer/GenericExceptionLocalizerTest.php
+++ b/repo/tests/phpunit/includes/Localizer/GenericExceptionLocalizerTest.php
@@ -4,10 +4,10 @@
use Exception;
use RuntimeException;
-use Wikibase\Lib\Localizer\GenericExceptionLocalizer;
+use Wikibase\Repo\Localizer\GenericExceptionLocalizer;
/**
- * @covers Wikibase\Lib\Localizer\GenericExceptionLocalizer
+ * @covers Wikibase\Repo\Localizer\GenericExceptionLocalizer
*
* @group Wikibase
* @group WikibaseLib
diff --git a/lib/tests/phpunit/Localizer/MessageExceptionLocalizerTest.php
b/repo/tests/phpunit/includes/Localizer/MessageExceptionLocalizerTest.php
similarity index 91%
rename from lib/tests/phpunit/Localizer/MessageExceptionLocalizerTest.php
rename to
repo/tests/phpunit/includes/Localizer/MessageExceptionLocalizerTest.php
index 7992cb8..d7d65b5 100644
--- a/lib/tests/phpunit/Localizer/MessageExceptionLocalizerTest.php
+++ b/repo/tests/phpunit/includes/Localizer/MessageExceptionLocalizerTest.php
@@ -3,11 +3,11 @@
namespace Wikibase\Test;
use Exception;
-use Wikibase\Lib\Localizer\MessageExceptionLocalizer;
+use Wikibase\Repo\Localizer\MessageExceptionLocalizer;
use Wikibase\Lib\MessageException;
/**
- * @covers Wikibase\Lib\Localizer\MessageExceptionLocalizer
+ * @covers Wikibase\Repo\Localizer\MessageExceptionLocalizer
*
* @group Wikibase
* @group WikibaseLib
diff --git a/lib/tests/phpunit/Localizer/ParseExceptionLocalizerTest.php
b/repo/tests/phpunit/includes/Localizer/ParseExceptionLocalizerTest.php
similarity index 90%
rename from lib/tests/phpunit/Localizer/ParseExceptionLocalizerTest.php
rename to repo/tests/phpunit/includes/Localizer/ParseExceptionLocalizerTest.php
index 691328c..eb75d69 100644
--- a/lib/tests/phpunit/Localizer/ParseExceptionLocalizerTest.php
+++ b/repo/tests/phpunit/includes/Localizer/ParseExceptionLocalizerTest.php
@@ -4,10 +4,10 @@
use Exception;
use ValueParsers\ParseException;
-use Wikibase\Lib\Localizer\ParseExceptionLocalizer;
+use Wikibase\Repo\Localizer\ParseExceptionLocalizer;
/**
- * @covers Wikibase\Lib\Localizer\ParseExceptionLocalizer
+ * @covers Wikibase\Repo\Localizer\ParseExceptionLocalizer
*
* @group Wikibase
* @group WikibaseLib
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 62fa957..c7fd55b 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -144,7 +144,7 @@
public function testGetExceptionLocalizer() {
$localizer = $this->getWikibaseRepo()->getExceptionLocalizer();
- $this->assertInstanceOf(
'Wikibase\Lib\Localizer\ExceptionLocalizer', $localizer );
+ $this->assertInstanceOf(
'Wikibase\Repo\Localizer\ExceptionLocalizer', $localizer );
}
public function testGetEntityContentDataCodec() {
diff --git a/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
b/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
index f884e34..fdbfd93 100644
--- a/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
+++ b/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
@@ -8,9 +8,9 @@
use Status;
use UsageException;
use ValueParsers\ParseException;
-use Wikibase\Lib\Localizer\DispatchingExceptionLocalizer;
-use Wikibase\Lib\Localizer\ExceptionLocalizer;
-use Wikibase\Lib\Localizer\ParseExceptionLocalizer;
+use Wikibase\Repo\Localizer\DispatchingExceptionLocalizer;
+use Wikibase\Repo\Localizer\ExceptionLocalizer;
+use Wikibase\Repo\Localizer\ParseExceptionLocalizer;
use Wikibase\Repo\Api\ApiErrorReporter;
/**
diff --git a/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
b/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
index 09e284f..13e5e0c 100644
--- a/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
+++ b/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
@@ -21,7 +21,7 @@
private function newApiHelperFactory() {
$titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
- $exceptionLocalizer = $this->getMock(
'Wikibase\Lib\Localizer\ExceptionLocalizer' );
+ $exceptionLocalizer = $this->getMock(
'Wikibase\Repo\Localizer\ExceptionLocalizer' );
$dataTypeLookup = $this->getMock(
'Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup' );
$entityFactory =
WikibaseRepo::getDefaultInstance()->getEntityFactory();
$summaryFormatter = $this->getMockBuilder(
'Wikibase\SummaryFormatter' )
diff --git
a/repo/tests/phpunit/includes/api/StatementModificationHelperTest.php
b/repo/tests/phpunit/includes/api/StatementModificationHelperTest.php
index 98cd7a2..ce52f0e 100644
--- a/repo/tests/phpunit/includes/api/StatementModificationHelperTest.php
+++ b/repo/tests/phpunit/includes/api/StatementModificationHelperTest.php
@@ -9,7 +9,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Lib\Localizer\DispatchingExceptionLocalizer;
+use Wikibase\Repo\Localizer\DispatchingExceptionLocalizer;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\CreateClaim;
use Wikibase\Repo\Api\StatementModificationHelper;
diff --git a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
index 4d287ad..3059d24 100644
--- a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
@@ -107,7 +107,7 @@
MockSiteStore::newFromTestSites()
);
- $exceptionLocalizer = $this->getMock(
'Wikibase\Lib\Localizer\ExceptionLocalizer' );
+ $exceptionLocalizer = $this->getMock(
'Wikibase\Repo\Localizer\ExceptionLocalizer' );
$exceptionLocalizer->expects( $this->any() )
->method( 'getExceptionMessage' )
->will( $this->returnCallback( function( Exception $ex
) {
diff --git a/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
b/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
index 195aced..330a610 100644
--- a/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
@@ -87,7 +87,7 @@
$idParser =
WikibaseRepo::getDefaultInstance()->getEntityIdParser();
$summaryFormatter =
WikibaseRepo::getDefaultInstance()->getSummaryFormatter();
- $exceptionLocalizer = $this->getMock(
'Wikibase\Lib\Localizer\ExceptionLocalizer' );
+ $exceptionLocalizer = $this->getMock(
'Wikibase\Repo\Localizer\ExceptionLocalizer' );
$exceptionLocalizer->expects( $this->any() )
->method( 'getExceptionMessage' )
->will( $this->returnCallback( function( Exception $ex
) {
--
To view, visit https://gerrit.wikimedia.org/r/229740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fad8970931d4956b148da8a07374e46f5278d96
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
