Jeroen De Dauw has submitted this change and it was merged.
Change subject: Adapt to changes in data-values/geo 1.0.0
......................................................................
Adapt to changes in data-values/geo 1.0.0
Change-Id: I94078a04bf628f5761c3fd90dff95b2a0bb32452
---
M client/includes/WikibaseClient.php
M composer.json
M lib/WikibaseLib.php
M lib/includes/DataValueFactory.php
M lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
M lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
M repo/Wikibase.php
M repo/includes/WikibaseRepo.php
10 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 785edf9..60a22a8 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -646,7 +646,7 @@
'number' => 'DataValues\NumberValue',
'string' => 'DataValues\StringValue',
'unknown' => 'DataValues\UnknownValue',
- 'globecoordinate' =>
'DataValues\GlobeCoordinateValue',
+ 'globecoordinate' =>
'DataValues\Geo\Values\GlobeCoordinateValue',
'monolingualtext' =>
'DataValues\MonolingualTextValue',
'multilingualtext' =>
'DataValues\MultilingualTextValue',
'quantity' => 'DataValues\QuantityValue',
diff --git a/composer.json b/composer.json
index 9d23dfb..efec9e1 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"data-values/data-values": "~0.1.0",
"data-values/common": "~0.2.0",
- "data-values/geo": "~0.2.0",
+ "data-values/geo": "~1.0.0",
"data-values/interfaces": "~0.1.4",
"data-values/number": "~0.4.0",
"data-values/time": "~0.6.0",
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index e969d61..a236a62 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -59,7 +59,7 @@
$GLOBALS['evilDataValueMap'] = array_merge(
$GLOBALS['evilDataValueMap'],
array(
- 'globecoordinate' => 'DataValues\GlobeCoordinateValue',
+ 'globecoordinate' =>
'DataValues\Geo\Values\GlobeCoordinateValue',
'monolingualtext' => 'DataValues\MonolingualTextValue',
'multilingualtext' => 'DataValues\MultilingualTextValue',
'quantity' => 'DataValues\QuantityValue',
diff --git a/lib/includes/DataValueFactory.php
b/lib/includes/DataValueFactory.php
index 8120c58..3f5378c 100644
--- a/lib/includes/DataValueFactory.php
+++ b/lib/includes/DataValueFactory.php
@@ -26,7 +26,7 @@
'number' => 'DataValues\NumberValue',
'string' => 'DataValues\StringValue',
'unknown' => 'DataValues\UnknownValue',
- 'globecoordinate' => 'DataValues\GlobeCoordinateValue',
+ 'globecoordinate' =>
'DataValues\Geo\Values\GlobeCoordinateValue',
'monolingualtext' => 'DataValues\MonolingualTextValue',
'multilingualtext' => 'DataValues\MultilingualTextValue',
'quantity' => 'DataValues\QuantityValue',
diff --git a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
index df0f02e..a2ed6d8 100644
--- a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
+++ b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
@@ -2,13 +2,13 @@
namespace Wikibase\Lib;
-use DataValues\GlobeCoordinateValue;
+use DataValues\Geo\Formatters\GeoCoordinateFormatter;
+use DataValues\Geo\Formatters\GlobeCoordinateFormatter;
+use DataValues\Geo\Values\GlobeCoordinateValue;
use Html;
use InvalidArgumentException;
use Message;
use ValueFormatters\FormatterOptions;
-use ValueFormatters\GeoCoordinateFormatter;
-use ValueFormatters\GlobeCoordinateFormatter;
use ValueFormatters\ValueFormatter;
use ValueFormatters\ValueFormatterBase;
diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
index 81514cc..45c7098 100644
--- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
@@ -7,8 +7,8 @@
use RuntimeException;
use ValueFormatters\DecimalFormatter;
use ValueFormatters\FormatterOptions;
-use ValueFormatters\GeoCoordinateFormatter;
-use ValueFormatters\GlobeCoordinateFormatter;
+use DataValues\Geo\Formatters\GeoCoordinateFormatter;
+use DataValues\Geo\Formatters\GlobeCoordinateFormatter;
use ValueFormatters\QuantityFormatter;
use ValueFormatters\ValueFormatter;
use Wikibase\LanguageFallbackChain;
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 1b3b500..64b714c 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -4,8 +4,8 @@
use DataTypes\DataType;
use DataTypes\DataTypeFactory;
-use DataValues\GlobeCoordinateValue;
-use DataValues\LatLongValue;
+use DataValues\Geo\Values\GlobeCoordinateValue;
+use DataValues\Geo\Values\LatLongValue;
use DataValues\MonolingualTextValue;
use DataValues\NumberValue;
use DataValues\QuantityValue;
diff --git
a/lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
b/lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
index f8ec27b..a37bf07 100644
--- a/lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
+++ b/lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
@@ -2,8 +2,8 @@
namespace Wikibase\Lib\Test;
-use DataValues\GlobeCoordinateValue;
-use DataValues\LatLongValue;
+use DataValues\Geo\Values\GlobeCoordinateValue;
+use DataValues\Geo\Values\LatLongValue;
use DataValues\NumberValue;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a1bb515..d163cba 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -112,7 +112,7 @@
};
$wgValueParsers['time'] = 'Wikibase\Lib\Parsers\TimeParser';
- $wgValueParsers['globecoordinate'] =
'ValueParsers\GlobeCoordinateParser';
+ $wgValueParsers['globecoordinate'] =
'DataValues\Geo\Parsers\GlobeCoordinateParser';
$wgValueParsers['null'] = 'ValueParsers\NullParser';
$wgValueParsers['monolingualtext'] =
'Wikibase\Parsers\MonolingualTextParser';
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d4454f6..cc2884b 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -823,7 +823,7 @@
'number' => 'DataValues\NumberValue',
'string' => 'DataValues\StringValue',
'unknown' => 'DataValues\UnknownValue',
- 'globecoordinate' =>
'DataValues\GlobeCoordinateValue',
+ 'globecoordinate' =>
'DataValues\Geo\Values\GlobeCoordinateValue',
'monolingualtext' =>
'DataValues\MonolingualTextValue',
'multilingualtext' =>
'DataValues\MultilingualTextValue',
'quantity' => 'DataValues\QuantityValue',
--
To view, visit https://gerrit.wikimedia.org/r/159995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94078a04bf628f5761c3fd90dff95b2a0bb32452
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
