Lucas Werkmeister (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402885 )
Change subject: Remove unnecessary code from checkers
......................................................................
Remove unnecessary code from checkers
Now that DelegatingConstraintChecker is responsible for checking whether
a constraint can be checked on a context or not, depending on the
context’s type, we can remove the equivalent checks from the individual
checkers. (Besides, the STATUS_NOT_MAIN_SNAK constant was already
renamed to NOT_IN_SCOPE in I629afe85d2.)
Bug: T183542
Change-Id: I100a01e612565cec15a4f9726b11c6ef73587737
---
M src/ConstraintCheck/Checker/ConflictsWithChecker.php
M src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M src/ConstraintCheck/Checker/InverseChecker.php
M src/ConstraintCheck/Checker/ItemChecker.php
M src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M src/ConstraintCheck/Checker/MultiValueChecker.php
M src/ConstraintCheck/Checker/QualifiersChecker.php
M src/ConstraintCheck/Checker/SingleValueChecker.php
M src/ConstraintCheck/Checker/SymmetricChecker.php
9 files changed, 0 insertions(+), 32 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/85/402885/1
diff --git a/src/ConstraintCheck/Checker/ConflictsWithChecker.php
b/src/ConstraintCheck/Checker/ConflictsWithChecker.php
index a1adec6..fa7033d 100644
--- a/src/ConstraintCheck/Checker/ConflictsWithChecker.php
+++ b/src/ConstraintCheck/Checker/ConflictsWithChecker.php
@@ -83,10 +83,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- // TODO T175562
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git a/src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
b/src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index f52fc82..2d3922d 100644
--- a/src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++ b/src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -133,10 +133,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- // TODO T175565
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
diff --git a/src/ConstraintCheck/Checker/InverseChecker.php
b/src/ConstraintCheck/Checker/InverseChecker.php
index 3b81432..a23d508 100644
--- a/src/ConstraintCheck/Checker/InverseChecker.php
+++ b/src/ConstraintCheck/Checker/InverseChecker.php
@@ -86,9 +86,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git a/src/ConstraintCheck/Checker/ItemChecker.php
b/src/ConstraintCheck/Checker/ItemChecker.php
index 738803b..0a5fc09 100644
--- a/src/ConstraintCheck/Checker/ItemChecker.php
+++ b/src/ConstraintCheck/Checker/ItemChecker.php
@@ -82,10 +82,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- // TODO T175562
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git a/src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
b/src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
index 4aaef1a..df82637 100644
--- a/src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
+++ b/src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
@@ -64,9 +64,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git a/src/ConstraintCheck/Checker/MultiValueChecker.php
b/src/ConstraintCheck/Checker/MultiValueChecker.php
index afa2851..68cd709 100644
--- a/src/ConstraintCheck/Checker/MultiValueChecker.php
+++ b/src/ConstraintCheck/Checker/MultiValueChecker.php
@@ -48,10 +48,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- // TODO T175566
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$propertyId = $context->getSnak()->getPropertyId();
diff --git a/src/ConstraintCheck/Checker/QualifiersChecker.php
b/src/ConstraintCheck/Checker/QualifiersChecker.php
index ea10235..9cec1f3 100644
--- a/src/ConstraintCheck/Checker/QualifiersChecker.php
+++ b/src/ConstraintCheck/Checker/QualifiersChecker.php
@@ -64,9 +64,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git a/src/ConstraintCheck/Checker/SingleValueChecker.php
b/src/ConstraintCheck/Checker/SingleValueChecker.php
index 9665366..2af4df2 100644
--- a/src/ConstraintCheck/Checker/SingleValueChecker.php
+++ b/src/ConstraintCheck/Checker/SingleValueChecker.php
@@ -48,10 +48,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- // TODO T175566
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$propertyId = $context->getSnak()->getPropertyId();
diff --git a/src/ConstraintCheck/Checker/SymmetricChecker.php
b/src/ConstraintCheck/Checker/SymmetricChecker.php
index a97d9f1..9ee3672 100644
--- a/src/ConstraintCheck/Checker/SymmetricChecker.php
+++ b/src/ConstraintCheck/Checker/SymmetricChecker.php
@@ -76,9 +76,6 @@
if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_DEPRECATED );
}
- if ( $context->getType() !== Context::TYPE_STATEMENT ) {
- return new CheckResult( $context, $constraint, [],
CheckResult::STATUS_NOT_MAIN_SNAK );
- }
$parameters = [];
--
To view, visit https://gerrit.wikimedia.org/r/402885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I100a01e612565cec15a4f9726b11c6ef73587737
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) <lucas.werkmeis...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
