]> granicus.if.org Git - php/commitdiff
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
authorJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:39:16 +0000 (17:39 +0100)
committerJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:39:16 +0000 (17:39 +0100)
This reverts commit 8e19705a93d785cd1ff8ba3a69699b00169fea47.

ext/date/php_date.c
ext/date/tests/bug55407.phpt [deleted file]

index fb3eaca9f4429ecb52b600b8fd996ade3467588c..58e23c0bb5cbdb527d41c0b13c20d80e5001ec0e 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)
diff --git a/ext/date/tests/bug55407.phpt b/ext/date/tests/bug55407.phpt
deleted file mode 100644 (file)
index 00c3356..0000000
+++ /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