Bug #60774 (DateInterval::format("%a") is always zero when an interval is

created using the createFromDateString method)

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index e8f393f322e25f7e41cbb21ea41bc6ec9bdb27a9..9f5593dacb567b70d70c4bea714aa5e242398659 100644 (file)
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -24789,6 +24789,7 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container
        in.tzdb = tzdb;
        in.time->is_localtime = 0;
        in.time->zone_type = 0;
+       in.time->relative.days = TIMELIB_UNSET;
 
        do {
                t = scan(&in, tz_get_wrapper);

diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index f3f5906b0a819dc3593cb29bbaa298f272020ba2..8aaa6c336ed07147c3196bc131d7092dfc92d629 100644 (file)
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -1796,6 +1796,7 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container
        in.tzdb = tzdb;
        in.time->is_localtime = 0;
        in.time->zone_type = 0;
+       in.time->relative.days = TIMELIB_UNSET;
 
        do {
                t = scan(&in, tz_get_wrapper);

diff --git a/ext/date/tests/bug60774.phpt b/ext/date/tests/bug60774.phpt
new file mode 100644 (file)
index 0000000..af8f447
--- /dev/null
+++ b/ext/date/tests/bug60774.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #60774 (DateInterval::format("%a") is always zero when an interval is created using the createFromDateString method)
+--FILE--
+<?php
+$i= DateInterval::createFromDateString('2 days');
+var_dump($i);
+echo $i->format("%d"), "\n";
+echo $i->format("%a"), "\n";
+?>
+--EXPECT--
+object(DateInterval)#1 (8) {
+  ["y"]=>
+  int(0)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(2)
+  ["h"]=>
+  int(0)
+  ["i"]=>
+  int(0)
+  ["s"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  bool(false)
+}
+2
+(unknown)