jenkins-bot has submitted this change and it was merged.
Change subject: Move PropertyLabelNotResolvedException to client
......................................................................
Move PropertyLabelNotResolvedException to client
Change-Id: If9cec8eddeaaee3cdb2b57cb85a5b0ca9e4431e7
---
M client/includes/DataAccess/PropertyIdResolver.php
M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/DataAccess/StatementTransclusionInteractor.php
R client/includes/PropertyLabelNotResolvedException.php
M client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
M
client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
9 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Bene: Looks good to me, approved
Jonas Kress (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/client/includes/DataAccess/PropertyIdResolver.php
b/client/includes/DataAccess/PropertyIdResolver.php
index 28bcd55..ba45e58 100644
--- a/client/includes/DataAccess/PropertyIdResolver.php
+++ b/client/includes/DataAccess/PropertyIdResolver.php
@@ -4,7 +4,7 @@
use InvalidArgumentException;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\PropertyLabelResolver;
diff --git
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
index 1657f91..d9de9cd 100644
---
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
@@ -7,7 +7,7 @@
use Status;
use Wikibase\Client\DataAccess\StatementTransclusionInteractor;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
/**
* PropertyClaimsRenderer of the {{#property}} parser function.
diff --git
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index b2854b4..88c9b9c 100644
---
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -13,7 +13,7 @@
use Wikibase\Client\DataAccess\SnaksFinder;
use Wikibase\Client\DataAccess\StatementTransclusionInteractor;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\Lib\SnakFormatter;
/**
diff --git
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index c6cc84f..8b362b5 100644
--- a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -15,7 +15,7 @@
use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityRetrievingTermLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
diff --git a/client/includes/DataAccess/StatementTransclusionInteractor.php
b/client/includes/DataAccess/StatementTransclusionInteractor.php
index 96d6369..fd2027f 100644
--- a/client/includes/DataAccess/StatementTransclusionInteractor.php
+++ b/client/includes/DataAccess/StatementTransclusionInteractor.php
@@ -6,7 +6,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Statement\StatementListProvider;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\UnresolvedRedirectException;
diff --git a/lib/includes/PropertyLabelNotResolvedException.php
b/client/includes/PropertyLabelNotResolvedException.php
similarity index 94%
rename from lib/includes/PropertyLabelNotResolvedException.php
rename to client/includes/PropertyLabelNotResolvedException.php
index 9833f9c..fdac5dc 100644
--- a/lib/includes/PropertyLabelNotResolvedException.php
+++ b/client/includes/PropertyLabelNotResolvedException.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Lib;
+namespace Wikibase\Client;
/**
* @since 0.5
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
index 8fdb3fc..34e69a6 100644
--- a/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
+++ b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
@@ -64,7 +64,7 @@
public function testResolvePropertyIdWithInvalidInput_throwsException(
$propertyIdOrLabel ) {
$propertyIdResolver = $this->getPropertyIdResolver();
- $this->setExpectedException(
'Wikibase\Lib\PropertyLabelNotResolvedException' );
+ $this->setExpectedException(
'Wikibase\Client\PropertyLabelNotResolvedException' );
$propertyIdResolver->resolvePropertyId( $propertyIdOrLabel,
'en' );
}
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
index a34abd9..a4ff84f 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\Lib\SnakFormatter;
/**
diff --git
a/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
b/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
index 8fd493a..0f35483 100644
---
a/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
+++
b/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Client\PropertyLabelNotResolvedException;
use Wikibase\Lib\SnakFormatter;
/**
@@ -81,7 +81,7 @@
'en'
);
- $this->setExpectedException(
'Wikibase\Lib\PropertyLabelNotResolvedException' );
+ $this->setExpectedException(
'Wikibase\Client\PropertyLabelNotResolvedException' );
$renderer->render( new ItemId( 'Q42' ), 'blah' );
}
--
To view, visit https://gerrit.wikimedia.org/r/230062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9cec8eddeaaee3cdb2b57cb85a5b0ca9e4431e7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits