Jeroen De Dauw has submitted this change and it was merged.
Change subject: Make monolingual-text datatype non-experimental
......................................................................
Make monolingual-text datatype non-experimental
Change-Id: Ifc2921f1c247de8f32d0b9dc4482484ea4e14f45
---
M lib/config/WikibaseLib.default.php
M lib/includes/WikibaseDataTypeBuilders.php
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
3 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
WikidataJenkins: Verified
Jeroen De Dauw: Looks good to me, approved
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index 6f82f10..292605f 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -98,6 +98,7 @@
'commonsMedia',
'globe-coordinate',
'quantity',
+ 'monolingualtext',
'string',
'time',
'url',
@@ -113,7 +114,6 @@
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES
) {
// experimental data types
$defaults['dataTypes'] = array_merge( $defaults['dataTypes'],
array(
- 'monolingualtext',
//'multilingual-text',
) );
}
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index 92300b8..3e84ccc 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -92,10 +92,10 @@
'time' => array( $this, 'buildTimeType' ),
'url' => array( $this, 'buildUrlType' ),
'wikibase-item' => array( $this, 'buildItemType' ),
+ 'monolingualtext' => array( $this,
'buildMonolingualTextType' ),
);
$experimental = array(
- 'monolingualtext' => array( $this,
'buildMonolingualTextType' ),
// 'multilingualtext' => array( $this,
'buildMultilingualTextType' ),
);
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index fbb0411..7ce7a57 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -164,13 +164,14 @@
array( 'quantity', QuantityValue::newFromNumber( 5 ),
true, 'Simple integer' ),
array( 'quantity', QuantityValue::newFromNumber( 5, 'm'
), false, 'We don\'t support units yet' ),
array( 'quantity', QuantityValue::newFromDecimal(
'-11.234', '1', '-10', '-12' ), true, 'decimal strings' ),
+
+ //monolingual text
+ array( 'monolingualtext', new MonoLingualTextValue(
'en', 'text' ), true, 'Simple value' ),
+ array( 'monolingualtext', new MonoLingualTextValue(
'grrr', 'text' ), false, 'Not a valid language' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) &&
WB_EXPERIMENTAL_FEATURES ) {
$cases = array_merge( $cases, array(
-
- array( 'monolingualtext', new
MonoLingualTextValue( 'en', 'text' ), true, 'Simple value' ),
- array( 'monolingualtext', new
MonoLingualTextValue( 'grrr', 'text' ), false, 'Not a valid language' ),
// ....
) );
--
To view, visit https://gerrit.wikimedia.org/r/153780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2921f1c247de8f32d0b9dc4482484ea4e14f45
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
