diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-20 06:42:44 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-20 06:42:44 +0100 |
| commit | aa0a2e8c58f59d8a717c455ff23fcb22641f5746 (patch) | |
| tree | 4e4be3c32a6df4f937313f9b31a820cccb7e55fa | |
| parent | 242bdf7e8bdaf3a64ec9e5eab244cae9e2d3e074 (diff) | |
| parent | 9b7f13cb1b750d2dcac441945ab7cc1600fc080b (diff) | |
| download | php-git-aa0a2e8c58f59d8a717c455ff23fcb22641f5746.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Avoid exact floating point comparison
| -rw-r--r-- | ext/date/tests/timezone_location_get.phpt | 4 |
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"]=> |