Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221819
Change subject: Update Wikibase to fix the SearchEntities api
......................................................................
Update Wikibase to fix the SearchEntities api
Contains: 34209ffd6d69f5150de9146ebe27eb700c9d06ce
Change-Id: I666e9315bd6fb0ed62856b0974b4e107e90586a3
---
M composer.lock
M extensions/Wikibase/repo/includes/api/SearchEntities.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
5 files changed, 106 insertions(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/19/221819/1
diff --git a/composer.lock b/composer.lock
index 992ffd1..04ee4ad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1277,7 +1277,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2015-06-22 08:36:36"
+ "time": "2015-06-22 08:31:58"
},
{
"name": "wikibase/serialization-javascript",
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "94f7f4c80eb2b1cdcbe3bac338c9dd1132276292"
+ "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/94f7f4c80eb2b1cdcbe3bac338c9dd1132276292";,
- "reference": "94f7f4c80eb2b1cdcbe3bac338c9dd1132276292",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
+ "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-06-29 18:53:21"
+ "time": "2015-06-30 01:40:22"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/api/SearchEntities.php
b/extensions/Wikibase/repo/includes/api/SearchEntities.php
index 3d89e0d..c54e7fb 100644
--- a/extensions/Wikibase/repo/includes/api/SearchEntities.php
+++ b/extensions/Wikibase/repo/includes/api/SearchEntities.php
@@ -180,7 +180,8 @@
$entry['url'] = $title->getFullUrl();
$entry = array_merge( $entry, $this->termsToArray(
$match['displayTerms'] ) );
$entry['match']['type'] =
$match[TermIndexSearchInteractor::MATCHEDTERMTYPE_KEY];
- //Special handeling for 'entityId's as these are not
actually Term objects
+
+ //Special handling for 'entityId's as these are not
actually Term objects
if ( $entry['match']['type'] === 'entityId' ) {
$entry['match']['text'] = $match['entityId'];
$entry['aliases'] = array( $match['entityId'] );
@@ -189,7 +190,10 @@
$matchedTerm =
$match[TermIndexSearchInteractor::MATCHEDTERM_KEY];
$entry['match']['language'] =
$matchedTerm->getLanguageCode();
$entry['match']['text'] =
$matchedTerm->getText();
- $entry['aliases'] = array(
$matchedTerm->getText() );
+
+ if ( $match['matchedTermType'] === 'alias' ) {
+ $entry['aliases'] = array(
$matchedTerm->getText() );
+ }
}
$entries[] = $entry;
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
index e3b1217..c5d9acb 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
@@ -249,7 +249,6 @@
'url' => 'http://fullTitleUrl',
TermIndexEntry::TYPE_LABEL => 'FooHeHe',
TermIndexEntry::TYPE_DESCRIPTION => 'FooHeHe en
description',
- 'aliases' => array( 'Fooooo' ),
'match' => array(
'type' => 'label',
'language' => 'en-gb',
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index d64a44e..9ac65da 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -256,6 +256,11 @@
'WikibaseQuality\\ConstraintReport\\EvaluateConstraintReportJobService' =>
$baseDir .
'/extensions/Constraints/includes/EvaluateConstraintReportJobService.php',
'WikibaseQuality\\ConstraintReport\\Maintenance\\UpdateTable' => $baseDir
. '/extensions/Constraints/maintenance/UpdateTable.php',
'WikibaseQuality\\ConstraintReport\\Specials\\SpecialConstraintReport' =>
$baseDir . '/extensions/Constraints/specials/SpecialConstraintReport.php',
+ 'WikibaseQuality\\ConstraintReport\\Tests\\ConstraintRepositoryTest' =>
$baseDir . '/extensions/Constraints/tests/phpunit/ConstraintRepositoryTest.php',
+ 'WikibaseQuality\\ConstraintReport\\Tests\\ConstraintTest' => $baseDir .
'/extensions/Constraints/tests/phpunit/ConstraintTest.php',
+
'WikibaseQuality\\ConstraintReport\\Tests\\EvaluateConstraintReportJobServiceTest'
=> $baseDir .
'/extensions/Constraints/tests/phpunit/EvaluateConstraintReportJobServiceTest.php',
+ 'WikibaseQuality\\ConstraintReport\\Tests\\Maintenance\\UpdateTableTest'
=> $baseDir .
'/extensions/Constraints/tests/phpunit/Maintenance/UpdateTableTest.php',
+
'WikibaseQuality\\ConstraintReport\\Tests\\Specials\\SpecialConstraintReport\\SpecialConstraintReportTest'
=> $baseDir .
'/extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php',
'WikibaseQuality\\Html\\HtmlTableBuilder' => $baseDir .
'/extensions/Quality/includes/Html/HtmlTableBuilder.php',
'WikibaseQuality\\Html\\HtmlTableCellBuilder' => $baseDir .
'/extensions/Quality/includes/Html/HtmlTableCellBuilder.php',
'WikibaseQuality\\Html\\HtmlTableHeaderBuilder' => $baseDir .
'/extensions/Quality/includes/Html/HtmlTableHeaderBuilder.php',
@@ -1349,7 +1354,14 @@
'Wikimedia\\Purtle\\RdfWriter' => $baseDir .
'/extensions/Wikibase/purtle/src/RdfWriter.php',
'Wikimedia\\Purtle\\RdfWriterBase' => $baseDir .
'/extensions/Wikibase/purtle/src/RdfWriterBase.php',
'Wikimedia\\Purtle\\RdfWriterFactory' => $baseDir .
'/extensions/Wikibase/purtle/src/RdfWriterFactory.php',
+ 'Wikimedia\\Purtle\\Tests\\BNodeLabelerTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/BNodeLabelerTest.php',
+ 'Wikimedia\\Purtle\\Tests\\N3QuoterTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/N3QuoterTest.php',
+ 'Wikimedia\\Purtle\\Tests\\NTriplesRdfWriterTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/NTriplesRdfWriterTest.php',
+ 'Wikimedia\\Purtle\\Tests\\RdfWriterFactoryTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/RdfWriterFactoryTest.php',
'Wikimedia\\Purtle\\Tests\\RdfWriterTestBase' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/RdfWriterTestBase.php',
+ 'Wikimedia\\Purtle\\Tests\\TurtleRdfWriterTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/TurtleRdfWriterTest.php',
+ 'Wikimedia\\Purtle\\Tests\\UnicodeEscaperTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/UnicodeEscaperTest.php',
+ 'Wikimedia\\Purtle\\Tests\\XmlRdfWriterTest' => $baseDir .
'/extensions/Wikibase/purtle/tests/phpunit/XmlRdfWriterTest.php',
'Wikimedia\\Purtle\\TurtleRdfWriter' => $baseDir .
'/extensions/Wikibase/purtle/src/TurtleRdfWriter.php',
'Wikimedia\\Purtle\\UnicodeEscaper' => $baseDir .
'/extensions/Wikibase/purtle/src/UnicodeEscaper.php',
'Wikimedia\\Purtle\\XmlRdfWriter' => $baseDir .
'/extensions/Wikibase/purtle/src/XmlRdfWriter.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 720f6ee..b1386f0 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1206,89 +1206,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.26wmf12",
- "version_normalized": "dev-wmf/1.26wmf12",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "94f7f4c80eb2b1cdcbe3bac338c9dd1132276292"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/94f7f4c80eb2b1cdcbe3bac338c9dd1132276292";,
- "reference": "94f7f4c80eb2b1cdcbe3bac338c9dd1132276292",
- "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|~0.7.0",
- "data-values/number": "~0.5.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.8.0",
- "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": "~3.0",
- "wikibase/data-model-javascript": "^1.0.2",
- "wikibase/data-model-serialization": "~1.4",
- "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-06-29 18:53:21",
- "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",
@@ -1495,5 +1412,88 @@
"support": {
"issues": "https://phabricator.wikimedia.org/project/profile/1202/";
}
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.26wmf12",
+ "version_normalized": "dev-wmf/1.26wmf12",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
+ "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+ "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|~0.7.0",
+ "data-values/number": "~0.5.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.8.0",
+ "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": "~3.0",
+ "wikibase/data-model-javascript": "^1.0.2",
+ "wikibase/data-model-serialization": "~1.4",
+ "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-06-30 01:40:22",
+ "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"
+ ]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/221819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I666e9315bd6fb0ed62856b0974b4e107e90586a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
