Jeroen De Dauw has submitted this change and it was merged.
Change subject: Small refactoring for ReferencedEntitiesFinder
......................................................................
Small refactoring for ReferencedEntitiesFinder
There still was a warning shown in PHPStorm. The introduction of the
$dataValue variable makes it go away.
Also the array of EntityId objects had a strange name. $links sounds
like a list of SiteLink objects.
Change-Id: Ibb6e011b6de9cce1629619c810b94f13a1ff33de
---
M lib/includes/ReferencedEntitiesFinder.php
1 file changed, 12 insertions(+), 7 deletions(-)
Approvals:
Bene: Looks good to me, but someone else must approve
Jeroen De Dauw: Looks good to me, approved
diff --git a/lib/includes/ReferencedEntitiesFinder.php
b/lib/includes/ReferencedEntitiesFinder.php
index db694b2..89f4b7d 100644
--- a/lib/includes/ReferencedEntitiesFinder.php
+++ b/lib/includes/ReferencedEntitiesFinder.php
@@ -24,22 +24,27 @@
* @since 0.4
*
* @param Snak[] $snaks
- * @return EntityId[]
+ *
+ * @return EntityId[] Entity id strings pointing to EntityId objects.
*/
public function findSnakLinks( array $snaks ) {
- $links = array();
+ $entityIds = array();
foreach ( $snaks as $snak ) {
$propertyId = $snak->getPropertyId();
- $links[$propertyId->getSerialization()] = $propertyId;
+ $entityIds[$propertyId->getSerialization()] =
$propertyId;
- if( $snak instanceof PropertyValueSnak &&
$snak->getDataValue() instanceof EntityIdValue ) {
- $entityId =
$snak->getDataValue()->getEntityId();
- $links[$entityId->getSerialization()] =
$entityId;
+ if ( $snak instanceof PropertyValueSnak ) {
+ $dataValue = $snak->getDataValue();
+
+ if ( $dataValue instanceof EntityIdValue ) {
+ $entityId = $dataValue->getEntityId();
+
$entityIds[$entityId->getSerialization()] = $entityId;
+ }
}
}
- return $links;
+ return $entityIds;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/156042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb6e011b6de9cce1629619c810b94f13a1ff33de
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
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
