Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/204260
Change subject: Update Wikidata - fix client wiki ...................................................................... Update Wikidata - fix client wiki Change-Id: Id465b4aacdb5e50096bee0d139ea2c0530cccb75 --- M composer.lock M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/lib/includes/ContentLanguages.php M extensions/Wikibase/lib/includes/WikibaseContentLanguages.php M vendor/composer/autoload_files.php M vendor/composer/installed.json 6 files changed, 99 insertions(+), 93 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/60/204260/1 diff --git a/composer.lock b/composer.lock index 37967d5..012e232 100644 --- a/composer.lock +++ b/composer.lock @@ -1209,12 +1209,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "74ed9964b5ce079264ef79496551a48364f41e84" + "reference": "daadb520e609b87e2c766d7d851203ca5a0237e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/74ed9964b5ce079264ef79496551a48364f41e84", - "reference": "74ed9964b5ce079264ef79496551a48364f41e84", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/daadb520e609b87e2c766d7d851203ca5a0237e2", + "reference": "daadb520e609b87e2c766d7d851203ca5a0237e2", "shasum": "" }, "require": { @@ -1282,7 +1282,7 @@ "wikibaserepo", "wikidata" ], - "time": "2015-04-15 09:53:00" + "time": "2015-04-15 12:50:42" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php b/extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php index dbbf3f4..35e1704 100644 --- a/extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php +++ b/extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php @@ -459,7 +459,10 @@ public function getEntityPrefetcher() { if ( $this->entityPrefetcher === null ) { $this->entityPrefetcher = new PrefetchingWikiPageEntityMetaDataAccessor( - new WikiPageEntityMetaDataLookup( $this->entityIdParser ) + new WikiPageEntityMetaDataLookup( + $this->entityIdParser, + $this->repoWiki + ) ); } diff --git a/extensions/Wikibase/lib/includes/ContentLanguages.php b/extensions/Wikibase/lib/includes/ContentLanguages.php index 3080a39..05ec9fa 100644 --- a/extensions/Wikibase/lib/includes/ContentLanguages.php +++ b/extensions/Wikibase/lib/includes/ContentLanguages.php @@ -16,7 +16,7 @@ public function getLanguages(); /** - * @return string $languageCode + * @param string $languageCode * * @return bool */ diff --git a/extensions/Wikibase/lib/includes/WikibaseContentLanguages.php b/extensions/Wikibase/lib/includes/WikibaseContentLanguages.php index 3efdfcb..1603fec 100644 --- a/extensions/Wikibase/lib/includes/WikibaseContentLanguages.php +++ b/extensions/Wikibase/lib/includes/WikibaseContentLanguages.php @@ -13,9 +13,9 @@ class WikibaseContentLanguages implements ContentLanguages { /** - * @var string|null + * @var string[]|null Array of language codes => language names. */ - private $languageMap; + private $languageMap = null; /** * @return string[] Array of language codes supported as content language @@ -26,7 +26,7 @@ } /** - * @return string $languageCode + * @param string $languageCode * * @return bool */ @@ -34,6 +34,9 @@ return array_key_exists( $languageCode, $this->getLanguageMap() ); } + /** + * @return string[] Array of language codes => language names. + */ private function getLanguageMap() { if ( $this->languageMap === null ) { $this->languageMap = Language::fetchLanguageNames(); diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index a1207e8..0f51ea1 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -22,6 +22,6 @@ $vendorDir . '/wikibase/serialization-javascript/init.php', $vendorDir . '/data-values/data-types/DataTypes.php', $vendorDir . '/data-values/validators/Validators.php', - $baseDir . '/extensions/Wikibase/Wikibase.composer.php', $baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php', + $baseDir . '/extensions/Wikibase/Wikibase.composer.php', ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f4071da..09efc65 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1193,89 +1193,6 @@ ] }, { - "name": "wikibase/wikibase", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "74ed9964b5ce079264ef79496551a48364f41e84" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/74ed9964b5ce079264ef79496551a48364f41e84", - "reference": "74ed9964b5ce079264ef79496551a48364f41e84", - "shasum": "" - }, - "require": { - "data-values/common": "~0.2.0", - "data-values/data-types": "~0.4.0", - "data-values/data-values": "~1.0.0", - "data-values/geo": "~1.0", - "data-values/interfaces": "^0.1.5", - "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.14.0", - "diff/diff": "~1.0", - "php": ">=5.3.2", - "wikibase/data-model": "~2.5", - "wikibase/data-model-javascript": "~1.0", - "wikibase/data-model-serialization": "~1.2", - "wikibase/internal-serialization": "~1.3", - "wikibase/javascript-api": "~1.0", - "wikibase/serialization-javascript": "~2.0" - }, - "conflict": { - "mediawiki/mediawiki": "<1.23" - }, - "time": "2015-04-15 09:53:00", - "type": "mediawiki-extension", - "installation-source": "dist", - "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\\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", @@ -1374,5 +1291,88 @@ "irc": "irc://irc.freenode.net/wikidata", "source": "https://github.com/wmde/Wikidata.org/tree/master" } + }, + { + "name": "wikibase/wikibase", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", + "reference": "daadb520e609b87e2c766d7d851203ca5a0237e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/daadb520e609b87e2c766d7d851203ca5a0237e2", + "reference": "daadb520e609b87e2c766d7d851203ca5a0237e2", + "shasum": "" + }, + "require": { + "data-values/common": "~0.2.0", + "data-values/data-types": "~0.4.0", + "data-values/data-values": "~1.0.0", + "data-values/geo": "~1.0", + "data-values/interfaces": "^0.1.5", + "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.14.0", + "diff/diff": "~1.0", + "php": ">=5.3.2", + "wikibase/data-model": "~2.5", + "wikibase/data-model-javascript": "~1.0", + "wikibase/data-model-serialization": "~1.2", + "wikibase/internal-serialization": "~1.3", + "wikibase/javascript-api": "~1.0", + "wikibase/serialization-javascript": "~2.0" + }, + "conflict": { + "mediawiki/mediawiki": "<1.23" + }, + "time": "2015-04-15 12:50:42", + "type": "mediawiki-extension", + "installation-source": "dist", + "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\\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" + ] } ] -- To view, visit https://gerrit.wikimedia.org/r/204260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id465b4aacdb5e50096bee0d139ea2c0530cccb75 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits