summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-04-20 06:42:55 +0100
committerJoe Watkins <krakjoe@php.net>2017-04-20 06:42:55 +0100
commit06eb61591ad1fdd28c8e68aa05ffaeb40e11187d (patch)
tree807b6f052bed913cd07ef451ba7ad249a332550b
parent010ccadf447b5d3ed4b61e8d31235a57d44f9f1c (diff)
parentaa0a2e8c58f59d8a717c455ff23fcb22641f5746 (diff)
downloadphp-git-06eb61591ad1fdd28c8e68aa05ffaeb40e11187d.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: Avoid exact floating point comparison
-rw-r--r--ext/date/tests/timezone_location_get.phpt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/date/tests/timezone_location_get.phpt b/ext/date/tests/timezone_location_get.phpt
index 745fc8799e..93f7ed6d75 100644
--- a/ext/date/tests/timezone_location_get.phpt
+++ b/ext/date/tests/timezone_location_get.phpt
@@ -10,12 +10,12 @@ date.timezone=UTC
$location = timezone_location_get(new DateTimeZone("Europe/Oslo"));
var_dump($location);
?>
---EXPECT--
+--EXPECTF--
array(4) {
["country_code"]=>
string(2) "NO"
["latitude"]=>
- float(59.91666)
+ float(59.9166%d)
["longitude"]=>
float(10.75)
["comments"]=>