com php-src: Fix DateInterval->days value when object was created not from DateTime::diff(): ext/date/php_date.c ext/date/tests/Date
Interval_days_prop1.phpt
| From: | Stanislav Malyshev | Date: | Tue, 09 Apr 2013 20:12:39 +0000 |
| Subject: | com php-src: Fix DateInterval->days value when object was created not from DateTime::diff(): ext/date/php_date.c ext/date/tests/Date Interval_days_prop1.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73104@lists.php.net to get a copy of this message | ||
Commit: a8dc4f0b18ea2fba0df6a627210beea0c5eda80f
Author: Alexander Moskalev <a.moskalev@corp.badoo.com> Wed, 10 Apr 2013 00:12:39
+0400
Parents: 626effcf1736f7f14e1c01ec52d62a55cf70cd9d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8dc4f0b18ea2fba0df6a627210beea0c5eda80f
Log:
Fix DateInterval->days value
when object was created not from DateTime::diff()
Changed paths:
M ext/date/php_date.c
A ext/date/tests/DateInterval_days_prop1.phpt
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 13e7b75..ce891d9 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -3470,7 +3470,11 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const
ze
ALLOC_INIT_ZVAL(retval);
Z_SET_REFCOUNT_P(retval, 0);
- ZVAL_LONG(retval, value);
+ if (value != -99999) {
+ ZVAL_LONG(retval, value);
+ } else {
+ ZVAL_FALSE(retval);
+ }
if (member == &tmp_member) {
zval_dtor(member);
diff --git a/ext/date/tests/DateInterval_days_prop1.phpt
b/ext/date/tests/DateInterval_days_prop1.phpt
new file mode 100644
index 0000000..3907974
--- /dev/null
+++ b/ext/date/tests/DateInterval_days_prop1.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Wrong var_dump(DateInterval->days) value
+--FILE--
+<?php
+
+$interval = new DateInterval('P2Y4DT6H8M');;
+
+var_dump($interval->days);
+--EXPECT--
+bool(false)