com php-src: Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)": ext/date/php_date.c ext/dat e/tests/bug55407.phpt
| From: | JulienPauli | Date: | Thu, 05 Feb 2015 09:01:26 +0000 |
| Subject: | com php-src: Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)": ext/date/php_date.c ext/dat e/tests/bug55407.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84667@lists.php.net to get a copy of this message | ||
Commit: f457487e163502480f74a70bf9272fd003fc1919
Author: Julien Pauli <jpauli@php.net> Thu, 5 Feb 2015 10:01:26 +0100
Parents: 75357354147710ae8e27e5f6da7a6e2834b4f73f
Branches: PHP-5.6.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f457487e163502480f74a70bf9272fd003fc1919
Log:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
This reverts commit 8e19705a93d785cd1ff8ba3a69699b00169fea47.
Bugs:
https://bugs.php.net/55407
Changed paths:
M ext/date/php_date.c
D ext/date/tests/bug55407..phpt
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 8a7aeae..f8571b9 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 00c3356..0000000
--- 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