jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase, add EntityHandler::supportsCategories
......................................................................
Update Wikibase, add EntityHandler::supportsCategories
Contains f7e8e4a23141948d5caf0515111fb7a63f5aaa40.
Will ease T147748.
Change-Id: I1761d0e1dbe88620969b0fc9e502358a0bfe3f0a
---
M composer.lock
M extensions/Wikibase/repo/includes/Content/EntityHandler.php
M extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
M vendor/composer/installed.json
4 files changed, 106 insertions(+), 93 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 0ce9e2d..3343e2f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1460,12 +1460,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6"
+ "reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c756269cf3d0b6ea3e21084cba5756e2857fcbb6";,
- "reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f7e8e4a23141948d5caf0515111fb7a63f5aaa40";,
+ "reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40",
"shasum": ""
},
"require": {
@@ -1539,7 +1539,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-10-03 18:04:02"
+ "time": "2016-10-10 11:37:29"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/Content/EntityHandler.php
b/extensions/Wikibase/repo/includes/Content/EntityHandler.php
index c335f08..ac57e82 100644
--- a/extensions/Wikibase/repo/includes/Content/EntityHandler.php
+++ b/extensions/Wikibase/repo/includes/Content/EntityHandler.php
@@ -279,6 +279,15 @@
}
/**
+ * None of the Entity content models support categories.
+ *
+ * @return bool Always false.
+ */
+ public function supportsCategories() {
+ return false;
+ }
+
+ /**
* @see ContentHandler::makeRedirectContent
*
* @warn Always throws an MWException, since an EntityRedirects needs
to know it's own
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index bffad59..192a4ff 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -502,4 +502,8 @@
$this->assertContains( '(wikibase-noentity)',
$context->getOutput()->getHTML() );
}
+ public function testSupportsCategories() {
+ $this->assertFalse( $this->getHandler()->supportsCategories() );
+ }
+
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ac18396..05e6598 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1342,95 +1342,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.28.0-wmf.21",
- "version_normalized": "dev-wmf/1.28.0-wmf.21",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c756269cf3d0b6ea3e21084cba5756e2857fcbb6";,
- "reference": "c756269cf3d0b6ea3e21084cba5756e2857fcbb6",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.3.0",
- "data-values/data-types": "~0.5.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.8.0",
- "data-values/number": "~0.7.0",
- "data-values/serialization": "~1.1",
- "data-values/time": "~0.8.4",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.17.3",
- "diff/diff": "~2.0",
- "php": ">=5.5.0",
- "wikibase/data-model": "~6.1",
- "wikibase/data-model-javascript": "~3.0.0",
- "wikibase/data-model-serialization": "~2.2",
- "wikibase/data-model-services": "~3.5",
- "wikibase/internal-serialization": "~2.3",
- "wikibase/javascript-api": "~2.1.1",
- "wikibase/serialization-javascript": "~2.0.6",
- "wikimedia/purtle": "~1.0"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.25"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
- },
- "time": "2016-10-03 18:04:02",
- "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/",
-
"lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTestMockHttp.php",
-
"lib/tests/phpunit/Store/WikiTextPropertyOrderProviderTestHelper.php",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
- "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
- "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",
@@ -1688,5 +1599,94 @@
"support": {
"issues": "https://phabricator.wikimedia.org/project/profile/1202/";
}
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.28.0-wmf.21",
+ "version_normalized": "dev-wmf/1.28.0-wmf.21",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f7e8e4a23141948d5caf0515111fb7a63f5aaa40";,
+ "reference": "f7e8e4a23141948d5caf0515111fb7a63f5aaa40",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.3.0",
+ "data-values/data-types": "~0.5.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.8.0",
+ "data-values/number": "~0.7.0",
+ "data-values/serialization": "~1.1",
+ "data-values/time": "~0.8.4",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.17.3",
+ "diff/diff": "~2.0",
+ "php": ">=5.5.0",
+ "wikibase/data-model": "~6.1",
+ "wikibase/data-model-javascript": "~3.0.0",
+ "wikibase/data-model-serialization": "~2.2",
+ "wikibase/data-model-services": "~3.5",
+ "wikibase/internal-serialization": "~2.3",
+ "wikibase/javascript-api": "~2.1.1",
+ "wikibase/serialization-javascript": "~2.0.6",
+ "wikimedia/purtle": "~1.0"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.25"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
+ },
+ "time": "2016-10-10 11:37:29",
+ "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/",
+
"lib/tests/phpunit/Store/HttpUrlPropertyOrderProviderTestMockHttp.php",
+
"lib/tests/phpunit/Store/WikiTextPropertyOrderProviderTestHelper.php",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
+ "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
+ "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/315075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1761d0e1dbe88620969b0fc9e502358a0bfe3f0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
