Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232556
Change subject: Update Wikidata - fix fatal error in ResultBuilder /
wbgetentities
......................................................................
Update Wikidata - fix fatal error in ResultBuilder / wbgetentities
Change-Id: Ib8fcbb1d4516819f6a19974b076f8e24ffa9b12b
---
M composer.json
M composer.lock
M extensions/Wikibase/repo/includes/api/ResultBuilder.php
M vendor/composer/installed.json
4 files changed, 133 insertions(+), 107 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/56/232556/1
diff --git a/composer.json b/composer.json
index 257ede1..a6893e6 100644
--- a/composer.json
+++ b/composer.json
@@ -4,6 +4,10 @@
"license": "GPL-2.0+",
"repositories": [
{
+ "type": "git",
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";
+ },
+ {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";
},
@@ -45,4 +49,4 @@
"classmap-authoritative": true,
"preferred-install": "dist"
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index df77b63..43ade12 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "baf1f0d0ba9e5dbc1cbe2b1b7ccfe303",
+ "hash": "3911e4c4d021d4f835cf5821ee3ef572",
"packages": [
{
"name": "composer/installers",
@@ -949,7 +949,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2015-08-14 11:26:42"
+ "time": "2015-08-14 10:25:37"
},
{
"name": "wikibase/data-model",
@@ -1330,7 +1330,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2015-08-14 10:27:43"
+ "time": "2015-08-14 10:23:53"
},
{
"name": "wikibase/serialization-javascript",
@@ -1378,14 +1378,8 @@
"version": "dev-wmf/1.26wmf19",
"source": {
"type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b9f31e4def71f33ef1c1fc6eb1fd782cd72924b8"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b9f31e4def71f33ef1c1fc6eb1fd782cd72924b8";,
- "reference": "b9f31e4def71f33ef1c1fc6eb1fd782cd72924b8",
- "shasum": ""
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
+ "reference": "1981ec428ebe0d59ffd52b1003945161f45fee0e"
},
"require": {
"data-values/common": "~0.3.0",
@@ -1435,7 +1429,17 @@
"Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit"
}
},
- "notification-url": "https://packagist.org/downloads/";,
+ "scripts": {
+ "test": [
+ "composer cs"
+ ],
+ "cs": [
+ "composer phpcs"
+ ],
+ "phpcs": [
+ "vendor/bin/phpcs -sp --standard=phpcs.xml
--extensions=php --ignore=extensions/ValueView,vendor ."
+ ]
+ },
"license": [
"GPL-2.0+"
],
@@ -1453,7 +1457,11 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-08-18 09:27:53"
+ "support": {
+ "issues": "https://phabricator.wikimedia.org/";,
+ "irc": "irc://irc.freenode.net/wikidata"
+ },
+ "time": "2015-08-19 18:22:18"
},
{
"name": "wikibase/wikimedia-badges",
@@ -1495,7 +1503,7 @@
"support": {
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2015-08-05 13:24:18"
+ "time": "2015-08-05 13:23:38"
}
],
"packages-dev": [],
diff --git a/extensions/Wikibase/repo/includes/api/ResultBuilder.php
b/extensions/Wikibase/repo/includes/api/ResultBuilder.php
index ec09fa9..d08c5c6 100644
--- a/extensions/Wikibase/repo/includes/api/ResultBuilder.php
+++ b/extensions/Wikibase/repo/includes/api/ResultBuilder.php
@@ -475,14 +475,20 @@
array $serialization,
array $fallbackChains
) {
- $serialization['labels'] =
$this->getTermsSerializationWithFallbackInfo(
- $serialization['labels'],
- $fallbackChains
- );
- $serialization['descriptions'] =
$this->getTermsSerializationWithFallbackInfo(
- $serialization['descriptions'],
- $fallbackChains
- );
+ if ( isset( $serialization['labels'] ) ) {
+ $serialization['labels'] =
$this->getTermsSerializationWithFallbackInfo(
+ $serialization['labels'],
+ $fallbackChains
+ );
+ }
+
+ if ( isset( $serialization['descriptions'] ) ) {
+ $serialization['descriptions'] =
$this->getTermsSerializationWithFallbackInfo(
+ $serialization['descriptions'],
+ $fallbackChains
+ );
+ }
+
return $serialization;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0fef33a..a1ed104 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1266,90 +1266,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.26wmf19",
- "version_normalized": "dev-wmf/1.26wmf19",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b9f31e4def71f33ef1c1fc6eb1fd782cd72924b8"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b9f31e4def71f33ef1c1fc6eb1fd782cd72924b8";,
- "reference": "b9f31e4def71f33ef1c1fc6eb1fd782cd72924b8",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.3.0",
- "data-values/data-types": "~0.4.0",
- "data-values/data-values": "~1.0",
- "data-values/geo": "~1.0",
- "data-values/interfaces": "~0.2.0|~0.1.5",
- "data-values/javascript": "~0.6.0|~0.7.0",
- "data-values/number": "~0.5.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.8.1",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.14.0",
- "diff/diff": "~2.0|~1.0",
- "php": ">=5.3.2",
- "wikibase/data-model": "~4.0",
- "wikibase/data-model-javascript": "^1.0.2",
- "wikibase/data-model-serialization": "~1.7",
- "wikibase/data-model-services": "~1.1",
- "wikibase/internal-serialization": "~1.4",
- "wikibase/javascript-api": "~1.0",
- "wikibase/serialization-javascript": "~2.0"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.23"
- },
- "require-dev": {
- "squizlabs/php_codesniffer": "~2.1"
- },
- "time": "2015-08-18 09:27:53",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "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\\View\\": "view/src",
- "Wikimedia\\Purtle\\": "purtle/src",
- "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ]
- },
- {
"name": "wikibase/wikimedia-badges",
"version": "dev-master",
"version_normalized": "9999999-dev",
@@ -1543,5 +1459,97 @@
"support": {
"issues": "https://phabricator.wikimedia.org/project/profile/1202/";
}
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.26wmf19",
+ "version_normalized": "dev-wmf/1.26wmf19",
+ "source": {
+ "type": "git",
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
+ "reference": "1981ec428ebe0d59ffd52b1003945161f45fee0e"
+ },
+ "require": {
+ "data-values/common": "~0.3.0",
+ "data-values/data-types": "~0.4.0",
+ "data-values/data-values": "~1.0",
+ "data-values/geo": "~1.0",
+ "data-values/interfaces": "~0.2.0|~0.1.5",
+ "data-values/javascript": "~0.6.0|~0.7.0",
+ "data-values/number": "~0.5.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.8.1",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.14.0",
+ "diff/diff": "~2.0|~1.0",
+ "php": ">=5.3.2",
+ "wikibase/data-model": "~4.0",
+ "wikibase/data-model-javascript": "^1.0.2",
+ "wikibase/data-model-serialization": "~1.7",
+ "wikibase/data-model-services": "~1.1",
+ "wikibase/internal-serialization": "~1.4",
+ "wikibase/javascript-api": "~1.0",
+ "wikibase/serialization-javascript": "~2.0"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.23"
+ },
+ "require-dev": {
+ "squizlabs/php_codesniffer": "~2.1"
+ },
+ "time": "2015-08-19 18:20:33",
+ "type": "mediawiki-extension",
+ "installation-source": "source",
+ "autoload": {
+ "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\\View\\": "view/src",
+ "Wikimedia\\Purtle\\": "purtle/src",
+ "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit"
+ }
+ },
+ "scripts": {
+ "test": [
+ "composer cs"
+ ],
+ "cs": [
+ "composer phpcs"
+ ],
+ "phpcs": [
+ "vendor/bin/phpcs -sp --standard=phpcs.xml --extensions=php
--ignore=extensions/ValueView,vendor ."
+ ]
+ },
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ],
+ "support": {
+ "issues": "https://phabricator.wikimedia.org/";,
+ "irc": "irc://irc.freenode.net/wikidata"
+ }
}
]
--
To view, visit https://gerrit.wikimedia.org/r/232556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8fcbb1d4516819f6a19974b076f8e24ffa9b12b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf19
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
