Require DataValues Number 0.8.2

Change-Id: I2cd088e09649113f2bbbb810d23419b3f6cd8a97
zbynek · Nov 17, 2016 · ac302b7 · ac302b7
1 parent 913a278
commit ac302b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php b/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
@@ -136,7 +136,7 @@ private function getGenericSnaks() {
 				)
 			],
 			'quantity' => [
-				'42 a &#91;&#91;b&#93;&#93; c',
+				'42±0 a &#91;&#91;b&#93;&#93; c',
 				new PropertyValueSnak(
 					$p4,
 					new QuantityValue(
@@ -148,7 +148,7 @@ private function getGenericSnaks() {
 				)
 			],
 			'quantity with unit' => [
-				'42 label &#91;&#91;with&#93;&#93; wikitext',
+				'42±0 label &#91;&#91;with&#93;&#93; wikitext',
 				new PropertyValueSnak(
 					$p4,
 					new QuantityValue(

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 		"data-values/common": "~0.3.0",
 		"data-values/geo": "~1.0",
 		"data-values/interfaces": "~0.2.0|~0.1.5",
-		"data-values/number": "~0.8.1",
+		"data-values/number": "~0.8.2",
 		"data-values/time": "~0.8.4",
 		"data-values/validators": "~0.1.0",
 		"data-values/data-types": "~0.5.0",

diff --git a/lib/includes/Formatters/QuantityDetailsFormatter.php b/lib/includes/Formatters/QuantityDetailsFormatter.php
@@ -126,7 +126,7 @@ public function format( $value ) {
 	 */
 	private function formatNumber( DecimalValue $number, $unit ) {
 		return htmlspecialchars( $this->numberFormatter->format(
-			new QuantityValue( $number, $unit, $number, $number )
+			new UnboundedQuantityValue( $number, $unit )
 		) );
 	}
 

diff --git a/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php b/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
@@ -9,6 +9,7 @@
 use DataValues\QuantityValue;
 use DataValues\StringValue;
 use DataValues\TimeValue;
+use DataValues\UnboundedQuantityValue;
 use DataValues\UnDeserializableValue;
 use Language;
 use MediaWikiTestCase;
@@ -306,7 +307,7 @@ public function provideNewFormatter() {
 				'Quantity',
 				SnakFormatter::FORMAT_PLAIN,
 				$this->newFormatterOptions( 'de' ),
-				QuantityValue::newFromNumber( '+123456.789' ),
+				UnboundedQuantityValue::newFromNumber( '+123456.789' ),
 				'@^123\\.456,789$@'
 			),
 			'quantity details' => array(

diff --git a/repo/tests/phpunit/includes/Api/FormatSnakValueTest.php b/repo/tests/phpunit/includes/Api/FormatSnakValueTest.php
@@ -8,6 +8,7 @@
 use DataValues\StringValue;
 use DataValues\TimeValue;
 use ApiUsageException;
+use DataValues\UnboundedQuantityValue;
 use UsageException;
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel\Entity\Item;
@@ -101,7 +102,7 @@ public function provideApiRequest() {
 				'@^http://acme\.test$@'
 			),
 			array(
-				QuantityValue::newFromNumber( '+12.33', '1' ),
+				UnboundedQuantityValue::newFromNumber( '+12.33' ),
 				'quantity',
 				SnakFormatter::FORMAT_PLAIN,
 				array( 'lang' => 'de' ),