[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Remove unnecessary code from checkers
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, [], Ch
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Remove unnecessary code from checkers
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 Chec