jenkins-bot has submitted this change and it was merged.
Change subject: Remove references to Entity in change tests
......................................................................
Remove references to Entity in change tests
Change-Id: I0902ede77b82eaae195b95cb943a9037ba5734d3
---
M lib/tests/phpunit/changes/EntityChangeTest.php
M lib/tests/phpunit/changes/ItemChangeTest.php
M lib/tests/phpunit/changes/TestChanges.php
3 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/changes/EntityChangeTest.php
b/lib/tests/phpunit/changes/EntityChangeTest.php
index 142adc7..ef535ff 100644
--- a/lib/tests/phpunit/changes/EntityChangeTest.php
+++ b/lib/tests/phpunit/changes/EntityChangeTest.php
@@ -7,7 +7,7 @@
use RecentChange;
use Revision;
use stdClass;
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -63,13 +63,13 @@
$entities = array_filter(
TestChanges::getEntities(),
- function( Entity $entity ) use ( $entityClass ) {
+ function( EntityDocument $entity ) use ( $entityClass )
{
return is_a( $entity, $entityClass );
}
);
$cases = array_map(
- function( Entity $entity ) {
+ function( EntityDocument $entity ) {
return array( $entity );
},
$entities
diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php
b/lib/tests/phpunit/changes/ItemChangeTest.php
index c386c17..5d6d36c 100644
--- a/lib/tests/phpunit/changes/ItemChangeTest.php
+++ b/lib/tests/phpunit/changes/ItemChangeTest.php
@@ -5,7 +5,7 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpChange;
use Exception;
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Services\Diff\ItemDiff;
use Wikibase\EntityChange;
@@ -38,14 +38,14 @@
public function entityProvider() {
$entities = array_filter(
TestChanges::getEntities(),
- function( Entity $entity ) {
+ function( EntityDocument $entity ) {
return ( $entity instanceof Item );
}
);
$cases = array_map(
- function( Entity $entity ) {
- return array( $entity );
+ function( Item $item ) {
+ return array( $item );
},
$entities
);
diff --git a/lib/tests/phpunit/changes/TestChanges.php
b/lib/tests/phpunit/changes/TestChanges.php
index c47d34a..92ce5f7 100644
--- a/lib/tests/phpunit/changes/TestChanges.php
+++ b/lib/tests/phpunit/changes/TestChanges.php
@@ -3,6 +3,7 @@
namespace Wikibase\Test;
use Wikibase\ChangeRow;
+use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
@@ -277,6 +278,9 @@
return $diffs;
}
+ /**
+ * @return EntityDocument[]
+ */
public static function getEntities() {
$entityList = array();
--
To view, visit https://gerrit.wikimedia.org/r/268867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0902ede77b82eaae195b95cb943a9037ba5734d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
