From f2e7cdb8b7a68315c902e9346f476e72370e30e1 Mon Sep 17 00:00:00 2001
From: Niklas Keller <me@kelunik.com>
Date: Mon, 29 May 2017 07:28:21 +0200
Subject: [PATCH] Fix bug #55407

This reverts commit b148c50f4864684aa9a6c6483cc309a7f2badbb5 and
reintroduces the fix for bug #55407.

With https://wiki.php.net/rfc/parameter-no-type-variance being
implemented now, it's no longer a BC break.
---
 NEWS                         | 3 ++-
 ext/date/php_date.c          | 2 +-
 ext/date/tests/bug55407.phpt | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 37fa8ace27..7c75a2566e 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,8 @@ PHP                                                                        NEWS
   . Fix integer overflows (Joshua Rogers)
 
 - Date:
+  . Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat).
+    (kelunik)
   . Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
   . Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
     (krakjoe)
@@ -71,7 +73,6 @@ PHP                                                                        NEWS
   . Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
     (andrewnester)
 
-
 - Dba:
   . Fixed bug #72885 (flatfile: dba_fetch() fails to read replaced entry).
     (Anatol)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 0e6f0544f7..ac08f361ad 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -167,7 +167,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_INFO(0, object)
+	ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1)
 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
index 925640554a..7180d2f37f 100644
--- a/ext/date/tests/bug55407.phpt
+++ b/ext/date/tests/bug55407.phpt
@@ -2,13 +2,11 @@
 Bug #55407 (Impossible to prototype DateTime::createFromFormat)
 --INI--
 error_reporting=-1
---XFAIL--
-Bug #55407
 --FILE--
 <?php namespace melt\core;
 
 class DateTime extends \DateTime {
-    public static function createFromFormat($format, $time, DateTimeZone $timezone = null) {
+    public static function createFromFormat($format, $time, \DateTimeZone $timezone = null) {
         return new DateTime(parent::createFromFormat($format, $time, $timezone));
     }
 }
-- 
2.40.0