clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source
This commit is contained in:
Derick Rethans 2015-01-20 21:44:25 +00:00
commit 1d09926e33
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/date/php_date.c
View 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_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)

17
ext/date/tests/bug55407.phpt Normal file
View File

@ -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