jenkins-bot has submitted this change and it was merged.
Change subject: allow precision to be null in globe coordinate
......................................................................
allow precision to be null in globe coordinate
Change-Id: I6cbd2bd46e17a7f6a26a49e2109e88f6af345ebd
---
M DataValues/src/GlobeCoordinateValue.php
M DataValues/tests/phpunit/GlobeCoordinateValueTest.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Denny Vrandecic: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataValues/src/GlobeCoordinateValue.php
b/DataValues/src/GlobeCoordinateValue.php
index cb03d47..753079a 100644
--- a/DataValues/src/GlobeCoordinateValue.php
+++ b/DataValues/src/GlobeCoordinateValue.php
@@ -65,8 +65,8 @@
}
protected function assertIsPrecision( $precision ) {
- if ( !is_float( $precision ) && !is_int( $precision ) ) {
- throw new IllegalValueException( 'Can only construct
GlobeCoordinateValue with a numeric precision' );
+ if ( !is_null( $precision ) && !is_float( $precision ) &&
!is_int( $precision ) ) {
+ throw new IllegalValueException( 'Can only construct
GlobeCoordinateValue with a numeric precision or null' );
}
}
diff --git a/DataValues/tests/phpunit/GlobeCoordinateValueTest.php
b/DataValues/tests/phpunit/GlobeCoordinateValueTest.php
index c6d224e..a2eea71 100644
--- a/DataValues/tests/phpunit/GlobeCoordinateValueTest.php
+++ b/DataValues/tests/phpunit/GlobeCoordinateValueTest.php
@@ -48,6 +48,7 @@
$argLists[] = array( new LatLongValue( 4.2, 4.2 ), 1,
'terminus' );
$argLists[] = array( new LatLongValue( 4.2, 4.2 ), 1, "Schar's
World" );
$argLists[] = array( new LatLongValue( 4.2, 4.2 ), 1,
'coruscant' );
+ $argLists[] = array( new LatLongValue( 4.2, 4.2 ), null );
return $argLists;
}
@@ -55,7 +56,6 @@
public function invalidConstructorArgumentsProvider() {
$argLists = array();
- $argLists[] = array( new LatLongValue( 4.2, 4.2 ), null );
$argLists[] = array( new LatLongValue( 4.2, 4.2 ), 'foo' );
$argLists[] = array( new LatLongValue( 4.2, 4.2 ), true );
$argLists[] = array( new LatLongValue( 4.2, 4.2 ), array( 1 ) );
@@ -102,7 +102,7 @@
public function testGetPrecision( GlobeCoordinateValue $geoCoord, array
$arguments ) {
$actual = $geoCoord->getPrecision();
- $this->assertTrue( is_float( $actual ) || is_int( $actual ),
'Precision is int or float' );
+ $this->assertTrue( is_null( $actual ) || is_float( $actual ) ||
is_int( $actual ), 'Precision is int or float or null' );
$this->assertEquals( $arguments[1], $actual );
}
--
To view, visit https://gerrit.wikimedia.org/r/81204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cbd2bd46e17a7f6a26a49e2109e88f6af345ebd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: mw1.22-wmf14
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Denny Vrandecic <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
