WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154244
Change subject: New Wikidata Build - 15/08/2014 10:00
......................................................................
New Wikidata Build - 15/08/2014 10:00
Change-Id: I0353586be6fae6502606b72172060e4f67d2a579
---
M composer.lock
M extensions/ValueView/README.md
M extensions/ValueView/ValueView.php
M extensions/ValueView/lib/resources.php
M extensions/ValueView/src/ExpertExtender/resources.php
M extensions/ValueView/src/experts/resources.php
M extensions/ValueView/src/resources.php
M extensions/Wikibase/client/i18n/pl.json
M extensions/Wikibase/lib/WikibaseLib.hooks.php
M extensions/Wikibase/lib/resources/Resources.php
M extensions/Wikibase/lib/resources/api/resources.php
M extensions/Wikibase/lib/resources/experts/resources.php
M extensions/Wikibase/lib/resources/parsers/resources.php
M extensions/Wikibase/repo/includes/EditEntity.php
M extensions/Wikibase/repo/includes/EntityView.php
M extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
M extensions/Wikibase/repo/includes/PropertyView.php
A extensions/Wikibase/repo/includes/View/FingerprintView.php
M extensions/Wikibase/repo/includes/View/TermBoxView.php
M extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php
A extensions/Wikibase/repo/tests/phpunit/includes/View/FingerprintViewTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
M vendor/data-values/javascript/DataValuesJavascript.php
M vendor/data-values/javascript/README.md
M vendor/data-values/javascript/lib/resources.php
M vendor/data-values/javascript/src/resources.php
M vendor/data-values/javascript/src/valueFormatters/resources.php
M vendor/data-values/javascript/src/valueParsers/resources.php
M vendor/wikibase/data-model-javascript/README.md
M vendor/wikibase/data-model-javascript/init.mw.php
M vendor/wikibase/data-model-javascript/resources.mw.php
35 files changed, 399 insertions(+), 365 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/44/154244/1
diff --git a/composer.lock b/composer.lock
index 71e493b..02ec9fb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -370,16 +370,16 @@
},
{
"name": "data-values/javascript",
- "version": "0.5.1",
+ "version": "0.5.2",
"source": {
"type": "git",
"url": "https://github.com/wmde/DataValuesJavascript.git";,
- "reference": "cfe87b1d8f1e9d8721de8de59bace70393ce9f48"
+ "reference": "36ee3384a4bdf60883dbf3e16a6cf966a8db4b4d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/cfe87b1d8f1e9d8721de8de59bace70393ce9f48";,
- "reference": "cfe87b1d8f1e9d8721de8de59bace70393ce9f48",
+ "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/36ee3384a4bdf60883dbf3e16a6cf966a8db4b4d";,
+ "reference": "36ee3384a4bdf60883dbf3e16a6cf966a8db4b4d",
"shasum": ""
},
"require": {
@@ -399,20 +399,15 @@
{
"name": "Jeroen De Dauw",
"email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "homepage": "http://jeroendedauw.com";
},
{
"name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";
},
{
"name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
+ "homepage": "http://www.snater.com";
}
],
"description": "DataValues implementation in Javascript",
@@ -420,7 +415,7 @@
"datavalues",
"wikidata"
],
- "time": "2014-06-04 10:58:47"
+ "time": "2014-08-14 18:12:06"
},
{
"name": "data-values/number",
@@ -632,16 +627,16 @@
},
{
"name": "data-values/value-view",
- "version": "0.6.9",
+ "version": "0.6.10",
"source": {
"type": "git",
"url": "https://github.com/wmde/ValueView.git";,
- "reference": "3711c81bd2376c9b214b18f5f4e805d147978b5a"
+ "reference": "256ec8e61a6cbf7fbd8f4c8d7d0a6f4a64f6e1f6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/ValueView/zipball/3711c81bd2376c9b214b18f5f4e805d147978b5a";,
- "reference": "3711c81bd2376c9b214b18f5f4e805d147978b5a",
+ "url":
"https://api.github.com/repos/wmde/ValueView/zipball/256ec8e61a6cbf7fbd8f4c8d7d0a6f4a64f6e1f6";,
+ "reference": "256ec8e61a6cbf7fbd8f4c8d7d0a6f4a64f6e1f6",
"shasum": ""
},
"require": {
@@ -670,7 +665,7 @@
],
"description": "Provides JS widgets to edit values defined by the
DataValues library",
"homepage": "https://www.mediawiki.org/wiki/Extension:ValueView";,
- "time": "2014-08-13 16:55:28"
+ "time": "2014-08-14 18:40:52"
},
{
"name": "diff/diff",
@@ -886,16 +881,16 @@
},
{
"name": "wikibase/data-model-javascript",
- "version": "0.3.0",
+ "version": "0.3.1",
"source": {
"type": "git",
"url":
"https://github.com/wmde/WikibaseDataModelJavascript.git";,
- "reference": "2d415cc002e3fe73c036696679abe25e71fd4463"
+ "reference": "983e8b2b334a4ec4d4418b2e46728818921abfa0"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikibaseDataModelJavascript/zipball/2d415cc002e3fe73c036696679abe25e71fd4463";,
- "reference": "2d415cc002e3fe73c036696679abe25e71fd4463",
+ "url":
"https://api.github.com/repos/wmde/WikibaseDataModelJavascript/zipball/983e8b2b334a4ec4d4418b2e46728818921abfa0";,
+ "reference": "983e8b2b334a4ec4d4418b2e46728818921abfa0",
"shasum": ""
},
"require": {
@@ -913,30 +908,25 @@
],
"authors": [
{
+ "name": "Adrian Lang",
+ "email": "[email protected]"
+ },
+ {
"name": "Jeroen De Dauw",
"email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "homepage": "http://jeroendedauw.com";
},
{
"name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";
},
{
"name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
- },
- {
- "name": "Adrian Lang",
- "email": "[email protected]"
+ "homepage": "http://www.snater.com";
}
],
"description": "Wikibase datamodel implementation in JavaScript",
- "time": "2014-07-10 11:15:17"
+ "time": "2014-08-14 18:19:35"
},
{
"name": "wikibase/data-model-serialization",
@@ -1152,12 +1142,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "37398dd52b9f76a6fc5855633065a084d7502380"
+ "reference": "c2f07302fa28695afda71b1981987c6573b02afc"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/37398dd52b9f76a6fc5855633065a084d7502380";,
- "reference": "37398dd52b9f76a6fc5855633065a084d7502380",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2f07302fa28695afda71b1981987c6573b02afc";,
+ "reference": "c2f07302fa28695afda71b1981987c6573b02afc",
"shasum": ""
},
"require": {
@@ -1226,7 +1216,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-08-14 00:23:11"
+ "time": "2014-08-15 01:15:18"
}
],
"packages-dev": [
diff --git a/extensions/ValueView/README.md b/extensions/ValueView/README.md
index 7a38f4d..a6837e7 100644
--- a/extensions/ValueView/README.md
+++ b/extensions/ValueView/README.md
@@ -105,6 +105,9 @@
## Release notes
+### 0.6.10 (2014-08-14)
+* Remove ResourceLoader dependencies on jquery and mediawiki (bug 69468)
+
### 0.6.9 (2014-08-13)
* $.ui.suggester updates "lang" and "dir" attribute of its menu whenever
repositioning the menu.
* $.ui.suggester issues "error" event in case of an error.
diff --git a/extensions/ValueView/ValueView.php
b/extensions/ValueView/ValueView.php
index 1f960f4..eb5a3b8 100644
--- a/extensions/ValueView/ValueView.php
+++ b/extensions/ValueView/ValueView.php
@@ -5,7 +5,7 @@
return 1;
}
-define( 'VALUEVIEW_VERSION', '0.6.9' );
+define( 'VALUEVIEW_VERSION', '0.6.10' );
/**
* @deprecated
diff --git a/extensions/ValueView/lib/resources.php
b/extensions/ValueView/lib/resources.php
index fa75347..626a02b 100644
--- a/extensions/ValueView/lib/resources.php
+++ b/extensions/ValueView/lib/resources.php
@@ -23,7 +23,6 @@
'jquery/jquery.animateWithEvent.js',
),
'dependencies' => array(
- 'jquery',
'jquery.AnimationEvent',
),
),
@@ -33,7 +32,6 @@
'jquery/jquery.AnimationEvent.js',
),
'dependencies' => array(
- 'jquery',
'jquery.PurposedCallbacks',
),
),
@@ -43,7 +41,6 @@
'jquery/jquery.autocompletestring.js',
),
'dependencies' => array(
- 'jquery',
'jquery.util.adaptlettercase',
),
),
@@ -52,9 +49,6 @@
'scripts' => array(
'jquery/jquery.focusAt.js',
),
- 'dependencies' => array(
- 'jquery',
- ),
),
'jquery.inputautoexpand' => $moduleTemplate + array(
@@ -62,7 +56,6 @@
'jquery/jquery.inputautoexpand.js',
),
'dependencies' => array(
- 'jquery',
'jquery.event.special.eachchange',
),
),
@@ -71,17 +64,11 @@
'scripts' => array(
'jquery/jquery.NativeEventHandler.js',
),
- 'dependencies' => array(
- 'jquery',
- ),
),
'jquery.PurposedCallbacks' => $moduleTemplate + array(
'scripts' => array(
'jquery/jquery.PurposedCallbacks.js',
- ),
- 'dependencies' => array(
- 'jquery',
),
),
@@ -91,7 +78,6 @@
'jquery.event/jquery.event.special.eachchange.js'
),
'dependencies' => array(
- 'jquery',
'jquery.client',
),
),
@@ -105,7 +91,6 @@
'jquery.ui/jquery.ui.inputextender.css',
),
'dependencies' => array(
- 'jquery',
'jquery.animateWithEvent',
'jquery.event.special.eachchange',
'jquery.ui.position',
@@ -121,7 +106,6 @@
'jquery.ui/jquery.ui.listrotator.css',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.autocomplete', // needs
jquery.ui.menu
'jquery.ui.widget',
'jquery.ui.position',
@@ -139,7 +123,6 @@
'jquery.ui/jquery.ui.ooMenu.css',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.widget',
'jquery.util.getscrollbarwidth',
'util.inherit',
@@ -154,7 +137,6 @@
'jquery.ui/jquery.ui.preview.css',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.widget',
),
),
@@ -167,7 +149,6 @@
'jquery.ui/jquery.ui.suggester.css',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.core',
'jquery.ui.ooMenu',
'jquery.ui.position',
@@ -180,7 +161,6 @@
'jquery.ui/jquery.ui.suggestCommons.js',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.suggester',
'jquery.ui.widget',
'jquery.util.highlightMatchingCharacters',
@@ -195,7 +175,6 @@
'jquery.ui/jquery.ui.toggler.css',
),
'dependencies' => array(
- 'jquery',
'jquery.animateWithEvent',
'jquery.ui.widget',
),
@@ -206,26 +185,17 @@
'scripts' => array(
'jquery.util/jquery.util.adaptlettercase.js',
),
- 'dependencies' => array(
- 'jquery',
- ),
),
'jquery.util.highlightMatchingCharacters' => $moduleTemplate +
array(
'scripts' => array(
'jquery.util/jquery.util.highlightMatchingCharacters.js',
),
- 'dependencies' => array(
- 'jquery',
- ),
),
'jquery.util.getscrollbarwidth' => $moduleTemplate + array(
'scripts' => array(
'jquery.util/jquery.util.getscrollbarwidth.js',
- ),
- 'dependencies' => array(
- 'jquery',
),
),
diff --git a/extensions/ValueView/src/ExpertExtender/resources.php
b/extensions/ValueView/src/ExpertExtender/resources.php
index b70a0b7..65d5edf 100644
--- a/extensions/ValueView/src/ExpertExtender/resources.php
+++ b/extensions/ValueView/src/ExpertExtender/resources.php
@@ -19,7 +19,6 @@
'ExpertExtender.js',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.inputextender',
'jquery.valueview',
'util.Extendable',
@@ -34,7 +33,6 @@
'ExpertExtender.CalendarHint.css',
),
'dependencies' => array(
- 'jquery',
'jquery.valueview.ExpertExtender',
'time.js'
),
@@ -51,7 +49,6 @@
'ExpertExtender.Container.js',
),
'dependencies' => array(
- 'jquery',
'jquery.valueview.ExpertExtender',
),
),
@@ -61,7 +58,6 @@
'ExpertExtender.LanguageSelector.js',
),
'dependencies' => array(
- 'jquery',
'jquery.event.special.eachchange',
'jquery.ui.suggester',
'jquery.valueview.ExpertExtender',
@@ -77,7 +73,6 @@
'ExpertExtender.Listrotator.js',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.listrotator',
'jquery.valueview.ExpertExtender',
),
@@ -91,7 +86,6 @@
'ExpertExtender.Preview.css',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.preview',
'jquery.valueview.ExpertExtender',
'util.MessageProvider',
@@ -110,7 +104,6 @@
'ExpertExtender.Toggler.css',
),
'dependencies' => array(
- 'jquery',
'jquery.ui.toggler',
'jquery.valueview.ExpertExtender',
),
diff --git a/extensions/ValueView/src/experts/resources.php
b/extensions/ValueView/src/experts/resources.php
index 883248b..ed86d93 100644
--- a/extensions/ValueView/src/experts/resources.php
+++ b/extensions/ValueView/src/experts/resources.php
@@ -56,7 +56,6 @@
),
'dependencies' => array(
'globeCoordinate.js',
- 'jquery',
'jquery.valueview.ExpertExtender',
'jquery.valueview.ExpertExtender.Container',
'jquery.valueview.ExpertExtender.Listrotator',
@@ -91,7 +90,6 @@
'StringValue.js',
),
'dependencies' => array(
- 'jquery',
'jquery.event.special.eachchange',
'jquery.focusAt',
'jquery.inputautoexpand',
@@ -121,7 +119,6 @@
'TimeInput.css',
),
'dependencies' => array(
- 'jquery',
'jquery.valueview.ExpertExtender',
'jquery.valueview.ExpertExtender.CalendarHint',
'jquery.valueview.ExpertExtender.Container',
diff --git a/extensions/ValueView/src/resources.php
b/extensions/ValueView/src/resources.php
index 9525cae..f73694e 100644
--- a/extensions/ValueView/src/resources.php
+++ b/extensions/ValueView/src/resources.php
@@ -25,7 +25,6 @@
'jquery.valueview.js',
),
'dependencies' => array(
- 'jquery',
'jquery.valueview.valueview',
),
),
@@ -35,7 +34,6 @@
'jquery.valueview.Expert.js',
),
'dependencies' => array(
- 'jquery',
'util.inherit',
'util.MessageProvider',
'util.Notifier',
@@ -47,17 +45,11 @@
'scripts' => array(
'jquery.valueview.ExpertStore.js',
),
- 'dependencies' => array(
- 'jquery',
- ),
),
'jquery.valueview.experts' => $moduleTemplate + array(
'scripts' => array(
'jquery.valueview.experts.js',
- ),
- 'dependencies' => array(
- 'jquery',
),
),
@@ -71,7 +63,6 @@
),
'dependencies' => array(
'dataValues.DataValue',
- 'jquery',
'jquery.ui.widget',
'jquery.valueview.ViewState',
'jquery.valueview.ExpertStore',
@@ -86,9 +77,6 @@
'jquery.valueview.ViewState' => $moduleTemplate + array(
'scripts' => array(
'jquery.valueview.ViewState.js',
- ),
- 'dependencies' => array(
- 'jquery',
),
),
diff --git a/extensions/Wikibase/client/i18n/pl.json
b/extensions/Wikibase/client/i18n/pl.json
index 854d27c..e76434f 100644
--- a/extensions/Wikibase/client/i18n/pl.json
+++ b/extensions/Wikibase/client/i18n/pl.json
@@ -45,7 +45,7 @@
"wikibase-linkitem-success-link": "Strony zostały pomyślnie powiązane.
Element zawierający linki możesz znaleźć w naszym [$1 centralnym repozytorium
danych].",
"wikibase-property-notfound": "Właściwość $1 nie została znaleziona.",
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
- "wikibase-rc-hide-wikidata-hide": "Schowaj",
+ "wikibase-rc-hide-wikidata-hide": "Ukryj",
"wikibase-rc-hide-wikidata-show": "Pokaż",
"wikibase-rc-show-wikidata-pref": "Pokazuj edycje w Wikidanych w
ostatnich zmianach",
"wikibase-rc-wikibase-edit-letter": "d",
diff --git a/extensions/Wikibase/lib/WikibaseLib.hooks.php
b/extensions/Wikibase/lib/WikibaseLib.hooks.php
index 755af8d..1b9868e 100644
--- a/extensions/Wikibase/lib/WikibaseLib.hooks.php
+++ b/extensions/Wikibase/lib/WikibaseLib.hooks.php
@@ -264,7 +264,6 @@
'tests/qunit/wikibase.store/store.EntityStore.tests.js',
),
'dependencies' => array(
- 'jquery',
'wikibase.store.EntityStore',
'wikibase.tests.qunit.testrunner'
),
@@ -300,7 +299,6 @@
'tests/qunit/wikibase.sites.tests.js',
),
'dependencies' => array(
- 'jquery',
'wikibase',
'wikibase.sites',
'wikibase.tests.qunit.testrunner',
@@ -312,7 +310,6 @@
'tests/qunit/wikibase.ValueViewBuilder.tests.js'
),
'dependencies' => array(
- 'jquery',
'test.sinonjs',
'wikibase.ValueViewBuilder'
)
diff --git a/extensions/Wikibase/lib/resources/Resources.php
b/extensions/Wikibase/lib/resources/Resources.php
index 02a5922..a87d710 100644
--- a/extensions/Wikibase/lib/resources/Resources.php
+++ b/extensions/Wikibase/lib/resources/Resources.php
@@ -46,7 +46,6 @@
'wikibase.Site.js',
),
'dependencies' => array(
- 'jquery',
'mediawiki.util',
'util.inherit',
'wikibase',
@@ -82,7 +81,6 @@
'dependencies' => array(
'dataTypes.DataType',
'dataTypes.DataTypeStore',
- 'jquery',
'mw.config.values.wbDataTypes',
'wikibase',
),
@@ -179,7 +177,6 @@
'json',
'user.tokens',
'mediawiki.api',
- 'mediawiki',
'mw.config.values.wbRepo',
'wikibase',
)
@@ -473,7 +470,6 @@
'wikibase.ValueViewBuilder.js',
),
'dependencies' => array(
- 'jquery',
'wikibase',
'jquery.valueview'
)
diff --git a/extensions/Wikibase/lib/resources/api/resources.php
b/extensions/Wikibase/lib/resources/api/resources.php
index d3f54a9..36d3d51 100644
--- a/extensions/Wikibase/lib/resources/api/resources.php
+++ b/extensions/Wikibase/lib/resources/api/resources.php
@@ -30,7 +30,6 @@
),
'dependencies' => array(
'json',
- 'jquery',
'wikibase.api.__namespace',
)
),
@@ -42,7 +41,6 @@
'dependencies' => array(
'dataValues',
'json',
- 'jquery',
'wikibase.api.__namespace',
)
),
diff --git a/extensions/Wikibase/lib/resources/experts/resources.php
b/extensions/Wikibase/lib/resources/experts/resources.php
index 918bc70..f7dc9eb 100644
--- a/extensions/Wikibase/lib/resources/experts/resources.php
+++ b/extensions/Wikibase/lib/resources/experts/resources.php
@@ -42,7 +42,6 @@
'EntityIdInput.js',
),
'dependencies' => array(
- 'jquery',
'jquery.event.special.eachchange',
'jquery.valueview.Expert',
'jquery.valueview.experts.StringValue',
diff --git a/extensions/Wikibase/lib/resources/parsers/resources.php
b/extensions/Wikibase/lib/resources/parsers/resources.php
index a4363eb..1c362f2 100644
--- a/extensions/Wikibase/lib/resources/parsers/resources.php
+++ b/extensions/Wikibase/lib/resources/parsers/resources.php
@@ -22,7 +22,6 @@
'getApiBasedValueParserConstructor.js',
),
'dependencies' => array(
- 'jquery',
'util.inherit',
'valueParsers.ValueParser',
'wikibase',
@@ -34,7 +33,6 @@
'EntityIdParser.js',
),
'dependencies' => array(
- 'jquery',
'util.inherit',
'valueParsers.ValueParser',
'wikibase',
@@ -48,7 +46,6 @@
),
'dependencies' => array(
'dataValues.values',
- 'jquery',
'valueParsers.parsers',
'valueParsers.ValueParserStore',
'wikibase.api.ParseValueCaller',
diff --git a/extensions/Wikibase/repo/includes/EditEntity.php
b/extensions/Wikibase/repo/includes/EditEntity.php
index 9486dd9..4e8c016 100644
--- a/extensions/Wikibase/repo/includes/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/EditEntity.php
@@ -786,7 +786,6 @@
$this->status->fatal( 'edit-conflict' );
$this->errorType |= self::EDIT_CONFLICT_ERROR;
- wfProfileOut( "Wikibase-" . __METHOD__ );
return $this->status;
}
}
diff --git a/extensions/Wikibase/repo/includes/EntityView.php
b/extensions/Wikibase/repo/includes/EntityView.php
index d048b95..14509a4 100644
--- a/extensions/Wikibase/repo/includes/EntityView.php
+++ b/extensions/Wikibase/repo/includes/EntityView.php
@@ -12,6 +12,7 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
+use Wikibase\Repo\View\FingerprintView;
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Repo\View\SnakHtmlGenerator;
use Wikibase\Repo\View\TextInjector;
@@ -29,6 +30,7 @@
* @author H. Snater < mediawiki at snater.com >
* @author Daniel Werner
* @author Daniel Kinzler
+ * @author Bene* < [email protected] >
*/
abstract class EntityView extends ContextSource {
@@ -230,12 +232,7 @@
$html = '';
- $html .= $this->getHtmlForLabel( $entity, $editable );
- $html .= $this->getHtmlForDescription( $entity, $editable );
-
- $html .= wfTemplate( 'wb-entity-header-separator' );
-
- $html .= $this->getHtmlForAliases( $entity, $editable );
+ $html .= $this->getHtmlForFingerprint( $entity, $editable );
$html .= $this->getHtmlForToc();
$html .= $this->getHtmlForTermBox( $entityRevision, $editable );
$html .= $this->getHtmlForClaims( $entity, $editable );
@@ -245,7 +242,19 @@
}
/**
- * Builds and returns the html for the toc.
+ * Builds and returns the HTML for the entity's fingerprint.
+ *
+ * @param Entity $entity
+ * @param bool $editable
+ * @return string
+ */
+ protected function getHtmlForFingerprint( Entity $entity, $editable =
true ) {
+ $fingerprintView = new FingerprintView(
$this->sectionEditLinkGenerator, $this->getLanguage()->getCode() );
+ return $fingerprintView->getHtml( $entity->getFingerprint(),
$entity->getId(), $editable );
+ }
+
+ /**
+ * Builds and returns the HTML for the toc.
*
* @return string
*/
@@ -383,128 +392,6 @@
wfProfileOut( __METHOD__ );
return $pout;
- }
-
- /**
- * Builds and returns the HTML representing a WikibaseEntity's label.
- *
- * @since 0.1
- *
- * @param Entity $entity the entity to render
- * @param bool $editable whether editing is allowed (enabled edit links)
- * @return string
- */
- public function getHtmlForLabel( Entity $entity, $editable = true ) {
- wfProfileIn( __METHOD__ );
-
- $languageCode = $this->getLanguage()->getCode();
- $label = $entity->getLabel( $languageCode );
- $entityId = $entity->getId();
- $idString = 'new';
- $supplement = '';
-
- if ( $entityId !== null ) {
- $idString = $entityId->getSerialization();
- $supplement .= wfTemplate(
'wb-property-value-supplement', wfMessage( 'parentheses', $idString ) );
- if ( $editable ) {
- $supplement .= $this->getHtmlForEditSection(
'SetLabel', array( $idString, $languageCode ) );
- }
- }
-
- $html = wfTemplate( 'wb-label',
- $idString,
- wfTemplate( 'wb-property',
- $label === false ? 'wb-value-empty' : '',
- htmlspecialchars( $label === false ? wfMessage(
'wikibase-label-empty' )->text() : $label ),
- $supplement
- )
- );
-
- wfProfileOut( __METHOD__ );
- return $html;
- }
-
- /**
- * Builds and returns the HTML representing a WikibaseEntity's
description.
- *
- * @since 0.1
- *
- * @param Entity $entity the entity to render
- * @param bool $editable whether editing is allowed (enabled edit links)
- * @return string
- */
- public function getHtmlForDescription( Entity $entity, $editable = true
) {
- wfProfileIn( __METHOD__ );
-
- $languageCode = $this->getLanguage()->getCode();
- $description = $entity->getDescription( $languageCode );
- $entityId = $entity->getId();
- $editSection = '';
-
- if ( $entityId !== null && $editable ) {
- $idString = $entityId->getSerialization();
- $editSection .= $this->getHtmlForEditSection(
'SetDescription', array( $idString, $languageCode ) );
- }
-
- $html = wfTemplate( 'wb-description',
- wfTemplate( 'wb-property',
- $description === false ? 'wb-value-empty' : '',
- htmlspecialchars( $description === false ?
wfMessage( 'wikibase-description-empty' )->text() : $description ),
- $editSection
- )
- );
-
- wfProfileOut( __METHOD__ );
- return $html;
- }
-
- /**
- * Builds and returns the HTML representing a WikibaseEntity's aliases.
- *
- * @since 0.1
- *
- * @param Entity $entity the entity to render
- * @param bool $editable whether editing is allowed (enabled edit links)
- * @return string
- */
- public function getHtmlForAliases( Entity $entity, $editable = true ) {
- wfProfileIn( __METHOD__ );
-
- $languageCode = $this->getLanguage()->getCode();
- $aliases = $entity->getAliases( $languageCode );
- $entityId = $entity->getId();
- $editSection = '';
-
- if ( $entityId !== null && $editable ) {
- $idString = $entityId->getSerialization();
- $action = empty( $aliases ) ? 'add' : 'edit';
- $editSection = $this->getHtmlForEditSection(
'SetAliases', array( $idString, $languageCode ), $action );
- }
-
- if ( empty( $aliases ) ) {
- $html = wfTemplate( 'wb-aliases-wrapper',
- 'wb-aliases-empty',
- 'wb-value-empty',
- wfMessage( 'wikibase-aliases-empty' )->text(),
- $editSection
- );
- } else {
- $aliasesHtml = '';
- foreach ( $aliases as $alias ) {
- $aliasesHtml .= wfTemplate( 'wb-alias',
htmlspecialchars( $alias ) );
- }
- $aliasList = wfTemplate( 'wb-aliases', $aliasesHtml );
-
- $html = wfTemplate( 'wb-aliases-wrapper',
- '',
- '',
- wfMessage( 'wikibase-aliases-label' )->text(),
- $aliasList . $editSection
- );
- }
-
- wfProfileOut( __METHOD__ );
- return $html;
}
/**
diff --git
a/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
b/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
index a89b6f8..a3812d9 100644
--- a/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
+++ b/extensions/Wikibase/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -422,6 +422,7 @@
$smaxage = max( 0, min( 60 * 60 * 24 * 31, $smaxage ) );
$response->header( 'Content-Type: ' . $contentType . ';
charset=UTF-8' );
+ $response->header( 'Access-Control-Allow-Origin: *' );
if ( $lastModified ) {
$response->header( 'Last-Modified: ' . wfTimestamp(
TS_RFC2822, $lastModified ) );
diff --git a/extensions/Wikibase/repo/includes/PropertyView.php
b/extensions/Wikibase/repo/includes/PropertyView.php
index 1060bed..8ceb012 100644
--- a/extensions/Wikibase/repo/includes/PropertyView.php
+++ b/extensions/Wikibase/repo/includes/PropertyView.php
@@ -39,12 +39,7 @@
$html = '';
- $html .= $this->getHtmlForLabel( $property, $editable );
- $html .= $this->getHtmlForDescription( $property, $editable );
-
- $html .= wfTemplate( 'wb-entity-header-separator' );
-
- $html .= $this->getHtmlForAliases( $property, $editable );
+ $html .= $this->getHtmlForFingerprint( $property, $editable );
$html .= $this->getHtmlForToc();
$html .= $this->getHtmlForTermBox( $entityRevision, $editable );
diff --git a/extensions/Wikibase/repo/includes/View/FingerprintView.php
b/extensions/Wikibase/repo/includes/View/FingerprintView.php
new file mode 100644
index 0000000..446e002
--- /dev/null
+++ b/extensions/Wikibase/repo/includes/View/FingerprintView.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace Wikibase\Repo\View;
+
+use Message;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Term\Fingerprint;
+use Wikibase\DataModel\Term\AliasGroupList;
+use Wikibase\DataModel\Term\TermList;
+
+/**
+ * Generates HTML to display the fingerprint of an entity
+ * in the user's current language.
+ *
+ * @since 0.5
+ * @licence GNU GPL v2+
+ *
+ * @author Bene* < [email protected] >
+ */
+class FingerprintView {
+
+ /**
+ * @var SectionEditLinkGenerator
+ */
+ private $sectionEditLinkGenerator;
+
+ /**
+ * @var string
+ */
+ private $languageCode;
+
+ /**
+ * @param SectionEditLinkGenerator $sectionEditLinkGenerator
+ * @param string $languageCode
+ */
+ public function __construct( SectionEditLinkGenerator
$sectionEditLinkGenerator, $languageCode ) {
+ $this->sectionEditLinkGenerator = $sectionEditLinkGenerator;
+ $this->languageCode = $languageCode;
+ }
+
+ /**
+ * Builds and returns the HTML representing a fingerprint.
+ *
+ * @since 0.5
+ *
+ * @param Fingerprint $fingerprint the fingerprint to render
+ * @param EntityId|null $entityId the id of the fingerprint's entity
+ * @param bool $editable whether editing is allowed (enabled edit links)
+ * @return string
+ */
+ public function getHtml( Fingerprint $fingerprint, EntityId $entityId =
null, $editable = true ) {
+ $labels = $fingerprint->getLabels();
+ $descriptions = $fingerprint->getDescriptions();
+ $aliasGroups = $fingerprint->getAliasGroups();
+
+ $html = '';
+
+ if ( $entityId !== null ) {
+ $serializedId = $entityId->getSerialization();
+ $html .= wfTemplate( 'wb-property-value-supplement',
wfMessage( 'parentheses', $serializedId ) );
+ }
+
+ $html .= $this->getHtmlForLabel( $labels, $entityId, $editable
);
+ $html .= $this->getHtmlForDescription( $descriptions,
$entityId, $editable );
+ $html .= wfTemplate( 'wb-entity-header-separator' );
+ $html .= $this->getHtmlForAliases( $aliasGroups, $entityId,
$editable );
+
+ return $html;
+ }
+
+ /**
+ * Builds and returns the HTML for the edit section.
+ *
+ * @param Message $message
+ * @param string $specialPageName
+ * @param EntityId|null $entityId
+ * @param bool $editable
+ * @return string
+ */
+ private function getHtmlForEditSection( Message $message,
$specialPageName, EntityId $entityId = null, $editable = true ) {
+ if ( $entityId !== null && $editable ) {
+ return
$this->sectionEditLinkGenerator->getHtmlForEditSection(
+ $specialPageName,
+ array( $entityId->getSerialization(),
$this->languageCode ),
+ $message
+ );
+ } else {
+ return '';
+ }
+ }
+
+ /**
+ * Builds and returns the HTML representing a label.
+ *
+ * @param TermList $labels the list of labels to render
+ * @param EntityId|null $entityId the id of the fingerprint's entity
+ * @param bool $editable whether editing is allowed (enabled edit links)
+ * @return string
+ */
+ private function getHtmlForLabel( TermList $labels, EntityId $entityId
= null, $editable = true ) {
+ $labelExists = $labels->hasTermForLanguage( $this->languageCode
);
+ $editSection = $this->getHtmlForEditSection( wfMessage(
'wikibase-edit' ), 'SetLabel', $entityId, $editable );
+ $idString = $entityId === null ? 'new' :
$entityId->getSerialization();
+
+ if ( $labelExists ) {
+ return $this->getLabelWrapperHTML(
+ $idString,
+ $labels->getByLanguage( $this->languageCode
)->getText(),
+ $editSection
+ );
+ } else {
+ return $this->getLabelWrapperHTML(
+ $idString,
+ wfMessage( 'wikibase-label-empty' )->text(),
+ $editSection
+ );
+ }
+ }
+
+ private function getLabelWrapperHTML( $idString, $content, $editSection
) {
+ return wfTemplate( 'wb-label',
+ $idString,
+ wfTemplate( 'wb-property',
+ '',
+ htmlspecialchars( $content ),
+ $editSection
+ )
+ );
+ }
+
+ /**
+ * Builds and returns the HTML representing a description.
+ *
+ * @param TermList $descriptions the list of descriptions to render
+ * @param EntityId|null $entityId the id of the fingerprint's entity
+ * @param bool $editable whether editing is allowed (enabled edit links)
+ * @return string
+ */
+ private function getHtmlForDescription( TermList $descriptions,
EntityId $entityId = null, $editable = true ) {
+ $descriptionExists = $descriptions->hasTermForLanguage(
$this->languageCode );
+ $editSection = $this->getHtmlForEditSection( wfMessage(
'wikibase-edit' ), 'SetDescription', $entityId, $editable );
+
+ if ( $descriptionExists ) {
+ return $this->getDescriptionWrapperHTML(
+ $descriptions->getByLanguage(
$this->languageCode )->getText(),
+ $editSection
+ );
+ } else {
+ return $this->getDescriptionWrapperHTML(
+ wfMessage( 'wikibase-label-empty' )->text(),
+ $editSection
+ );
+ }
+ }
+
+ private function getDescriptionWrapperHTML( $content, $editSection ) {
+ return wfTemplate( 'wb-description',
+ wfTemplate( 'wb-property',
+ 'wb-value-empty',
+ htmlspecialchars( $content ),
+ $editSection
+ )
+ );
+ }
+
+ /**
+ * Builds and returns the HTML representing aliases.
+ *
+ * @param AliasGroupList $aliasGroups the list of alias groups to render
+ * @param EntityId|null $entityId the id of the fingerprint's entity
+ * @param bool $editable whether editing is allowed (enabled edit links)
+ * @return string
+ */
+ private function getHtmlForAliases( AliasGroupList $aliasGroups,
EntityId $entityId = null, $editable = true ) {
+ $aliasesExist = $aliasGroups->hasGroupForLanguage(
$this->languageCode );
+ $message = wfMessage( 'wikibase-' . $aliasesExist ? 'edit' :
'add' );
+ $editSection = $this->getHtmlForEditSection( $message,
'SetAliases', $entityId, $editable );
+
+ if ( $aliasesExist ) {
+ $aliasList = $this->getAliasListHTML(
$aliasGroups->getByLanguage( $this->languageCode )->getAliases() );
+
+ return wfTemplate( 'wb-aliases-wrapper',
+ '',
+ '',
+ wfMessage( 'wikibase-aliases-label' )->text(),
+ $aliasList . $editSection
+ );
+ } else {
+ return wfTemplate( 'wb-aliases-wrapper',
+ 'wb-aliases-empty',
+ 'wb-value-empty',
+ wfMessage( 'wikibase-aliases-empty' )->text(),
+ $editSection
+ );
+ }
+ }
+
+ private function getAliasListHTML( array $aliases ) {
+ $aliasesHtml = '';
+ foreach ( $aliases as $alias ) {
+ $aliasesHtml .= wfTemplate( 'wb-alias',
htmlspecialchars( $alias ) );
+ }
+ return wfTemplate( 'wb-aliases', $aliasesHtml );
+ }
+
+}
diff --git a/extensions/Wikibase/repo/includes/View/TermBoxView.php
b/extensions/Wikibase/repo/includes/View/TermBoxView.php
index bd3f1d4..1f30162 100644
--- a/extensions/Wikibase/repo/includes/View/TermBoxView.php
+++ b/extensions/Wikibase/repo/includes/View/TermBoxView.php
@@ -4,7 +4,6 @@
use Language;
use Message;
-use SpecialPage;
use Title;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\Utils;
diff --git a/extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php
index a3ef4d2..f275039 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php
@@ -506,54 +506,6 @@
return $argLists;
}
- public function testGetHtmlForLabel_editable() {
- $entity = $this->makeEntity( $this->makeEntityId( 1 ) );
- $entityView = $this->newEntityView( $entity->getType() );
- $html = $entityView->getHtmlForLabel( $entity );
-
- $this->assertRegExp( '@<a
href="[^"]*\bSpecial:SetLabel/\w1/en"[^>]*>\S+</a>@', $html );
- }
-
- public function testGetHtmlForLabel_notEditable() {
- $entity = $this->makeEntity( $this->makeEntityId( 1 ) );
- $entityView = $this->newEntityView( $entity->getType() );
- $html = $entityView->getHtmlForLabel( $entity, false );
-
- $this->assertNotContains( '<a ', $html );
- }
-
- public function testGetHtmlForDescription_editable() {
- $entity = $this->makeEntity( $this->makeEntityId( 1 ) );
- $entityView = $this->newEntityView( $entity->getType() );
- $html = $entityView->getHtmlForDescription( $entity );
-
- $this->assertRegExp( '@<a
href="[^"]*\bSpecial:SetDescription/\w1/en"[^>]*>\S+</a>@', $html );
- }
-
- public function testGetHtmlForDescription_notEditable() {
- $entity = $this->makeEntity( $this->makeEntityId( 1 ) );
- $entityView = $this->newEntityView( $entity->getType() );
- $html = $entityView->getHtmlForDescription( $entity, false );
-
- $this->assertNotContains( '<a ', $html );
- }
-
- public function testGetHtmlForAliases_editable() {
- $entity = $this->makeEntity( $this->makeEntityId( 1 ) );
- $entityView = $this->newEntityView( $entity->getType() );
- $html = $entityView->getHtmlForAliases( $entity );
-
- $this->assertRegExp( '@<a
href="[^"]*\bSpecial:SetAliases/\w1/en"[^>]*>\S+</a>@', $html );
- }
-
- public function testGetHtmlForAliases_notEditable() {
- $entity = $this->makeEntity( $this->makeEntityId( 1 ) );
- $entityView = $this->newEntityView( $entity->getType() );
- $html = $entityView->getHtmlForAliases( $entity, false );
-
- $this->assertNotContains( '<a ', $html );
- }
-
/**
* @return Entity
*/
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/View/FingerprintViewTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/View/FingerprintViewTest.php
new file mode 100644
index 0000000..44d93e3
--- /dev/null
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/View/FingerprintViewTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Wikibase\Test;
+
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Term\AliasGroup;
+use Wikibase\DataModel\Term\Fingerprint;
+use Wikibase\DataModel\Term\Term;
+use Wikibase\Repo\View\FingerprintView;
+use Wikibase\Repo\View\SectionEditLinkGenerator;
+
+/**
+ * @covers Wikibase\Repo\View\FingerprintView
+ *
+ * @group Wikibase
+ * @group WikibaseRepo
+ *
+ * @licence GNU GPL v2+
+ * @author Bene* < [email protected] >
+ */
+class FingerprintViewTest extends \MediaWikiLangTestCase {
+
+ public function provideTestGetHtml() {
+ $cases = array();
+
+ $fingerprint = Fingerprint::newEmpty();
+
+ $cases['empty fingerprint'] = array(
+ $fingerprint,
+ new ItemId( 'Q42' ),
+ 'en'
+ );
+
+ $fingerprint->setLabel( new Term( 'en', 'Foobar' ) );
+ $fingerprint->setDescription( new Term( 'en', 'This is a foo
bar.' ) );
+ $fingerprint->setAliasGroup( new AliasGroup( 'en', array(
'foo', 'bar' ) ) );
+
+ $cases['empty fingerprint'] = array(
+ $fingerprint,
+ new ItemId( 'Q42' ),
+ 'en'
+ );
+
+ $cases['other language'] = array(
+ $fingerprint,
+ new ItemId( 'Q42' ),
+ 'de'
+ );
+
+ $cases['other item id'] = array(
+ $fingerprint,
+ new ItemId( 'Q12' ),
+ 'en'
+ );
+
+ return $cases;
+ }
+
+ /**
+ * @dataProvider provideTestGetHtml
+ */
+ public function testGetHtmlEditable( Fingerprint $fingerprint, EntityId
$entityId, $languageCode ) {
+ $fingerprintView = new FingerprintView( new
SectionEditLinkGenerator(), $languageCode );
+ $html = $fingerprintView->getHtml( $fingerprint, $entityId,
true );
+ $serializedId = $entityId->getSerialization();
+
+ $this->assertRegExp( '@<a href="[^"]*\bSpecial:SetLabel/' .
$serializedId . '/' . $languageCode . '"[^>]*>\S+</a>@', $html );
+ $this->assertRegExp( '@<a href="[^"]*\bSpecial:SetDescription/'
. $serializedId . '/' . $languageCode . '"[^>]*>\S+</a>@', $html );
+ $this->assertRegExp( '@<a href="[^"]*\bSpecial:SetAliases/' .
$serializedId . '/' . $languageCode . '"[^>]*>\S+</a>@', $html );
+ }
+
+ /**
+ * @dataProvider provideTestGetHtml
+ */
+ public function testGetHtmlNotEditable( Fingerprint $fingerprint,
EntityId $entityId, $languageCode ) {
+ $fingerprintView = new FingerprintView( new
SectionEditLinkGenerator(), $languageCode );
+ $html = $fingerprintView->getHtml( $fingerprint, $entityId,
false );
+
+ $this->assertNotContains( '<a ', $html );
+ }
+
+ public function testGetHtmlNoEntityId() {
+ $fingerprintView = new FingerprintView( new
SectionEditLinkGenerator(), 'en' );
+ $html = $fingerprintView->getHtml( Fingerprint::newEmpty(),
null, true );
+
+ $this->assertNotContains( '<a ', $html );
+ }
+
+}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
index bfca7a7..dce7dc1 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
@@ -5,9 +5,8 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpRemove;
-use MediaWikiTestCase;
-use Wikibase\Repo\Content\EntityContentDiff;
use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\Repo\Content\EntityContentDiff;
/**
* @covers Wikibase\Repo\Content\EntityContentDiff
@@ -18,7 +17,7 @@
* @licence GNU GPL v2+
* @author Daniel Kinzler
*/
-class EntityContentDiffTest extends MediaWikiTestCase {
+class EntityContentDiffTest extends \MediaWikiTestCase {
public function provideConstruction() {
return array(
diff --git a/vendor/autoload.php b/vendor/autoload.php
index b26a971..9767eae 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInite7bd671c4e7a88a5767054d1ce3b237d::getLoader();
+return ComposerAutoloaderInit8d6b272f203b91572bb965fe69ceaba7::getLoader();
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index 6fbb147..2c01d92 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -700,6 +700,7 @@
'Wikibase\\Repo\\Store\\WikiPageEntityStore' => $baseDir .
'/extensions/Wikibase/repo/includes/store/sql/WikiPageEntityStore.php',
'Wikibase\\Repo\\Tests\\DefaultRepoSettingsTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/DefaultRepoSettingsTest.php',
'Wikibase\\Repo\\ValueParserFactory' => $baseDir .
'/extensions/Wikibase/repo/includes/ValueParserFactory.php',
+ 'Wikibase\\Repo\\View\\FingerprintView' => $baseDir .
'/extensions/Wikibase/repo/includes/View/FingerprintView.php',
'Wikibase\\Repo\\View\\SectionEditLinkGenerator' => $baseDir .
'/extensions/Wikibase/repo/includes/View/SectionEditLinkGenerator.php',
'Wikibase\\Repo\\View\\SiteLinksView' => $baseDir .
'/extensions/Wikibase/repo/includes/View/SiteLinksView.php',
'Wikibase\\Repo\\View\\SnakHtmlGenerator' => $baseDir .
'/extensions/Wikibase/repo/includes/View/SnakHtmlGenerator.php',
@@ -847,6 +848,7 @@
'Wikibase\\Test\\EntityViewPlaceholderExpanderTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/EntityViewPlaceholderExpanderTest.php',
'Wikibase\\Test\\EntityViewTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php',
'Wikibase\\Test\\FingerprintChangeOpFactoryTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/FingerprintChangeOpFactoryTest.php',
+ 'Wikibase\\Test\\FingerprintViewTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/View/FingerprintViewTest.php',
'Wikibase\\Test\\GenericExceptionLocalizerTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Localizer/GenericExceptionLocalizerTest.php',
'Wikibase\\Test\\HttpAcceptNegotiatorTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php',
'Wikibase\\Test\\HttpAcceptParserTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptParserTest.php',
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 0a81c62..6665fd8 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInite7bd671c4e7a88a5767054d1ce3b237d
+class ComposerAutoloaderInit8d6b272f203b91572bb965fe69ceaba7
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInite7bd671c4e7a88a5767054d1ce3b237d',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit8d6b272f203b91572bb965fe69ceaba7',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInite7bd671c4e7a88a5767054d1ce3b237d',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit8d6b272f203b91572bb965fe69ceaba7',
'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequiree7bd671c4e7a88a5767054d1ce3b237d($file);
+ composerRequire8d6b272f203b91572bb965fe69ceaba7($file);
}
return $loader;
}
}
-function composerRequiree7bd671c4e7a88a5767054d1ce3b237d($file)
+function composerRequire8d6b272f203b91572bb965fe69ceaba7($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ec729c5..168fd29 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -603,23 +603,23 @@
},
{
"name": "data-values/javascript",
- "version": "0.5.1",
- "version_normalized": "0.5.1.0",
+ "version": "0.5.2",
+ "version_normalized": "0.5.2.0",
"source": {
"type": "git",
"url": "https://github.com/wmde/DataValuesJavascript.git";,
- "reference": "cfe87b1d8f1e9d8721de8de59bace70393ce9f48"
+ "reference": "36ee3384a4bdf60883dbf3e16a6cf966a8db4b4d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/cfe87b1d8f1e9d8721de8de59bace70393ce9f48";,
- "reference": "cfe87b1d8f1e9d8721de8de59bace70393ce9f48",
+ "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/36ee3384a4bdf60883dbf3e16a6cf966a8db4b4d";,
+ "reference": "36ee3384a4bdf60883dbf3e16a6cf966a8db4b4d",
"shasum": ""
},
"require": {
"composer/installers": ">=1.0.1"
},
- "time": "2014-06-04 10:58:47",
+ "time": "2014-08-14 18:12:06",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -635,20 +635,15 @@
{
"name": "Jeroen De Dauw",
"email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "homepage": "http://jeroendedauw.com";
},
{
"name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";
},
{
"name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
+ "homepage": "http://www.snater.com";
}
],
"description": "DataValues implementation in Javascript",
@@ -659,24 +654,24 @@
},
{
"name": "data-values/value-view",
- "version": "0.6.9",
- "version_normalized": "0.6.9.0",
+ "version": "0.6.10",
+ "version_normalized": "0.6.10.0",
"source": {
"type": "git",
"url": "https://github.com/wmde/ValueView.git";,
- "reference": "3711c81bd2376c9b214b18f5f4e805d147978b5a"
+ "reference": "256ec8e61a6cbf7fbd8f4c8d7d0a6f4a64f6e1f6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/ValueView/zipball/3711c81bd2376c9b214b18f5f4e805d147978b5a";,
- "reference": "3711c81bd2376c9b214b18f5f4e805d147978b5a",
+ "url":
"https://api.github.com/repos/wmde/ValueView/zipball/256ec8e61a6cbf7fbd8f4c8d7d0a6f4a64f6e1f6";,
+ "reference": "256ec8e61a6cbf7fbd8f4c8d7d0a6f4a64f6e1f6",
"shasum": ""
},
"require": {
"data-values/javascript": "~0.5.0",
"php": ">=5.3.0"
},
- "time": "2014-08-13 16:55:28",
+ "time": "2014-08-14 18:40:52",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -812,23 +807,23 @@
},
{
"name": "wikibase/data-model-javascript",
- "version": "0.3.0",
- "version_normalized": "0.3.0.0",
+ "version": "0.3.1",
+ "version_normalized": "0.3.1.0",
"source": {
"type": "git",
"url": "https://github.com/wmde/WikibaseDataModelJavascript.git";,
- "reference": "2d415cc002e3fe73c036696679abe25e71fd4463"
+ "reference": "983e8b2b334a4ec4d4418b2e46728818921abfa0"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikibaseDataModelJavascript/zipball/2d415cc002e3fe73c036696679abe25e71fd4463";,
- "reference": "2d415cc002e3fe73c036696679abe25e71fd4463",
+ "url":
"https://api.github.com/repos/wmde/WikibaseDataModelJavascript/zipball/983e8b2b334a4ec4d4418b2e46728818921abfa0";,
+ "reference": "983e8b2b334a4ec4d4418b2e46728818921abfa0",
"shasum": ""
},
"require": {
"data-values/javascript": "~0.5.0"
},
- "time": "2014-07-10 11:15:17",
+ "time": "2014-08-14 18:19:35",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -842,26 +837,21 @@
],
"authors": [
{
+ "name": "Adrian Lang",
+ "email": "[email protected]"
+ },
+ {
"name": "Jeroen De Dauw",
"email": "[email protected]",
- "homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "homepage": "http://jeroendedauw.com";
},
{
"name": "Daniel Werner",
- "email": "[email protected]",
- "homepage": "https://www.mediawiki.org/wiki/User:Danwe";,
- "role": "Developer"
+ "homepage": "https://www.mediawiki.org/wiki/User:Danwe";
},
{
"name": "H. Snater",
- "email": "[email protected]",
- "homepage": "http://www.snater.com";,
- "role": "Developer"
- },
- {
- "name": "Adrian Lang",
- "email": "[email protected]"
+ "homepage": "http://www.snater.com";
}
],
"description": "Wikibase datamodel implementation in JavaScript"
@@ -1188,12 +1178,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "37398dd52b9f76a6fc5855633065a084d7502380"
+ "reference": "c2f07302fa28695afda71b1981987c6573b02afc"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/37398dd52b9f76a6fc5855633065a084d7502380";,
- "reference": "37398dd52b9f76a6fc5855633065a084d7502380",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2f07302fa28695afda71b1981987c6573b02afc";,
+ "reference": "c2f07302fa28695afda71b1981987c6573b02afc",
"shasum": ""
},
"require": {
@@ -1220,7 +1210,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-08-14 00:23:11",
+ "time": "2014-08-15 01:15:18",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
diff --git a/vendor/data-values/javascript/DataValuesJavascript.php
b/vendor/data-values/javascript/DataValuesJavascript.php
index c198260..42f0188 100644
--- a/vendor/data-values/javascript/DataValuesJavascript.php
+++ b/vendor/data-values/javascript/DataValuesJavascript.php
@@ -7,7 +7,7 @@
return 1;
}
-define( 'DATA_VALUES_JAVASCRIPT_VERSION', '0.5.1' );
+define( 'DATA_VALUES_JAVASCRIPT_VERSION', '0.5.2' );
// Include the composer autoloader if it is present.
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
@@ -62,7 +62,6 @@
),
'dependencies' => array(
'dataValues.DataValue',
- 'jquery',
'jquery.qunit',
'util.inherit',
'valueFormatters',
@@ -75,7 +74,6 @@
),
'dependencies' => array(
'dataValues.DataValue',
- 'jquery',
'jquery.qunit',
'util.inherit',
'valueParsers',
diff --git a/vendor/data-values/javascript/README.md
b/vendor/data-values/javascript/README.md
index 6a0614a..efcf920 100644
--- a/vendor/data-values/javascript/README.md
+++ b/vendor/data-values/javascript/README.md
@@ -15,6 +15,10 @@
## Release notes
+### 0.5.2 (2014-08-14)
+
+* Remove ResourceLoader dependencies on jquery and mediawiki (bug 69468)
+
### 0.5.1 (2014-06-04)
#### Bugfixes
diff --git a/vendor/data-values/javascript/lib/resources.php
b/vendor/data-values/javascript/lib/resources.php
index ded5e87..456ff89 100644
--- a/vendor/data-values/javascript/lib/resources.php
+++ b/vendor/data-values/javascript/lib/resources.php
@@ -42,9 +42,6 @@
'time/time.Time.validate.js',
'time/time.Parser.js',
),
- 'dependencies' => array(
- 'jquery',
- ),
),
'time.js.validTimeDefinitions' => $moduleTemplate + array(
diff --git a/vendor/data-values/javascript/src/resources.php
b/vendor/data-values/javascript/src/resources.php
index 1fb1c9c..6d091d3 100644
--- a/vendor/data-values/javascript/src/resources.php
+++ b/vendor/data-values/javascript/src/resources.php
@@ -30,7 +30,6 @@
),
'dependencies' => array(
'dataValues',
- 'jquery',
'util.inherit',
),
),
@@ -54,7 +53,6 @@
'dependencies' => array(
'dataValues.DataValue',
'globeCoordinate.js', // required by
GlobeCoordinateValue
- 'jquery',
'time.js', // required by TimeValue
'util.inherit',
),
@@ -67,8 +65,6 @@
'dependencies' => array(
// load all values. TODO: this is bad but the
system is not as advanced as ValueView yet.
'dataValues.values',
- 'jquery',
- 'mediawiki',
'time.js',
),
'messages' => array(
diff --git a/vendor/data-values/javascript/src/valueFormatters/resources.php
b/vendor/data-values/javascript/src/valueFormatters/resources.php
index fd3f607..b4d44c5 100644
--- a/vendor/data-values/javascript/src/valueFormatters/resources.php
+++ b/vendor/data-values/javascript/src/valueFormatters/resources.php
@@ -28,7 +28,6 @@
'formatters/ValueFormatter.js',
),
'dependencies' => array(
- 'jquery',
'util.inherit',
'valueFormatters',
),
@@ -50,7 +49,6 @@
),
'dependencies' => array(
'dataValues.values',
- 'jquery',
'util.inherit',
'valueFormatters.ValueFormatter',
),
diff --git a/vendor/data-values/javascript/src/valueParsers/resources.php
b/vendor/data-values/javascript/src/valueParsers/resources.php
index 316bcdd..c4fb13d 100644
--- a/vendor/data-values/javascript/src/valueParsers/resources.php
+++ b/vendor/data-values/javascript/src/valueParsers/resources.php
@@ -29,7 +29,6 @@
'parsers/ValueParser.js',
),
'dependencies' => array(
- 'jquery',
'util.inherit',
'valueParsers',
),
@@ -40,7 +39,6 @@
'ValueParserStore.js',
),
'dependencies' => array(
- 'jquery',
'valueParsers',
),
),
@@ -56,7 +54,6 @@
),
'dependencies' => array(
'dataValues.values',
- 'jquery',
'time.js', // required by TimeParser
'util.inherit',
'valueParsers.ValueParser',
diff --git a/vendor/wikibase/data-model-javascript/README.md
b/vendor/wikibase/data-model-javascript/README.md
index 314377a..a80e8e3 100644
--- a/vendor/wikibase/data-model-javascript/README.md
+++ b/vendor/wikibase/data-model-javascript/README.md
@@ -6,6 +6,9 @@
## Release notes
+### 0.3.1 (2014-08-14)
+* Remove ResourceLoader dependencies on jquery and mediawiki (bug 69468)
+
### 0.3.0 (2014-07-10)
* Remove methods isSameAs and equals from wikibase.Entity
diff --git a/vendor/wikibase/data-model-javascript/init.mw.php
b/vendor/wikibase/data-model-javascript/init.mw.php
index 2ef789d..63cc061 100644
--- a/vendor/wikibase/data-model-javascript/init.mw.php
+++ b/vendor/wikibase/data-model-javascript/init.mw.php
@@ -3,7 +3,7 @@
$GLOBALS['wgExtensionCredits']['wikibase'][] = array(
'path' => __FILE__,
'name' => 'Wikibase DataModel JavaScript',
- 'version' => '0.3 alpha',
+ 'version' => '0.3.1 alpha',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Danwe Daniel Werner]',
'[http://www.snater.com H. Snater]',
diff --git a/vendor/wikibase/data-model-javascript/resources.mw.php
b/vendor/wikibase/data-model-javascript/resources.mw.php
index 3db66da..51295fd 100644
--- a/vendor/wikibase/data-model-javascript/resources.mw.php
+++ b/vendor/wikibase/data-model-javascript/resources.mw.php
@@ -39,11 +39,6 @@
'Statement.js',
),
'dependencies' => array(
- // Used by wikibase.Claim, wikibase.Entity,
wikibase.Reference, wikibase.SnakList,
- // wikibase.Statement
- // Methods: $.each, $.extend, $.inArray,
$.isArray, $.isPlainObject
- 'jquery',
-
// Used by wikibase.EntityId
'mw.ext.dataValues', // DataValues extension
@@ -106,8 +101,6 @@
'Snak.js',
),
'dependencies' => array(
- 'jquery', // $.each, $.extend
-
'mw.ext.dataValues', // DataValues extension
'util.inherit',
--
To view, visit https://gerrit.wikimedia.org/r/154244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0353586be6fae6502606b72172060e4f67d2a579
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
