diff options
| author | Anatol Belski <ab@php.net> | 2015-06-12 17:56:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-12 17:56:02 +0200 |
| commit | b148c50f4864684aa9a6c6483cc309a7f2badbb5 (patch) | |
| tree | c5d52b37a20de8718384cb462d265425db9d58bb /ext/date | |
| parent | 7c2a0157c7c71a55dce2d4dade854a4d6ccb03e9 (diff) | |
| download | php-git-b148c50f4864684aa9a6c6483cc309a7f2badbb5.tar.gz | |
Revert fix for bug #55407
See 8e19705a93d785cd1ff8ba3a69699b00169fea47 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/date/tests/bug55407.phpt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ce0e7f45cc..be48b13a8c 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -163,7 +163,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, time) - ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1) + ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse, 0, 0, 1) diff --git a/ext/date/tests/bug55407.phpt b/ext/date/tests/bug55407.phpt index 00c3356461..925640554a 100644 --- a/ext/date/tests/bug55407.phpt +++ b/ext/date/tests/bug55407.phpt @@ -2,6 +2,8 @@ Bug #55407 (Impossible to prototype DateTime::createFromFormat) --INI-- error_reporting=-1 +--XFAIL-- +Bug #55407 --FILE-- <?php namespace melt\core; |