Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236539
Change subject: Clean up code around PropertyInfoBuilder
......................................................................
Clean up code around PropertyInfoBuilder
This is a direct follow up for I363e38f. Stuff I found while reviewing
I363e38f (while it was already merged).
Bug: T95285
Change-Id: Ia6418b8753a64e7796e81857ed82ae602d0795a4
---
M repo/includes/PropertyInfoBuilder.php
M repo/includes/content/ItemHandler.php
M repo/includes/content/PropertyHandler.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
4 files changed, 23 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/39/236539/1
diff --git a/repo/includes/PropertyInfoBuilder.php
b/repo/includes/PropertyInfoBuilder.php
index b87b16d..b0f1351 100644
--- a/repo/includes/PropertyInfoBuilder.php
+++ b/repo/includes/PropertyInfoBuilder.php
@@ -7,7 +7,6 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
/**
@@ -23,7 +22,7 @@
/**
* @var PropertyId|null
*/
- private $formatterUrlProperty = null;
+ private $formatterUrlProperty;
/**
* @param PropertyId|null $formatterUrlProperty
@@ -33,8 +32,12 @@
}
/**
+ * @see PropertyInfoTable::setPropertyInfo
+ *
* @param Property $property
- * @return array
+ *
+ * @return array Information to be stored in the "pi_info" column of
the "wb_property_info"
+ * table. Must be an array and can contain anything that can be encoded
by json_encode.
*/
public function buildPropertyInfo( Property $property ) {
$info = array(
@@ -51,7 +54,9 @@
/**
* @param StatementList $statements
- * @return string|null
+ *
+ * @return string|null The string value of the main snak of the first
best
+ * "formatterUrlProperty" statements, if such exists. Null otherwise.
*/
private function getFormatterUrl( StatementList $statements ) {
if ( $this->formatterUrlProperty === null ) {
@@ -63,9 +68,8 @@
return null;
}
- /** @var Statement $statement */
- $statementArray = $bestStatements->toArray();
- $mainSnak = $statementArray[0]->getMainSnak();
+ $statement = reset( $bestStatements );
+ $mainSnak = $statement->getMainSnak();
if ( !( $mainSnak instanceof PropertyValueSnak ) ) {
return null;
}
diff --git a/repo/includes/content/ItemHandler.php
b/repo/includes/content/ItemHandler.php
index d0a350d..3202c8c 100644
--- a/repo/includes/content/ItemHandler.php
+++ b/repo/includes/content/ItemHandler.php
@@ -78,7 +78,7 @@
}
/**
- * @return array
+ * @return string[]
*/
public function getActionOverrides() {
return array(
diff --git a/repo/includes/content/PropertyHandler.php
b/repo/includes/content/PropertyHandler.php
index a665853..049aa39 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -61,6 +61,7 @@
* @param ValidatorErrorLocalizer $errorLocalizer
* @param EntityIdParser $entityIdParser
* @param PropertyInfoStore $infoStore
+ * @param PropertyInfoBuilder $propertyInfoBuilder
* @param callable|null $legacyExportFormatDetector
*/
public function __construct(
@@ -108,7 +109,7 @@
}
/**
- * @return array
+ * @return string[]
*/
public function getActionOverrides() {
return array(
diff --git a/repo/includes/store/sql/PropertyInfoTableBuilder.php
b/repo/includes/store/sql/PropertyInfoTableBuilder.php
index 3c3020b..b342b86 100644
--- a/repo/includes/store/sql/PropertyInfoTableBuilder.php
+++ b/repo/includes/store/sql/PropertyInfoTableBuilder.php
@@ -71,6 +71,12 @@
*/
private $batchSize = 100;
+ /**
+ * @param PropertyInfoTable $propertyInfoTable
+ * @param EntityLookup $entityLookup
+ * @param PropertyInfoBuilder $propertyInfoBuilder
+ * @param bool $useRedirectTargetColumn
+ */
public function __construct(
PropertyInfoTable $propertyInfoTable,
EntityLookup $entityLookup,
@@ -264,6 +270,9 @@
);
}
+ /**
+ * @param string $msg
+ */
private function reportMessage( $msg ) {
if ( $this->reporter ) {
$this->reporter->reportMessage( $msg );
--
To view, visit https://gerrit.wikimedia.org/r/236539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6418b8753a64e7796e81857ed82ae602d0795a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
