jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365568 )
Change subject: New Wikidata Build - 2017-07-17T10:00:02+0000
......................................................................
New Wikidata Build - 2017-07-17T10:00:02+0000
Change-Id: Idd3a744b38650244aa88f2cffcb6ad67f86779ce
---
M composer.lock
M
extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js
M
extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
M
extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
M
extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
M
extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
M
extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
M
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
M extensions/Constraints/tests/phpunit/ResultAssertions.php
M extensions/Wikibase/repo/includes/Specials/SpecialGoToLinkedPage.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
M vendor/composer/installed.json
40 files changed, 393 insertions(+), 36 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 9500875..04a13cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -756,12 +756,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "0e3fce680234e7fdf5bc89a306a70bc3e46ad963"
+ "reference": "c0c33a07f4f302512ad86ba3665c99dddbd89322"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/0e3fce680234e7fdf5bc89a306a70bc3e46ad963";,
- "reference": "0e3fce680234e7fdf5bc89a306a70bc3e46ad963",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/c0c33a07f4f302512ad86ba3665c99dddbd89322";,
+ "reference": "c0c33a07f4f302512ad86ba3665c99dddbd89322",
"shasum": ""
},
"require": {
@@ -790,7 +790,7 @@
],
"description": "Provides a special page with Wikibase information
about a certain topic, with invitation to create an article for the topic",
"homepage":
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder";,
- "time": "2017-07-14 20:23:43"
+ "time": "2017-07-17 05:11:14"
},
{
"name": "propertysuggester/property-suggester",
@@ -966,7 +966,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "4a00edcd50d5f4f6c97cd9d7b88efb8b2d4c5a23"
+ "reference": "08baa60a2f35296a46db7c2d61ac8a4f21ebe827"
},
"require": {
"php": ">=5.5.9",
@@ -1027,7 +1027,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2017-07-15 19:52:39"
+ "time": "2017-07-17 09:39:53"
},
{
"name": "wikibase/data-model",
@@ -1540,12 +1540,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "6bd348525e9e0bd59aad853bfdf8e5c582af4960"
+ "reference": "d73fabdf7d38855b03185f291411b99284d2862e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6bd348525e9e0bd59aad853bfdf8e5c582af4960";,
- "reference": "6bd348525e9e0bd59aad853bfdf8e5c582af4960",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d73fabdf7d38855b03185f291411b99284d2862e";,
+ "reference": "d73fabdf7d38855b03185f291411b99284d2862e",
"shasum": ""
},
"require": {
@@ -1621,7 +1621,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-07-15 22:25:30"
+ "time": "2017-07-17 09:25:29"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js
b/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js
index 5b694c7..6a53527 100644
---
a/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js
+++
b/extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js
@@ -136,9 +136,7 @@
this.titleInput = new OO.ui.TextInputWidget( {
value: mw.config.get( 'apLabel' ),
label: mw.msg(
'articleplaceholder-abouttopic-create-article-label' ),
- multiline: false,
- required: true,
- autosize: true
+ required: true
} );
this.titleInput.on( 'enter', function () {
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
index 96b8c7f..3cdca21 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
@@ -69,6 +69,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index 66a5461..9b3014f 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -61,6 +61,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
index 8c0cbfe..738140f 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
@@ -71,6 +71,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
index ec89cf0..3c8cab6 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
@@ -69,6 +69,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
index 65ebb67..f3cbec2 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
@@ -52,6 +52,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
index de62282..f666411 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
@@ -36,6 +36,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$propertyId = $statement->getPropertyId();
$parameters = [];
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
index 905bcdc..7909be0 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
@@ -51,6 +51,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
index 677bc98..82d9a93 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
@@ -52,6 +52,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
index 7f3361d..5f5790e 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
@@ -70,6 +70,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
index 68bde11..31b899c 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
@@ -36,6 +36,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$propertyId = $statement->getPropertyId();
$parameters = [];
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
index 0534f8a..bec7264 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
@@ -61,6 +61,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$mainSnak = $statement->getMainSnak();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
index 9221f61..8dc6814 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
@@ -71,6 +71,10 @@
* @return CheckResult
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
index 1ed8829..321550c 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
@@ -73,6 +73,10 @@
* @throws SparqlHelperException if the checker uses SPARQL and the
query times out or some other error occurs
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
index 30bf0e8..54eb2db 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
@@ -53,6 +53,10 @@
* @throws SparqlHelperException if the checker uses SPARQL and the
query times out or some other error occurs
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
if ( $this->sparqlHelper !== null ) {
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
b/extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
index 6f5dcfb..95799f7 100644
---
a/extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
+++
b/extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
@@ -75,6 +75,10 @@
* @throws SparqlHelperException if the checker uses SPARQL and the
query times out or some other error occurs
*/
public function checkConstraint( Statement $statement, Constraint
$constraint, EntityDocument $entity ) {
+ if ( $statement->getRank() === Statement::RANK_DEPRECATED ) {
+ return new CheckResult( $entity->getId(), $statement,
$constraint, [], CheckResult::STATUS_DEPRECATED );
+ }
+
$parameters = [];
$constraintParameters = $constraint->getConstraintParameters();
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
b/extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
index 9524eca..355354f 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
@@ -40,6 +40,10 @@
* The constraint parameters are broken.
*/
const STATUS_BAD_PARAMETERS = 'bad-parameters';
+ /**
+ * The constraint has not been checked because the statement is
deprecated.
+ */
+ const STATUS_DEPRECATED = 'deprecated';
/**
* @var EntityId
diff --git
a/extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
index 66b037a..6521542 100644
---
a/extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
@@ -11,6 +11,8 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker;
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
@@ -179,6 +181,20 @@
$this->assertViolation( $result,
'wbqc-violation-message-value-needed' );
}
+ public function testCommonsLinkConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->commonsLinkChecker->checkConstraint(
$statement, $constraint, $entity );
+
+ // this constraint is still checked on deprecated statements
+ $this->assertViolation( $checkResult,
'wbqc-violation-message-value-needed' );
+ }
+
public function testCheckConstraintParameters() {
$namespaceId = $this->getDefaultConfig()->get(
'WBQualityConstraintsNamespaceId' );
$constraint = $this->getConstraintMock( [ $namespaceId => [] ]
);
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
index a7194a4..445902e 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
@@ -13,6 +13,8 @@
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
use WikibaseQuality\Tests\Helper\JsonFileEntityLookup;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -149,6 +151,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-conflicts-with-claim' );
}
+ public function testConflictsWithConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
index 5ab0cff..c9e868a 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
@@ -9,6 +9,8 @@
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\InverseChecker;
@@ -138,6 +140,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-value-needed' );
}
+ public function testInverseConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
index 991a30f..2be86b0 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
@@ -127,6 +127,19 @@
$this->assertCompliance( $checkResult );
}
+ public function testItemConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
index 41d26ab..9f6dfde 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
@@ -11,6 +11,8 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\SymmetricChecker;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConnectionCheckerHelper;
@@ -97,6 +99,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-value-needed' );
}
+ public function testSymmetricConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
index 0935970..0818db6 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
@@ -17,6 +17,8 @@
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
use WikibaseQuality\Tests\Helper\JsonFileEntityLookup;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -156,6 +158,19 @@
$this->assertCompliance( $checkResult );
}
+ public function testTargetRequiredClaimConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
index 9e7139e..31c8475 100644
---
a/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
@@ -12,6 +12,8 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\FormatChecker;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\SparqlHelper;
@@ -333,6 +335,20 @@
$this->assertTodo( $result );
}
+ public function testFormatConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( $this->formatParameter(
'' ) );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->formatChecker->checkConstraint(
$statement, $constraint, $entity );
+
+ // this constraint is still checked on deprecated statements
+ $this->assertViolation( $checkResult,
'wbqc-violation-message-value-needed' );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
index db23773..85d2b59 100644
---
a/extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
@@ -12,6 +12,8 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use Wikibase\Repo\WikibaseRepo;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\OneOfChecker;
@@ -112,6 +114,19 @@
}
}
+ public function testOneOfConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->oneOfChecker->checkConstraint(
$statement, $constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
index 6d3dc16..f5d66b3 100644
---
a/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
@@ -11,6 +11,7 @@
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
/**
* @covers
\WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\MandatoryQualifiersChecker
@@ -74,6 +75,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-mandatory-qualifier' );
}
+ public function testMandatoryQualifiersConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
index c4fec64..d4a7c20 100644
---
a/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
@@ -6,6 +6,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementListProvider;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\QualifierChecker;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
@@ -53,6 +55,21 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-qualifier' );
}
+ public function testQualifierConstraintDeprecatedStatement() {
+ $checker = new QualifierChecker();
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $checker->checkConstraint( $statement,
$constraint, $entity );
+
+ // this constraint is still checked on deprecated statements
+ $this->assertViolation( $checkResult,
'wbqc-violation-message-qualifier' );
+ }
+
public function testCheckConstraintParameters() {
$checker = new QualifierChecker();
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
index ebfc764..f084a84 100644
---
a/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
@@ -6,6 +6,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementListProvider;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\QualifiersChecker;
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
@@ -92,6 +94,19 @@
$this->assertCompliance( $checkResult );
}
+ public function testQualifiersConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
index 4b9159d..d131349 100644
---
a/extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
@@ -9,6 +9,8 @@
use DataValues\UnboundedQuantityValue;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\DiffWithinRangeChecker;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\RangeCheckerHelper;
@@ -169,6 +171,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-diff-within-range-rightopen' );
}
+ public function testDiffWithinRangeConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
index 340c069..70c3d32 100644
---
a/extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
@@ -14,6 +14,8 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\RangeChecker;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\RangeCheckerHelper;
@@ -271,6 +273,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-range-time-rightopen' );
}
+ public function testRangeConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
/**
* @dataProvider propertyIdProvider
*/
diff --git
a/extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
index b5c42da..16ef71e 100644
---
a/extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
@@ -13,6 +13,8 @@
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
use WikibaseQuality\Tests\Helper\JsonFileEntityLookup;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -233,6 +235,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-type-instance' );
}
+ public function testTypeConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
index d7e51af..af2b7be 100644
---
a/extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
@@ -17,6 +17,8 @@
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
use WikibaseQuality\Tests\Helper\JsonFileEntityLookup;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -258,6 +260,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-value-needed' );
}
+ public function testTypeConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
index 3a0eeda..9f4851a 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
@@ -7,6 +7,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\MultiValueChecker;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
@@ -70,6 +72,19 @@
$this->assertViolation( $checkResult,
'wbqc-violation-message-multi-value' );
}
+ public function testMultiValueConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
index fd3876e..c7f09f2 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
@@ -7,6 +7,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\SingleValueChecker;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
@@ -70,6 +72,19 @@
$this->assertCompliance( $checkResult );
}
+ public function testSingleValueConstraintDeprecatedStatement() {
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$constraint = $this->getConstraintMock( [] );
diff --git
a/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
b/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
index ac7a4dd..f7b342a 100644
---
a/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
+++
b/extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
@@ -7,6 +7,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\Repo\Tests\NewItem;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\UniqueValueChecker;
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
@@ -92,6 +94,20 @@
$this->assertTodo( $checkResult );
}
+ public function testUniqueValueConstraintDeprecatedStatement() {
+ $this->checker = new UniqueValueChecker(
$this->getConstraintParameterRenderer(), null );
+ $statement = NewStatement::noValueFor( 'P1' )
+ ->withDeprecatedRank()
+ ->build();
+ $constraint = $this->getConstraintMock( [] );
+ $entity = NewItem::withId( 'Q1' )
+ ->build();
+
+ $checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
+
+ $this->assertDeprecation( $checkResult );
+ }
+
public function testCheckConstraintParameters() {
$this->checker = new UniqueValueChecker(
$this->getConstraintParameterRenderer(), null );
$constraint = $this->getConstraintMock( [] );
diff --git a/extensions/Constraints/tests/phpunit/ResultAssertions.php
b/extensions/Constraints/tests/phpunit/ResultAssertions.php
index a78d031..3a41f11 100644
--- a/extensions/Constraints/tests/phpunit/ResultAssertions.php
+++ b/extensions/Constraints/tests/phpunit/ResultAssertions.php
@@ -109,4 +109,17 @@
$this->assertTodo( $result );
}
+ /**
+ * Assert that $result indicates a skipped constraint check due to
deprecated statement rank.
+ *
+ * @param CheckResult $result
+ */
+ public function assertDeprecation( CheckResult $result ) {
+ $this->assertEquals(
+ CheckResult::STATUS_DEPRECATED,
+ $result->getStatus(),
+ 'Check should indicate deprecation; message: ' .
$result->getMessage()
+ );
+ }
+
}
diff --git
a/extensions/Wikibase/repo/includes/Specials/SpecialGoToLinkedPage.php
b/extensions/Wikibase/repo/includes/Specials/SpecialGoToLinkedPage.php
index f54599c..7cdeb06 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialGoToLinkedPage.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialGoToLinkedPage.php
@@ -79,15 +79,18 @@
/**
* @param string|null $subPage
*
- * @return array array( string $site, string $itemString )
+ * @return array array( string[] $sites, string $itemString )
*/
private function getArguments( $subPage ) {
$request = $this->getRequest();
$parts = ( $subPage === '' ) ? [] : explode( '/', $subPage, 2 );
- $site = trim( $request->getVal( 'site', isset( $parts[0] ) ?
$parts[0] : '' ) );
+ $sites = explode(
+ ',',
+ trim( $request->getVal( 'site', isset( $parts[0] ) ?
$parts[0] : '' ) )
+ );
$itemString = trim( $request->getVal( 'itemid', isset(
$parts[1] ) ? $parts[1] : 0 ) );
- return [ $site, $itemString ];
+ return [ $sites, $itemString ];
}
/**
@@ -186,32 +189,34 @@
*/
public function execute( $subPage ) {
parent::execute( $subPage );
- list( $site, $itemString ) = $this->getArguments( $subPage );
+ list( $sites, $itemString ) = $this->getArguments( $subPage );
- if ( !empty( $site ) || !empty( $itemString ) ) {
- $url = $this->getTargetUrl( $site, $itemString );
- if ( null !== $url ) {
- $this->getOutput()->redirect( $url );
- return;
+ if ( !empty( $sites ) || !empty( $itemString ) ) {
+ foreach ( $sites as $site ) {
+ $url = $this->getTargetUrl( $site, $itemString
);
+ if ( $url !== null ) {
+ $this->getOutput()->redirect( $url );
+ return;
+ }
}
}
$this->outputError();
- $this->outputForm( $site, $itemString );
+ $this->outputForm( $sites, $itemString );
}
/**
* Output a form via the context's OutputPage object to go to a
* sitelink (linked page) for an item and site id.
*
- * @param string $site
+ * @param string[] $sites
* @param string $itemString
*/
- private function outputForm( $site, $itemString ) {
+ private function outputForm( array $sites, $itemString ) {
$formDescriptor = [
'site' => [
'name' => 'site',
- 'default' => $site ?: '',
+ 'default' => implode( ',', $sites ),
'type' => 'text',
'id' => 'wb-gotolinkedpage-sitename',
'size' => 12,
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
index 07c4c2f..9553676 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php
@@ -144,6 +144,10 @@
'XXwiki/Q23', null, 'XXwiki', 'Q23',
'(wikibase-gotolinkedpage-error-page-not-found)'
],
+ 'notFound3' => [
+ 'XXwiki,enwiki,zhwiki/Q23', null,
'XXwiki,enwiki,zhwiki', 'Q23',
+ '(wikibase-gotolinkedpage-error-page-not-found)'
+ ],
];
}
@@ -171,6 +175,7 @@
$cases['found'] = [ 'dewiki/Q23',
'http://dewiki.com/TestPageName' ];
$cases['foundEntityRedirect'] = [ 'dewiki/Q24',
'http://dewiki.com/TestPageName' ];
$cases['foundWithSiteIdHack'] = [ 'de/Q23',
'http://dewiki.com/TestPageName' ];
+ $cases['foundInFallbackChain'] = [ 'enwiki,dewiki,fawiki/Q23',
'http://dewiki.com/TestPageName' ];
return $cases;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ca8d2b4..7cad3af 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -122,12 +122,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "0e3fce680234e7fdf5bc89a306a70bc3e46ad963"
+ "reference": "c0c33a07f4f302512ad86ba3665c99dddbd89322"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/0e3fce680234e7fdf5bc89a306a70bc3e46ad963";,
- "reference": "0e3fce680234e7fdf5bc89a306a70bc3e46ad963",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/c0c33a07f4f302512ad86ba3665c99dddbd89322";,
+ "reference": "c0c33a07f4f302512ad86ba3665c99dddbd89322",
"shasum": ""
},
"require": {
@@ -138,7 +138,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.10.0"
},
- "time": "2017-07-14 20:23:43",
+ "time": "2017-07-17 05:11:14",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1380,12 +1380,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "6bd348525e9e0bd59aad853bfdf8e5c582af4960"
+ "reference": "d73fabdf7d38855b03185f291411b99284d2862e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6bd348525e9e0bd59aad853bfdf8e5c582af4960";,
- "reference": "6bd348525e9e0bd59aad853bfdf8e5c582af4960",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d73fabdf7d38855b03185f291411b99284d2862e";,
+ "reference": "d73fabdf7d38855b03185f291411b99284d2862e",
"shasum": ""
},
"require": {
@@ -1418,7 +1418,7 @@
"jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-07-15 22:25:30",
+ "time": "2017-07-17 09:25:29",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1771,7 +1771,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "4a00edcd50d5f4f6c97cd9d7b88efb8b2d4c5a23"
+ "reference": "08baa60a2f35296a46db7c2d61ac8a4f21ebe827"
},
"require": {
"php": ">=5.5.9",
@@ -1787,7 +1787,7 @@
"satooshi/php-coveralls": "master-dev",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-07-15 19:52:39",
+ "time": "2017-07-17 09:39:53",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/365568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd3a744b38650244aa88f2cffcb6ad67f86779ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
