Merge branch 'PHP-5.6'

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_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)

ext/date/tests/bug55407.phpt

@@ -0,0 +1,17 @@
+--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