Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262845
Change subject: Update usage of GeoData classes (which are being put in
namespace)
......................................................................
Update usage of GeoData classes (which are being put in namespace)
Bug: T122339
Change-Id: Iaf4fd69ab2ad6171003b22f588badb5a970099cc
Depends-On: I2a52a7f44f747cd13c34edd1ef19c96f66d548f0
---
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/includes/ParserOutput/GeoDataDataUpdater.php
M repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/45/262845/1
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index d86123b..67cca21 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -179,7 +179,7 @@
$updaters[] = new PageImagesDataUpdater(
$this->preferredPageImagesProperties );
}
- if ( class_exists( 'GeoData' ) ) {
+ if ( class_exists( 'GeoData\GeoData' ) ) {
$updaters[] = new GeoDataDataUpdater(
$propertyDataTypeMatcher,
$this->preferredGeoDataProperties,
diff --git a/repo/includes/ParserOutput/GeoDataDataUpdater.php
b/repo/includes/ParserOutput/GeoDataDataUpdater.php
index 47a89fb..e4cc9e0 100644
--- a/repo/includes/ParserOutput/GeoDataDataUpdater.php
+++ b/repo/includes/ParserOutput/GeoDataDataUpdater.php
@@ -2,9 +2,9 @@
namespace Wikibase\Repo\ParserOutput;
-use Coord;
-use CoordinatesOutput;
use DataValues\Geo\Values\GlobeCoordinateValue;
+use GeoData\Coord;
+use GeoData\CoordinatesOutput;
use ParserOutput;
use RuntimeException;
use Wikibase\DataModel\Services\Entity\PropertyDataTypeMatcher;
@@ -60,7 +60,7 @@
array $preferredPropertiesIds,
array $globeUris
) {
- if ( !class_exists( 'GeoData' ) ) {
+ if ( !class_exists( 'GeoData\GeoData' ) ) {
throw new RuntimeException( 'GeoDataDataUpdater
requires the GeoData extension '
. 'to be enabled' );
}
diff --git
a/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
b/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
index 5abd396..09ec66d 100644
--- a/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
+++ b/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
@@ -2,12 +2,12 @@
namespace Wikibase\Repo\Tests\ParserOutput;
-use Coord;
-use CoordinatesOutput;
use DataValues\DataValue;
use DataValues\Geo\Values\GlobeCoordinateValue;
use DataValues\Geo\Values\LatLongValue;
use DataValues\StringValue;
+use GeoData\Coord;
+use GeoData\CoordinatesOutput;
use ParserOutput;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -33,7 +33,7 @@
class GeoDataDataUpdaterTest extends \MediaWikiTestCase {
private function willSkipTests() {
- if ( !class_exists( 'GeoData' ) ) {
+ if ( !class_exists( 'GeoData\GeoData' ) ) {
return true;
}
return false;
--
To view, visit https://gerrit.wikimedia.org/r/262845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf4fd69ab2ad6171003b22f588badb5a970099cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
