]> granicus.if.org Git - php/commitdiff
Revert fix for bug #55407
authorAnatol Belski <ab@php.net>
Fri, 12 Jun 2015 15:56:02 +0000 (17:56 +0200)
committerAnatol Belski <ab@php.net>
Fri, 12 Jun 2015 15:56:02 +0000 (17:56 +0200)
See 8e19705a93d785cd1ff8ba3a69699b00169fea47 and discussion on
github. The suggestion is to target a proper solution in in 7.1.

ext/date/php_date.c
ext/date/tests/bug55407.phpt

index ce0e7f45cc7a39515afe12662f76c92b8335d510..be48b13a8cb36c7133882c07cad57101c505cbba 100644 (file)
@@ -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)
index 00c33564618faadebfb85bf70cd576550f90ad1e..925640554a515434b70513040826df2280fadc29 100644 (file)
@@ -2,6 +2,8 @@
 Bug #55407 (Impossible to prototype DateTime::createFromFormat)
 --INI--
 error_reporting=-1
+--XFAIL--
+Bug #55407
 --FILE--
 <?php namespace melt\core;