Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/246834
Change subject: Minor clean-ups in ParserOutput DataUpdates code ...................................................................... Minor clean-ups in ParserOutput DataUpdates code This is a small subset of the changes in I1aa5890. I hope nothing in here is controversial and can be merged fast. Bug: T114220 Change-Id: I16e31581da250467ffbdba122cb4364e2e4daaaa --- M repo/includes/DataUpdates/EntityParserOutputDataUpdater.php M repo/includes/DataUpdates/ReferencedEntitiesDataUpdate.php M repo/includes/EntityParserOutputGenerator.php 3 files changed, 40 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/34/246834/1 diff --git a/repo/includes/DataUpdates/EntityParserOutputDataUpdater.php b/repo/includes/DataUpdates/EntityParserOutputDataUpdater.php index 2fe04b2..c5e5528 100644 --- a/repo/includes/DataUpdates/EntityParserOutputDataUpdater.php +++ b/repo/includes/DataUpdates/EntityParserOutputDataUpdater.php @@ -22,36 +22,36 @@ /** * @var ParserOutputDataUpdate[] */ - private $dataUpdates; + private $dataUpdaters; /** * @var StatementDataUpdate[] */ - private $statementDataUpdates = array(); + private $statementDataUpdaters = array(); /** * @var SiteLinkDataUpdate[] */ - private $siteLinkDataUpdates = array(); + private $siteLinkDataUpdaters = array(); /** - * @param ParserOutputDataUpdate[] $dataUpdates + * @param ParserOutputDataUpdate[] $dataUpdaters * * @throws InvalidArgumentException */ - public function __construct( array $dataUpdates ) { - foreach ( $dataUpdates as $dataUpdate ) { + public function __construct( array $dataUpdaters ) { + foreach ( $dataUpdaters as $dataUpdate ) { if ( $dataUpdate instanceof StatementDataUpdate ) { - $this->statementDataUpdates[] = $dataUpdate; + $this->statementDataUpdaters[] = $dataUpdate; } elseif ( $dataUpdate instanceof SiteLinkDataUpdate ) { - $this->siteLinkDataUpdates[] = $dataUpdate; + $this->siteLinkDataUpdaters[] = $dataUpdate; } else { - throw new InvalidArgumentException( 'Each $dataUpdates element must be a ' + throw new InvalidArgumentException( 'Each $dataUpdaters element must be a ' . 'StatementDataUpdate, SiteLinkDataUpdate or both' ); } } - $this->dataUpdates = $dataUpdates; + $this->dataUpdaters = $dataUpdaters; } /** @@ -71,12 +71,12 @@ * @param StatementListProvider $entity */ private function processStatementListProvider( StatementListProvider $entity ) { - if ( empty( $this->statementDataUpdates ) ) { + if ( empty( $this->statementDataUpdaters ) ) { return; } foreach ( $entity->getStatements() as $statement ) { - foreach ( $this->statementDataUpdates as $dataUpdate ) { + foreach ( $this->statementDataUpdaters as $dataUpdate ) { $dataUpdate->processStatement( $statement ); } } @@ -86,12 +86,12 @@ * @param Item $item */ private function processItem( Item $item ) { - if ( empty( $this->siteLinkDataUpdates ) ) { + if ( empty( $this->siteLinkDataUpdaters ) ) { return; } foreach ( $item->getSiteLinkList() as $siteLink ) { - foreach ( $this->siteLinkDataUpdates as $dataUpdate ) { + foreach ( $this->siteLinkDataUpdaters as $dataUpdate ) { $dataUpdate->processSiteLink( $siteLink ); } } @@ -101,7 +101,7 @@ * @param ParserOutput $parserOutput */ public function updateParserOutput( ParserOutput $parserOutput ) { - foreach ( $this->dataUpdates as $dataUpdate ) { + foreach ( $this->dataUpdaters as $dataUpdate ) { $dataUpdate->updateParserOutput( $parserOutput ); } } diff --git a/repo/includes/DataUpdates/ReferencedEntitiesDataUpdate.php b/repo/includes/DataUpdates/ReferencedEntitiesDataUpdate.php index b56ce1d..eb82285 100644 --- a/repo/includes/DataUpdates/ReferencedEntitiesDataUpdate.php +++ b/repo/includes/DataUpdates/ReferencedEntitiesDataUpdate.php @@ -129,8 +129,13 @@ * @param ParserOutput $parserOutput */ public function updateParserOutput( ParserOutput $parserOutput ) { - // needed and used in EntityParserOutputGenerator, for getEntityInfo, - // to allow this data to be accessed later in processing. + /** + * Needed and used in EntityParserOutputGenerator, for getEntityInfo, to allow this data to + * be accessed later in processing. + * + * @see EntityParserOutputGenerator::getEntityInfo + * @fixme Use self::getEntityIds instead. + */ $parserOutput->setExtensionData( 'referenced-entities', $this->entityIds ); $this->addLinksToParserOutput( $parserOutput ); } diff --git a/repo/includes/EntityParserOutputGenerator.php b/repo/includes/EntityParserOutputGenerator.php index ccbd2ce..955d4d5 100644 --- a/repo/includes/EntityParserOutputGenerator.php +++ b/repo/includes/EntityParserOutputGenerator.php @@ -84,6 +84,17 @@ */ private $languageCode; + /** + * @param EntityViewFactory $entityViewFactory + * @param ParserOutputJsConfigBuilder $configBuilder + * @param EntityTitleLookup $entityTitleLookup + * @param EntityInfoBuilderFactory $entityInfoBuilderFactory + * @param LanguageFallbackChain $languageFallbackChain + * @param TemplateFactory $templateFactory + * @param EntityDataFormatProvider $entityDataFormatProvider + * @param EntityParserOutputDataUpdater $parserOutputDataUpdater + * @param string $languageCode + */ public function __construct( EntityViewFactory $entityViewFactory, ParserOutputJsConfigBuilder $configBuilder, @@ -191,7 +202,12 @@ * @return EntityInfo */ private function getEntityInfo( ParserOutput $parserOutput ) { - // set in ReferencedEntitiesDataUpdate + /** + * Set in ReferencedEntitiesDataUpdate. + * + * @see ReferencedEntitiesDataUpdate::updateParserOutput + * @fixme Use ReferencedEntitiesDataUpdate::getEntityIds instead. + */ $entityIds = $parserOutput->getExtensionData( 'referenced-entities' ); if ( !is_array( $entityIds ) ) { @@ -248,7 +264,7 @@ if ( !is_string( $titleText ) ) { $entityId = $entity->getId(); - if ( $entityId !== null ) { + if ( $entityId instanceof EntityId ) { $titleText = $entityId->getSerialization(); } } -- To view, visit https://gerrit.wikimedia.org/r/246834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16e31581da250467ffbdba122cb4364e2e4daaaa 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