[MediaWiki-commits] [Gerrit] Move PropertyIdResolver to DataAccess namespace - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move PropertyIdResolver to DataAccess namespace .. Move PropertyIdResolver to DataAccess namespace this can be useful for Lua and is more general functionality. Change-Id: I8db5e7247f413cbcb045caa6a316d3cc462957f0 --- R client/includes/DataAccess/PropertyIdResolver.php M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php M client/includes/WikibaseClient.php R client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php 7 files changed, 14 insertions(+), 10 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php b/client/includes/DataAccess/PropertyIdResolver.php similarity index 97% rename from client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php rename to client/includes/DataAccess/PropertyIdResolver.php index db19fbf..395377b 100644 --- a/client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php +++ b/client/includes/DataAccess/PropertyIdResolver.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase\DataAccess\PropertyParserFunction; +namespace Wikibase\DataAccess; use InvalidArgumentException; use Wikibase\DataModel\Entity\Entity; diff --git a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php index 70f4238..b4ebde8 100644 --- a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php +++ b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php @@ -5,6 +5,10 @@ use InvalidArgumentException; use Language; use Status; +use Wikibase\Client\WikibaseClient; +use Wikibase\DataAccess\PropertyIdResolver; +use Wikibase\DataModel\Claim\Claims; +use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdValue; use Wikibase\DataModel\Entity\PropertyId; diff --git a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php index 1b58cb0..8844f77 100644 --- a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php +++ b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php @@ -5,6 +5,7 @@ use Language; use Parser; use ValueFormatters\FormatterOptions; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\OutputFormatSnakFormatterFactory; use Wikibase\Lib\SnakFormatter; diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index 17b5108..6491948 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -18,8 +18,8 @@ use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator; use Wikibase\Client\Hooks\ParserFunctionRegistrant; use Wikibase\ClientStore; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory; -use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver; use Wikibase\DataAccess\PropertyParserFunction\Runner; use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder; use Wikibase\DataModel\Entity\BasicEntityIdParser; diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php similarity index 90% rename from client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php rename to client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php index d9dbac0..ddb48cc 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php @@ -1,10 +1,10 @@ ?php -namespace Wikibase\DataAccess\Tests\PropertyParserFunction; +namespace Wikibase\DataAccess\Tests; use DataValues\StringValue; use Language; -use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataModel\Claim; use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\BasicEntityIdParser; @@ -17,12 +17,11 @@ use Wikibase\Test\MockRepository; /** - * @covers Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver + * @covers Wikibase\DataAccess\PropertyIdResolver * * @group Wikibase * @group
[MediaWiki-commits] [Gerrit] Move PropertyIdResolver to DataAccess namespace - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/149002 Change subject: Move PropertyIdResolver to DataAccess namespace .. Move PropertyIdResolver to DataAccess namespace this can be useful for Lua and is more general functionality. Change-Id: I8db5e7247f413cbcb045caa6a316d3cc462957f0 --- R client/includes/DataAccess/PropertyIdResolver.php M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php M client/includes/WikibaseClient.php R client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php 7 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/02/149002/1 diff --git a/client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php b/client/includes/DataAccess/PropertyIdResolver.php similarity index 97% rename from client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php rename to client/includes/DataAccess/PropertyIdResolver.php index db19fbf..395377b 100644 --- a/client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php +++ b/client/includes/DataAccess/PropertyIdResolver.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase\DataAccess\PropertyParserFunction; +namespace Wikibase\DataAccess; use InvalidArgumentException; use Wikibase\DataModel\Entity\Entity; diff --git a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php index 421a3a8..5163b9a 100644 --- a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php +++ b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php @@ -6,6 +6,7 @@ use Language; use Status; use Wikibase\Client\WikibaseClient; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; diff --git a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php index 0dd0152..4428bcc 100644 --- a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php +++ b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php @@ -5,6 +5,7 @@ use Language; use Parser; use ValueFormatters\FormatterOptions; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\OutputFormatSnakFormatterFactory; use Wikibase\Lib\SnakFormatter; diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index 2f249b7..5de423d 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -17,8 +17,8 @@ use ValueFormatters\FormatterOptions; use Wikibase\ClientStore; use Wikibase\Client\Hooks\ParserFunctionRegistrant; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory; -use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver; use Wikibase\DataAccess\PropertyParserFunction\Runner; use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder; use Wikibase\DataModel\Entity\BasicEntityIdParser; diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php similarity index 90% rename from client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php rename to client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php index 4d59c0d..0de5a8c 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php @@ -1,11 +1,11 @@ ?php -namespace Wikibase\DataAccess\Tests\PropertyParserFunction; +namespace Wikibase\DataAccess\Tests; use DataValues\StringValue; use Language; use Wikibase\Claim; -use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Entity\ItemId; @@ -17,12 +17,11 @@ use Wikibase\Test\MockRepository; /** - * @covers Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver + * @covers Wikibase\DataAccess\PropertyIdResolver * * @group Wikibase * @group WikibaseClient * @group WikibaseDataAccess - * @group
