Skip to content

Commit

Permalink
Revert fix for bug #55407
Browse files Browse the repository at this point in the history
See 8e19705 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
  • Loading branch information
weltling committed Jun 12, 2015
1 parent 7c2a015 commit b148c50
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ext/date/php_date.c
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions ext/date/tests/bug55407.phpt
Expand Up @@ -2,6 +2,8 @@
Bug #55407 (Impossible to prototype DateTime::createFromFormat)
--INI--
error_reporting=-1
--XFAIL--
Bug #55407
--FILE--
<?php namespace melt\core;

Expand Down

0 comments on commit b148c50

Please sign in to comment.