WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390382 )
Change subject: New Wikidata Build - 2017-11-10T10:00:01+0000
......................................................................
New Wikidata Build - 2017-11-10T10:00:01+0000
Change-Id: I0c4c1c649c884dd3de58eb9051751c37ae845207
---
M composer.lock
M extensions/ArticlePlaceholder/composer.json
M extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php
M extensions/Constraints/modules/gadget.js
M extensions/Constraints/tests/phpunit/Helper/SparqlHelperTest.php
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
M extensions/Wikibase/view/resources/wikibase/wikibase.less
M extensions/Wikidata.org/extension.json
M vendor/composer/installed.json
9 files changed, 108 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/82/390382/1
diff --git a/composer.lock b/composer.lock
index 5921bf0..c7554d7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -664,12 +664,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "3b26504095fb411c8710043ff944c2b0c6408ab0"
+ "reference": "17248f09b47d2717d2dc9404c0d2a397acded033"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/3b26504095fb411c8710043ff944c2b0c6408ab0";,
- "reference": "3b26504095fb411c8710043ff944c2b0c6408ab0",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/17248f09b47d2717d2dc9404c0d2a397acded033";,
+ "reference": "17248f09b47d2717d2dc9404c0d2a397acded033",
"shasum": ""
},
"require": {
@@ -678,6 +678,7 @@
"require-dev": {
"jakub-onderka/php-console-highlighter": "0.3.2",
"jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/minus-x": "0.2.0",
"wikibase/wikibase-codesniffer": "^0.2.0"
},
"type": "mediawiki-extension",
@@ -698,7 +699,7 @@
],
"description": "Provides a special page with Wikibase information
about a certain topic, with invitation to create an article for the topic",
"homepage":
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder";,
- "time": "2017-11-06 21:43:26"
+ "time": "2017-11-09 21:52:40"
},
{
"name": "propertysuggester/property-suggester",
@@ -808,7 +809,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";,
- "reference": "1f744a38f074fbf7da31ae0cdb6994593d0126c0"
+ "reference": "45331b50c5ba98c75e4f34de5e8901edd6e417f5"
},
"require": {
"php": ">=5.5.9"
@@ -851,7 +852,7 @@
"support": {
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2017-11-09 02:41:54"
+ "time": "2017-11-09 19:46:47"
},
{
"name": "wikibase/constraints",
@@ -859,7 +860,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "9ea1e2f97679715d86a55871582e2cb398e604d2"
+ "reference": "123b1b6e6773ac7af32ef926ac603717b9aee62a"
},
"require": {
"php": ">=5.5.9",
@@ -922,7 +923,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2017-11-08 16:45:36"
+ "time": "2017-11-09 14:05:28"
},
{
"name": "wikibase/data-model",
@@ -1252,7 +1253,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
- "reference": "e63efdcf5aec13a22a2ec4ec52b97b98ecd28e43"
+ "reference": "c05e2988bfb8a0837275258a5c63585e0902570e"
},
"require": {
"composer/installers": ">=1.0.1",
@@ -1338,7 +1339,7 @@
"issues": "https://phabricator.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2017-11-08 21:50:01"
+ "time": "2017-11-10 04:56:55"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/composer.json
b/extensions/ArticlePlaceholder/composer.json
index 4ee14da..f31b3d2 100644
--- a/extensions/ArticlePlaceholder/composer.json
+++ b/extensions/ArticlePlaceholder/composer.json
@@ -19,7 +19,8 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "wikibase/wikibase-codesniffer": "^0.2.0"
+ "wikibase/wikibase-codesniffer": "^0.2.0",
+ "mediawiki/minus-x": "0.2.0"
},
"autoload": {
"psr-4": {
@@ -30,10 +31,12 @@
"scripts": {
"test": [
"parallel-lint . --exclude vendor --exclude
node_modules",
- "phpcs -p -s"
+ "phpcs -p -s",
+ "minus-x check ."
],
"fix": [
- "phpcbf"
+ "phpcbf",
+ "minus-x fix ."
]
}
}
diff --git
a/extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php
b/extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php
index 2b3b0ed..ba521d1 100644
--- a/extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php
+++ b/extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php
@@ -447,6 +447,33 @@
}
/**
+ * Return the max-age of a cached response,
+ * or a boolean indicating whether the response was cached or not.
+ *
+ * @param array $responseHeaders see MWHttpRequest::getResponseHeaders()
+ * @return integer|boolean the max-age (in seconds)
+ * or a plain boolean if no max-age can be determined
+ */
+ public function getCacheMaxAge( $responseHeaders ) {
+ if (
+ array_key_exists( 'x-cache-status', $responseHeaders )
&&
+ preg_match( '/^hit(?:-.*)?$/',
$responseHeaders['x-cache-status'] )
+ ) {
+ $maxage = [];
+ if (
+ array_key_exists( 'cache-control',
$responseHeaders ) &&
+ preg_match( '/\bmax-age=(\d+)\b/',
$responseHeaders['cache-control'], $maxage )
+ ) {
+ return intval( $maxage[1] );
+ } else {
+ return true;
+ }
+ } else {
+ return false;
+ }
+ }
+
+ /**
* Runs a query against the configured endpoint and returns the results.
*
* @param string $query The query, unencoded (plain string).
@@ -484,7 +511,7 @@
( $endTime - $startTime ) * 1000
);
- if ( $request->getResponseHeader( 'X-Cache-Status' ) === 'hit'
) {
+ if ( $this->getCacheMaxAge( $request->getResponseHeaders() ) ) {
$this->dataFactory->increment(
'wikibase.quality.constraints.sparql.cached' );
}
diff --git a/extensions/Constraints/modules/gadget.js
b/extensions/Constraints/modules/gadget.js
index 6c46e6e..85b3a60 100644
--- a/extensions/Constraints/modules/gadget.js
+++ b/extensions/Constraints/modules/gadget.js
@@ -9,7 +9,7 @@
iconTitle: mw.message( iconTitleMessageKey ).text(),
flags: flags || '',
framed: false,
- classes: [ 'wbqc-reports-button' ],
+ classes: [ 'wbqc-reports-button',
'wikibase-snakview-indicator' ],
$overlay: $container.parents( '.wikibase-statementview'
).first(),
popup: {
$content: $content,
@@ -144,19 +144,14 @@
function addResultsToSnak( results, $snak ) {
var reports = results.map( buildReport ),
list = buildReportList( reports ),
- haveMandatoryViolations,
- $target;
+ haveMandatoryViolations;
if ( list !== null ) {
haveMandatoryViolations = list.items[ 0 ].status ===
'violation';
- $target = $snak.find( '.wikibase-snakview-value
.valueview-instaticmode' );
- if ( $target.length === 0 ) {
- $target = $snak.find(
'.wikibase-snakview-value' );
- }
buildPopup(
list.$element,
- $target,
+ $snak.find( '.wikibase-snakview-indicators' ),
( haveMandatoryViolations ? '' : 'non-' ) +
'mandatory-constraint-violation',
haveMandatoryViolations ? 'wbqc-issues-long' :
'wbqc-potentialissues-long'
);
@@ -216,8 +211,7 @@
problems,
reports,
list,
- $statement,
- $target;
+ $snak;
for ( constraintId in parameterReports ) {
status = parameterReports[ constraintId ].status;
@@ -238,13 +232,15 @@
expanded: false // expanded: true does not work
within a popup
} );
- $statement = $( '.wikibase-statement-' +
constraintId.replace( /\$/g, '\\$' ) +
- '
.wikibase-statementview-mainsnak .wikibase-snakview-value' );
- $target = $statement.find( '.valueview-instaticmode' );
- if ( $target.length === 0 ) {
- $target = $statement;
- }
- buildPopup( list.$element, $target, 'alert',
'wbqc-badparameters-long', 'warning' );
+ $snak = $( '.wikibase-statement-' +
constraintId.replace( /\$/g, '\\$' ) +
+ '
.wikibase-statementview-mainsnak .wikibase-snakview' );
+ buildPopup(
+ list.$element,
+ $snak.find( '.wikibase-snakview-indicators' ),
+ 'alert',
+ 'wbqc-badparameters-long',
+ 'warning'
+ );
}
}
diff --git a/extensions/Constraints/tests/phpunit/Helper/SparqlHelperTest.php
b/extensions/Constraints/tests/phpunit/Helper/SparqlHelperTest.php
index fcb4e51..ec4109e 100644
--- a/extensions/Constraints/tests/phpunit/Helper/SparqlHelperTest.php
+++ b/extensions/Constraints/tests/phpunit/Helper/SparqlHelperTest.php
@@ -407,4 +407,41 @@
];
}
+ /**
+ * @dataProvider getCacheMaxAgeProvider
+ */
+ public function testGetCacheMaxAge( $responseHeaders, $expected ) {
+ $sparqlHelper = new SparqlHelper(
+ $this->getDefaultConfig(),
+ new RdfVocabulary(
+ 'http://www.wikidata.org/entity/',
+
'http://www.wikidata.org/wiki/Special:EntityData/'
+ ),
+ new ItemIdParser(),
+ $this->getMock( PropertyDataTypeLookup::class ),
+ WANObjectCache::newEmpty()
+ );
+
+ $actual = $sparqlHelper->getCacheMaxAge( $responseHeaders );
+
+ $this->assertSame( $expected, $actual );
+ }
+
+ public function getCacheMaxAgeProvider() {
+ return [
+ 'WDQS hit' => [
+ [ 'x-cache-status' => 'hit-front',
'cache-control' => 'public, max-age=300' ],
+ 300
+ ],
+ 'WDQS miss' => [
+ [ 'x-cache-status' => 'miss', 'cache-control'
=> 'public, max-age=300' ],
+ false
+ ],
+ 'generic hit' => [
+ [ 'x-cache-status' => 'hit' ],
+ true
+ ],
+ ];
+ }
+
}
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
index c2126b2..55ffada 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
@@ -293,7 +293,7 @@
deferred.resolve(
response.search,
- response.searchinfo.search,
+ term,
response[ 'search-continue' ]
);
} )
diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.less
b/extensions/Wikibase/view/resources/wikibase/wikibase.less
index 8722bc9..f52234f 100644
--- a/extensions/Wikibase/view/resources/wikibase/wikibase.less
+++ b/extensions/Wikibase/view/resources/wikibase/wikibase.less
@@ -234,7 +234,7 @@
.wikibase-snakview {
.wikibase-snakview-value,
.wikibase-snakview-indicators {
- display: inline-block;
+ display: inline;
}
&.wb-edit {
diff --git a/extensions/Wikidata.org/extension.json
b/extensions/Wikidata.org/extension.json
index a6050d2..0ce09ce 100644
--- a/extensions/Wikidata.org/extension.json
+++ b/extensions/Wikidata.org/extension.json
@@ -30,6 +30,5 @@
"BeforePageDisplay": "WikidataOrg\\Hooks::onBeforePageDisplay",
"SkinTemplateOutputPageBeforeExec":
"WikidataOrg\\Hooks::onSkinTemplateOutputPageBeforeExec"
},
- "load_composer_autoloader": true,
"manifest_version": 2
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 8539e68..300a434 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -125,12 +125,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "3b26504095fb411c8710043ff944c2b0c6408ab0"
+ "reference": "17248f09b47d2717d2dc9404c0d2a397acded033"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/3b26504095fb411c8710043ff944c2b0c6408ab0";,
- "reference": "3b26504095fb411c8710043ff944c2b0c6408ab0",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/17248f09b47d2717d2dc9404c0d2a397acded033";,
+ "reference": "17248f09b47d2717d2dc9404c0d2a397acded033",
"shasum": ""
},
"require": {
@@ -139,9 +139,10 @@
"require-dev": {
"jakub-onderka/php-console-highlighter": "0.3.2",
"jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/minus-x": "0.2.0",
"wikibase/wikibase-codesniffer": "^0.2.0"
},
- "time": "2017-11-06 21:43:26",
+ "time": "2017-11-09 21:52:40",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -223,7 +224,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";,
- "reference": "1f744a38f074fbf7da31ae0cdb6994593d0126c0"
+ "reference": "45331b50c5ba98c75e4f34de5e8901edd6e417f5"
},
"require": {
"php": ">=5.5.9"
@@ -234,7 +235,7 @@
"mediawiki/minus-x": "0.2.0",
"wikibase/wikibase-codesniffer": "^0.2.0"
},
- "time": "2017-11-09 02:36:20",
+ "time": "2017-11-09 19:46:47",
"type": "mediawiki-extension",
"installation-source": "source",
"scripts": {
@@ -1302,7 +1303,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
- "reference": "e63efdcf5aec13a22a2ec4ec52b97b98ecd28e43"
+ "reference": "c05e2988bfb8a0837275258a5c63585e0902570e"
},
"require": {
"composer/installers": ">=1.0.1",
@@ -1331,7 +1332,7 @@
"mediawiki/minus-x": "0.1.0",
"wikibase/wikibase-codesniffer": "^0.2.0"
},
- "time": "2017-11-08 21:50:01",
+ "time": "2017-11-10 04:50:26",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
@@ -1470,7 +1471,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "9ea1e2f97679715d86a55871582e2cb398e604d2"
+ "reference": "123b1b6e6773ac7af32ef926ac603717b9aee62a"
},
"require": {
"php": ">=5.5.9",
@@ -1487,7 +1488,7 @@
"satooshi/php-coveralls": "master-dev",
"wikibase/wikibase-codesniffer": "^0.2.0"
},
- "time": "2017-11-07 11:43:33",
+ "time": "2017-11-09 14:05:28",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/390382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c4c1c649c884dd3de58eb9051751c37ae845207
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
