jenkins-bot has submitted this change and it was merged.
Change subject: DM 1.0 compat: do not use EntityId constructor
......................................................................
DM 1.0 compat: do not use EntityId constructor
Change-Id: I6bc643a6ed3dcb956b7cb8fb6e14160c2d53bd0e
---
M repo/includes/store/sql/EntityPerPageTable.php
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
WikidataJenkins: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/store/sql/EntityPerPageTable.php
b/repo/includes/store/sql/EntityPerPageTable.php
index f22d250..9bdff32 100644
--- a/repo/includes/store/sql/EntityPerPageTable.php
+++ b/repo/includes/store/sql/EntityPerPageTable.php
@@ -5,6 +5,7 @@
use InvalidArgumentException;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\LegacyIdInterpreter;
/**
* Represents a lookup database table that make the link between entities and
pages.
@@ -36,12 +37,14 @@
*
* @throws InvalidArgumentException
*/
- function __construct( $useRedirectTargetColumn = true ) {
+ public function __construct( $useRedirectTargetColumn = true ) {
if ( !is_bool( $useRedirectTargetColumn ) ) {
throw new InvalidArgumentException(
'$useRedirectTargetColumn must be true or false' );
}
+ // FIXME: this needs to be injected if the table is to work
with entities other than items and properties
$this->idParser = new BasicEntityIdParser();
+
$this->useRedirectTargetColumn = $useRedirectTargetColumn;
}
@@ -252,9 +255,11 @@
protected function getEntityIdsFromRows( $rows ) {
$entities = array();
+ $legacyIdParser = new LegacyIdInterpreter();
+
foreach ( $rows as $row ) {
- $id = new EntityId( $row->entity_type,
(int)$row->entity_id );
- $entities[] = $this->idParser->parse(
$id->getSerialization() );
+ // FIXME: this only works for items and properties
+ $entities[] = $legacyIdParser->newIdFromTypeAndNumber(
$row->entity_type, (int)$row->entity_id );
}
return $entities;
--
To view, visit https://gerrit.wikimedia.org/r/149227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bc643a6ed3dcb956b7cb8fb6e14160c2d53bd0e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
