Skip to content

Commit 5f11906

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fixed bug #76462 Undefined property: DateInterval::$f
2 parents eb2a3c6 + 7212829 commit 5f11906

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

ext/date/php_date.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4279,6 +4279,7 @@ static zval *date_interval_get_property_ptr_ptr(zval *object, zval *member, int
42794279
zend_binary_strcmp("h", sizeof("h") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0 ||
42804280
zend_binary_strcmp("i", sizeof("i") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0 ||
42814281
zend_binary_strcmp("s", sizeof("s") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0 ||
4282+
zend_binary_strcmp("f", sizeof("f") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0 ||
42824283
zend_binary_strcmp("days", sizeof("days") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0 ||
42834284
zend_binary_strcmp("invert", sizeof("invert") - 1, Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0) {
42844285
/* Fallback to read_property. */

ext/date/tests/bug76462.phpt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
--TEST--
2+
Bug #76462 Undefined property: DateInterval::$f
3+
--FILE--
4+
<?php
5+
$buggy = new DateInterval('P0Y');
6+
$buggy->f += 0.01;
7+
8+
$ok = new DateInterval('P0Y');
9+
$ok->f = $ok->f + 0.01;
10+
11+
var_dump($buggy->f);
12+
var_dump($ok->f);
13+
?>
14+
--EXPECT--
15+
float(0.01)
16+
float(0.01)

0 commit comments

Comments
 (0)