JanZerebecki has submitted this change and it was merged.

Change subject: Use Wikibase DataModel 4.x
......................................................................


Use Wikibase DataModel 4.x

Change-Id: Ib0d6d5fb6d9317eca36594205698391c48884be6
---
M composer.json
M specials/SpecialConstraintReport.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
3 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  JanZerebecki: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index ccc518c..04f1e8c 100644
--- a/composer.json
+++ b/composer.json
@@ -21,11 +21,11 @@
        ],
        "require": {
                "php": ">=5.3.0",
-               "wikibase/data-model": "~3.0",
-               "serialization/serialization": "3.*,>=3.2.1"
+               "wikibase/data-model": "~4.0",
+               "serialization/serialization": "^3.2.1"
        },
        "require-dev": {
-               "phpunit/phpunit": "~3.7,>=3.7.37|~4.5",
+               "phpunit/phpunit": "^3.7.37|~4.5",
                "satooshi/php-coveralls": "master-dev"
        },
        "autoload": {
diff --git a/specials/SpecialConstraintReport.php 
b/specials/SpecialConstraintReport.php
index a876482..d333dab 100644
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -6,9 +6,10 @@
 use SpecialPage;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
+use Wikibase\DataModel\Services\EntityId\EntityIdParser;
+use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
 use Wikibase\Lib\EntityIdFormatter;
 use HTMLForm;
-use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\Lib\OutputFormatValueFormatterFactory;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityLookup;
@@ -21,7 +22,6 @@
 use UnexpectedValueException;
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel;
 use Wikibase\DataModel\Entity\ItemId;
diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php 
b/tests/phpunit/Specials/SpecialConstraintReportTest.php
index 2157e4e..2fbe3f5 100644
--- a/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -2,6 +2,7 @@
 
 namespace 
WikibaseQuality\ConstraintReport\Tests\Specials\SpecialConstraintReport;
 
+use Wikibase\DataModel\Services\Statement\GuidGenerator;
 use Wikibase\Repo\EntityIdLabelFormatterFactory;
 use Wikibase\Test\SpecialPageTestBase;
 use DataValues\StringValue;
@@ -9,7 +10,6 @@
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\DataModel\Entity\EntityId;
 use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
@@ -103,7 +103,7 @@
                        $store->saveEntity( $itemQ1, 'TestEntityQ1', $GLOBALS[ 
'wgUser' ], EDIT_NEW );
                        self::$idMap[ 'Q1' ] = $itemQ1->getId();
 
-                       $statementGuidGenerator = new ClaimGuidGenerator();
+                       $statementGuidGenerator = new GuidGenerator();
 
                        $dataValue = new StringValue( 'foo' );
                        $snak = new PropertyValueSnak( self::$idMap[ 'P1' ], 
$dataValue );

-- 
To view, visit https://gerrit.wikimedia.org/r/228974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0d6d5fb6d9317eca36594205698391c48884be6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to