diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-04 17:39:16 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-04 17:39:16 +0100 |
| commit | f51b73c833ef88761780487da610d7e94e68ad47 (patch) | |
| tree | 5257949c1beb918f0bde8346b13b32bd23893590 | |
| parent | b86529f751c277c699f707e2506c0c84f698bc18 (diff) | |
| download | php-git-f51b73c833ef88761780487da610d7e94e68ad47.tar.gz | |
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
This reverts commit 8e19705a93d785cd1ff8ba3a69699b00169fea47.
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/date/tests/bug55407.phpt | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index fb3eaca9f4..58e23c0bb5 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 deleted file mode 100644 index 00c3356461..0000000000 --- a/ext/date/tests/bug55407.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -Bug #55407 (Impossible to prototype DateTime::createFromFormat) ---INI-- -error_reporting=-1 ---FILE-- -<?php namespace melt\core; - -class DateTime extends \DateTime { - public static function createFromFormat($format, $time, DateTimeZone $timezone = null) { - return new DateTime(parent::createFromFormat($format, $time, $timezone)); - } -} - -echo "DONE\n"; -?> ---EXPECTF-- -DONE |