jenkins-bot has submitted this change and it was merged.
Change subject: Rename $dataUpdate(s) variables to $dataUpdater with an r
......................................................................
Rename $dataUpdate(s) variables to $dataUpdater with an r
To restore consistency between class and variable names again.
Change-Id: Ibfd576d69cf77550c1a1175e2d690b6f305389e9
---
M repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputDataUpdaterTest.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
6 files changed, 50 insertions(+), 50 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
b/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
index be2ef6f..3b561f7 100644
--- a/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
+++ b/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
@@ -27,38 +27,38 @@
/**
* @var ParserOutputDataUpdater[]
*/
- private $dataUpdates;
+ private $dataUpdaters;
/**
* @var StatementDataUpdater[]
*/
- private $statementDataUpdates = array();
+ private $statementDataUpdaters = array();
/**
* @var SiteLinkDataUpdater[]
*/
- private $siteLinkDataUpdates = array();
+ private $siteLinkDataUpdaters = array();
/**
* @param ParserOutput $parserOutput
- * @param ParserOutputDataUpdater[] $dataUpdates
+ * @param ParserOutputDataUpdater[] $dataUpdaters
*
* @throws InvalidArgumentException
*/
- public function __construct( ParserOutput $parserOutput, array
$dataUpdates ) {
- foreach ( $dataUpdates as $dataUpdate ) {
- if ( $dataUpdate instanceof StatementDataUpdater ) {
- $this->statementDataUpdates[] = $dataUpdate;
- } elseif ( $dataUpdate instanceof SiteLinkDataUpdater )
{
- $this->siteLinkDataUpdates[] = $dataUpdate;
+ public function __construct( ParserOutput $parserOutput, array
$dataUpdaters ) {
+ foreach ( $dataUpdaters as $dataUpdater ) {
+ if ( $dataUpdater instanceof StatementDataUpdater ) {
+ $this->statementDataUpdaters[] = $dataUpdater;
+ } elseif ( $dataUpdater instanceof SiteLinkDataUpdater
) {
+ $this->siteLinkDataUpdaters[] = $dataUpdater;
} else {
- throw new InvalidArgumentException( 'Each
$dataUpdates element must be a '
+ throw new InvalidArgumentException( 'Each
$dataUpdaters element must be a '
. 'StatementDataUpdater,
SiteLinkDataUpdater or both' );
}
}
$this->parserOutput = $parserOutput;
- $this->dataUpdates = $dataUpdates;
+ $this->dataUpdaters = $dataUpdaters;
}
/**
@@ -78,13 +78,13 @@
* @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 ) {
- $dataUpdate->processStatement( $statement );
+ foreach ( $this->statementDataUpdaters as $dataUpdater
) {
+ $dataUpdater->processStatement( $statement );
}
}
}
@@ -93,20 +93,20 @@
* @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 ) {
- $dataUpdate->processSiteLink( $siteLink );
+ foreach ( $this->siteLinkDataUpdaters as $dataUpdater )
{
+ $dataUpdater->processSiteLink( $siteLink );
}
}
}
public function finish() {
- foreach ( $this->dataUpdates as $dataUpdate ) {
- $dataUpdate->updateParserOutput( $this->parserOutput );
+ foreach ( $this->dataUpdaters as $dataUpdater ) {
+ $dataUpdater->updateParserOutput( $this->parserOutput );
}
}
diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index d23b7b1..f6e6a1d 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -78,7 +78,7 @@
/**
* @var ParserOutputDataUpdater[]
*/
- private $dataUpdates;
+ private $dataUpdaters;
/**
* @var string
@@ -93,7 +93,7 @@
LanguageFallbackChain $languageFallbackChain,
TemplateFactory $templateFactory,
EntityDataFormatProvider $entityDataFormatProvider,
- array $dataUpdates,
+ array $dataUpdaters,
$languageCode
) {
$this->entityViewFactory = $entityViewFactory;
@@ -104,7 +104,7 @@
$this->languageCode = $languageCode;
$this->templateFactory = $templateFactory;
$this->entityDataFormatProvider = $entityDataFormatProvider;
- $this->dataUpdates = $dataUpdates;
+ $this->dataUpdaters = $dataUpdaters;
$this->languageCode = $languageCode;
}
@@ -142,7 +142,7 @@
$entity = $entityRevision->getEntity();
- $dataUpdater = new EntityParserOutputDataUpdater(
$parserOutput, $this->dataUpdates );
+ $dataUpdater = new EntityParserOutputDataUpdater(
$parserOutput, $this->dataUpdaters );
$dataUpdater->processEntity( $entity );
$dataUpdater->finish();
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index 02ef68c..e053b1c 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -165,7 +165,7 @@
private function getDataUpdates() {
$propertyDataTypeMatcher = new PropertyDataTypeMatcher(
$this->propertyDataTypeLookup );
- $dataUpdates = array(
+ $dataUpdaters = array(
new ReferencedEntitiesDataUpdater(
$this->entityTitleLookup,
$this->externalEntityIdParser
@@ -175,18 +175,18 @@
);
if ( !empty( $this->preferredPageImagesProperties ) ) {
- $dataUpdates[] = new PageImagesDataUpdater(
$this->preferredPageImagesProperties );
+ $dataUpdaters[] = new PageImagesDataUpdater(
$this->preferredPageImagesProperties );
}
if ( class_exists( 'GeoData' ) ) {
- $dataUpdates[] = new GeoDataDataUpdater(
+ $dataUpdaters[] = new GeoDataDataUpdater(
$propertyDataTypeMatcher,
$this->preferredGeoDataProperties,
$this->globeUris
);
}
- return $dataUpdates;
+ return $dataUpdaters;
}
}
diff --git
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputDataUpdaterTest.php
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputDataUpdaterTest.php
index b573199..19b0d8e 100644
---
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputDataUpdaterTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputDataUpdaterTest.php
@@ -29,21 +29,21 @@
->disableOriginalConstructor()
->getMock();
- $statementDataUpdate = $this->getMock(
'Wikibase\Repo\ParserOutput\StatementDataUpdater' );
- $statementDataUpdate->expects( $this->exactly( $statements ) )
+ $statementDataUpdater = $this->getMock(
'Wikibase\Repo\ParserOutput\StatementDataUpdater' );
+ $statementDataUpdater->expects( $this->exactly( $statements ) )
->method( 'processStatement' );
- $statementDataUpdate->expects( $this->once() )
+ $statementDataUpdater->expects( $this->once() )
->method( 'updateParserOutput' );
- $siteLinkDataUpdate = $this->getMock(
'Wikibase\Repo\ParserOutput\SiteLinkDataUpdater' );
- $siteLinkDataUpdate->expects( $this->exactly( $siteLinks ) )
+ $siteLinkDataUpdater = $this->getMock(
'Wikibase\Repo\ParserOutput\SiteLinkDataUpdater' );
+ $siteLinkDataUpdater->expects( $this->exactly( $siteLinks ) )
->method( 'processSiteLink' );
- $siteLinkDataUpdate->expects( $this->once() )
+ $siteLinkDataUpdater->expects( $this->once() )
->method( 'updateParserOutput' );
$instance = new EntityParserOutputDataUpdater( $parserOutput,
array(
- $statementDataUpdate,
- $siteLinkDataUpdate,
+ $statementDataUpdater,
+ $siteLinkDataUpdater,
) );
foreach ( $entities as $entity ) {
$instance->processEntity( $entity );
diff --git
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
index f9d86ff..e72d82e 100644
---
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
@@ -143,7 +143,7 @@
$propertyDataTypeMatcher = new PropertyDataTypeMatcher(
$this->getPropertyDataTypeLookup() );
- $dataUpdates = array(
+ $dataUpdaters = array(
new ExternalLinksDataUpdater( $propertyDataTypeMatcher
),
new ImageLinksDataUpdater( $propertyDataTypeMatcher ),
new ReferencedEntitiesDataUpdater(
@@ -160,7 +160,7 @@
$this->newLanguageFallbackChain(),
TemplateFactory::getDefaultInstance(),
$entityDataFormatProvider,
- $dataUpdates,
+ $dataUpdaters,
'en'
);
}
diff --git
a/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
b/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
index 6d0d03a..8cc236d 100644
--- a/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
+++ b/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
@@ -52,18 +52,18 @@
* @dataProvider processStatementProvider
*/
public function testProcessStatement( array $expected, array
$statements, $message ) {
- $dataUpdate = $this->newGeoDataDataUpdate(
+ $dataUpdater = $this->newGeoDataDataUpdate(
array( 'P625', 'P9000' )
);
foreach ( $statements as $statement ) {
- $dataUpdate->processStatement( $statement );
+ $dataUpdater->processStatement( $statement );
}
$this->assertAttributeEquals(
$expected,
'coordinates',
- $dataUpdate,
+ $dataUpdater,
$message
);
}
@@ -160,12 +160,12 @@
}
public function
testUpdateParserOutput_withPrimaryCoordPreferredStatement() {
- $dataUpdate = $this->newGeoDataDataUpdate(
+ $dataUpdater = $this->newGeoDataDataUpdate(
array( 'P9000', 'P625' )
);
foreach ( $this->getStatements() as $statement ) {
- $dataUpdate->processStatement( $statement );
+ $dataUpdater->processStatement( $statement );
}
$coords = $this->getCoords();
@@ -183,18 +183,18 @@
}
$parserOutput = new ParserOutput();
- $dataUpdate->updateParserOutput( $parserOutput );
+ $dataUpdater->updateParserOutput( $parserOutput );
$this->assertEquals( $expected, $parserOutput->geoData );
}
public function
testUpdateParserOutput_withPrimaryCoordNormalStatement() {
- $dataUpdate = $this->newGeoDataDataUpdate(
+ $dataUpdater = $this->newGeoDataDataUpdate(
array( 'P625', 'P10' )
);
foreach ( $this->getStatements() as $statement ) {
- $dataUpdate->processStatement( $statement );
+ $dataUpdater->processStatement( $statement );
}
$expected = new CoordinatesOutput();
@@ -211,18 +211,18 @@
}
$parserOutput = new ParserOutput();
- $dataUpdate->updateParserOutput( $parserOutput );
+ $dataUpdater->updateParserOutput( $parserOutput );
$this->assertEquals( $expected, $parserOutput->geoData );
}
public function testUpdateParserOutput_noPrimaryCoord() {
- $dataUpdate = $this->newGeoDataDataUpdate(
+ $dataUpdater = $this->newGeoDataDataUpdate(
array( 'P17', 'P404', 'P10', 'P20', 'P9000', 'P9001',
'P625' )
);
foreach ( $this->getStatements() as $statement ) {
- $dataUpdate->processStatement( $statement );
+ $dataUpdater->processStatement( $statement );
}
$expected = new CoordinatesOutput();
@@ -232,7 +232,7 @@
}
$parserOutput = new ParserOutput();
- $dataUpdate->updateParserOutput( $parserOutput );
+ $dataUpdater->updateParserOutput( $parserOutput );
$this->assertEquals( $expected, $parserOutput->geoData );
}
--
To view, visit https://gerrit.wikimedia.org/r/249437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfd576d69cf77550c1a1175e2d690b6f305389e9
Gerrit-PatchSet: 3
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: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
