WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252659
Change subject: New Wikidata Build - 2015-11-12T10:00:01+0000
......................................................................
New Wikidata Build - 2015-11-12T10:00:01+0000
Change-Id: I28a684157997a5bffdecba4a334fed85d701c824
---
M composer.lock
M extensions/Quality/i18n/sd.json
M extensions/Wikibase/client/i18n/bs.json
M extensions/Wikibase/client/i18n/sd.json
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M
extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
M extensions/Wikibase/client/includes/Usage/PageEntityUsages.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
M extensions/Wikibase/lib/includes/changes/ItemChange.php
M extensions/Wikibase/repo/i18n/bn.json
M extensions/Wikibase/repo/i18n/it.json
M extensions/Wikibase/repo/i18n/sd.json
M extensions/Wikibase/repo/includes/EditEntity.php
M extensions/Wikibase/repo/includes/Hooks/EditFilterHookRunner.php
M extensions/Wikibase/repo/includes/ParserOutput/GeoDataDataUpdater.php
M extensions/Wikibase/repo/includes/api/CreateClaim.php
M extensions/Wikibase/repo/includes/api/RemoveReferences.php
M extensions/Wikibase/repo/includes/api/SetClaim.php
M extensions/Wikibase/repo/includes/api/SetQualifier.php
M extensions/Wikibase/repo/includes/content/PropertyHandler.php
M
extensions/Wikibase/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/ItemDisambiguationTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
M extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php
M extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
M extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php
M vendor/composer/installed.json
31 files changed, 146 insertions(+), 87 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/59/252659/1
diff --git a/composer.lock b/composer.lock
index bbff0c8..5815a18 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1355,7 +1355,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "5e7c38865133a2a6b503886fc97c1e92ee867edf"
+ "reference": "b2a94a413a6156e31d1a27ebe07638f2697c9c63"
},
"require": {
"php": ">=5.3.0",
@@ -1399,7 +1399,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2015-11-02 14:19:08"
+ "time": "2015-11-11 20:58:07"
},
{
"name": "wikibase/serialization-javascript",
@@ -1448,12 +1448,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf"
+ "reference": "5b65eea44d1f9867b81b2a3315dc1a98a17e0b6a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf";,
- "reference": "3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5b65eea44d1f9867b81b2a3315dc1a98a17e0b6a";,
+ "reference": "5b65eea44d1f9867b81b2a3315dc1a98a17e0b6a",
"shasum": ""
},
"require": {
@@ -1523,7 +1523,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-11-11 01:19:24"
+ "time": "2015-11-11 20:57:57"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Quality/i18n/sd.json b/extensions/Quality/i18n/sd.json
index ebe9696..482e938 100644
--- a/extensions/Quality/i18n/sd.json
+++ b/extensions/Quality/i18n/sd.json
@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"Sindhu",
- "Aursani"
+ "Aursani",
+ "Mehtab ahmed"
]
},
"wbq-violations-description": "اعدادي سڀاءُ وارن ڳالهوڙن جي فهرست",
@@ -14,10 +15,10 @@
"wbq-violations-form-select-all": "سڀ",
"wbq-violations-exceptions-checkbox-label": "قاعدي کان هٽيل ڏيکاريو",
"wbq-violations-submit-button-label": "خلاف ورزيون ڏيکاريو",
- "wbq-violations-invalid-entity-id": "$1 -درست وجود جي آءِ ڊي نه آهي!",
- "wbq-violations-not-existent-entity": "$1 وجود موجود نه آهي!",
- "wbq-violations-invalid-property-id": "$1 -درست ملڪيت جي آءِ ڊي نه
آهي!",
- "wbq-violations-not-existent-property": "$1 پراپرٽي موجود نه آهي!",
+ "wbq-violations-invalid-entity-id": "ڏنل آءِ ڊي قابل قبول نه آهي.",
+ "wbq-violations-not-existent-entity": "هڪ وجود آءِ ڊي سان ڏنل وجود نٿي
رکي.",
+ "wbq-violations-invalid-property-id": "درست ملڪيت جي آءِ ڊي نه آهي.",
+ "wbq-violations-not-existent-property": "آءِ ڊي سان ڏنل ملڪيت وجود نٿي
رکي آهي.",
"wbq-violations-table-header-entity": "هستي",
"wbq-violations-table-header-claim": "دعوىٰ",
"wbq-violations-table-header-constraint-type": "قسم",
diff --git a/extensions/Wikibase/client/i18n/bs.json
b/extensions/Wikibase/client/i18n/bs.json
index 68ce275..a83a2d6 100644
--- a/extensions/Wikibase/client/i18n/bs.json
+++ b/extensions/Wikibase/client/i18n/bs.json
@@ -53,7 +53,7 @@
"wikibase-error-invalid-entity-id": "Unešen ID nije poznat u sistemu.
Koristite validan ID.",
"unconnectedpages": "Stranice koje nisu povezane sa stavkama",
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|međuwiki
veza|međuwiki veze|međuwiki veza}} na stranici)",
- "wikibase-unconnectedpages-submit": "OK",
+ "wikibase-unconnectedpages-submit": "Prikaži stranice",
"wikibase-pageinfo-entity-id": "{{WBREPONAME}} stavka ID",
"wikibase-pageinfo-entity-id-none": "Ništa",
"wikibase-property-render-error": "Neizvršeno izražavanje osobine $1:
$2",
diff --git a/extensions/Wikibase/client/i18n/sd.json
b/extensions/Wikibase/client/i18n/sd.json
index 52d4cfc..2fcdd24 100644
--- a/extensions/Wikibase/client/i18n/sd.json
+++ b/extensions/Wikibase/client/i18n/sd.json
@@ -7,11 +7,14 @@
]
},
"tooltip-t-wikibase": "جُڙيل اعدادي ذخيري جي وَٿَ ڏانهن ڳنڍڻو",
+ "wikibase-comment-update": "{{WBREPONAME}} شيءِ تبديل ٿي",
"wikibase-dataitem": "{{WBREPONAME}} وَٿَ",
"wikibase-editlinks": "ڳنڍڻن کي سنواريو",
"wikibase-editlinkstitle": "بينالزباني ڳنڍڻا سنواريو",
+ "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "لڪايو",
"wikibase-rc-hide-wikidata-show": "نمايو",
+ "wikibase-rc-wikibase-edit-letter": "D",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} ترميم",
"wikibase-unconnectedpages-submit": "صفحا ڏيکاريو",
"wikibase-otherprojects": "ٻيون رٿائون"
diff --git
a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
index 55a47f1..b6071a4 100644
---
a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
+++
b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
@@ -104,7 +104,7 @@
* @throws MWException
*/
private function newLanguageAwareRenderer( $language, UsageAccumulator
$usageAccumulator ) {
- if ( !$language instanceof Language ) {
+ if ( !( $language instanceof Language ) ) {
wfDebugLog(
'T107711',
get_class( $language ) . ' is not a Language
object.',
diff --git
a/extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
b/extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
index 0ad127c..8f77f0b 100644
---
a/extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
+++
b/extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
@@ -87,7 +87,7 @@
return '';
}
- if ( !$entity instanceof StatementListProvider ) {
+ if ( !( $entity instanceof StatementListProvider ) ) {
return '';
}
diff --git a/extensions/Wikibase/client/includes/Usage/PageEntityUsages.php
b/extensions/Wikibase/client/includes/Usage/PageEntityUsages.php
index f69f71f..edc19cb 100644
--- a/extensions/Wikibase/client/includes/Usage/PageEntityUsages.php
+++ b/extensions/Wikibase/client/includes/Usage/PageEntityUsages.php
@@ -68,7 +68,7 @@
*/
public function addUsages( array $usages ) {
foreach ( $usages as $usage ) {
- if ( !$usage instanceof EntityUsage ) {
+ if ( !( $usage instanceof EntityUsage ) ) {
throw new InvalidArgumentException( '$usages
must contain only EntityUsage objects' );
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
index 50b3440..ad76337 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
@@ -32,7 +32,7 @@
$wikibaseClient = WikibaseClient::getDefaultInstance( 'reset' );
$store = $wikibaseClient->getStore();
- if ( ! $store instanceof MockClientStore ) {
+ if ( !( $store instanceof MockClientStore ) ) {
$store = new MockClientStore( 'de' );
$wikibaseClient->overrideStore( $store );
}
diff --git a/extensions/Wikibase/lib/includes/changes/ItemChange.php
b/extensions/Wikibase/lib/includes/changes/ItemChange.php
index 2796a5c..28577e0 100644
--- a/extensions/Wikibase/lib/includes/changes/ItemChange.php
+++ b/extensions/Wikibase/lib/includes/changes/ItemChange.php
@@ -22,7 +22,7 @@
public function getSiteLinkDiff() {
$diff = $this->getDiff();
- if ( !$diff instanceof ItemDiff ) {
+ if ( !( $diff instanceof ItemDiff ) ) {
// This shouldn't happen, but we should be robust
against corrupt, incomplete
// or obsolete instances in the database, etc.
diff --git a/extensions/Wikibase/repo/i18n/bn.json
b/extensions/Wikibase/repo/i18n/bn.json
index 71e550b..fb01146 100644
--- a/extensions/Wikibase/repo/i18n/bn.json
+++ b/extensions/Wikibase/repo/i18n/bn.json
@@ -91,10 +91,13 @@
"wikibase-itembytitle-lookup-site": "সাইট:",
"wikibase-itembytitle-lookup-page": "পাতা:",
"wikibase-itembytitle-submit": "অনুসন্ধান",
+ "wikibase-itembytitle-error-site": "দয়া করে একটি বিদ্যমান সাইট
শনাক্তকারী ব্যবহার করুন, উদা. বাংলা উইকিপিডিয়ার জন্য \"bnwiki\"।",
+ "wikibase-itembytitle-error-item": "প্রদত্ত পাতার সাথে সংযুক্ত আইটেম
পাওয়া যায়নি।",
"wikibase-itembytitle-create": "এছাড়াও আপনি [$1 একটি আইটেম তৈরি] করতে
পারেন।",
"wikibase-gotolinkedpage-lookup-site": "সাইট:",
"wikibase-gotolinkedpage-lookup-item": "আইটেম আইডি:",
"wikibase-gotolinkedpage-submit": "চলো",
+ "wikibase-gotolinkedpage-error-item-not-found": "আইটেম পাওয়া যায়নি",
"special-itemdisambiguation": "আইটেম দ্ব্যর্থতা নিরসন",
"wikibase-itemdisambiguation-lookup-fieldset": "ভাষা এবং লেবেল অনুযায়ী
আইটেমের জন্য অনুসন্ধান",
"wikibase-itemdisambiguation-lookup-language": "ভাষার কোড:",
@@ -110,13 +113,16 @@
"wikibase-newproperty-datatype": "উপাত্তের ধরণ:",
"wikibase-newproperty-invalid-datatype": "উল্লিখিত ডাটাটাইপ অবৈধ।",
"special-newitem": "নতুন আইটেম তৈরি করুন",
+ "wikibase-newitem-summary": "[[Special:ItemByTitle|আইটেমটি আগে থেকেই
আছে কিনা তা পরীক্ষা করে]] নিশ্চিত করুন!<br /> সব নতুন আইটেম জন্য আপনার একটি
[[Help:Label/bn|লেভেল]] এবং একটি [[Help:Description/bn|বিবরণ]] তৈরি করা উচিত।",
"wikibase-newitem-fieldset": "নতুন আইটেম তৈরি করুন",
"wikibase-newitem-site": "প্রথম সংযুক্ত পাতার সাইট",
"wikibase-newitem-page": "প্রথম সংযুক্ত পাতার নাম",
+ "wikibase-newitem-no-external-page": "নির্দিষ্ট করা পাতাটি সংশ্লিষ্ট
সাইটে পাওয়া যায়নি।",
"wikibase-newitem-not-recognized-siteid": "প্রদান করা শনাক্তকারী সাইট
স্বীকৃত নয়।",
"wikibase-newentity-language": "ভাষা:",
"wikibase-newentity-label": "লেবেল:",
"wikibase-newentity-description": "বিবরণ:",
+ "wikibase-newentity-aliases": "উপনাম, উল্লম্ব দণ্ড দ্বারা বিভাজিত:",
"wikibase-newentity-submit": "তৈরি",
"special-setlabel": "লেবেল যোগ",
"wikibase-setlabel-label": "লেবেল:",
diff --git a/extensions/Wikibase/repo/i18n/it.json
b/extensions/Wikibase/repo/i18n/it.json
index c50ce58..e5354bd 100644
--- a/extensions/Wikibase/repo/i18n/it.json
+++ b/extensions/Wikibase/repo/i18n/it.json
@@ -329,6 +329,7 @@
"action-property-create": "creare proprietà",
"apihelp-wbcreateclaim-description": "Crea asserzioni Wikibase.",
"apihelp-wbcreateclaim-param-entity": "ID dell'entità a cui stai
aggiungendo l'asserzione",
+ "apihelp-wbcreateclaim-param-snaktype": "Il tipo di snak",
"apihelp-wbcreateredirect-example-1": "Trasforma Q11 in un redirect a
Q12",
"apihelp-wbparsevalue-param-values": "I valori da analizzare",
"apihelp-wbremoveclaims-description": "Rimuove asserzioni Wikibase.",
@@ -342,6 +343,7 @@
"apihelp-wbsetaliases-param-remove": "Elenco degli alias da rimuovere
(può essere combinato con add)",
"apihelp-wbsetaliases-param-language": "La lingua per la quale
impostare gli alias",
"apihelp-wbsetclaimvalue-description": "Imposta il valore di
un'asserzione Wikibase.",
+ "apihelp-wbsetclaimvalue-param-snaktype": "Il tipo di snak",
"apihelp-wbsetdescription-description": "Imposta una descrizione per
una singola entità Wikibase.",
"apihelp-wbsetdescription-param-language": "Lingua della descrizione",
"apihelp-wbsetdescription-param-value": "Il valore da impostare per la
descrizione",
diff --git a/extensions/Wikibase/repo/i18n/sd.json
b/extensions/Wikibase/repo/i18n/sd.json
index 74f2015..edbc47f 100644
--- a/extensions/Wikibase/repo/i18n/sd.json
+++ b/extensions/Wikibase/repo/i18n/sd.json
@@ -2,13 +2,17 @@
"@metadata": {
"authors": [
"Sindhu",
- "Aursani"
+ "Aursani",
+ "Mehtab ahmed"
]
},
"wikibase-edit": "ترميم",
"wikibase-add": "ڏيو",
+ "wikibase-label-empty": "ڪو به ليبل بيان ڪيل نه آهي",
"wikibase-description-empty": "تشريح غير ميسر",
"wikibase-statements": "بيانات",
"wikibase-sitelinks-special": "ٻيون سرزمينون",
+ "wikibase-aliases-empty": "ڪي به عرف بيان ناهن ڪيل",
+ "wikibase-statementview-rank-normal": "عام درجو",
"wikibase-statementview-referencesheading-pendingcountersubject":
"{{PLURAL:$1|حوالو|حوالا}}"
}
diff --git a/extensions/Wikibase/repo/includes/EditEntity.php
b/extensions/Wikibase/repo/includes/EditEntity.php
index 54358db..30d2980 100644
--- a/extensions/Wikibase/repo/includes/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/EditEntity.php
@@ -202,7 +202,10 @@
$this->errorType = 0;
$this->status = Status::newGood();
- if ( $context !== null && !$context instanceof RequestContext
&& !$context instanceof DerivativeContext ) {
+ if ( $context !== null
+ && !( $context instanceof RequestContext )
+ && !( $context instanceof DerivativeContext )
+ ) {
throw new InvalidArgumentException( '$context must be
an instance of RequestContext'
. ' or DerivativeContext' );
}
diff --git a/extensions/Wikibase/repo/includes/Hooks/EditFilterHookRunner.php
b/extensions/Wikibase/repo/includes/Hooks/EditFilterHookRunner.php
index 2ccc51d..0c482c0 100644
--- a/extensions/Wikibase/repo/includes/Hooks/EditFilterHookRunner.php
+++ b/extensions/Wikibase/repo/includes/Hooks/EditFilterHookRunner.php
@@ -47,7 +47,9 @@
EntityContentFactory $entityContentFactory,
$context = null
) {
- if ( $context !== null && !$context instanceof RequestContext
&& !$context instanceof DerivativeContext ) {
+ if ( $context !== null
+ && !( $context instanceof RequestContext )
+ && !( $context instanceof DerivativeContext ) ) {
throw new InvalidArgumentException( '$context must be
an instance of RequestContext'
. ' or DerivativeContext' );
}
diff --git
a/extensions/Wikibase/repo/includes/ParserOutput/GeoDataDataUpdater.php
b/extensions/Wikibase/repo/includes/ParserOutput/GeoDataDataUpdater.php
index 71aacbf..c5fd5d7 100644
--- a/extensions/Wikibase/repo/includes/ParserOutput/GeoDataDataUpdater.php
+++ b/extensions/Wikibase/repo/includes/ParserOutput/GeoDataDataUpdater.php
@@ -215,13 +215,13 @@
private function extractMainSnakCoord( Statement $statement ) {
$snak = $statement->getMainSnak();
- if ( !$snak instanceof PropertyValueSnak ) {
+ if ( !( $snak instanceof PropertyValueSnak ) ) {
return null;
}
$dataValue = $snak->getDataValue();
- if ( !$dataValue instanceof GlobeCoordinateValue ) {
+ if ( !( $dataValue instanceof GlobeCoordinateValue ) ) {
// Property data type - value mismatch
return null;
}
diff --git a/extensions/Wikibase/repo/includes/api/CreateClaim.php
b/extensions/Wikibase/repo/includes/api/CreateClaim.php
index a1cf380..5a77d38 100644
--- a/extensions/Wikibase/repo/includes/api/CreateClaim.php
+++ b/extensions/Wikibase/repo/includes/api/CreateClaim.php
@@ -64,7 +64,7 @@
$entity = $entityRevision->getEntity();
$propertyId = $this->modificationHelper->getEntityIdFromString(
$params['property'] );
- if ( !$propertyId instanceof PropertyId ) {
+ if ( !( $propertyId instanceof PropertyId ) ) {
$this->errorReporter->dieError(
$propertyId->getSerialization() . ' does not
appear to be a property ID',
'param-illegal'
diff --git a/extensions/Wikibase/repo/includes/api/RemoveReferences.php
b/extensions/Wikibase/repo/includes/api/RemoveReferences.php
index 481cc3d..56c9673 100644
--- a/extensions/Wikibase/repo/includes/api/RemoveReferences.php
+++ b/extensions/Wikibase/repo/includes/api/RemoveReferences.php
@@ -68,7 +68,7 @@
$claim = $this->modificationHelper->getStatementFromEntity(
$guid, $entity );
- if ( ! ( $claim instanceof Statement ) ) {
+ if ( !( $claim instanceof Statement ) ) {
$this->errorReporter->dieError(
'The referenced claim is not a statement and
thus cannot have references',
'not-statement'
diff --git a/extensions/Wikibase/repo/includes/api/SetClaim.php
b/extensions/Wikibase/repo/includes/api/SetClaim.php
index a63ae57..b21571b 100644
--- a/extensions/Wikibase/repo/includes/api/SetClaim.php
+++ b/extensions/Wikibase/repo/includes/api/SetClaim.php
@@ -155,7 +155,7 @@
throw new IllegalValueException( 'Failed to get
statement from Serialization' );
}
$claim = $this->statementDeserializer->deserialize(
$serializedStatement );
- if ( !$claim instanceof Statement ) {
+ if ( !( $claim instanceof Statement ) ) {
throw new IllegalValueException( 'Failed to get
statement from Serialization' );
}
return $claim;
diff --git a/extensions/Wikibase/repo/includes/api/SetQualifier.php
b/extensions/Wikibase/repo/includes/api/SetQualifier.php
index c7825bb..72d2112 100644
--- a/extensions/Wikibase/repo/includes/api/SetQualifier.php
+++ b/extensions/Wikibase/repo/includes/api/SetQualifier.php
@@ -136,7 +136,7 @@
$guid = $params['claim'];
$propertyId = $this->modificationHelper->getEntityIdFromString(
$params['property'] );
- if ( !$propertyId instanceof PropertyId ) {
+ if ( !( $propertyId instanceof PropertyId ) ) {
$this->errorReporter->dieError(
$propertyId->getSerialization() . ' does not
appear to be a property ID',
'param-illegal'
diff --git a/extensions/Wikibase/repo/includes/content/PropertyHandler.php
b/extensions/Wikibase/repo/includes/content/PropertyHandler.php
index 049aa39..53188ee 100644
--- a/extensions/Wikibase/repo/includes/content/PropertyHandler.php
+++ b/extensions/Wikibase/repo/includes/content/PropertyHandler.php
@@ -101,7 +101,7 @@
* @return PropertyContent
*/
protected function newContent( Entity $property ) {
- if ( ! $property instanceof Property ) {
+ if ( !( $property instanceof Property ) ) {
throw new InvalidArgumentException( '$property must be
an instance of Property' );
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
index 2fb2e61..597ae6d 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/EntityIdHtmlLinkFormatterFactoryTest.php
@@ -21,9 +21,13 @@
private function getFormatterFactory() {
$titleLookup = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
+ $languageNameLookup->expects( $this->never() )
+ ->method( 'getName' );
+
return new EntityIdHtmlLinkFormatterFactory(
$titleLookup,
- $this->getMock( 'Wikibase\Lib\LanguageNameLookup' )
+ $languageNameLookup
);
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
index 147491c..6fa3a56 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageBeforeHTMLHookHandlerTest.php
@@ -8,7 +8,6 @@
use RequestContext;
use Title;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Repo\Content\EntityContentFactory;
use Wikibase\Repo\Hooks\OutputPageBeforeHTMLHookHandler;
use Wikibase\View\Template\TemplateFactory;
@@ -40,13 +39,17 @@
->method( 'getLanguages' )
->will( $this->returnValue( array( 'en', 'es', 'ru' ) )
);
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
+ $languageNameLookup->expects( $this->never() )
+ ->method( 'getName' );
+
$outputPageBeforeHTMLHookHandler = new
OutputPageBeforeHTMLHookHandler(
TemplateFactory::getDefaultInstance(),
$userLanguageLookup,
$contentLanguages,
new BasicEntityIdParser(),
$this->getMock(
'Wikibase\Lib\Store\EntityRevisionLookup' ),
- new LanguageNameLookup(),
+ $languageNameLookup,
new EntityContentFactory( array() )
);
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/ItemDisambiguationTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/ItemDisambiguationTest.php
index d71ce77..646d48f 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/ItemDisambiguationTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/ItemDisambiguationTest.php
@@ -7,7 +7,6 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Term\Term;
use Wikibase\ItemDisambiguation;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Interactors\TermSearchResult;
@@ -31,11 +30,13 @@
*/
private function getMockEntityTitleLookup() {
$entityIdFormatter = $this->getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
+
$entityIdFormatter->expects( $this->any() )
->method( 'getTitleForId' )
->will( $this->returnCallback( function( ItemId $id ) {
return Title::makeTitle( NS_MAIN,
$id->getSerialization() );
} ) );
+
return $entityIdFormatter;
}
@@ -43,9 +44,11 @@
* @return ItemDisambiguation
*/
private function newItemDisambiguation() {
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
+
return new ItemDisambiguation(
$this->getMockEntityTitleLookup(),
- new LanguageNameLookup(),
+ $languageNameLookup,
'en'
);
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
index cbe2916..a218581 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
@@ -80,8 +80,8 @@
$html = $this->executeViewAction( $page, $params );
- $this->assertRegExp( '/diff-currentversion-title/', $html, 'is
diff view' );
- $this->assertNotRegExp( '/wikibase-edittoolbar-container/',
$html, 'no edit toolbar' );
+ $this->assertContains( 'diff-currentversion-title', $html, 'is
diff view' );
+ $this->assertNotContains( 'wikibase-edittoolbar-container',
$html, 'no edit toolbar' );
}
public function testShowOldRevision_hasNoEditLinks() {
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
index 65ea526..8c93d0c 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
@@ -567,7 +567,7 @@
list( $result, ) = $this->doApiRequestWithToken( $params );
$warning = $result['warnings']['wbsetsitelink']['warnings'];
- $this->assertRegExp( "/Unrecognized value for parameter
'badges'/", $warning );
+ $this->assertContains( 'Unrecognized value for parameter
\'badges\'', $warning );
}
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
index 1d1bbcf..b2d8727 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
@@ -3,11 +3,11 @@
namespace Wikibase\Test;
use DataTypes\DataTypeFactory;
+use Language;
use Title;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\PropertyInfoStore;
use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
@@ -97,11 +97,16 @@
protected function newSpecialPage() {
$specialPage = new SpecialListProperties();
+ $specialPage->getContext()->setLanguage( Language::factory(
'en' ) );
+
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
+ $languageNameLookup->expects( $this->never() )
+ ->method( 'getName' );
$specialPage->initServices(
$this->getDataTypeFactory(),
$this->getPropertyInfoStore(),
- new EntityIdHtmlLinkFormatterFactory(
$this->getEntityTitleLookup(), new LanguageNameLookup() ),
+ new EntityIdHtmlLinkFormatterFactory(
$this->getEntityTitleLookup(), $languageNameLookup ),
new LanguageFallbackChainFactory(),
$this->getEntityTitleLookup(),
$this->getBufferingTermLookup()
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
index 41a543f..117ed2f 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
@@ -224,8 +224,6 @@
}
public function testRedirectRequest() {
-
- // -- set up params ---------------------------------
$params = array(
'fromid' => 'Q1',
'toid' => 'Q2',
@@ -242,9 +240,9 @@
// -- do the request
--------------------------------------------
$html = $this->executeSpecialEntityRedirect( $params );
- // -- check the result
--------------------------------------------
$this->assertNoError( $html );
- $this->assertRegExp( '!\(wikibase-redirectentity-success: Q1,
Q2\)!', $html, 'Expected success message' );
+ $this->assertContains( '(wikibase-redirectentity-success: Q1,
Q2)', $html,
+ 'Expected success message' );
// -- check the items
--------------------------------------------
$actualFrom = $this->entityModificationTestHelper->getEntity(
'Q1', true );
diff --git a/extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php
b/extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php
index b105c88..e661fbd 100644
--- a/extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php
+++ b/extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php
@@ -7,8 +7,10 @@
use SiteList;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\SnakFormatter;
+use Wikibase\View\EntityIdFormatterFactory;
use Wikibase\View\EntityViewFactory;
use Wikibase\View\Template\TemplateFactory;
+use Wikibase\View\Template\TemplateRegistry;
/**
* @covers Wikibase\View\EntityViewFactory
@@ -32,18 +34,63 @@
*
* @licence GNU GPL v2+
* @author Katie Filbert < [email protected] >
+ * @author Thiemo Mättig
*/
class EntityViewFactoryTest extends PHPUnit_Framework_TestCase {
+
+ private function newEntityViewFactory(
+ EntityIdFormatterFactory $htmlFactory = null,
+ EntityIdFormatterFactory $plainFactory = null
+ ) {
+ $templateFactory = new TemplateFactory( new TemplateRegistry(
array() ) );
+
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
+ $languageNameLookup->expects( $this->never() )
+ ->method( 'getName' );
+
+ return new EntityViewFactory(
+ $htmlFactory ?: $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_HTML ),
+ $plainFactory ?: $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_PLAIN ),
+ $this->getSnakFormatterFactory(),
+ $this->getSiteStore(),
+ new DataTypeFactory( array() ),
+ $templateFactory,
+ $languageNameLookup,
+ array(),
+ array(),
+ array()
+ );
+ }
+
+ /**
+ * @dataProvider invalidConstructorArgumentsProvider
+ */
+ public function testConstructorThrowsException(
+ EntityIdFormatterFactory $htmlFormatterFactory,
+ EntityIdFormatterFactory $plainFormatterFactory
+ ) {
+ $this->setExpectedException( 'InvalidArgumentException' );
+ $this->newEntityViewFactory( $htmlFormatterFactory,
$plainFormatterFactory );
+ }
+
+ public function invalidConstructorArgumentsProvider() {
+ $htmlFactory = $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_HTML );
+ $plainFactory = $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_PLAIN );
+ $wikiFactory = $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_WIKI );
+
+ return array(
+ array( $wikiFactory, $plainFactory ),
+ array( $htmlFactory, $wikiFactory ),
+ );
+ }
/**
* @dataProvider newEntityViewProvider
*/
public function testNewEntityView( $expectedClass, $entityType ) {
- $entityViewFactory = $this->getEntityViewFactory();
-
$languageFallback = new LanguageFallbackChain( array() );
- $entityView = $entityViewFactory->newEntityView(
+ $entityView = $this->newEntityViewFactory()->newEntityView(
$entityType,
'de',
$this->getMock(
'Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup' ),
@@ -62,35 +109,16 @@
}
public function testNewEntityView_withInvalidType() {
- $entityViewFactory = $this->getEntityViewFactory();
-
$languageFallback = new LanguageFallbackChain( array() );
$this->setExpectedException( 'InvalidArgumentException' );
- $entityViewFactory->newEntityView(
+ $this->newEntityViewFactory()->newEntityView(
'kittens',
'de',
$this->getMock(
'Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup' ),
$languageFallback,
$this->getMock( 'Wikibase\View\EditSectionGenerator' )
- );
- }
-
- private function getEntityViewFactory() {
- $templateFactory = TemplateFactory::getDefaultInstance();
-
- return new EntityViewFactory(
- $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_HTML ),
- $this->getEntityIdFormatterFactory(
SnakFormatter::FORMAT_PLAIN ),
- $this->getSnakFormatterFactory(),
- $this->getSiteStore(),
- new DataTypeFactory( array() ),
- $templateFactory,
- $this->getMock( 'Wikibase\Lib\LanguageNameLookup' ),
- array(),
- array(),
- array()
);
}
diff --git
a/extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
b/extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
index 0bf566d..2a06605 100644
---
a/extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
+++
b/extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
@@ -8,7 +8,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\EntityRevision;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\WikibaseContentLanguages;
@@ -59,6 +58,8 @@
->method( 'getAllUserLanguages' )
->will( $this->returnValue( array( 'de', 'en', 'ru' ) )
);
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
+
return new EntityViewPlaceholderExpander(
$templateFactory,
$title,
@@ -68,7 +69,7 @@
$entityRevisionLookup,
$userLanguages,
new WikibaseContentLanguages(),
- new LanguageNameLookup()
+ $languageNameLookup
);
}
@@ -164,10 +165,14 @@
// 'de' and 'ru', since 'en' is already covered by the
interface language.
$html = $expander->renderTermBox( new ItemId( 'Q23' ), 0 );
- $this->assertRegExp( '/Moskow/', $html );
+ $this->assertContains(
'wikibase-entitytermsforlanguageview-en', $html );
+ $this->assertContains( 'Moskow', $html );
- $this->assertRegExp( '/Moskau/', $html );
- $this->assertRegExp( '/Hauptstadt/', $html );
+ $this->assertContains(
'wikibase-entitytermsforlanguageview-de', $html );
+ $this->assertContains( 'Moskau', $html );
+ $this->assertContains( 'Hauptstadt Russlands', $html );
+
+ $this->assertContains(
'wikibase-entitytermsforlanguageview-ru', $html );
}
public function testRenderTermBoxForDeleteRevision() {
diff --git a/extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php
b/extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php
index da15e46..566d109 100644
--- a/extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php
+++ b/extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php
@@ -9,7 +9,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
-use Wikibase\Lib\LanguageNameLookup;
use Wikibase\View\EditSectionGenerator;
use Wikibase\View\SiteLinksView;
use Wikibase\View\Template\TemplateFactory;
@@ -166,28 +165,21 @@
*/
private function getSiteLinksView() {
$templateFactory = TemplateFactory::getDefaultInstance();
+ $editSectionGenerator = $this->getMock(
'Wikibase\View\EditSectionGenerator' );
+ $languageNameLookup = $this->getMock(
'Wikibase\Lib\LanguageNameLookup' );
return new SiteLinksView(
$templateFactory,
$this->newSiteList(),
- $this->getEditSectionGeneratorMock(),
+ $editSectionGenerator,
$this->getEntityIdFormatterMock(),
- new LanguageNameLookup(),
+ $languageNameLookup,
array(
'Q42' => 'wb-badge-featuredarticle',
'Q12' => 'wb-badge-goodarticle'
),
array( 'special group' )
);
- }
-
- /**
- * @return EditSectionGenerator
- */
- private function getEditSectionGeneratorMock() {
- $editSectionGenerator = $this->getMock(
'Wikibase\View\EditSectionGenerator' );
-
- return $editSectionGenerator;
}
/**
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 8e18f63..be152b4 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": "3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf"
+ "reference": "5b65eea44d1f9867b81b2a3315dc1a98a17e0b6a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf";,
- "reference": "3ff82e9bb245b4ee0ed9a49f835d414a20a19bcf",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5b65eea44d1f9867b81b2a3315dc1a98a17e0b6a";,
+ "reference": "5b65eea44d1f9867b81b2a3315dc1a98a17e0b6a",
"shasum": ""
},
"require": {
@@ -1273,7 +1273,7 @@
"jakub-onderka/php-parallel-lint": "0.9",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2015-11-11 01:19:24",
+ "time": "2015-11-11 20:57:57",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1513,7 +1513,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "5e7c38865133a2a6b503886fc97c1e92ee867edf"
+ "reference": "b2a94a413a6156e31d1a27ebe07638f2697c9c63"
},
"require": {
"php": ">=5.3.0",
@@ -1525,7 +1525,7 @@
"phpunit/phpunit": "^3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2015-11-02 14:19:08",
+ "time": "2015-11-11 20:58:07",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/252659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28a684157997a5bffdecba4a334fed85d701c824
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
