jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase, data-values/geo et al.
......................................................................
Update Wikibase, data-values/geo et al.
Change-Id: I08946aac354f1282b5544396a3de2fcdf697725d
---
M composer.lock
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
M vendor/composer/installed.json
M vendor/data-values/geo/Geo.php
M vendor/data-values/geo/README.md
M vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
M vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
M vendor/data-values/geo/tests/unit/Formatters/GlobeCoordinateFormatterTest.php
13 files changed, 319 insertions(+), 283 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 944f011..45d2dc4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -258,16 +258,16 @@
},
{
"name": "data-values/geo",
- "version": "1.1.3",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/DataValues/Geo.git";,
- "reference": "ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645"
+ "reference": "e7222bc743ae05bfc5213cb1e20150aa772d8668"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/DataValues/Geo/zipball/ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645";,
- "reference": "ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645",
+ "url":
"https://api.github.com/repos/DataValues/Geo/zipball/e7222bc743ae05bfc5213cb1e20150aa772d8668";,
+ "reference": "e7222bc743ae05bfc5213cb1e20150aa772d8668",
"shasum": ""
},
"require": {
@@ -318,10 +318,10 @@
],
"support": {
"irc": "irc://irc.freenode.net/wikidata",
- "source": "https://github.com/DataValues/Geo/tree/1.1.3";,
+ "source": "https://github.com/DataValues/Geo/tree/1.1.4";,
"issues": "https://github.com/DataValues/Geo/issues";
},
- "time": "2014-11-19 17:53:17"
+ "time": "2014-11-25 16:48:57"
},
{
"name": "data-values/interfaces",
@@ -852,12 +852,12 @@
"source": {
"type": "git",
"url": "https://github.com/wmde/Wikidata.org.git";,
- "reference": "f5c714145472733c23e4afa897d3c6feaf36ec8b"
+ "reference": "bf5acbdb7f236614ae08d99cbca9c7aefdb784c2"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/Wikidata.org/zipball/f5c714145472733c23e4afa897d3c6feaf36ec8b";,
- "reference": "f5c714145472733c23e4afa897d3c6feaf36ec8b",
+ "url":
"https://api.github.com/repos/wmde/Wikidata.org/zipball/bf5acbdb7f236614ae08d99cbca9c7aefdb784c2";,
+ "reference": "bf5acbdb7f236614ae08d99cbca9c7aefdb784c2",
"shasum": ""
},
"require": {
@@ -891,7 +891,7 @@
"source": "https://github.com/wmde/Wikidata.org/tree/master";,
"issues": "https://github.com/wmde/Wikidata.org/issues";
},
- "time": "2014-11-11 18:42:29"
+ "time": "2014-11-25 18:32:14"
},
{
"name": "wikibase/data-model",
@@ -1188,8 +1188,14 @@
"version": "dev-wmf/1.25wmf8",
"source": {
"type": "git",
- "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "f23cc183c2c2cef60fce53231df8b4a4d09d96a6"
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "6388f3c8cc7da263ec793beacead1591f65a5261"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6388f3c8cc7da263ec793beacead1591f65a5261";,
+ "reference": "6388f3c8cc7da263ec793beacead1591f65a5261",
+ "shasum": ""
},
"require": {
"data-values/common": "~0.2.0",
@@ -1236,6 +1242,7 @@
"Wikibase\\Repo\\View\\": "repo/includes/View"
}
},
+ "notification-url": "https://packagist.org/downloads/";,
"license": [
"GNU GPL v2+"
],
@@ -1253,11 +1260,7 @@
"wikibaserepo",
"wikidata"
],
- "support": {
- "issues": "https://bugzilla.wikimedia.org/";,
- "irc": "irc://irc.freenode.net/wikidata"
- },
- "time": "2014-11-19 17:15:03"
+ "time": "2014-11-25 18:02:38"
},
{
"name": "wikibase/wikimedia-badges",
@@ -1265,12 +1268,12 @@
"source": {
"type": "git",
"url": "https://github.com/wmde/WikimediaBadges.git";,
- "reference": "dcf01e7be8c379083abec0eab89abb1ab5ce6102"
+ "reference": "bb5baa8e74f45b66929cc721a112605ba947dbc1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/dcf01e7be8c379083abec0eab89abb1ab5ce6102";,
- "reference": "dcf01e7be8c379083abec0eab89abb1ab5ce6102",
+ "url":
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/bb5baa8e74f45b66929cc721a112605ba947dbc1";,
+ "reference": "bb5baa8e74f45b66929cc721a112605ba947dbc1",
"shasum": ""
},
"require": {
@@ -1307,7 +1310,7 @@
"source":
"https://github.com/wmde/WikimediaBadges/tree/master";,
"issues": "https://github.com/wmde/WikimediaBadges/issues";
},
- "time": "2014-11-11 18:42:07"
+ "time": "2014-11-25 18:25:26"
}
],
"packages-dev": [],
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 75cda6d..f2ba609 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -1051,7 +1051,7 @@
: null,
nextListItemIsPending = hasNextListItem && (
nextSnaklist === null
-
|| !claimview._initialQualifiers.hasSnak( nextSnaklist.toArray()[0] )
+
|| claimview._initialQualifiers.indexOf( nextSnaklist.toArray()[0] )
=== -1
),
isBeforePending = isLastInSnaklistview && nextListItemIsPending;
diff --git
a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
index d909860..6bd3ddb 100644
--- a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
+++ b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
@@ -21,6 +21,7 @@
background-image: linear-gradient(transparent, transparent),
url(../../images/wb-badges-gold.svg);
}
+.wb-badge.wb-badge-recommendedarticle,
.wb-badge.wb-badge-goodarticle {
background-image: url(../../images/wb-badges-silver.png);
/* @embed */
diff --git
a/extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
b/extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
index 14ca840..2e3587f 100644
---
a/extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
+++
b/extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
@@ -7,7 +7,8 @@
* @author Bene* < [email protected] >
*/
-.badge-goodarticle:before {
+.badge-goodarticle:before,
+.badge-recommendedarticle:before {
/* @embed */
content: url(../../images/badge-silver-star.png);
margin-right: .2em;
diff --git
a/extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
b/extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
index 407626e..f7d6273 100644
--- a/extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
+++ b/extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
@@ -7,7 +7,8 @@
* @author Bene* < [email protected] >
*/
-.badge-goodarticle {
+.badge-goodarticle,
+.badge-recommendedarticle {
/* @embed */
list-style-image: url(../../images/badge-silver-star.png);
margin-left: 2px;
@@ -24,6 +25,7 @@
.badge-goodarticle a,
.badge-featuredarticle a,
.badge-featuredportal a,
-.badge-featuredlist a {
+.badge-featuredlist a,
+.badge-recommendedarticle a {
margin-left: -2px;
}
diff --git
a/extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
b/extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
index 917a653..c11de99 100644
--- a/extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
+++ b/extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
@@ -7,7 +7,8 @@
* @author Bene* < [email protected] >
*/
-.portlet .badge-goodarticle {
+.portlet .badge-goodarticle,
+.portlet .badge-recommendedarticle {
/* @embed */
list-style-image: url(../../images/badge-silver-star.png);
}
diff --git
a/extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
b/extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
index 2d18158..7759a96 100644
--- a/extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
+++ b/extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
@@ -7,7 +7,8 @@
* @author Bene* < [email protected] >
*/
-.badge-goodarticle {
+.badge-goodarticle,
+.badge-recommendedarticle {
/* @embed */
list-style-image: url(../../images/badge-silver-star.png);
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 5af6f64..8027949 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -92,107 +92,6 @@
]
},
{
- "name": "wikibase/wikimedia-badges",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/wmde/WikimediaBadges.git";,
- "reference": "dcf01e7be8c379083abec0eab89abb1ab5ce6102"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/dcf01e7be8c379083abec0eab89abb1ab5ce6102";,
- "reference": "dcf01e7be8c379083abec0eab89abb1ab5ce6102",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "time": "2014-11-11 18:42:07",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "WikimediaBadges.php"
- ],
- "classmap": [
- "WikimediaBadges.hooks.php"
- ]
- },
- "license": [
- "GNU GPL v2+"
- ],
- "authors": [
- {
- "name": "Bene*",
- "email": "[email protected]",
- "homepage": "https://www.wikidata.org/wiki/User:Bene*";,
- "role": "Developer"
- }
- ],
- "description": "Extension which contains default themes to display
badges on Wikimedia projects",
- "homepage": "https://github.com/wmde/WikimediaBadges";,
- "keywords": [
- "Wikibase",
- "Wikidata"
- ],
- "support": {
- "irc": "irc://irc.freenode.net/wikidata",
- "source": "https://github.com/wmde/WikimediaBadges/tree/master";,
- "issues": "https://github.com/wmde/WikimediaBadges/issues";
- }
- },
- {
- "name": "wikibase/Wikidata.org",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/wmde/Wikidata.org.git";,
- "reference": "f5c714145472733c23e4afa897d3c6feaf36ec8b"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wmde/Wikidata.org/zipball/f5c714145472733c23e4afa897d3c6feaf36ec8b";,
- "reference": "f5c714145472733c23e4afa897d3c6feaf36ec8b",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "time": "2014-11-11 18:42:29",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "WikidataOrg.hooks.php"
- ]
- },
- "license": [
- "GNU GPL v2+"
- ],
- "authors": [
- {
- "name": "Bene*",
- "email": "[email protected]",
- "homepage": "https://www.wikidata.org/wiki/User:Bene*";,
- "role": "Developer"
- }
- ],
- "description": "Configuration for and customizations to Wikibase that
are specific to wikidata.org",
- "homepage": "https://github.com/wmde/Wikidata.org";,
- "keywords": [
- "Wikibase",
- "Wikidata"
- ],
- "support": {
- "irc": "irc://irc.freenode.net/wikidata",
- "source": "https://github.com/wmde/Wikidata.org/tree/master";,
- "issues": "https://github.com/wmde/Wikidata.org/issues";
- }
- },
- {
"name": "wikibase/easyrdf_lite",
"version": "0.8.1",
"version_normalized": "0.8.1.0",
@@ -1157,153 +1056,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.25wmf8",
- "version_normalized": "dev-wmf/1.25wmf8",
- "source": {
- "type": "git",
- "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "f23cc183c2c2cef60fce53231df8b4a4d09d96a6"
- },
- "require": {
- "data-values/common": "~0.2.0",
- "data-values/data-types": "~0.4.0",
- "data-values/data-values": "~0.1.0",
- "data-values/geo": "~1.0",
- "data-values/interfaces": "~0.1.4",
- "data-values/javascript": "~0.6.0",
- "data-values/number": "~0.4.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.6.0",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.8.1",
- "diff/diff": "~1.0",
- "php": ">=5.3.2",
- "wikibase/data-model": "~2.0",
- "wikibase/data-model-javascript": "~1.0",
- "wikibase/data-model-serialization": "~1.2",
- "wikibase/easyrdf_lite": "~0.8.1",
- "wikibase/internal-serialization": "~1.3",
- "wikibase/serialization-javascript": "~2.0"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.23"
- },
- "time": "2014-11-19 17:15:03",
- "type": "mediawiki-extension",
- "installation-source": "source",
- "autoload": {
- "files": [
- "Wikibase.composer.php"
- ],
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/tests/phpunit/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Repo\\View\\": "repo/includes/View"
- }
- },
- "license": [
- "GNU GPL v2+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ],
- "support": {
- "issues": "https://bugzilla.wikimedia.org/";,
- "irc": "irc://irc.freenode.net/wikidata"
- }
- },
- {
- "name": "data-values/geo",
- "version": "1.1.3",
- "version_normalized": "1.1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/DataValues/Geo.git";,
- "reference": "ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/DataValues/Geo/zipball/ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645";,
- "reference": "ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.1",
- "data-values/data-values": "~1.0|~0.1",
- "data-values/interfaces": "~0.1",
- "php": ">=5.3.0"
- },
- "time": "2014-11-19 17:53:17",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "files": [
- "Geo.php"
- ],
- "psr-4": {
- "DataValues\\Geo\\": "src"
- }
- },
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Jeroen De Dauw",
- "email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
- },
- {
- "name": "The Wikidata team",
- "role": "Developer"
- }
- ],
- "description": "Geographical value objects, parsers and formatters",
- "homepage": "https://github.com/DataValues/Geo";,
- "keywords": [
- "datavalues",
- "formatters",
- "geo",
- "geographical",
- "latlong",
- "parsers",
- "wikidata"
- ],
- "support": {
- "irc": "irc://irc.freenode.net/wikidata",
- "source": "https://github.com/DataValues/Geo/tree/1.1.3";,
- "issues": "https://github.com/DataValues/Geo/issues";
- }
- },
- {
"name": "propertysuggester/property-suggester",
"version": "2.0.1",
"version_normalized": "2.0.1.0",
@@ -1349,5 +1101,256 @@
"wikibase",
"wikidata"
]
+ },
+ {
+ "name": "wikibase/wikimedia-badges",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wmde/WikimediaBadges.git";,
+ "reference": "bb5baa8e74f45b66929cc721a112605ba947dbc1"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/bb5baa8e74f45b66929cc721a112605ba947dbc1";,
+ "reference": "bb5baa8e74f45b66929cc721a112605ba947dbc1",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2014-11-25 18:25:26",
+ "type": "mediawiki-extension",
+ "installation-source": "source",
+ "autoload": {
+ "files": [
+ "WikimediaBadges.php"
+ ],
+ "classmap": [
+ "WikimediaBadges.hooks.php"
+ ]
+ },
+ "license": [
+ "GNU GPL v2+"
+ ],
+ "authors": [
+ {
+ "name": "Bene*",
+ "email": "[email protected]",
+ "homepage": "https://www.wikidata.org/wiki/User:Bene*";,
+ "role": "Developer"
+ }
+ ],
+ "description": "Extension which contains default themes to display
badges on Wikimedia projects",
+ "homepage": "https://github.com/wmde/WikimediaBadges";,
+ "keywords": [
+ "Wikibase",
+ "Wikidata"
+ ],
+ "support": {
+ "irc": "irc://irc.freenode.net/wikidata",
+ "source": "https://github.com/wmde/WikimediaBadges/tree/master";,
+ "issues": "https://github.com/wmde/WikimediaBadges/issues";
+ }
+ },
+ {
+ "name": "wikibase/Wikidata.org",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wmde/Wikidata.org.git";,
+ "reference": "bf5acbdb7f236614ae08d99cbca9c7aefdb784c2"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wmde/Wikidata.org/zipball/bf5acbdb7f236614ae08d99cbca9c7aefdb784c2";,
+ "reference": "bf5acbdb7f236614ae08d99cbca9c7aefdb784c2",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2014-11-25 18:32:14",
+ "type": "mediawiki-extension",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "WikidataOrg.hooks.php"
+ ]
+ },
+ "license": [
+ "GNU GPL v2+"
+ ],
+ "authors": [
+ {
+ "name": "Bene*",
+ "email": "[email protected]",
+ "homepage": "https://www.wikidata.org/wiki/User:Bene*";,
+ "role": "Developer"
+ }
+ ],
+ "description": "Configuration for and customizations to Wikibase that
are specific to wikidata.org",
+ "homepage": "https://github.com/wmde/Wikidata.org";,
+ "keywords": [
+ "Wikibase",
+ "Wikidata"
+ ],
+ "support": {
+ "irc": "irc://irc.freenode.net/wikidata",
+ "source": "https://github.com/wmde/Wikidata.org/tree/master";,
+ "issues": "https://github.com/wmde/Wikidata.org/issues";
+ }
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.25wmf8",
+ "version_normalized": "dev-wmf/1.25wmf8",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "6388f3c8cc7da263ec793beacead1591f65a5261"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6388f3c8cc7da263ec793beacead1591f65a5261";,
+ "reference": "6388f3c8cc7da263ec793beacead1591f65a5261",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.2.0",
+ "data-values/data-types": "~0.4.0",
+ "data-values/data-values": "~0.1.0",
+ "data-values/geo": "~1.0",
+ "data-values/interfaces": "~0.1.4",
+ "data-values/javascript": "~0.6.0",
+ "data-values/number": "~0.4.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.6.0",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.8.1",
+ "diff/diff": "~1.0",
+ "php": ">=5.3.2",
+ "wikibase/data-model": "~2.0",
+ "wikibase/data-model-javascript": "~1.0",
+ "wikibase/data-model-serialization": "~1.2",
+ "wikibase/easyrdf_lite": "~0.8.1",
+ "wikibase/internal-serialization": "~1.3",
+ "wikibase/serialization-javascript": "~2.0"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.23"
+ },
+ "time": "2014-11-25 18:02:38",
+ "type": "mediawiki-extension",
+ "installation-source": "source",
+ "autoload": {
+ "files": [
+ "Wikibase.composer.php"
+ ],
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/tests/phpunit/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Repo\\View\\": "repo/includes/View"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GNU GPL v2+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ]
+ },
+ {
+ "name": "data-values/geo",
+ "version": "1.1.4",
+ "version_normalized": "1.1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/DataValues/Geo.git";,
+ "reference": "e7222bc743ae05bfc5213cb1e20150aa772d8668"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/DataValues/Geo/zipball/e7222bc743ae05bfc5213cb1e20150aa772d8668";,
+ "reference": "e7222bc743ae05bfc5213cb1e20150aa772d8668",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.1",
+ "data-values/data-values": "~1.0|~0.1",
+ "data-values/interfaces": "~0.1",
+ "php": ">=5.3.0"
+ },
+ "time": "2014-11-25 16:48:57",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "Geo.php"
+ ],
+ "psr-4": {
+ "DataValues\\Geo\\": "src"
+ }
+ },
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Jeroen De Dauw",
+ "email": "[email protected]",
+ "homepage": "http://jeroendedauw.com";,
+ "role": "Developer"
+ },
+ {
+ "name": "The Wikidata team",
+ "role": "Developer"
+ }
+ ],
+ "description": "Geographical value objects, parsers and formatters",
+ "homepage": "https://github.com/DataValues/Geo";,
+ "keywords": [
+ "datavalues",
+ "formatters",
+ "geo",
+ "geographical",
+ "latlong",
+ "parsers",
+ "wikidata"
+ ],
+ "support": {
+ "irc": "irc://irc.freenode.net/wikidata",
+ "source": "https://github.com/DataValues/Geo/tree/1.1.4";,
+ "issues": "https://github.com/DataValues/Geo/issues";
+ }
}
]
diff --git a/vendor/data-values/geo/Geo.php b/vendor/data-values/geo/Geo.php
index 57eee59..84f3d63 100644
--- a/vendor/data-values/geo/Geo.php
+++ b/vendor/data-values/geo/Geo.php
@@ -15,7 +15,7 @@
return 1;
}
-define( 'DATAVALUES_GEO_VERSION', '1.1.3' );
+define( 'DATAVALUES_GEO_VERSION', '1.1.4' );
if ( defined( 'MEDIAWIKI' ) ) {
$GLOBALS['wgExtensionCredits']['datavalues'][] = array(
diff --git a/vendor/data-values/geo/README.md b/vendor/data-values/geo/README.md
index d799dc7..a89be83 100644
--- a/vendor/data-values/geo/README.md
+++ b/vendor/data-values/geo/README.md
@@ -93,9 +93,13 @@
## Release notes
+### 1.1.4 (2014-11-25)
+
+* Add fall back to default on invalid precision to more places.
+
### 1.1.3 (2014-11-19)
-* On invalid precision fall back to default instead of dividing by zero.
+* Fall back to default on invalid precision instead of dividing by zero.
### 1.1.2 (2014-11-18)
diff --git a/vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
b/vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
index 2306a4e..0ee4909 100644
--- a/vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
+++ b/vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
@@ -113,10 +113,6 @@
$precision = $this->options->getOption( self::OPT_PRECISION );
- if ( $precision <= 0 ) {
- $precision = 1 / 3600;
- }
-
return $this->formatLatLongValue( $value, $precision );
}
@@ -132,6 +128,10 @@
* @throws InvalidArgumentException
*/
public function formatLatLongValue( LatLongValue $value, $precision ) {
+ if ( $precision <= 0 ) {
+ $precision = 1 / 3600;
+ }
+
$formatted = implode(
$this->getOption( self::OPT_SEPARATOR_SYMBOL ) .
$this->getSpacing( self::OPT_SPACE_LATLONG ),
array(
diff --git
a/vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
b/vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
index 4cc8676..ac988f9 100644
---
a/vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
+++
b/vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
@@ -488,7 +488,7 @@
/**
* @dataProvider invalidPrecisionProvider
*/
- public function testInvalidPrecision_fallsBackToDefaultPrecision(
$precision ) {
+ public function
testFormatWithInvalidPrecision_fallsBackToDefaultPrecision( $precision ) {
$options = new FormatterOptions();
$options->setOption( GeoCoordinateFormatter::OPT_PRECISION,
$precision );
$formatter = new GeoCoordinateFormatter( $options );
@@ -497,6 +497,16 @@
$this->assertEquals( '1.2, 3.4', $formatted );
}
+ /**
+ * @dataProvider invalidPrecisionProvider
+ */
+ public function
testFormatLatLongValueWithInvalidPrecision_fallsBackToDefaultPrecision(
$precision ) {
+ $formatter = new GeoCoordinateFormatter( new FormatterOptions()
);
+
+ $formatted = $formatter->formatLatLongValue( new LatLongValue(
1.2, 3.4 ), $precision );
+ $this->assertEquals( '1.2, 3.4', $formatted );
+ }
+
public function invalidPrecisionProvider() {
return array(
array( null ),
diff --git
a/vendor/data-values/geo/tests/unit/Formatters/GlobeCoordinateFormatterTest.php
b/vendor/data-values/geo/tests/unit/Formatters/GlobeCoordinateFormatterTest.php
index 4d617a5..0b54c65 100644
---
a/vendor/data-values/geo/tests/unit/Formatters/GlobeCoordinateFormatterTest.php
+++
b/vendor/data-values/geo/tests/unit/Formatters/GlobeCoordinateFormatterTest.php
@@ -3,6 +3,7 @@
namespace Tests\DataValues\Geo\Formatters;
use DataValues\Geo\Formatters\GeoCoordinateFormatter;
+use DataValues\Geo\Formatters\GlobeCoordinateFormatter;
use DataValues\Geo\Parsers\GlobeCoordinateParser;
use DataValues\Geo\Values\GlobeCoordinateValue;
use DataValues\Geo\Values\LatLongValue;
@@ -108,8 +109,17 @@
return 'DataValues\Geo\Formatters\GlobeCoordinateFormatter';
}
+ public function
testFormatWithInvalidPrecision_fallsBackToDefaultPrecision() {
+ $options = new FormatterOptions();
+ $options->setOption( GeoCoordinateFormatter::OPT_PRECISION, 0 );
+ $formatter = new GlobeCoordinateFormatter( $options );
+
+ $formatted = $formatter->format( new GlobeCoordinateValue( new
LatLongValue( 1.2, 3.4 ), null ) );
+ $this->assertEquals( '1.2, 3.4', $formatted );
+ }
+
/**
- * @dataProvider validProvider()
+ * @dataProvider validProvider
*/
public function testFormatterRoundTrip( GlobeCoordinateValue $coord,
$expectedValue, FormatterOptions $options ) {
$formatter = $this->getInstance( $options );
--
To view, visit https://gerrit.wikimedia.org/r/175778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08946aac354f1282b5544396a3de2fcdf697725d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
