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: | Sun, 25 Aug 2013 06:38:33 +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-73102@lists.php.net to get a copy of this message | ||
Commit: b378b0b081c2c3dd4a7aa25ce4d37bad48db752e
Author: Alexander Moskalev <a.moskalev@corp.badoo.com> Wed, 10 Apr 2013 00:12:39
+0400
Committer: Stanislav Malyshev <stas@php.net> Sat, 24 Aug 2013 23:38:33 -0700
Parents: e22c139fe09db7e74ad027db49d76921fc1a19fd
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b378b0b081c2c3dd4a7aa25ce4d37bad48db752e
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 f091fed..1c97781 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -3568,7 +3568,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..627b8f0
--- /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)