Aude has submitted this change and it was merged.
Change subject: Stop using the Wikibase\EntityId alias
......................................................................
Stop using the Wikibase\EntityId alias
At least in all the tests. This can not be done in classes that are
in the Wikibase namespace. PHP will find both and complain.
Change-Id: Iaf184d9522035b4b01872427b703e0bd88bac893
---
M client/tests/phpunit/includes/RepoLinkerTest.php
M lib/tests/phpunit/MockPropertyLabelResolver.php
M lib/tests/phpunit/ReferencedUrlFinderTest.php
M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
7 files changed, 14 insertions(+), 10 deletions(-)
Approvals:
Aude: Looks good to me, approved
WikidataJenkins: Verified
jenkins-bot: Checked
diff --git a/client/tests/phpunit/includes/RepoLinkerTest.php
b/client/tests/phpunit/includes/RepoLinkerTest.php
index cc28ae8..999d8d4 100644
--- a/client/tests/phpunit/includes/RepoLinkerTest.php
+++ b/client/tests/phpunit/includes/RepoLinkerTest.php
@@ -2,9 +2,9 @@
namespace Wikibase\Test;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\EntityId;
use Wikibase\RepoLinker;
/**
@@ -350,4 +350,5 @@
)
);
}
+
}
diff --git a/lib/tests/phpunit/MockPropertyLabelResolver.php
b/lib/tests/phpunit/MockPropertyLabelResolver.php
index 4b53471..2a454fc 100644
--- a/lib/tests/phpunit/MockPropertyLabelResolver.php
+++ b/lib/tests/phpunit/MockPropertyLabelResolver.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Wikibase\EntityId;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\PropertyLabelResolver;
/**
@@ -46,4 +46,5 @@
return $ids;
}
+
}
diff --git a/lib/tests/phpunit/ReferencedUrlFinderTest.php
b/lib/tests/phpunit/ReferencedUrlFinderTest.php
index afa0654..3eb8913 100644
--- a/lib/tests/phpunit/ReferencedUrlFinderTest.php
+++ b/lib/tests/phpunit/ReferencedUrlFinderTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Lib\Test;
use DataValues\StringValue;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\EntityId;
use Wikibase\Lib\InMemoryDataTypeLookup;
use Wikibase\PropertyNoValueSnak;
use Wikibase\PropertySomeValueSnak;
@@ -82,4 +82,5 @@
$actual = $linkFinder->findSnakLinks( $snaks );
$this->assertEmpty( $actual ); // since $p42 isn't know, this
should return nothing
}
+
}
diff --git
a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
index 2772dc3..1bb2244 100644
--- a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
+++ b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
@@ -9,9 +9,9 @@
use SiteStore;
use Title;
use ValueFormatters\ValueFormatter;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\EntityId;
use Wikibase\EntityTitleLookup;
use Wikibase\Repo\Localizer\MessageParameterFormatter;
@@ -112,4 +112,5 @@
return $mock;
}
+
}
diff --git
a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
index 6afe5d5..65db270 100644
--- a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
@@ -3,13 +3,13 @@
namespace Wikibase\Test\Validators;
use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Term\AliasGroupList;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
-use Wikibase\EntityId;
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\Test\ChangeOpTestMockProvider;
use Wikibase\Validators\LabelUniquenessValidator;
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
index 6a4f64e..b755806 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
@@ -8,9 +8,9 @@
use EasyRdf_Namespace;
use EasyRdf_Resource;
use SiteList;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Entity;
-use Wikibase\EntityId;
use Wikibase\EntityRevision;
use Wikibase\Item;
use Wikibase\RdfBuilder;
diff --git a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
index 158239d..372bd8b 100644
--- a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
@@ -7,20 +7,20 @@
use Status;
use User;
use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\EntityContentFactory;
-use Wikibase\EntityId;
use Wikibase\EntityPerPageTable;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Lib\Store\EntityRevisionLookup;
+use Wikibase\Lib\Store\EntityStore;
+use Wikibase\Lib\Store\StorageException;
+use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
use Wikibase\Repo\Store\WikiPageEntityStore;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\SqlIdGenerator;
-use Wikibase\Lib\Store\StorageException;
-use Wikibase\Lib\Store\EntityStore;
-use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
/**
* @covers Wikibase\Repo\Store\WikiPageEntityStore
--
To view, visit https://gerrit.wikimedia.org/r/155728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf184d9522035b4b01872427b703e0bd88bac893
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
