jenkins-bot has submitted this change and it was merged.
Change subject: Follow up on compatibility breaks in Wikibase
......................................................................
Follow up on compatibility breaks in Wikibase
EntityLookup and LanguageLabelDescriptionLookup have been removed from
WikibaseLib thus we must now get it from DataModelServices.
This extensions now requires ~1.1 of DMServices.
Renamed getClaimGuidValidator to getStatementGuidValidator.
Replace ClaimGuidValidator StatementGuidValidator from DataModelServices.
Rename TermLookup to EntityTermLookupBase.
Bug: T108934
Change-Id: I46279264d3fd8afb247363b8106dbac98c5df8ec
---
M api/ModifyViolation.php
M composer.json
M specials/SpecialViolationsPage.php
M tests/phpunit/Helper/JsonFileEntityLookup.php
4 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ModifyViolation.php b/api/ModifyViolation.php
index 81b55f6..370a4b4 100644
--- a/api/ModifyViolation.php
+++ b/api/ModifyViolation.php
@@ -7,10 +7,10 @@
use MWException;
use DataValues\Serializers;
use RequestContext;
+use Wikibase\DataModel\Services\Statement\StatementGuidValidator;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ApiHelperFactory;
use Wikibase\Repo\Api\ResultBuilder;
-use Wikibase\Lib\ClaimGuidValidator;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\Violations\Violation;
@@ -34,9 +34,9 @@
const MAX_CONSTRAINT_ID_LENGTH = 63;
/**
- * @var ClaimGuidValidator
+ * @var StatementGuidValidator
*/
- private $claimGuidValidator;
+ private $statementGuidValidator;
/**
* @var EntityPermissionChecker
@@ -77,7 +77,7 @@
$main,
$name,
$prefix,
- $wikibaseRepo->getClaimGuidValidator(),
+ $wikibaseRepo->getStatementGuidValidator(),
$wikibaseRepo->getEntityPermissionChecker(),
$qualityServices->getViolationLookup(),
$qualityServices->getViolationStore(),
@@ -89,7 +89,7 @@
* @param ApiMain $main
* @param string $name
* @param string $prefix
- * @param ClaimGuidValidator $claimGuidValidator
+ * @param StatementGuidValidator $statementGuidValidator
* @param EntityPermissionChecker $permissionChecker
* @param ViolationLookup $violationLookup
* @param ViolationStore $violationStore
@@ -99,7 +99,7 @@
ApiMain $main,
$name,
$prefix = '',
- ClaimGuidValidator $claimGuidValidator,
+ StatementGuidValidator $statementGuidValidator,
EntityPermissionChecker $permissionChecker,
ViolationLookup $violationLookup,
ViolationStore $violationStore,
@@ -107,7 +107,7 @@
) {
parent::__construct( $main, $name, $prefix );
- $this->claimGuidValidator = $claimGuidValidator;
+ $this->statementGuidValidator = $statementGuidValidator;
$this->permissionChecker = $permissionChecker;
$this->violationLookup = $violationLookup;
$this->violationStore = $violationStore;
@@ -128,7 +128,7 @@
$constraintId = $params['constraintid'];
$status = $params['status'];
- if ( !$this->claimGuidValidator->validate( $claimGuid ) ) {
+ if ( !$this->statementGuidValidator->validate( $claimGuid ) ) {
$this->errorReporter->dieError( 'Invalid claim guid!',
'guid-invalid' );
}
diff --git a/composer.json b/composer.json
index 4c9a32a..ff238be 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"require": {
"php": ">=5.3.0",
"wikibase/data-model": "~4.0",
- "wikibase/data-model-services": "~1.0",
+ "wikibase/data-model-services": "~1.1",
"serialization/serialization": "^3.2.1"
},
"require-dev": {
diff --git a/specials/SpecialViolationsPage.php
b/specials/SpecialViolationsPage.php
index 98da71d..e16f543 100644
--- a/specials/SpecialViolationsPage.php
+++ b/specials/SpecialViolationsPage.php
@@ -13,15 +13,15 @@
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
+use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\LanguageLabelDescriptionLookup;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\StatementListProvider;
use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Lib\Store\LanguageLabelDescriptionLookup;
-use Wikibase\Lib\Store\TermLookup;
+use Wikibase\Lib\Store\EntityTermLookupBase;
use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
use Wikibase\Repo\EntityIdLabelFormatterFactory;
use Wikibase\Repo\Store\EntityPermissionChecker;
@@ -122,7 +122,7 @@
/**
* @param EntityLookup $entityLookup
- * @param TermLookup $termLookup
+ * @param EntityTermLookupBase $termLookup
* @param EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory
* @param EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory
* @param EntityIdParser $entityIdParser
@@ -136,7 +136,7 @@
*/
public function __construct(
EntityLookup $entityLookup,
- TermLookup $termLookup,
+ EntityTermLookupBase $termLookup,
EntityIdLabelFormatterFactory $entityIdLabelFormatterFactory,
EntityIdHtmlLinkFormatterFactory
$entityIdHtmlLinkFormatterFactory,
EntityIdParser $entityIdParser,
diff --git a/tests/phpunit/Helper/JsonFileEntityLookup.php
b/tests/phpunit/Helper/JsonFileEntityLookup.php
index da834bd..238ca1c 100644
--- a/tests/phpunit/Helper/JsonFileEntityLookup.php
+++ b/tests/phpunit/Helper/JsonFileEntityLookup.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\DeserializerFactory;
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\Repo\WikibaseRepo;
@@ -97,4 +97,4 @@
$filePath = sprintf( '%s/%s.json', $this->baseDir,
(string)$entityId );
return $filePath;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/231275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46279264d3fd8afb247363b8106dbac98c5df8ec
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
