WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260231
Change subject: New Wikidata Build - 2015-12-20T10:00:01+0000
......................................................................
New Wikidata Build - 2015-12-20T10:00:01+0000
Change-Id: I5ecdd173b3d053d574a624ea4dee1181f49107cd
---
M composer.lock
M extensions/Constraints/i18n/fa.json
M extensions/Quality/i18n/fa.json
M extensions/Wikibase/client/i18n/vep.json
R extensions/Wikibase/client/includes/Serializer/ClientEntitySerializer.php
A
extensions/Wikibase/client/tests/phpunit/includes/Serializer/ClientEntitySerializerTest.php
M extensions/Wikibase/lib/i18n/nap.json
M extensions/Wikibase/lib/i18n/zh-hans.json
M
extensions/Wikibase/lib/includes/formatters/HtmlExternalIdentifierFormatter.php
M extensions/Wikibase/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
M
extensions/Wikibase/lib/includes/formatters/WikitextExternalIdentifierFormatter.php
M extensions/Wikibase/lib/includes/store/FieldPropertyInfoProvider.php
M extensions/Wikibase/lib/includes/store/PropertyInfoProvider.php
M
extensions/Wikibase/lib/tests/phpunit/formatters/HtmlExternalIdentifierFormatterTest.php
M
extensions/Wikibase/lib/tests/phpunit/formatters/WikitextExternalIdentifierFormatterTest.php
M extensions/Wikibase/repo/i18n/ast.json
M extensions/Wikibase/repo/i18n/nap.json
M extensions/Wikibase/repo/i18n/zh-hans.json
M extensions/Wikibase/repo/includes/Hooks/CirrusSearchHookHandlers.php
M
extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
M
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
M
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
M extensions/Wikibase/view/resources/wikibase/store/store.CachingEntityStore.js
M extensions/Wikibase/view/resources/wikibase/templates.js
M extensions/Wikibase/view/resources/wikibase/view/ViewController.js
M extensions/Wikibase/view/resources/wikibase/wikibase.css
M extensions/Wikibase/view/tests/phpunit/ItemViewTest.php
M extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php
M extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
32 files changed, 202 insertions(+), 97 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/31/260231/1
diff --git a/composer.lock b/composer.lock
index 35cd285..0f7a9ed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -919,7 +919,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "5d7a246de38d982cb9aa8ef75380eccbd28980fb"
+ "reference": "e98aa427ba1669243da460d8c0ddcae0cd75d617"
},
"require": {
"php": ">=5.3.0",
@@ -965,7 +965,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2015-12-04 22:39:19"
+ "time": "2015-12-18 22:39:37"
},
{
"name": "wikibase/data-model",
@@ -1355,7 +1355,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "685de4315ec51079a64d69dcc2c30f7646102f7b"
+ "reference": "2f5cfd71cbd51a984f46975d1b060f1430b8bab1"
},
"require": {
"php": ">=5.3.0",
@@ -1399,7 +1399,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2015-12-17 12:16:39"
+ "time": "2015-12-18 22:39:32"
},
{
"name": "wikibase/serialization-javascript",
@@ -1448,12 +1448,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "be89c88746a54e13b0a2243d34576441b3f89da4"
+ "reference": "cdc7fe92fe980e47b88b128ccefdbc0352829786"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/be89c88746a54e13b0a2243d34576441b3f89da4";,
- "reference": "be89c88746a54e13b0a2243d34576441b3f89da4",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/cdc7fe92fe980e47b88b128ccefdbc0352829786";,
+ "reference": "cdc7fe92fe980e47b88b128ccefdbc0352829786",
"shasum": ""
},
"require": {
@@ -1524,7 +1524,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-12-17 21:47:07"
+ "time": "2015-12-20 01:00:53"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/i18n/fa.json
b/extensions/Constraints/i18n/fa.json
index d3616bd..4ba69f2 100644
--- a/extensions/Constraints/i18n/fa.json
+++ b/extensions/Constraints/i18n/fa.json
@@ -8,7 +8,10 @@
"wbqc-constraintreport-explanation-part-one": "این صفحه محدویتهای
کنترلی بر روی هر ورودیای که شما میخواهید اعمال میکند. ورودیها از سامانههای
زنده گرفته میشوند در نتیجه هر محدودیت خرابکاری که شما اینجا تعمیر میکنید از
این فهرست حذف میشود.",
"wbqc-constraintreport-explanation-part-two": "محدودیتها از بحث صفحهٔ
خصوصیتها هفتهای یک بار گرفته میشود در نتیجه اگر یکی از آنها را
حذف/اضافه/ویرایش کردهاید یک هفته زمان میبرد تا در گزارش محدودیتها بیاید.در
حال حاضر در حال انتقال دادن محدودیتها از اظهارها به خصوصیتها و فعالسازی
صفحهٔ ویژه برای چک کردن زنده آنها هستیم.",
"wbqc-constraintreport-form-submit-label": "بررسی",
- "wbqc-constraintreport-result-headline": "نتیجه برای $1",
+ "wbqc-constraintreport-form-entityid-label": "شناسهٔ ورودی:",
+ "wbqc-constraintreport-result-headline": "نتیجه برای",
+ "wbqc-constraintreport-invalid-entity-id": "شناسهٔ نادرست ورودی.",
+ "wbqc-constraintreport-not-existent-entity": "ورودی وجود ندارد.",
"wbqc-constraintreport-empty-result": "هیچ محدودیتی برای این ورودی
تعریف نشدهاست.",
"wbqc-constraintreport-status-violation": "خرابکاری",
"wbqc-constraintreport-status-compliance": "مطلوبیت",
diff --git a/extensions/Quality/i18n/fa.json b/extensions/Quality/i18n/fa.json
index b1ff28e..3088620 100644
--- a/extensions/Quality/i18n/fa.json
+++ b/extensions/Quality/i18n/fa.json
@@ -6,10 +6,26 @@
},
"wbq-desc": "افزونه پایه برای افزونهٔ کیفیت ویکیبیس که یافتن اطلاعات
اشتباه را مدیریت میکند",
"specialpages-group-wikibasequality": "کیفیت ویکیبیس",
+ "wbq-violatons-filter-headline": "دستهبندی موضوعها",
+ "wbq-violations-entity-id-label": "شناسهٔ ورودی:",
+ "wbq-violations-property-id-label": "شناسهٔ ویژگی:",
"wbq-violations-group-label": "گروه:",
"wbq-violations-type-label": "نوع:",
"wbq-violations-form-select-all": "(همه)",
+ "wbq-violations-exceptions-checkbox-label": "نمایش استثناها",
+ "wbq-violations-submit-button-label": "نمایش خرابکاریها",
+ "wbq-violations-table-header-entity": "ورودی",
+ "wbq-violations-table-header-claim": "اظهار",
"wbq-violations-table-header-constraint-type": "نوع",
"wbq-violations-table-header-updated-at": "آخرین بهروزرسانی",
- "wbq-violations-table-header-status": "وضعیت"
+ "wbq-violations-table-header-status": "وضعیت",
+ "wbq-violations-table-header-additional-info": "اطلاعات بیشتر",
+ "wbq-violations-status-violation": "خرابکاری",
+ "wbq-violations-status-unverified": "تائید نشده",
+ "wbq-violations-status-exception": "استثنا",
+ "wbq-violations-mark-as-exception": "انتخاب به عنوان استثنا",
+ "wbq-violations-mark-as-violation": "انتخاب به عنوان خرابکاری",
+ "wbq-violations-next-page": "پيغام بعدى >>",
+ "wbq-violations-prev-page": "<< پيغام قبلى",
+ "apihelp-wbqgetviolationmessages-description": "دریافت پیامهای
خرابکاری اظهارها"
}
diff --git a/extensions/Wikibase/client/i18n/vep.json
b/extensions/Wikibase/client/i18n/vep.json
index e2dccfa..6d9822c 100644
--- a/extensions/Wikibase/client/i18n/vep.json
+++ b/extensions/Wikibase/client/i18n/vep.json
@@ -10,6 +10,7 @@
"wikibase-editlinks": "Redaktiruida kosketused",
"wikibase-editlinkstitle": "Redaktiruida kelidenkeskeižid kosketusid",
"wikibase-linkitem-addlinks": "Ližata kosketused",
+ "wikibase-rc-hide-wikidata": "$1 Wikidata",
"wikibase-rc-hide-wikidata-show": "Ozutada",
"wikibase-rc-wikibase-edit-letter": "D",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}}-redakcii"
diff --git
a/extensions/Wikibase/client/includes/serializers/ClientEntitySerializer.php
b/extensions/Wikibase/client/includes/Serializer/ClientEntitySerializer.php
similarity index 97%
rename from
extensions/Wikibase/client/includes/serializers/ClientEntitySerializer.php
rename to
extensions/Wikibase/client/includes/Serializer/ClientEntitySerializer.php
index 9355de4..5197453 100644
--- a/extensions/Wikibase/client/includes/serializers/ClientEntitySerializer.php
+++ b/extensions/Wikibase/client/includes/Serializer/ClientEntitySerializer.php
@@ -45,6 +45,11 @@
*/
private $fallbackChains;
+ /**
+ * @param PropertyDataTypeLookup $dataTypeLookup
+ * @param string[] $filterLangCodes
+ * @param LanguageFallbackChain[] $fallbackChains
+ */
public function __construct(
PropertyDataTypeLookup $dataTypeLookup,
array $filterLangCodes,
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Serializer/ClientEntitySerializerTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Serializer/ClientEntitySerializerTest.php
new file mode 100644
index 0000000..d9b00e1
--- /dev/null
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Serializer/ClientEntitySerializerTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Wikibase\Client\Tests\Serializer;
+
+use PHPUnit_Framework_TestCase;
+use Wikibase\Client\Serializer\ClientEntitySerializer;
+use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+
+/**
+ * @covers Wikibase\Client\Serializer\ClientEntitySerializer
+ *
+ * @group Wikibase
+ * @group WikibaseClient
+ *
+ * @licence GNU GPL v2+
+ * @author Thiemo Mättig
+ */
+class ClientEntitySerializerTest extends PHPUnit_Framework_TestCase {
+
+ private function newInstance() {
+ $fallbackChain = $this->getMockBuilder(
'Wikibase\LanguageFallbackChain' )
+ ->disableOriginalConstructor()
+ ->getMock();
+ $fallbackChain->expects( $this->any() )
+ ->method( 'extractPreferredValue' )
+ ->will( $this->returnValue( array( 'source' =>
'<SOURCE>' ) ) );
+
+ $dataTypeLookup = $this->getMock(
+
'Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup'
+ );
+ $dataTypeLookup->expects( $this->any() )
+ ->method( 'getDataTypeIdForProperty' )
+ ->will( $this->returnValue( '<DATATYPE>' ) );
+
+ return new ClientEntitySerializer(
+ $dataTypeLookup,
+ array( 'en' ),
+ array( 'en' => $fallbackChain )
+ );
+ }
+
+ public function testSerialize() {
+ $item = new Item();
+ $item->setLabel( 'de', 'German' );
+ $item->setDescription( 'de', 'German' );
+ $item->setAliases( 'de', array( 'German' ) );
+ $item->setAliases( 'en', array( 'English' ) );
+ $item->getStatements()->addNewStatement( new
PropertyNoValueSnak( 1 ) );
+
+ $instance = $this->newInstance();
+ $serialization = $instance->serialize( $item );
+
+ $expected = array(
+ 'type' => 'item',
+ 'labels' => array(
+ 'en' => array( 'source-language' => '<SOURCE>'
),
+ ),
+ 'descriptions' => array(
+ 'en' => array( 'source-language' => '<SOURCE>'
),
+ ),
+ 'aliases' => array(
+ 'en' => array( array( 'language' => 'en',
'value' => 'English' ) ),
+ ),
+ 'claims' => array(
+ 'P1' => array( array(
+ 'mainsnak' => array(
+ 'snaktype' => 'novalue',
+ 'property' => 'P1',
+ 'datatype' => '<DATATYPE>',
+ ),
+ 'type' => 'statement',
+ 'rank' => 'normal'
+ ) ),
+ ),
+ );
+ $this->assertSame( $expected, $serialization );
+ }
+
+}
diff --git a/extensions/Wikibase/lib/i18n/nap.json
b/extensions/Wikibase/lib/i18n/nap.json
index 6138627..d77296e 100644
--- a/extensions/Wikibase/lib/i18n/nap.json
+++ b/extensions/Wikibase/lib/i18n/nap.json
@@ -73,6 +73,7 @@
"datatypes-type-wikibase-item": "Oggietto",
"datatypes-type-wikibase-property": "Proprietà",
"datatypes-type-commonsMedia": "File media 'e Commons",
+ "datatypes-type-external-id": "Identificatore 'e fore",
"version-wikibase": "Wikibase",
"wikibase-time-precision-Gannum": "$1 miliarde 'e anne d.C.",
"wikibase-time-precision-Mannum": "$1 milione 'e anne d.C.",
diff --git a/extensions/Wikibase/lib/i18n/zh-hans.json
b/extensions/Wikibase/lib/i18n/zh-hans.json
index 4aa6240..c67766f 100644
--- a/extensions/Wikibase/lib/i18n/zh-hans.json
+++ b/extensions/Wikibase/lib/i18n/zh-hans.json
@@ -80,6 +80,7 @@
"datatypes-type-wikibase-item": "项",
"datatypes-type-wikibase-property": "属性",
"datatypes-type-commonsMedia": "共享资源媒体文件",
+ "datatypes-type-external-id": "外部标识符",
"version-wikibase": "维基数据库",
"wikibase-time-precision-Gannum": "公元$1十亿年",
"wikibase-time-precision-Mannum": "公元$1百万年",
diff --git
a/extensions/Wikibase/lib/includes/formatters/HtmlExternalIdentifierFormatter.php
b/extensions/Wikibase/lib/includes/formatters/HtmlExternalIdentifierFormatter.php
index dc91c98..d4e1370 100644
---
a/extensions/Wikibase/lib/includes/formatters/HtmlExternalIdentifierFormatter.php
+++
b/extensions/Wikibase/lib/includes/formatters/HtmlExternalIdentifierFormatter.php
@@ -2,10 +2,7 @@
namespace Wikibase\Lib\Formatters;
-use DataValues\UnDeserializableValue;
use Html;
-use ValueFormatters\FormattingException;
-use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\Lib\SnakFormatter;
diff --git
a/extensions/Wikibase/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
b/extensions/Wikibase/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
index 7293e2d..d61ce4d 100644
---
a/extensions/Wikibase/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
+++
b/extensions/Wikibase/lib/includes/formatters/WikibaseSnakFormatterBuilders.php
@@ -46,6 +46,9 @@
/**
* @param WikibaseValueFormatterBuilders $valueFormatterBuilders
+ * @param PropertyInfoStore $propertyInfoStore
+ * @param PropertyDataTypeLookup $dataTypeLookup
+ * @param DataTypeFactory $dataTypeFactory
*/
public function __construct(
WikibaseValueFormatterBuilders $valueFormatterBuilders,
diff --git
a/extensions/Wikibase/lib/includes/formatters/WikitextExternalIdentifierFormatter.php
b/extensions/Wikibase/lib/includes/formatters/WikitextExternalIdentifierFormatter.php
index bd5beae..e7c1377 100644
---
a/extensions/Wikibase/lib/includes/formatters/WikitextExternalIdentifierFormatter.php
+++
b/extensions/Wikibase/lib/includes/formatters/WikitextExternalIdentifierFormatter.php
@@ -2,9 +2,6 @@
namespace Wikibase\Lib\Formatters;
-use DataValues\UnDeserializableValue;
-use ValueFormatters\FormattingException;
-use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\Lib\SnakFormatter;
diff --git
a/extensions/Wikibase/lib/includes/store/FieldPropertyInfoProvider.php
b/extensions/Wikibase/lib/includes/store/FieldPropertyInfoProvider.php
index 845065c..04a06be 100644
--- a/extensions/Wikibase/lib/includes/store/FieldPropertyInfoProvider.php
+++ b/extensions/Wikibase/lib/includes/store/FieldPropertyInfoProvider.php
@@ -3,7 +3,6 @@
namespace Wikibase\Lib;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Services\Lookup\EntityLookupException;
use Wikibase\Lib\Store\StorageException;
use Wikibase\PropertyInfoStore;
use Wikimedia\Assert\Assert;
diff --git a/extensions/Wikibase/lib/includes/store/PropertyInfoProvider.php
b/extensions/Wikibase/lib/includes/store/PropertyInfoProvider.php
index fa9aba1..f278e70 100644
--- a/extensions/Wikibase/lib/includes/store/PropertyInfoProvider.php
+++ b/extensions/Wikibase/lib/includes/store/PropertyInfoProvider.php
@@ -3,7 +3,6 @@
namespace Wikibase\Lib;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Services\Lookup\EntityLookupException;
use Wikibase\Lib\Store\StorageException;
/**
diff --git
a/extensions/Wikibase/lib/tests/phpunit/formatters/HtmlExternalIdentifierFormatterTest.php
b/extensions/Wikibase/lib/tests/phpunit/formatters/HtmlExternalIdentifierFormatterTest.php
index ef6cbde..f7a879d 100644
---
a/extensions/Wikibase/lib/tests/phpunit/formatters/HtmlExternalIdentifierFormatterTest.php
+++
b/extensions/Wikibase/lib/tests/phpunit/formatters/HtmlExternalIdentifierFormatterTest.php
@@ -3,8 +3,6 @@
namespace Wikibase\Lib\Formatters\Test;
use DataValues\StringValue;
-use DataValues\UnDeserializableValue;
-use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
diff --git
a/extensions/Wikibase/lib/tests/phpunit/formatters/WikitextExternalIdentifierFormatterTest.php
b/extensions/Wikibase/lib/tests/phpunit/formatters/WikitextExternalIdentifierFormatterTest.php
index d172f9d..bbce00a 100644
---
a/extensions/Wikibase/lib/tests/phpunit/formatters/WikitextExternalIdentifierFormatterTest.php
+++
b/extensions/Wikibase/lib/tests/phpunit/formatters/WikitextExternalIdentifierFormatterTest.php
@@ -3,8 +3,6 @@
namespace Wikibase\Lib\Formatters\Test;
use DataValues\StringValue;
-use DataValues\UnDeserializableValue;
-use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
diff --git a/extensions/Wikibase/repo/i18n/ast.json
b/extensions/Wikibase/repo/i18n/ast.json
index 10e88bb..04d37b2 100644
--- a/extensions/Wikibase/repo/i18n/ast.json
+++ b/extensions/Wikibase/repo/i18n/ast.json
@@ -305,6 +305,7 @@
"wikibase-listdatatypes-time-body": "Campu de datos lliteral pa un
puntu de tiempu. Dau como una fecha y hora con cierta precisión y llendes. El
tiempu guardase internamente nel modelu de calendariu especificáu.\n* time –
valor esplícitu pa un puntu nel tiempu, representáu como marca de tiempu ISO
8601, p. ex. +2013-01-01T00:00:00Z. L'añu siempre tien signu y se rellena pa
tener ente 4 y 16 cifres.\n* timezone – valor esplícitu como enteru con signu.
La información del fusu horariu como un desplazamientu dende UTC en minutos.\n*
before – valor enteru esplícitu pal númberu d'unidaes posibles después del
tiempu dau. La unidá vien dada pola precisión.\n* after – valor enteru
esplícitu pal númberu d'unidaes posibles antes del tiempu dau. La unidá vien
dada pola precisión.\n* precision – valor esplícitu codificáu nun enteru
curtiu. Los númberos tienen el siguiente significáu: 0 - mil millones d'años, 1
- cien millones d'años, ..., 6 - mileniu, 7 - sieglu, 8 - década, 9 - añu, 10 -
mes, 11 - día, 12 - hora, 13 - minutu, 14 - segundu.\n* calendarmodel – valor
esplícitu dau como URI. Identifica'l modelu de calendariu de la marca de
tiempu.",
"wikibase-listdatatypes-url-head": "URL",
"wikibase-listdatatypes-url-body": "Campu de datos lliteral pa una URL.
Les URL tan restrinxíes a los protocolos que tamién se sofiten pa los enllaces
esternos del testu wiki.",
+ "wikibase-listdatatypes-external-id-head": "Identificador esternu",
"wikibase-concept-uri": "URI del conceptu",
"wikibase-concept-uri-tooltip": "URI qu'identifica el conceptu
describíu por esti elementu",
"wikibase-add-badges": "Amestar insinies",
@@ -357,6 +358,8 @@
"apihelp-wbeditentity-example-8": "Crea una declaración nueva nel
elementu pa la propiedá P56 y un valor de \"ExampleString\"
(\"ExempluCadenaTestu\")",
"apihelp-wbeditentity-example-9": "Desanicia les declaraciones del
elementu coles GUIDs Q42$D8404CDA-25E4-4334-AF13-A3290BCD9C0F y
Q42$GH678DSA-01PQ-28XC-HJ90-DDFD9990126X",
"apihelp-wbeditentity-example-10": "Configura la declaración col GUID
al valor de la declaración",
+ "apihelp-wbeditentity-example-11": "Amiesta una etiqueta sin sustituila
si yá existe",
+ "apihelp-wbeditentity-example-12": "Desanicia una etiqueta",
"apihelp-wbformatvalue-description": "Da formatu a DataValues.",
"apihelp-wbformatvalue-param-generate": "El formatu de salida deseáu a
xenerar.",
"apihelp-wbformatvalue-param-datatype": "El tipu de datu del valor.
Esto ye diferente del tipu del valor",
@@ -407,13 +410,13 @@
"apihelp-wbmergeitems-description": "Fusiona múltiples elementos.",
"apihelp-wbmergeitems-param-fromid": "ID dende la que fusionar",
"apihelp-wbmergeitems-param-toid": "ID a la que fusionar",
- "apihelp-wbmergeitems-param-ignoreconflicts": "Matriz d'elementos del
oxetu pa los qu'inorar conflictos, sólo puede contener los valores de \"label\"
(etiqueta), \"description\" (descripción) o \"sitelink\" (enllaz de sitiu)",
+ "apihelp-wbmergeitems-param-ignoreconflicts": "Matriz d'elementos del
oxetu pa los qu'inorar conflictos, sólo puede contener los valores de
\"description\" (descripción) y o \"sitelink\" (enllaz de sitiu) y o
\"statement\" (declaración)",
"apihelp-wbmergeitems-param-summary": "Resume de la
edición.\nPrefixaráse con un comentariu xeneráu automáticamente. La llende de
llonxitú del comentariu automáticu xunto col resume ye de 260 caráuteres. Ten
en cuenta que tolo que pase d'esa llende va cortase.",
"apihelp-wbmergeitems-param-bot": "Marcar esta edición como bot. Esta
marca d'URL sólo se respetará si l'usuariu pertenez al grupu \"bot\".",
"apihelp-wbmergeitems-example-1": "Fusiona datos dende Q42 en Q222",
"apihelp-wbmergeitems-example-2": "Fusiona datos dende Q555 en Q3",
- "apihelp-wbmergeitems-example-3": "Fusiona datos dende Q66 en Q99
inorando cualquier etiqueta conflictiva",
- "apihelp-wbmergeitems-example-4": "Fusiona datos dende Q66 en Q99
inorando cualquier etiqueta o descripción conflictiva",
+ "apihelp-wbmergeitems-example-3": "Fusiona datos dende Q66 en Q99
ignorando cualquier enllaz de sitiu conflictivu",
+ "apihelp-wbmergeitems-example-4": "Fusiona datos dende Q66 en Q99
inorando cualquier enllaz de sitiu o descripción conflictiva",
"apihelp-wbparsevalue-description": "Analiza valores usando un
analizador de valores.",
"apihelp-wbparsevalue-param-parser": "Identificador del ValueParser
qu'usar. <span class=\"apihelp-deprecated\">Anticuáu</span>. Nel so llugar
usa'l parámetru datatype.",
"apihelp-wbparsevalue-param-datatype": "Tipu de datu del valor a
analizar. Determina l'analizador a utilizar.",
@@ -519,7 +522,7 @@
"apihelp-wbsetreference-description": "Crea una referencia o
configura'l valor d'una esistente.",
"apihelp-wbsetreference-param-statement": "Un GUID qu'identifica la
declaración pa la que va configurase la referencia",
"apihelp-wbsetreference-param-snaks": "Los snaks a los que configurar
la referencia. L'oxetu JSON con IDs de propiedá qu'apunten a matrices que
contienen los snaks pa esa propiedá",
- "apihelp-wbsetreference-param-snaks-order": "L'orde de los snaks.
Llista separada por comes d'IDs de propiedá",
+ "apihelp-wbsetreference-param-snaks-order": "L'orde de los snaks.
Matriz JSON de cadenes d'ID de propiedá",
"apihelp-wbsetreference-param-reference": "Una función hash de
referencia que tien d'anovase. Opcional. Si nun se da, créyase una nueva
referencia.",
"apihelp-wbsetreference-param-index": "Índiz, dientro de la llista de
referencies de la declaración, onde mover la referencia. Opcional. Si nun se
da, una referencia esistente siguirá nel so llugar mentanto qu'una referencia
nueva añadiráse.",
"apihelp-wbsetreference-param-summary": "Resume de la
edición.\nPrefixaráse con un comentariu xeneráu automáticamente. La llende de
llonxitú del comentariu automáticu xunto col resume ye de 260 caráuteres. Ten
en cuenta que tolo que pase d'esa llende va cortase.",
diff --git a/extensions/Wikibase/repo/i18n/nap.json
b/extensions/Wikibase/repo/i18n/nap.json
index f6e722b..1947cc2 100644
--- a/extensions/Wikibase/repo/i18n/nap.json
+++ b/extensions/Wikibase/repo/i18n/nap.json
@@ -305,6 +305,8 @@
"wikibase-listdatatypes-time-body": "Campo 'e date letterale pe' nu
punto 'e tiempo. Fornito comm'a na data e nu tiempo dint'a na certa precisiona
'e lemmete. 'O tiempo è sempre sarvato dint' 'o formato gregoriano prolettico,
ma putess'ausà ati furmatte pe' tramente ca se facesse l'analisi e
furmattaziona.\n* tiempo — valore esplicito pe' n'istante d' 'o tiempo,
rappresentato comm'a nu timestamp simmele a ISO 8601, p'esempio:
+2013-01-01T00:00:00Z.\nL'hanno ave sempe 'o segno e nfra 1 e 16 cifre.\n* fuso
orario — valore espresso comm'a n'intero c' 'o segno. L'infurmaziune d' 'o fuso
orario è innecata comm'a n'offset 'a ll'orario UTC scritto 'n minute.\n* primma
— valore sano espresso pe' quante unità, aròpp' 'o tiempo specificato, putesse
essere. L'unità è data d' 'a precisione.\n* aropp — valore sano sano espresso
pe' quante unità, primma ca 'o tiempo specificato, putesse essere. L'unità è
data d' 'a precisione.\n* precisione — valore espresso codificato int'a
n'intero breve. 'E nummere hanno 'o significato ccà: 0 - meliarde d'anne, 100
meliune d'anne, ..., 6 - millenio, 7 - siecolo, 8 - decade, 9 - anno, 10 -
mese, 11 - juorno, 12 - ora, 13 - minuto, 14 - seconno.\n* calannario — valore
espresso fornito comm'a n'URI. Identificasse 'o modello 'e calannario d' 'o
valore d' 'o tiempo.",
"wikibase-listdatatypes-url-head": "URL",
"wikibase-listdatatypes-url-body": "Date literale pe' n'URL. Ll'URL so'
limmetate a 'e protocolle suppurtate pure pe' link esterne 'n wikitesto.",
+ "wikibase-listdatatypes-external-id-head": "Identificatore 'e fore",
+ "wikibase-listdatatypes-external-id-body": "'O campo 'e date letterale
pe' n'identificatore 'e fore. Ll'identificature 'e fore se ponno
automatecamente cullegà a na risorsa autoritativa pe' mmustà.",
"wikibase-concept-uri": "Concetto URI",
"wikibase-concept-uri-tooltip": "URI ca identificasse 'o concetto
descritto 'a st'elemento",
"wikibase-add-badges": "Azzecca distintivo",
@@ -521,7 +523,7 @@
"apihelp-wbsetreference-description": "Crèa nu riferimento o mpusta 'e
valure a uno ch'esiste mò.",
"apihelp-wbsetreference-param-statement": "Na GUID identificanno 'a
dichiarazione p' 'a quale 'o riferimento se stà mpustanno",
"apihelp-wbsetreference-param-snaks": "'E snak a mpustà 'o riferimento.
L'oggetto JSON ch' 'e pruprietà ID spuntann' 'array cuntenenno 'e snaks 'e sta
proprietà",
- "apihelp-wbsetreference-param-snaks-order": "L'ordine d' 'e snaks.
Elenco spartuto 'a comme 'e ID 'e pruprietà.",
+ "apihelp-wbsetreference-param-snaks-order": "L'ordine d' 'e snaks.
Matrice JSON 'e pruprietà catene ID.",
"apihelp-wbsetreference-param-reference": "Nu valore 'e hash 'e nu
riferimento ca s'avess'agghiurnà. Opzionale. Quanno nun se da, nu riferimento
fosse criato",
"apihelp-wbsetreference-param-index": "L'innece cu l'elenco 'e
statement 'e riferimente addò s'avess'a mòvere 'o riferimento. Opzionale.
Quanno nun se pruvvedesse, nu riferimento esistente sarrà miso a posto pe'
tramente ca nu riferimento novo sarrà mpiso.",
"apihelp-wbsetreference-param-summary": "Sommario pe'
l'edizione.\nSarrà pre'appiso 'a nu cummento automatecamente criato. 'O lemmeto
'e luongo 'e n'autocommento nziem'a sommario fosse 260 carattere. Pe' piacere
stateve accuorte ca tutto pe' coppa fosse nu lemmeto 'e passa e ferma.",
diff --git a/extensions/Wikibase/repo/i18n/zh-hans.json
b/extensions/Wikibase/repo/i18n/zh-hans.json
index d3d001f..093f199 100644
--- a/extensions/Wikibase/repo/i18n/zh-hans.json
+++ b/extensions/Wikibase/repo/i18n/zh-hans.json
@@ -329,6 +329,7 @@
"wikibase-listdatatypes-time-body":
"用于一个时间点的文字数据字段。给出一个拥有一定精度和边界的日期和时间。时间以指定的日历模型保存在内部。\n* 时刻（time） –
时间点的确定值，表现为类似ISO 8601标准的时间戳，例如+2013-01-01T00:00:00Z。年份总是用4~16位数来标记并保存。\n*
时区（timezone） – 有符号整数确定值。时区信息是以分为单位以国际标准时间（UTC）为基准的一个偏移量。\n* 早于（before） –
表示它发生时可能晚于给定时间多少单位的整数确定值。单位由精度给定。\n* 晚于（after） –
表示它发生时可能早于给定时间多少单位的整数确定值。单位由精度给定。\n* 精度（precision） – 编码为短整数的确定值。数字含义如下：0 -
十亿年，1 - 亿年，...，6 - 千年，7 - 世纪，8 - 十年，9 - 年，10 - 月，11 - 天，12 - 小时，13 - 分，14 -
秒。\n* 日历模型（calendarmodel） – 由一个URI给定的确定值。它可识别时间戳的日历模型。",
"wikibase-listdatatypes-url-head": "URL",
"wikibase-listdatatypes-url-body":
"一个URL的文本数据字段。协议中限制使用的URL支持以外部链接的方式写在维基文本中。",
+ "wikibase-listdatatypes-external-id-head": "外部标识符",
"wikibase-concept-uri": "概念URI",
"wikibase-concept-uri-tooltip": "识别此项描述概念的URI",
"wikibase-add-badges": "添加徽章",
diff --git
a/extensions/Wikibase/repo/includes/Hooks/CirrusSearchHookHandlers.php
b/extensions/Wikibase/repo/includes/Hooks/CirrusSearchHookHandlers.php
index e9ee6e2..59f92f3 100644
--- a/extensions/Wikibase/repo/includes/Hooks/CirrusSearchHookHandlers.php
+++ b/extensions/Wikibase/repo/includes/Hooks/CirrusSearchHookHandlers.php
@@ -64,20 +64,16 @@
}
/**
- * @return BuildDocumentParserHookHandler
+ * @return self
*/
public static function newFromGlobalState() {
- return new self(
- new WikibaseFieldDefinitions()
- );
+ return new self( new WikibaseFieldDefinitions() );
}
/**
* @param WikibaseFieldDefinitions $fieldDefinitions
*/
- public function __construct(
- WikibaseFieldDefinitions $fieldDefinitions
- ) {
+ public function __construct( WikibaseFieldDefinitions $fieldDefinitions
) {
$this->fieldDefinitions = $fieldDefinitions;
}
diff --git
a/extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
b/extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
index 3615dca..72f2528 100644
---
a/extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
+++
b/extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
@@ -256,7 +256,9 @@
if ( $this->languageCode === '' ) {
$this->languageCode = $this->getLanguage()->getCode();
} elseif ( !$this->isValidLanguageCode( $this->languageCode ) )
{
- $msg = $this->msg(
'wikibase-wikibaserepopage-invalid-langcode', $this->languageCode );
+ $msg = $this->msg(
'wikibase-wikibaserepopage-invalid-langcode',
+ htmlspecialchars( $this->languageCode )
+ );
$this->showErrorHTML( $msg->parse() );
$this->languageCode = null;
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index e689cbe..552fd40 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
@@ -37,6 +37,7 @@
* @author Bene* < [email protected] >
* @author H. Snater < [email protected] >
* @author Daniel Kinzler
+ * @author Thiemo Mättig
*/
class SpecialSetLabelDescriptionAliasesTest extends
SpecialWikibaseRepoPageTestBase {
@@ -163,7 +164,9 @@
$fake->expects( $this->any() )
->method( 'hasLanguage' )
- ->will( $this->returnValue( true ) );
+ ->will( $this->returnCallback( function( $languageCode
) {
+ return preg_match( '/^\w+$/', $languageCode );
+ } ) );
return $fake;
}
@@ -353,7 +356,6 @@
array( 'de' => array( 'foo', 'bar' ) )
),
),
-
);
}
@@ -372,8 +374,6 @@
$this->mockRepository->putEntity( $inputEntity );
$id = $inputEntity->getId();
-
- $this->newSpecialPage();
$subpage = str_replace( '$id', $id->getSerialization(),
$subpage );
list( $output, $response ) = $this->executeSpecialPage(
$subpage, $request );
@@ -396,6 +396,16 @@
}
}
+ public function testLanguageCodeEscaping() {
+ $request = new FauxRequest( array( 'language' => '<sup>' ),
true );
+ list( $output, ) = $this->executeSpecialPage( null, $request );
+
+ $this->assertContains( '<p class="error">', $output );
+ $this->assertContains( '<sup>', $output );
+ $this->assertNotContains( '<sup>', $output, 'never unescaped' );
+ $this->assertNotContains( '&lt;', $output, 'no double
escaping' );
+ }
+
private function assetFingerprintEquals( Fingerprint $expected,
Fingerprint $actual, $message = 'Fingerprint mismatches' ) {
// TODO: Compare serializations.
$this->assertTrue( $expected->equals( $actual ), $message );
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
index 58efb10..50ce8f2 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
@@ -1,4 +1,4 @@
-( function( $, mw ) {
+( function( $ ) {
'use strict';
/**
@@ -41,4 +41,4 @@
}
} );
-}( jQuery, mediaWiki ) );
+}( jQuery ) );
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
index 1eddb73..8e7431f 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
@@ -2,7 +2,7 @@
* @licence GNU GPL v2+
* @author H. Snater < [email protected] >
*/
-( function( $, mw ) {
+( function( $ ) {
'use strict';
var PARENT = $.wikibase.toolbaritem;
@@ -168,4 +168,4 @@
} );
-} )( jQuery, mediaWiki );
+} )( jQuery );
diff --git
a/extensions/Wikibase/view/resources/wikibase/store/store.CachingEntityStore.js
b/extensions/Wikibase/view/resources/wikibase/store/store.CachingEntityStore.js
index 96ddbe9..4892ebc 100644
---
a/extensions/Wikibase/view/resources/wikibase/store/store.CachingEntityStore.js
+++
b/extensions/Wikibase/view/resources/wikibase/store/store.CachingEntityStore.js
@@ -2,7 +2,7 @@
* @licence GNU GPL v2+
* @author Adrian Heine < [email protected] >
*/
-( function( wb, $ ) {
+( function( wb ) {
'use strict';
var MODULE = wb.store;
@@ -44,4 +44,4 @@
return this._deferreds[ entityId ];
}
} );
-}( wikibase, jQuery ) );
+}( wikibase ) );
diff --git a/extensions/Wikibase/view/resources/wikibase/templates.js
b/extensions/Wikibase/view/resources/wikibase/templates.js
index 510a032..7cc1541 100644
--- a/extensions/Wikibase/view/resources/wikibase/templates.js
+++ b/extensions/Wikibase/view/resources/wikibase/templates.js
@@ -58,19 +58,15 @@
* @return {string}
*/
function stripAutoGeneratedHtml( string ) {
- var tagsToIgnore = [ 't(?:head|body|foot)' ],
- inTag = false,
+ var inTag = false,
readTag = false,
tag = '',
outTag = false,
filteredString = '',
character = '';
- $.each( tagsToIgnore, function( i, tag ) {
- // ignore case since IE8 will convert tag names to
upper case
- var re = new RegExp( '<\\/?' + tag + '[^>]*>', 'gi' );
- string = string.replace( re, '' );
- } );
+ // ignore case since IE8 will convert tag names to upper case
+ string = string.replace( /<\/?t(?:head|body|foot)[^>]*>/gi, ''
);
// strip white space between tags as well since it might cause
interference
string = string.replace( />\s+</g, '><' );
diff --git a/extensions/Wikibase/view/resources/wikibase/view/ViewController.js
b/extensions/Wikibase/view/resources/wikibase/view/ViewController.js
index abd08e9..65b1bcf 100644
--- a/extensions/Wikibase/view/resources/wikibase/view/ViewController.js
+++ b/extensions/Wikibase/view/resources/wikibase/view/ViewController.js
@@ -1,4 +1,4 @@
-wikibase.view.ViewController = ( function( wb ) {
+wikibase.view.ViewController = ( function() {
'use strict';
/**
@@ -46,4 +46,4 @@
return SELF;
-} )( wikibase );
+} )();
diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.css
b/extensions/Wikibase/view/resources/wikibase/wikibase.css
index 4a75ffc..de0086a 100644
--- a/extensions/Wikibase/view/resources/wikibase/wikibase.css
+++ b/extensions/Wikibase/view/resources/wikibase/wikibase.css
@@ -362,11 +362,6 @@
padding-left: 17em;
}
-
-.wb-edit .wikibase-statementview-qualifiers .wikibase-snaklistview {
- border-color: #C0DAE5;
-}
-
.wikibase-statementview-qualifiers .wikibase-snaklistview
.wikibase-snaklistview-listview .wikibase-snakview-property {
width: 12em;
position: absolute;
@@ -443,7 +438,7 @@
float: left;
width: 100%;
position: relative;
- padding-bottom: 0.5em;
+ padding-bottom: 1em;
}
.wikibase-statementview:last-child {
@@ -455,6 +450,10 @@
margin-left: 15.2em;
margin-top: 1em;
z-index: 1;
+}
+
+.wikibase-statementview .wikibase-statementview-rankselector
.wikibase-rankselector {
+ border: 0;
}
.wikibase-statementview > .wikibase-toolbar {
@@ -485,7 +484,11 @@
position: relative;
background: #F8F8F8;
overflow: hidden;
- margin-bottom: 5px;
+ margin-bottom: 0.5em;
+}
+
+.wikibase-referenceview .wikibase-referenceview-listview {
+ padding-top: 0.3em;
}
.wikibase-referenceview .wikibase-referenceview-heading {
@@ -514,14 +517,6 @@
.wikibase-referenceview.wb-error > .wikibase-referenceview-heading {
background-color: #E5C8B5;
-}
-
-
-.wikibase-referenceview .wikibase-snaklistview:nth-child(2) {
- border-top: none;
-}
-.wikibase-referenceview.wb-edit .wikibase-snaklistview {
- border-color: #C0DAE5;
}
.wikibase-referenceview .wikibase-snaklistview-listview
.wikibase-snakview-property {
@@ -564,9 +559,10 @@
.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview {
position: relative;
- min-height: 1.8em;
- padding-top: 4px;
- padding-bottom: 2px;
+ line-height: 1.2;
+ min-height: 1.7em;
+ padding-top: 0;
+ padding-bottom: 0.3em;
}
/* a reference's "edit" toolbar */
diff --git a/extensions/Wikibase/view/tests/phpunit/ItemViewTest.php
b/extensions/Wikibase/view/tests/phpunit/ItemViewTest.php
index 8dca462..ccdb32c 100644
--- a/extensions/Wikibase/view/tests/phpunit/ItemViewTest.php
+++ b/extensions/Wikibase/view/tests/phpunit/ItemViewTest.php
@@ -5,7 +5,6 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Services\Statement\Grouper\NullStatementGrouper;
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\View\ItemView;
use Wikibase\View\Template\TemplateFactory;
diff --git a/extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php
b/extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php
index 0437ab0..7399c87 100644
--- a/extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php
+++ b/extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php
@@ -8,7 +8,6 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Services\Statement\Grouper\NullStatementGrouper;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\View\PropertyView;
diff --git
a/extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
b/extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
index 4a5e569..6c2899b 100644
--- a/extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
+++ b/extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
@@ -3,6 +3,7 @@
namespace Wikibase\View\Tests;
use MediaWikiTestCase;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
@@ -29,31 +30,32 @@
/**
* @dataProvider getAddStatementToGroupSectionProvider
*/
- public function testGetAddStatementToGroupSection( $propertyId,
$entityId ) {
+ public function testGetAddStatementToGroupSection( $propertyId ) {
$generator = $this->newToolbarEditSectionGenerator();
$this->assertEquals(
'<span class="wikibase-toolbar-container"></span>',
- $generator->getAddStatementToGroupSection( $propertyId,
$entityId )
+ $generator->getAddStatementToGroupSection( $propertyId )
);
}
public function getAddStatementToGroupSectionProvider() {
return array(
- array( new PropertyId( 'P1' ), null )
+ array( new PropertyId( 'P1' ) ),
);
}
/**
* @dataProvider getLabelDescriptionAliasesEditSectionProvider
*/
- public function testGetLabelDescriptionAliasesEditSection(
$languageCode, $entityId, $expectedMatch ) {
+ public function testGetLabelDescriptionAliasesEditSection(
+ $languageCode,
+ EntityId $entityId,
+ $expected
+ ) {
$generator = $this->newToolbarEditSectionGenerator();
-
- $this->assertRegExp(
- $expectedMatch,
- $generator->getLabelDescriptionAliasesEditSection(
$languageCode, $entityId )
- );
+ $html = $generator->getLabelDescriptionAliasesEditSection(
$languageCode, $entityId );
+ $this->assertContains( $expected, $html );
}
public function getLabelDescriptionAliasesEditSectionProvider() {
@@ -61,7 +63,7 @@
array(
'en',
new PropertyId( 'P1' ),
- '/Special:SetLabelDescriptionAliases\/P1\/en/'
+ 'Special:SetLabelDescriptionAliases/P1/en'
)
);
}
@@ -69,15 +71,15 @@
/**
* @dataProvider getSiteLinksEditSectionProvider
*/
- public function testGetSiteLinksEditSection( $entityId, $expectedMatch
) {
+ public function testGetSiteLinksEditSection( EntityId $entityId,
$expected ) {
$generator = $this->newToolbarEditSectionGenerator();
-
- $this->assertRegExp( $expectedMatch,
$generator->getSiteLinksEditSection( $entityId ) );
+ $html = $generator->getSiteLinksEditSection( $entityId );
+ $this->assertContains( $expected, $html );
}
public function getSiteLinksEditSectionProvider() {
return array(
- array( new PropertyId( 'P1' ),
'/Special:SetSiteLink\/P1/' )
+ array( new PropertyId( 'P1' ), 'Special:SetSiteLink/P1'
)
);
}
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index 48a71fa..6032b93 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -387,7 +387,7 @@
'Wikibase\\Client\\RecentChanges\\RevisionData' => $baseDir .
'/extensions/Wikibase/client/includes/recentchanges/RevisionData.php',
'Wikibase\\Client\\RepoItemLinkGenerator' => $baseDir .
'/extensions/Wikibase/client/includes/RepoItemLinkGenerator.php',
'Wikibase\\Client\\RepoLinker' => $baseDir .
'/extensions/Wikibase/client/includes/RepoLinker.php',
- 'Wikibase\\Client\\Serializer\\ClientEntitySerializer' => $baseDir .
'/extensions/Wikibase/client/includes/serializers/ClientEntitySerializer.php',
+ 'Wikibase\\Client\\Serializer\\ClientEntitySerializer' => $baseDir .
'/extensions/Wikibase/client/includes/Serializer/ClientEntitySerializer.php',
'Wikibase\\Client\\Specials\\SpecialPagesWithBadges' => $baseDir .
'/extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php',
'Wikibase\\Client\\Specials\\SpecialUnconnectedPages' => $baseDir .
'/extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php',
'Wikibase\\Client\\Store\\AddUsagesForPageJob' => $baseDir .
'/extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php',
@@ -456,6 +456,7 @@
'Wikibase\\Client\\Tests\\RecentChanges\\RevisionDataTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RevisionDataTest.php',
'Wikibase\\Client\\Tests\\RepoItemLinkGeneratorTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php',
'Wikibase\\Client\\Tests\\RepoLinkerTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/RepoLinkerTest.php',
+ 'Wikibase\\Client\\Tests\\Serializer\\ClientEntitySerializerTest' =>
$baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/Serializer/ClientEntitySerializerTest.php',
'Wikibase\\Client\\Tests\\SiteLinkCommentCreatorTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php',
'Wikibase\\Client\\Tests\\Specials\\SpecialPagesWithBadgesTest' =>
$baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/specials/SpecialPagesWithBadgesTest.php',
'Wikibase\\Client\\Tests\\Specials\\SpecialUnconnectedPagesTest' =>
$baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/specials/SpecialUnconnectedPagesTest.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a076cda..79a8ec9 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1236,12 +1236,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "be89c88746a54e13b0a2243d34576441b3f89da4"
+ "reference": "cdc7fe92fe980e47b88b128ccefdbc0352829786"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/be89c88746a54e13b0a2243d34576441b3f89da4";,
- "reference": "be89c88746a54e13b0a2243d34576441b3f89da4",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/cdc7fe92fe980e47b88b128ccefdbc0352829786";,
+ "reference": "cdc7fe92fe980e47b88b128ccefdbc0352829786",
"shasum": ""
},
"require": {
@@ -1273,7 +1273,7 @@
"jakub-onderka/php-parallel-lint": "0.9",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2015-12-17 21:47:07",
+ "time": "2015-12-20 01:00:53",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1514,7 +1514,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "685de4315ec51079a64d69dcc2c30f7646102f7b"
+ "reference": "2f5cfd71cbd51a984f46975d1b060f1430b8bab1"
},
"require": {
"php": ">=5.3.0",
@@ -1526,7 +1526,7 @@
"phpunit/phpunit": "^3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2015-12-17 12:16:39",
+ "time": "2015-12-18 22:39:32",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
@@ -1568,7 +1568,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "5d7a246de38d982cb9aa8ef75380eccbd28980fb"
+ "reference": "e98aa427ba1669243da460d8c0ddcae0cd75d617"
},
"require": {
"php": ">=5.3.0",
@@ -1580,7 +1580,7 @@
"phpunit/phpunit": "^3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2015-12-04 22:39:19",
+ "time": "2015-12-18 22:39:37",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/260231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ecdd173b3d053d574a624ea4dee1181f49107cd
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
