Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352812 )
Change subject: Update Wikidata - Temporarily disable use of client services in
WikibaseRepo
......................................................................
Update Wikidata - Temporarily disable use of client services in WikibaseRepo
Change-Id: Ie27a030f5a620419eb19de3cf65fc8a27acc5806
---
M composer.lock
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M vendor/composer/installed.json
3 files changed, 94 insertions(+), 101 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/12/352812/1
diff --git a/composer.lock b/composer.lock
index 665c6d0..348e083 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1454,12 +1454,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b723410e6b00e1bdb3f9d2e42f9d7a318ed72a8a"
+ "reference": "0f8632c6f7542617f2d6f736ef045e0de54bdd5e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b723410e6b00e1bdb3f9d2e42f9d7a318ed72a8a";,
- "reference": "b723410e6b00e1bdb3f9d2e42f9d7a318ed72a8a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0f8632c6f7542617f2d6f736ef045e0de54bdd5e";,
+ "reference": "0f8632c6f7542617f2d6f736ef045e0de54bdd5e",
"shasum": ""
},
"require": {
@@ -1534,7 +1534,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-05-08T21:02:01+00:00"
+ "time": "2017-05-09T02:42:51+00:00"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/WikibaseRepo.php
b/extensions/Wikibase/repo/includes/WikibaseRepo.php
index d25e4d5..e13aab5 100644
--- a/extensions/Wikibase/repo/includes/WikibaseRepo.php
+++ b/extensions/Wikibase/repo/includes/WikibaseRepo.php
@@ -32,7 +32,6 @@
use ValueFormatters\ValueFormatter;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\Client\EntityDataRetrievalServiceFactory;
-use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\DeserializerFactory;
use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
@@ -327,12 +326,6 @@
$repositoryDefinitions =
self::getRepositoryDefinitionsFromSettings( $settings );
$dataRetrievalServices = null;
-
- // If client functionality is enabled, use it to enable
federation.
- if ( defined( 'WBC_VERSION' ) ) {
- $dataRetrievalServices =
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
- $repositoryDefinitions =
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
- }
return new self(
$settings,
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3e3dd41..ec9e1d4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1360,96 +1360,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.30.0-wmf.1",
- "version_normalized": "dev-wmf/1.30.0-wmf.1",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b723410e6b00e1bdb3f9d2e42f9d7a318ed72a8a"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b723410e6b00e1bdb3f9d2e42f9d7a318ed72a8a";,
- "reference": "b723410e6b00e1bdb3f9d2e42f9d7a318ed72a8a",
- "shasum": ""
- },
- "require": {
- "data-values/common": "^0.3.0",
- "data-values/data-types": "^1.0.0",
- "data-values/data-values": "^1.0.0",
- "data-values/geo": "^1.2.1",
- "data-values/interfaces": "^0.2.0|^0.1.5",
- "data-values/javascript": "^0.8.3",
- "data-values/number": "^0.8.2",
- "data-values/serialization": "^1.2.0",
- "data-values/time": "^0.8.4",
- "data-values/value-view": "^0.19.1",
- "diff/diff": "^2.0.0",
- "php": ">=5.5.9",
- "wikibase/data-model": "^7.0.0",
- "wikibase/data-model-javascript": "^3.0.1",
- "wikibase/data-model-serialization": "^2.1.0",
- "wikibase/data-model-services": "^3.7.0",
- "wikibase/internal-serialization": "^2.2.0",
- "wikibase/javascript-api": "^2.2.0",
- "wikibase/serialization-javascript": "^2.0.8",
- "wikimedia/purtle": "^1.0.3"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.25"
- },
- "require-dev": {
- "jakub-onderka/php-console-highlighter": "0.3.2",
- "jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
- "wikibase/wikibase-codesniffer": "^0.1.0"
- },
- "time": "2017-05-08T21:02:01+00:00",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/MockClientStore.php",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/maintenance/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Client\\": "client/includes",
- "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
- "Wikibase\\Lib\\": "lib/includes",
- "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
- "Wikibase\\Repo\\": "repo/includes",
- "Wikibase\\Repo\\Tests\\": "repo/tests/phpunit/includes",
- "Wikibase\\View\\": "view/src",
- "Wikibase\\View\\Tests\\": "view/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",
@@ -1738,5 +1648,95 @@
"support": {
"issues": "https://phabricator.wikimedia.org/project/profile/1202/";
}
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.30.0-wmf.1",
+ "version_normalized": "dev-wmf/1.30.0-wmf.1",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "0f8632c6f7542617f2d6f736ef045e0de54bdd5e"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0f8632c6f7542617f2d6f736ef045e0de54bdd5e";,
+ "reference": "0f8632c6f7542617f2d6f736ef045e0de54bdd5e",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "^0.3.0",
+ "data-values/data-types": "^1.0.0",
+ "data-values/data-values": "^1.0.0",
+ "data-values/geo": "^1.2.1",
+ "data-values/interfaces": "^0.2.0|^0.1.5",
+ "data-values/javascript": "^0.8.3",
+ "data-values/number": "^0.8.2",
+ "data-values/serialization": "^1.2.0",
+ "data-values/time": "^0.8.4",
+ "data-values/value-view": "^0.19.1",
+ "diff/diff": "^2.0.0",
+ "php": ">=5.5.9",
+ "wikibase/data-model": "^7.0.0",
+ "wikibase/data-model-javascript": "^3.0.1",
+ "wikibase/data-model-serialization": "^2.1.0",
+ "wikibase/data-model-services": "^3.7.0",
+ "wikibase/internal-serialization": "^2.2.0",
+ "wikibase/javascript-api": "^2.2.0",
+ "wikibase/serialization-javascript": "^2.0.8",
+ "wikimedia/purtle": "^1.0.3"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.25"
+ },
+ "require-dev": {
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
+ "wikibase/wikibase-codesniffer": "^0.1.0"
+ },
+ "time": "2017-05-09T02:42:51+00:00",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/MockClientStore.php",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/maintenance/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Client\\": "client/includes",
+ "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
+ "Wikibase\\Lib\\": "lib/includes",
+ "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
+ "Wikibase\\Repo\\": "repo/includes",
+ "Wikibase\\Repo\\Tests\\": "repo/tests/phpunit/includes",
+ "Wikibase\\View\\": "view/src",
+ "Wikibase\\View\\Tests\\": "view/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/352812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27a030f5a620419eb19de3cf65fc8a27acc5806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
