jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase: Add api featureLog for ungroupedlist param
......................................................................
Update Wikibase: Add api featureLog for ungroupedlist param
Includes: 36397d6e4b3da98399e1153fae91193c1f744f90
Change-Id: If5ddd7096263cfff534ad64a42f15f1683924553
---
M composer.lock
M extensions/Wikibase/repo/includes/api/GetClaims.php
M extensions/Wikibase/repo/includes/api/GetEntities.php
M vendor/composer/ClassLoader.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
6 files changed, 16 insertions(+), 26 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 438264d..13c3ffe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,7 +1,7 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
+ "Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
"hash": "1650c31aae304f33d8513f578d249bf6",
@@ -1277,7 +1277,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2015-06-30 17:53:04"
+ "time": "2015-06-30 13:02:17"
},
{
"name": "wikibase/serialization-javascript",
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "de80d2f861c15bb08e914be5248bcab7c43d22fa"
+ "reference": "36397d6e4b3da98399e1153fae91193c1f744f90"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/de80d2f861c15bb08e914be5248bcab7c43d22fa";,
- "reference": "de80d2f861c15bb08e914be5248bcab7c43d22fa",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/36397d6e4b3da98399e1153fae91193c1f744f90";,
+ "reference": "36397d6e4b3da98399e1153fae91193c1f744f90",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-07-08 21:02:55"
+ "time": "2015-07-20 20:56:27"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/api/GetClaims.php
b/extensions/Wikibase/repo/includes/api/GetClaims.php
index c7a71e7..cba01d5 100644
--- a/extensions/Wikibase/repo/includes/api/GetClaims.php
+++ b/extensions/Wikibase/repo/includes/api/GetClaims.php
@@ -74,6 +74,7 @@
$entity = $entityRevision->getEntity();
if ( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetclaims&ungroupedlist' );
$this->getResultBuilder()->getOptions()
->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
diff --git a/extensions/Wikibase/repo/includes/api/GetEntities.php
b/extensions/Wikibase/repo/includes/api/GetEntities.php
index bd63c3d..ea7fe69 100644
--- a/extensions/Wikibase/repo/includes/api/GetEntities.php
+++ b/extensions/Wikibase/repo/includes/api/GetEntities.php
@@ -275,6 +275,7 @@
$languages = $params['languages'];
}
if( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetentities&ungroupedlist' );
$options->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
array()
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 4e05d3b..5e1469e 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -351,7 +351,7 @@
foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
if (0 === strpos($class, $prefix)) {
foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR .
substr($logicalPathPsr4, $length))) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
substr($logicalPathPsr4, $length))) {
return $file;
}
}
@@ -361,7 +361,7 @@
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr4)) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr4)) {
return $file;
}
}
@@ -380,7 +380,7 @@
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr0)) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr0)) {
return $file;
}
}
@@ -390,7 +390,7 @@
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
- if (is_file($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr0)) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR .
$logicalPathPsr0)) {
return $file;
}
}
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index 9ac65da..d64a44e 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -256,11 +256,6 @@
'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',
@@ -1354,14 +1349,7 @@
'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 d7392fb..87f3142 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1420,12 +1420,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "de80d2f861c15bb08e914be5248bcab7c43d22fa"
+ "reference": "36397d6e4b3da98399e1153fae91193c1f744f90"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/de80d2f861c15bb08e914be5248bcab7c43d22fa";,
- "reference": "de80d2f861c15bb08e914be5248bcab7c43d22fa",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/36397d6e4b3da98399e1153fae91193c1f744f90";,
+ "reference": "36397d6e4b3da98399e1153fae91193c1f744f90",
"shasum": ""
},
"require": {
@@ -1455,7 +1455,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
- "time": "2015-07-08 21:02:55",
+ "time": "2015-07-20 20:56:27",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/226086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5ddd7096263cfff534ad64a42f15f1683924553
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
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
