jenkins-bot has submitted this change and it was merged. (
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(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ConstraintCheck/Checker/ConflictsWithChecker.php
b/src/ConstraintCheck/Checker/ConflictsWithChecker.php
index e48271e..532a93c 100644
--- a/src/ConstraintCheck/Checker/ConflictsWithChecker.php
+++ b/src/ConstraintCheck/Checker/ConflictsWithChecker.php
@@ -95,10 +95,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 4071d70..24d5c0e 100644
--- a/src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++ b/src/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -145,10 +145,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 14193e8..9caab88 100644
--- a/src/ConstraintCheck/Checker/InverseChecker.php
+++ b/src/ConstraintCheck/Checker/InverseChecker.php
@@ -98,9 +98,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 b81d99d..fb0f8fa 100644
--- a/src/ConstraintCheck/Checker/ItemChecker.php
+++ b/src/ConstraintCheck/Checker/ItemChecker.php
@@ -94,10 +94,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 c4dc4e8..fb202ae 100644
--- a/src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
+++ b/src/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
@@ -73,9 +73,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 588de3f..6f200d4 100644
--- a/src/ConstraintCheck/Checker/MultiValueChecker.php
+++ b/src/ConstraintCheck/Checker/MultiValueChecker.php
@@ -59,10 +59,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 41aea9b..db07897 100644
--- a/src/ConstraintCheck/Checker/QualifiersChecker.php
+++ b/src/ConstraintCheck/Checker/QualifiersChecker.php
@@ -73,9 +73,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 fd6040e..5218b78 100644
--- a/src/ConstraintCheck/Checker/SingleValueChecker.php
+++ b/src/ConstraintCheck/Checker/SingleValueChecker.php
@@ -59,10 +59,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 4690138..9b796d5 100644
--- a/src/ConstraintCheck/Checker/SymmetricChecker.php
+++ b/src/ConstraintCheck/Checker/SymmetricChecker.php
@@ -88,9 +88,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: merged
Gerrit-Change-Id: I100a01e612565cec15a4f9726b11c6ef73587737
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) <[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
