com php-src: fix bug #75222 DateInterval microseconds property always 0: NEWS ext/date/php_date.c ext/date/tests/bug7522 2.phpt
| From: | Joe Watkins | Date: | Wed, 27 Sep 2017 05:23:42 +0000 |
| Subject: | com php-src: fix bug #75222 DateInterval microseconds property always 0: NEWS ext/date/php_date.c ext/date/tests/bug7522 2.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99562@lists.php.net to get a copy of this message | ||
Commit: 7deb561f75b74ddf537e8da3efb4498ba5911043
Author: jhdxr <jhdxr@php.net> Tue, 26 Sep 2017 02:51:33 +0800
Committer: Joe Watkins <krakjoe@php.net> Wed, 27 Sep 2017 06:23:42 +0100
Parents: b0950ff854a804563e7453ecf275eaddaadb1a4c
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7deb561f75b74ddf537e8da3efb4498ba5911043
Log:
fix bug #75222 DateInterval microseconds property always 0
Bugs:
https://bugs.php.net/75222
Changed paths:
M NEWS
M ext/date/php_date.c
A ext/date/tests/bug75222.phpt
Diff:
diff --git a/NEWS b/NEWS
index abc4f80..de668e2 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ PHP NEWS
. Fixed bug #75220 (Segfault when calling is_callable on parent).
(andrewnester)
+- Date:
+ . Fixed bug #75222 (DateInterval microseconds property always 0). (jhdxr)
+
- litespeed:
. Fixed bug #75248 (Binary directory doesn't get created when building
only litespeed SAPI). (petk)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 86ac49f...c99dad5 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4165,7 +4165,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, void
**c
GET_VALUE_FROM_STRUCT(i, "i");
GET_VALUE_FROM_STRUCT(s, "s");
if (strcmp(Z_STRVAL_P(member), "f") == 0) {
- fvalue = obj->diff->us / 1000000;
+ fvalue = obj->diff->us / 1000000.0;
break;
}
GET_VALUE_FROM_STRUCT(invert, "invert");
diff --git a/ext/date/tests/bug75222.phpt b/ext/date/tests/bug75222.phpt
new file mode 100644
index 0000000..2a2ee5f
--- /dev/null
+++ b/ext/date/tests/bug75222.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #75222 DateInterval microseconds property always 0
+--FILE--
+<?php
+
+$dt1 = new \DateTimeImmutable('2017-01-01T00:00:00.000000Z');
+$dt2 = new \DateTimeImmutable('2017-01-01T00:00:00.123456Z');
+$diff = $dt1->diff($dt2);
+//var_dump($diff);
+var_dump($diff->f);
+var_dump(get_object_vars($diff)['f']);
+var_dump($diff->f === get_object_vars($diff)['f']);
+?>
+--EXPECTF--
+float(0.123456)
+float(0.123456)
+bool(true)