diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-08-14 14:25:19 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-08-14 14:25:19 +0200 |
| commit | 5e93fe3c57ccea12ab5016dce71aa8025aeeb6e9 (patch) | |
| tree | a76aa67d0a2d4a222ecc7db1455594138bd02f56 | |
| parent | a094f4faedef02f7ed757c56260aa091569c5716 (diff) | |
| parent | 0e51f9798c6cea1b155cb18342a43c54be55a1fd (diff) | |
| download | php-git-5e93fe3c57ccea12ab5016dce71aa8025aeeb6e9.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/date/tests/bug70266.phpt | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index eeaed2b660..ee30071f54 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -381,7 +381,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_date_period_construct, 0, 0, 3) ZEND_ARG_INFO(0, end) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_construct, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_construct, 0, 0, 1) ZEND_ARG_INFO(0, interval_spec) ZEND_END_ARG_INFO() /* }}} */ diff --git a/ext/date/tests/bug70266.phpt b/ext/date/tests/bug70266.phpt new file mode 100644 index 0000000000..5eeebabab8 --- /dev/null +++ b/ext/date/tests/bug70266.phpt @@ -0,0 +1,8 @@ +--TEST-- +Bug #70266 (DateInterval::__construct.interval_spec is not supposed to be optional) +--FILE-- +<?php +var_dump((new ReflectionParameter(['DateInterval', '__construct'], 0))->isOptional()); +?> +--EXPECT-- +bool(false) |