diff options
Diffstat (limited to 'ext/date')
138 files changed, 2626 insertions, 3075 deletions
diff --git a/ext/date/config.w32 b/ext/date/config.w32 index 5f5f08781d..ff5c4fff1c 100755 --- a/ext/date/config.w32 +++ b/ext/date/config.w32 @@ -1,7 +1,7 @@ // $Id$ // vim:ft=javascript -EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DHAVE_TIMELIB_CONFIG_H=1"); +EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 /DHAVE_TIMELIB_CONFIG_H=1"); ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date"); AC_DEFINE('HAVE_DATE', 1, 'Have date/time support'); @@ -10,8 +10,13 @@ ADD_FLAG('CFLAGS_DATE', "/wd4244"); var tl_config = FSO.CreateTextFile("ext/date/lib/timelib_config.h", true); tl_config.WriteLine("#include \"config.w32.h\""); tl_config.WriteLine("#include <php_stdint.h>"); -tl_config.WriteLine("#include \"win32/php_inttypes.h\""); tl_config.WriteLine("#define TIMELIB_OMIT_STDINT 1"); +tl_config.WriteLine("#include \"zend.h\""); +tl_config.WriteLine("#define timelib_malloc emalloc"); +tl_config.WriteLine("#define timelib_realloc erealloc"); +tl_config.WriteLine("#define timelib_calloc ecalloc"); +tl_config.WriteLine("#define timelib_strdup estrdup"); +tl_config.WriteLine("#define timelib_free efree"); tl_config.Close(); PHP_INSTALL_HEADERS("ext/date/", "php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h"); diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 index b83f9bc0d4..ca895379f2 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -4,7 +4,7 @@ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) sinclude(lib/timelib.m4) -PHP_DATE_CFLAGS="-I@ext_builddir@/lib -D HAVE_TIMELIB_CONFIG_H=1" +PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" @@ -25,4 +25,12 @@ cat > $ext_builddir/lib/timelib_config.h <<EOF #endif #include <php_stdint.h> #define TIMELIB_OMIT_STDINT 1 + +#include "zend.h" + +#define timelib_malloc emalloc +#define timelib_realloc erealloc +#define timelib_calloc ecalloc +#define timelib_strdup estrdup +#define timelib_free efree EOF diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 80403d02c3..059b04cfcd 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -829,38 +829,38 @@ std: YYCTYPE yych; unsigned int yyaccept = 0; static const unsigned char yybm[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 100, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 128, 64, 160, 96, 0, - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 0, 0, 0, 0, 0, 0, - 0, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 0, 0, 0, 0, 0, - 0, 24, 24, 24, 88, 24, 24, 24, - 88, 24, 24, 24, 24, 24, 88, 24, - 24, 24, 88, 88, 88, 24, 24, 24, - 24, 24, 24, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 100, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 128, 64, 160, 96, 0, + 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 0, 0, 0, 0, 0, 0, + 0, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 0, 0, 0, 0, 0, + 0, 24, 24, 24, 88, 24, 24, 24, + 88, 24, 24, 24, 24, 24, 88, 24, + 24, 24, 88, 88, 88, 24, 24, 24, + 24, 24, 24, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, }; YYDEBUG(0, *YYCURSOR); diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c index 7d1de0dde9..237201623b 100644 --- a/ext/date/lib/parse_iso_intervals.c +++ b/ext/date/lib/parse_iso_intervals.c @@ -263,38 +263,38 @@ std: YYCTYPE yych; unsigned int yyaccept = 0; static const unsigned char yybm[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, }; if ((YYLIMIT - YYCURSOR) < 20) YYFILL(20); diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 5ce1f7262c..ec1cabc34d 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ @@ -85,7 +85,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0) ZEND_ARG_INFO(0, mon) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) - ZEND_ARG_INFO(0, is_dst) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) @@ -95,7 +94,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) ZEND_ARG_INFO(0, mon) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) - ZEND_ARG_INFO(0, is_dst) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_checkdate, 0) @@ -327,8 +325,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_name_from_abbr, 0, 0, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_offset_get, 0, 0, 2) - ZEND_ARG_INFO(0, object) - ZEND_ARG_INFO(0, datetime) + ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 0) + ZEND_ARG_OBJ_INFO(0, datetime, DateTimeInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_method_offset_get, 0, 0, 1) @@ -541,8 +539,8 @@ const zend_function_entry date_funcs_period[] = { PHP_FE_END }; -static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC); -static void date_register_classes(TSRMLS_D); +static char* guess_timezone(const timelib_tzdb *tzdb); +static void date_register_classes(void); /* }}} */ ZEND_DECLARE_MODULE_GLOBALS(date) @@ -610,47 +608,47 @@ static zend_object_handlers date_object_handlers_period; return; \ } \ } else { \ - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, date_ce_date) == FAILURE) { \ + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), NULL, "O", &object, date_ce_date) == FAILURE) { \ RETURN_FALSE; \ } \ } \ - obj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); \ + obj = Z_PHPDATE_P(object); \ #define DATE_CHECK_INITIALIZED(member, class_name) \ if (!(member)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The " #class_name " object has not been correctly initialized by its constructor"); \ + php_error_docref(NULL, E_WARNING, "The " #class_name " object has not been correctly initialized by its constructor"); \ RETURN_FALSE; \ } -static void date_object_free_storage_date(void *object TSRMLS_DC); -static void date_object_free_storage_timezone(void *object TSRMLS_DC); -static void date_object_free_storage_interval(void *object TSRMLS_DC); -static void date_object_free_storage_period(void *object TSRMLS_DC); - -static zend_object_value date_object_new_date(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_interval(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_period(zend_class_entry *class_type TSRMLS_DC); - -static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC); - -static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC); -static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_DC); -static HashTable *date_object_get_properties(zval *object TSRMLS_DC); -static HashTable *date_object_get_gc_interval(zval *object, zval ***table, int *n TSRMLS_DC); -static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC); -static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC); -static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC); -static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC); -static HashTable *date_object_get_gc_timezone(zval *object, zval ***table, int *n TSRMLS_DC); - -zval *date_interval_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC); -void date_interval_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC); -static zval *date_period_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC); -static void date_period_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC); +static void date_object_free_storage_date(zend_object *object); +static void date_object_free_storage_timezone(zend_object *object); +static void date_object_free_storage_interval(zend_object *object); +static void date_object_free_storage_period(zend_object *object); + +static zend_object *date_object_new_date(zend_class_entry *class_type); +static zend_object *date_object_new_timezone(zend_class_entry *class_type); +static zend_object *date_object_new_interval(zend_class_entry *class_type); +static zend_object *date_object_new_period(zend_class_entry *class_type); + +static zend_object *date_object_clone_date(zval *this_ptr); +static zend_object *date_object_clone_timezone(zval *this_ptr); +static zend_object *date_object_clone_interval(zval *this_ptr); +static zend_object *date_object_clone_period(zval *this_ptr); + +static int date_object_compare_date(zval *d1, zval *d2); +static HashTable *date_object_get_gc(zval *object, zval **table, int *n); +static HashTable *date_object_get_properties(zval *object); +static HashTable *date_object_get_gc_interval(zval *object, zval **table, int *n); +static HashTable *date_object_get_properties_interval(zval *object); +static HashTable *date_object_get_gc_period(zval *object, zval **table, int *n); +static HashTable *date_object_get_properties_period(zval *object); +static HashTable *date_object_get_properties_timezone(zval *object); +static HashTable *date_object_get_gc_timezone(zval *object, zval **table, int *n); + +zval *date_interval_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv); +void date_interval_write_property(zval *object, zval *member, zval *value, void **cache_slot); +static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv); +static void date_period_write_property(zval *object, zval *member, zval *value, void **cache_slot); /* {{{ Module struct */ zend_module_entry date_module_entry = { @@ -664,7 +662,7 @@ zend_module_entry date_module_entry = { PHP_RINIT(date), /* request startup */ PHP_RSHUTDOWN(date), /* request shutdown */ PHP_MINFO(date), /* extension info */ - PHP_VERSION, /* extension version */ + PHP_DATE_VERSION, /* extension version */ PHP_MODULE_GLOBALS(date), /* globals descriptor */ PHP_GINIT(date), /* globals ctor */ NULL, /* globals dtor */ @@ -685,12 +683,12 @@ static PHP_GINIT_FUNCTION(date) /* }}} */ -static void _php_date_tzinfo_dtor(void *tzinfo) +static void _php_date_tzinfo_dtor(zval *zv) /* {{{ */ { - timelib_tzinfo **tzi = (timelib_tzinfo **)tzinfo; + timelib_tzinfo *tzi = (timelib_tzinfo*)Z_PTR_P(zv); - timelib_tzinfo_dtor(*tzi); -} + timelib_tzinfo_dtor(tzi); +} /* }}} */ /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(date) @@ -812,6 +810,16 @@ PHP_RSHUTDOWN_FUNCTION(date) #define DATE_FORMAT_ISO8601 "Y-m-d\\TH:i:sO" /* + * RFC3339, Appendix A: http://www.ietf.org/rfc/rfc3339.txt + * ISO 8601 also requires (in section 5.3.1.3) that a decimal fraction + * be proceeded by a "0" if less than unity. Annex B.2 of ISO 8601 + * gives examples where the decimal fractions are not preceded by a "0". + * This grammar assumes section 5.3.1.3 is correct and that Annex B.2 is + * in error. + */ +#define DATE_FORMAT_RFC3339_EXTENDED "Y-m-d\\TH:i:s.vP" + +/* * This comes from various sources that like to contradict. I'm going with the * format here because of: * http://msdn.microsoft.com/en-us/library/windows/desktop/aa384321%28v=vs.85%29.aspx @@ -819,13 +827,6 @@ PHP_RSHUTDOWN_FUNCTION(date) */ #define DATE_FORMAT_COOKIE "l, d-M-Y H:i:s T" -#define DATE_TZ_ERRMSG \ - "It is not safe to rely on the system's timezone settings. You are " \ - "*required* to use the date.timezone setting or the " \ - "date_default_timezone_set() function. In case you used any of those " \ - "methods and you are still getting this warning, you most likely " \ - "misspelled the timezone identifier. " - #define SUNFUNCS_RET_TIMESTAMP 0 #define SUNFUNCS_RET_STRING 1 #define SUNFUNCS_RET_DOUBLE 2 @@ -834,7 +835,7 @@ PHP_RSHUTDOWN_FUNCTION(date) PHP_MINIT_FUNCTION(date) { REGISTER_INI_ENTRIES(); - date_register_classes(TSRMLS_C); + date_register_classes(); /* * RFC4287, Section 3.3: http://www.ietf.org/rfc/rfc4287.txt * A Date construct is an element whose content MUST conform to the @@ -851,12 +852,15 @@ PHP_MINIT_FUNCTION(date) */ REGISTER_STRING_CONSTANT("DATE_COOKIE", DATE_FORMAT_COOKIE, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_ISO8601", DATE_FORMAT_ISO8601, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("DATE_RFC822", DATE_FORMAT_RFC822, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_RFC850", DATE_FORMAT_RFC850, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_RFC1036", DATE_FORMAT_RFC1036, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_RFC1123", DATE_FORMAT_RFC1123, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_RFC2822", DATE_FORMAT_RFC2822, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("DATE_RFC3339", DATE_FORMAT_RFC3339, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("DATE_RFC3339", DATE_FORMAT_RFC3339, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("DATE_RFC3339_EXTENDED", DATE_FORMAT_RFC3339_EXTENDED, CONST_CS | CONST_PERSISTENT); + /* * RSS 2.0 Specification: http://blogs.law.harvard.edu/tech/rss * "All date-times in RSS conform to the Date and Time Specification of RFC 822, @@ -902,7 +906,7 @@ PHP_MINFO_FUNCTION(date) php_info_print_table_row(2, "date/time support", "enabled"); php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version); php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal"); - php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb TSRMLS_CC)); + php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb)); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -910,30 +914,29 @@ PHP_MINFO_FUNCTION(date) /* }}} */ /* {{{ Timezone Cache functions */ -static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, const timelib_tzdb *tzdb TSRMLS_DC) +static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, const timelib_tzdb *tzdb) { - timelib_tzinfo *tzi, **ptzi; + timelib_tzinfo *tzi; if(!DATEG(tzcache)) { ALLOC_HASHTABLE(DATEG(tzcache)); zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0); } - if (zend_hash_find(DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void **) &ptzi) == SUCCESS) { - return *ptzi; + if ((tzi = zend_hash_str_find_ptr(DATEG(tzcache), formal_tzname, strlen(formal_tzname))) != NULL) { + return tzi; } tzi = timelib_parse_tzfile(formal_tzname, tzdb); if (tzi) { - zend_hash_add(DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL); + zend_hash_str_add_ptr(DATEG(tzcache), formal_tzname, strlen(formal_tzname), tzi); } return tzi; } timelib_tzinfo *php_date_parse_tzfile_wrapper(char *formal_tzname, const timelib_tzdb *tzdb) { - TSRMLS_FETCH(); - return php_date_parse_tzfile(formal_tzname, tzdb TSRMLS_CC); + return php_date_parse_tzfile(formal_tzname, tzdb); } /* }}} */ @@ -941,14 +944,16 @@ timelib_tzinfo *php_date_parse_tzfile_wrapper(char *formal_tzname, const timelib /* {{{ static PHP_INI_MH(OnUpdate_date_timezone) */ static PHP_INI_MH(OnUpdate_date_timezone) { - if (OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC) == FAILURE) { + if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) { return FAILURE; } DATEG(timezone_valid) = 0; if (stage == PHP_INI_STAGE_RUNTIME) { if (!timelib_timezone_id_is_valid(DATEG(default_timezone), DATE_TIMEZONEDB)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG); + if (DATEG(default_timezone) && *DATEG(default_timezone)) { + php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone)); + } } else { DATEG(timezone_valid) = 1; } @@ -959,7 +964,7 @@ static PHP_INI_MH(OnUpdate_date_timezone) /* }}} */ /* {{{ Helper functions */ -static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC) +static char* guess_timezone(const timelib_tzdb *tzdb) { /* Checking configure timezone */ if (DATEG(timezone) && (strlen(DATEG(timezone))) > 0) { @@ -968,11 +973,11 @@ static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC) /* Check config setting for default timezone */ if (!DATEG(default_timezone)) { /* Special case: ext/date wasn't initialized yet */ - zval ztz; + zval *ztz; - if (SUCCESS == zend_get_configuration_directive("date.timezone", sizeof("date.timezone"), &ztz) - && Z_TYPE(ztz) == IS_STRING && Z_STRLEN(ztz) > 0 && timelib_timezone_id_is_valid(Z_STRVAL(ztz), tzdb)) { - return Z_STRVAL(ztz); + if (NULL != (ztz = cfg_get_entry("date.timezone", sizeof("date.timezone"))) + && Z_TYPE_P(ztz) == IS_STRING && Z_STRLEN_P(ztz) > 0 && timelib_timezone_id_is_valid(Z_STRVAL_P(ztz), tzdb)) { + return Z_STRVAL_P(ztz); } } else if (*DATEG(default_timezone)) { if (DATEG(timezone_valid) == 1) { @@ -980,7 +985,7 @@ static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC) } if (!timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone)); + php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone)); return "UTC"; } @@ -988,19 +993,18 @@ static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC) return DATEG(default_timezone); } /* Fallback to UTC */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone."); return "UTC"; } -PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D) +PHPAPI timelib_tzinfo *get_timezone_info(void) { char *tz; timelib_tzinfo *tzi; - tz = guess_timezone(DATE_TIMEZONEDB TSRMLS_CC); - tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB TSRMLS_CC); + tz = guess_timezone(DATE_TIMEZONEDB); + tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB); if (! tzi) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone database is corrupt - this should *never* happen!"); + php_error_docref(NULL, E_ERROR, "Timezone database is corrupt - this should *never* happen!"); } return tzi; } @@ -1008,7 +1012,7 @@ PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D) /* {{{ date() and gmdate() data */ -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str.h" static char *mon_full_names[] = { "January", "February", "March", "April", @@ -1064,7 +1068,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib_sll d) /* }}} */ /* {{{ date_format - (gm)date helper */ -static char *date_format(char *format, int format_len, timelib_time *t, int localtime) +static zend_string *date_format(char *format, size_t format_len, timelib_time *t, int localtime) { smart_str string = {0}; int i, length = 0; @@ -1075,7 +1079,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca int weekYearSet = 0; if (!format_len) { - return estrdup(""); + return ZSTR_EMPTY_ALLOC(); } if (localtime) { @@ -1084,13 +1088,13 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca offset->offset = (t->z - (t->dst * 60)) * -60; offset->leap_secs = 0; offset->is_dst = t->dst; - offset->abbr = strdup(t->tz_abbr); + offset->abbr = timelib_strdup(t->tz_abbr); } else if (t->zone_type == TIMELIB_ZONETYPE_OFFSET) { offset = timelib_time_offset_ctor(); offset->offset = (t->z) * -60; offset->leap_secs = 0; offset->is_dst = 0; - offset->abbr = malloc(9); /* GMT�xxxx\0 */ + offset->abbr = timelib_malloc(9); /* GMT±xxxx\0 */ snprintf(offset->abbr, 9, "GMT%c%02d%02d", localtime ? ((offset->offset < 0) ? '-' : '+') : '+', localtime ? abs(offset->offset / 3600) : 0, @@ -1152,6 +1156,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca case 'i': length = slprintf(buffer, 32, "%02d", (int) t->i); break; case 's': length = slprintf(buffer, 32, "%02d", (int) t->s); break; case 'u': length = slprintf(buffer, 32, "%06d", (int) floor(t->f * 1000000 + 0.5)); break; + case 'v': length = slprintf(buffer, 32, "%03d", (int) floor(t->f * 1000 + 0.5)); break; /* timezone */ case 'I': length = slprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break; @@ -1219,39 +1224,36 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca timelib_time_offset_dtor(offset); } - return string.c; + return string.s; } static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime) { char *format; - int format_len; - long ts; - char *string; + size_t format_len; + zend_long ts; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &format, &format_len, &ts) == FAILURE) { RETURN_FALSE; } if (ZEND_NUM_ARGS() == 1) { ts = time(NULL); } - string = php_format_date(format, format_len, ts, localtime TSRMLS_CC); - - RETVAL_STRING(string, 0); + RETURN_STR(php_format_date(format, format_len, ts, localtime)); } /* }}} */ -PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localtime TSRMLS_DC) /* {{{ */ +PHPAPI zend_string *php_format_date(char *format, size_t format_len, time_t ts, int localtime) /* {{{ */ { timelib_time *t; timelib_tzinfo *tzi; - char *string; + zend_string *string; t = timelib_time_ctor(); if (localtime) { - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); t->tz_info = tzi; t->zone_type = TIMELIB_ZONETYPE_ID; timelib_unixtime2local(t, ts); @@ -1269,7 +1271,7 @@ PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localt /* {{{ php_idate */ -PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC) +PHPAPI int php_idate(char format, time_t ts, int localtime) { timelib_time *t; timelib_tzinfo *tzi; @@ -1280,7 +1282,7 @@ PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC) t = timelib_time_ctor(); if (!localtime) { - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); t->tz_info = tzi; t->zone_type = TIMELIB_ZONETYPE_ID; timelib_unixtime2local(t, ts); @@ -1295,13 +1297,13 @@ PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC) offset->offset = (t->z - (t->dst * 60)) * -60; offset->leap_secs = 0; offset->is_dst = t->dst; - offset->abbr = strdup(t->tz_abbr); + offset->abbr = timelib_strdup(t->tz_abbr); } else if (t->zone_type == TIMELIB_ZONETYPE_OFFSET) { offset = timelib_time_offset_ctor(); offset->offset = (t->z - (t->dst * 60)) * -60; offset->leap_secs = 0; offset->is_dst = t->dst; - offset->abbr = malloc(9); /* GMT�xxxx\0 */ + offset->abbr = timelib_malloc(9); /* GMT±xxxx\0 */ snprintf(offset->abbr, 9, "GMT%c%02d%02d", !localtime ? ((offset->offset < 0) ? '-' : '+') : '+', !localtime ? abs(offset->offset / 3600) : 0, @@ -1384,16 +1386,16 @@ PHP_FUNCTION(gmdate) PHP_FUNCTION(idate) { char *format; - int format_len; - long ts = 0; + size_t format_len; + zend_long ts = 0; int ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &format, &format_len, &ts) == FAILURE) { RETURN_FALSE; } if (format_len != 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "idate format is one char"); + php_error_docref(NULL, E_WARNING, "idate format is one char"); RETURN_FALSE; } @@ -1401,9 +1403,9 @@ PHP_FUNCTION(idate) ts = time(NULL); } - ret = php_idate(format[0], ts, 0 TSRMLS_CC); + ret = php_idate(format[0], ts, 0); if (ret == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token."); + php_error_docref(NULL, E_WARNING, "Unrecognized date format token."); RETURN_FALSE; } RETURN_LONG(ret); @@ -1423,12 +1425,12 @@ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb) /* }}} */ /* {{{ php_parse_date: Backwards compatibility function */ -PHPAPI signed long php_parse_date(char *string, signed long *now) +PHPAPI zend_long php_parse_date(char *string, zend_long *now) { timelib_time *parsed_time; timelib_error_container *error = NULL; int error2; - signed long retval; + zend_long retval; parsed_time = timelib_strtotime(string, strlen(string), &error, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); if (error->error_count) { @@ -1451,43 +1453,25 @@ PHPAPI signed long php_parse_date(char *string, signed long *now) Convert string representation of date and time to a timestamp */ PHP_FUNCTION(strtotime) { - char *times, *initial_ts; - int time_len, error1, error2; + char *times; + size_t time_len; + int error1, error2; struct timelib_error_container *error; - long preset_ts = 0, ts; - + zend_long preset_ts = 0, ts; timelib_time *t, *now; timelib_tzinfo *tzi; - tzi = get_timezone_info(TSRMLS_C); - - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "sl", ×, &time_len, &preset_ts) != FAILURE) { - /* We have an initial timestamp */ - now = timelib_time_ctor(); - - initial_ts = emalloc(25); - snprintf(initial_ts, 24, "@%ld UTC", preset_ts); - t = timelib_strtotime(initial_ts, strlen(initial_ts), NULL, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); /* we ignore the error here, as this should never fail */ - timelib_update_ts(t, tzi); - now->tz_info = tzi; - now->zone_type = TIMELIB_ZONETYPE_ID; - timelib_unixtime2local(now, t->sse); - timelib_time_dtor(t); - efree(initial_ts); - } else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", ×, &time_len, &preset_ts) != FAILURE) { - /* We have no initial timestamp */ - now = timelib_time_ctor(); - now->tz_info = tzi; - now->zone_type = TIMELIB_ZONETYPE_ID; - timelib_unixtime2local(now, (timelib_sll) time(NULL)); - } else { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", ×, &time_len, &preset_ts) == FAILURE || !time_len) { RETURN_FALSE; } - if (!time_len) { - timelib_time_dtor(now); - RETURN_FALSE; - } + tzi = get_timezone_info(); + + now = timelib_time_ctor(); + now->tz_info = tzi; + now->zone_type = TIMELIB_ZONETYPE_ID; + timelib_unixtime2local(now, + (ZEND_NUM_ARGS() == 2) ? (timelib_sll) preset_ts : (timelib_sll) time(NULL)); t = timelib_strtotime(times, time_len, &error, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); error1 = error->error_count; @@ -1510,13 +1494,13 @@ PHP_FUNCTION(strtotime) /* {{{ php_mktime - (gm)mktime helper */ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) { - long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0, dst = -1; + zend_long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0; timelib_time *now; timelib_tzinfo *tzi = NULL; - long ts, adjust_seconds = 0; + zend_long ts, adjust_seconds = 0; int error; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lllllll", &hou, &min, &sec, &mon, &day, &yea, &dst) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|llllll", &hou, &min, &sec, &mon, &day, &yea) == FAILURE) { RETURN_FALSE; } /* Initialize structure with current time */ @@ -1524,7 +1508,7 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) if (gmt) { timelib_unixtime2gmt(now, (timelib_sll) time(NULL)); } else { - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); now->tz_info = tzi; now->zone_type = TIMELIB_ZONETYPE_ID; timelib_unixtime2local(now, (timelib_sll) time(NULL)); @@ -1557,7 +1541,7 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) now->h = hou; break; default: - php_error_docref(NULL TSRMLS_CC, E_STRICT, "You should be using the time() function instead"); + php_error_docref(NULL, E_DEPRECATED, "You should be using the time() function instead"); } /* Update the timestamp */ if (gmt) { @@ -1565,27 +1549,7 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) } else { timelib_update_ts(now, tzi); } - /* Support for the deprecated is_dst parameter */ - if (dst != -1) { - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The is_dst parameter is deprecated"); - if (gmt) { - /* GMT never uses DST */ - if (dst == 1) { - adjust_seconds = -3600; - } - } else { - /* Figure out is_dst for current TS */ - timelib_time_offset *tmp_offset; - tmp_offset = timelib_get_time_zone_info(now->sse, tzi); - if (dst == 1 && tmp_offset->is_dst == 0) { - adjust_seconds = -3600; - } - if (dst == 0 && tmp_offset->is_dst == 1) { - adjust_seconds = +3600; - } - timelib_time_offset_dtor(tmp_offset); - } - } + /* Clean up and return */ ts = timelib_date_to_int(now, &error); ts += adjust_seconds; @@ -1619,9 +1583,9 @@ PHP_FUNCTION(gmmktime) Returns true(1) if it is a valid date in gregorian calendar */ PHP_FUNCTION(checkdate) { - long m, d, y; + zend_long m, d, y; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll", &m, &d, &y) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "lll", &m, &d, &y) == FAILURE) { RETURN_FALSE; } @@ -1636,19 +1600,20 @@ PHP_FUNCTION(checkdate) /* {{{ php_strftime - (gm)strftime helper */ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) { - char *format, *buf; - int format_len; - long timestamp = 0; + char *format; + size_t format_len; + zend_long timestamp = 0; struct tm ta; int max_reallocs = 5; size_t buf_len = 256, real_len; timelib_time *ts; timelib_tzinfo *tzi; timelib_time_offset *offset = NULL; + zend_string *buf; - timestamp = (long) time(NULL); + timestamp = (zend_long) time(NULL); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, ×tamp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &format, &format_len, ×tamp) == FAILURE) { RETURN_FALSE; } @@ -1661,7 +1626,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) tzi = NULL; timelib_unixtime2gmt(ts, (timelib_sll) timestamp); } else { - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); ts->tz_info = tzi; ts->zone_type = TIMELIB_ZONETYPE_ID; timelib_unixtime2local(ts, (timelib_sll) timestamp); @@ -1697,19 +1662,19 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) /* VS2012 crt has a bug where strftime crash with %z and %Z format when the initial buffer is too small. See http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code */ - buf = (char *) emalloc(buf_len); - while ((real_len=strftime(buf, buf_len, format, &ta))==buf_len || real_len==0) { + buf = zend_string_alloc(buf_len, 0); + while ((real_len = strftime(ZSTR_VAL(buf), buf_len, format, &ta)) == buf_len || real_len == 0) { buf_len *= 2; - buf = (char *) erealloc(buf, buf_len); + buf = zend_string_extend(buf, buf_len, 0); if (!--max_reallocs) { break; } } -#if defined(PHP_WIN32) && _MSC_VER >= 1700 +#ifdef PHP_WIN32 /* VS2012 strftime() returns number of characters, not bytes. See VC++11 bug id 766205. */ if (real_len > 0) { - real_len = strlen(buf); + real_len = strlen(buf->val); } #endif @@ -1719,10 +1684,10 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) } if (real_len && real_len != buf_len) { - buf = (char *) erealloc(buf, real_len + 1); - RETURN_STRINGL(buf, real_len, 0); + buf = zend_string_truncate(buf, real_len, 0); + RETURN_NEW_STR(buf); } - efree(buf); + zend_string_free(buf); RETURN_FALSE; } /* }}} */ @@ -1748,7 +1713,7 @@ PHP_FUNCTION(gmstrftime) Return current UNIX timestamp */ PHP_FUNCTION(time) { - RETURN_LONG((long)time(NULL)); + RETURN_LONG((zend_long)time(NULL)); } /* }}} */ @@ -1756,16 +1721,16 @@ PHP_FUNCTION(time) Returns the results of the C system call localtime as an associative array if the associative_array argument is set to 1 other wise it is a regular array */ PHP_FUNCTION(localtime) { - long timestamp = (long)time(NULL); + zend_long timestamp = (zend_long)time(NULL); zend_bool associative = 0; timelib_tzinfo *tzi; timelib_time *ts; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lb", ×tamp, &associative) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lb", ×tamp, &associative) == FAILURE) { RETURN_FALSE; } - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); ts = timelib_time_ctor(); ts->tz_info = tzi; ts->zone_type = TIMELIB_ZONETYPE_ID; @@ -1803,15 +1768,15 @@ PHP_FUNCTION(localtime) Get date/time information */ PHP_FUNCTION(getdate) { - long timestamp = (long)time(NULL); + zend_long timestamp = (zend_long)time(NULL); timelib_tzinfo *tzi; timelib_time *ts; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", ×tamp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", ×tamp) == FAILURE) { RETURN_FALSE; } - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); ts = timelib_time_ctor(); ts->tz_info = tzi; ts->zone_type = TIMELIB_ZONETYPE_ID; @@ -1827,8 +1792,8 @@ PHP_FUNCTION(getdate) add_assoc_long(return_value, "mon", ts->m); add_assoc_long(return_value, "year", ts->y); add_assoc_long(return_value, "yday", timelib_day_of_year(ts->y, ts->m, ts->d)); - add_assoc_string(return_value, "weekday", php_date_full_day_name(ts->y, ts->m, ts->d), 1); - add_assoc_string(return_value, "month", mon_full_names[ts->m - 1], 1); + add_assoc_string(return_value, "weekday", php_date_full_day_name(ts->y, ts->m, ts->d)); + add_assoc_string(return_value, "month", mon_full_names[ts->m - 1]); add_index_long(return_value, 0, timestamp); timelib_time_dtor(ts); @@ -1856,44 +1821,39 @@ PHP_FUNCTION(getdate) /* define an overloaded iterator structure */ typedef struct { zend_object_iterator intern; - zval *date_period_zval; - zval *current; + zval current; php_period_obj *object; int current_index; } date_period_it; /* {{{ date_period_it_invalidate_current */ -static void date_period_it_invalidate_current(zend_object_iterator *iter TSRMLS_DC) +static void date_period_it_invalidate_current(zend_object_iterator *iter) { date_period_it *iterator = (date_period_it *)iter; - if (iterator->current) { + if (Z_TYPE(iterator->current) != IS_UNDEF) { zval_ptr_dtor(&iterator->current); - iterator->current = NULL; + ZVAL_UNDEF(&iterator->current); } } /* }}} */ - /* {{{ date_period_it_dtor */ -static void date_period_it_dtor(zend_object_iterator *iter TSRMLS_DC) +static void date_period_it_dtor(zend_object_iterator *iter) { date_period_it *iterator = (date_period_it *)iter; - date_period_it_invalidate_current(iter TSRMLS_CC); + date_period_it_invalidate_current(iter); - zval_ptr_dtor(&iterator->date_period_zval); - - efree(iterator); + zval_ptr_dtor(&iterator->intern.data); } /* }}} */ - /* {{{ date_period_it_has_more */ -static int date_period_it_has_more(zend_object_iterator *iter TSRMLS_DC) +static int date_period_it_has_more(zend_object_iterator *iter) { date_period_it *iterator = (date_period_it *)iter; - php_period_obj *object = iterator->object; + php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data); timelib_time *it_time = object->current; /* apply modification if it's not the first iteration */ @@ -1913,68 +1873,62 @@ static int date_period_it_has_more(zend_object_iterator *iter TSRMLS_DC) } /* }}} */ - /* {{{ date_period_it_current_data */ -static void date_period_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) +static zval *date_period_it_current_data(zend_object_iterator *iter) { date_period_it *iterator = (date_period_it *)iter; - php_period_obj *object = iterator->object; + php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data); timelib_time *it_time = object->current; php_date_obj *newdateobj; /* Create new object */ - MAKE_STD_ZVAL(iterator->current); - php_date_instantiate(object->start_ce, iterator->current TSRMLS_CC); - newdateobj = (php_date_obj *) zend_object_store_get_object(iterator->current TSRMLS_CC); + php_date_instantiate(object->start_ce, &iterator->current); + newdateobj = Z_PHPDATE_P(&iterator->current); newdateobj->time = timelib_time_ctor(); *newdateobj->time = *it_time; if (it_time->tz_abbr) { - newdateobj->time->tz_abbr = strdup(it_time->tz_abbr); + newdateobj->time->tz_abbr = timelib_strdup(it_time->tz_abbr); } if (it_time->tz_info) { newdateobj->time->tz_info = it_time->tz_info; } - *data = &iterator->current; + return &iterator->current; } /* }}} */ - /* {{{ date_period_it_current_key */ -static void date_period_it_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) +static void date_period_it_current_key(zend_object_iterator *iter, zval *key) { date_period_it *iterator = (date_period_it *)iter; ZVAL_LONG(key, iterator->current_index); } /* }}} */ - /* {{{ date_period_it_move_forward */ -static void date_period_it_move_forward(zend_object_iterator *iter TSRMLS_DC) +static void date_period_it_move_forward(zend_object_iterator *iter) { date_period_it *iterator = (date_period_it *)iter; iterator->current_index++; - date_period_it_invalidate_current(iter TSRMLS_CC); + date_period_it_invalidate_current(iter); } /* }}} */ - /* {{{ date_period_it_rewind */ -static void date_period_it_rewind(zend_object_iterator *iter TSRMLS_DC) +static void date_period_it_rewind(zend_object_iterator *iter) { - date_period_it *iterator = (date_period_it *)iter; + date_period_it *iterator = (date_period_it *)iter; iterator->current_index = 0; if (iterator->object->current) { timelib_time_dtor(iterator->object->current); } iterator->object->current = timelib_time_clone(iterator->object->start); - date_period_it_invalidate_current(iter TSRMLS_CC); + date_period_it_invalidate_current(iter); } /* }}} */ - /* iterator handler table */ zend_object_iterator_funcs date_period_it_funcs = { date_period_it_dtor, @@ -1986,91 +1940,93 @@ zend_object_iterator_funcs date_period_it_funcs = { date_period_it_invalidate_current }; - - -zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) +zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval *object, int by_ref) /* {{{ */ { - date_period_it *iterator = emalloc(sizeof(date_period_it)); - php_period_obj *dpobj = (php_period_obj *)zend_object_store_get_object(object TSRMLS_CC); + date_period_it *iterator = emalloc(sizeof(date_period_it)); if (by_ref) { zend_error(E_ERROR, "An iterator cannot be used with foreach by reference"); } - Z_ADDREF_P(object); - iterator->intern.data = (void*) dpobj; + zend_iterator_init((zend_object_iterator*)iterator); + + ZVAL_COPY(&iterator->intern.data, object); iterator->intern.funcs = &date_period_it_funcs; - iterator->date_period_zval = object; - iterator->object = dpobj; - iterator->current = NULL; + iterator->object = Z_PHPPERIOD_P(object); + ZVAL_UNDEF(&iterator->current); return (zend_object_iterator*)iterator; -} +} /* }}} */ -static int implement_date_interface_handler(zend_class_entry *interface, zend_class_entry *implementor TSRMLS_DC) +static int implement_date_interface_handler(zend_class_entry *interface, zend_class_entry *implementor) /* {{{ */ { if (implementor->type == ZEND_USER_CLASS && - !instanceof_function(implementor, date_ce_date TSRMLS_CC) && - !instanceof_function(implementor, date_ce_immutable TSRMLS_CC) + !instanceof_function(implementor, date_ce_date) && + !instanceof_function(implementor, date_ce_immutable) ) { zend_error(E_ERROR, "DateTimeInterface can't be implemented by user classes"); } return SUCCESS; -} +} /* }}} */ -static void date_register_classes(TSRMLS_D) +static void date_register_classes(void) /* {{{ */ { zend_class_entry ce_date, ce_immutable, ce_timezone, ce_interval, ce_period, ce_interface; INIT_CLASS_ENTRY(ce_interface, "DateTimeInterface", date_funcs_interface); - date_ce_interface = zend_register_internal_interface(&ce_interface TSRMLS_CC); + date_ce_interface = zend_register_internal_interface(&ce_interface); date_ce_interface->interface_gets_implemented = implement_date_interface_handler; INIT_CLASS_ENTRY(ce_date, "DateTime", date_funcs_date); ce_date.create_object = date_object_new_date; - date_ce_date = zend_register_internal_class_ex(&ce_date, NULL, NULL TSRMLS_CC); + date_ce_date = zend_register_internal_class_ex(&ce_date, NULL); memcpy(&date_object_handlers_date, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_date.offset = XtOffsetOf(php_date_obj, std); + date_object_handlers_date.free_obj = date_object_free_storage_date; date_object_handlers_date.clone_obj = date_object_clone_date; date_object_handlers_date.compare_objects = date_object_compare_date; date_object_handlers_date.get_properties = date_object_get_properties; date_object_handlers_date.get_gc = date_object_get_gc; - zend_class_implements(date_ce_date TSRMLS_CC, 1, date_ce_interface); + zend_class_implements(date_ce_date, 1, date_ce_interface); #define REGISTER_DATE_CLASS_CONST_STRING(const_name, value) \ - zend_declare_class_constant_stringl(date_ce_date, const_name, sizeof(const_name)-1, value, sizeof(value)-1 TSRMLS_CC); - - REGISTER_DATE_CLASS_CONST_STRING("ATOM", DATE_FORMAT_RFC3339); - REGISTER_DATE_CLASS_CONST_STRING("COOKIE", DATE_FORMAT_COOKIE); - REGISTER_DATE_CLASS_CONST_STRING("ISO8601", DATE_FORMAT_ISO8601); - REGISTER_DATE_CLASS_CONST_STRING("RFC822", DATE_FORMAT_RFC822); - REGISTER_DATE_CLASS_CONST_STRING("RFC850", DATE_FORMAT_RFC850); - REGISTER_DATE_CLASS_CONST_STRING("RFC1036", DATE_FORMAT_RFC1036); - REGISTER_DATE_CLASS_CONST_STRING("RFC1123", DATE_FORMAT_RFC1123); - REGISTER_DATE_CLASS_CONST_STRING("RFC2822", DATE_FORMAT_RFC2822); - REGISTER_DATE_CLASS_CONST_STRING("RFC3339", DATE_FORMAT_RFC3339); - REGISTER_DATE_CLASS_CONST_STRING("RSS", DATE_FORMAT_RFC1123); - REGISTER_DATE_CLASS_CONST_STRING("W3C", DATE_FORMAT_RFC3339); + zend_declare_class_constant_stringl(date_ce_date, const_name, sizeof(const_name)-1, value, sizeof(value)-1); + + REGISTER_DATE_CLASS_CONST_STRING("ATOM", DATE_FORMAT_RFC3339); + REGISTER_DATE_CLASS_CONST_STRING("COOKIE", DATE_FORMAT_COOKIE); + REGISTER_DATE_CLASS_CONST_STRING("ISO8601", DATE_FORMAT_ISO8601); + REGISTER_DATE_CLASS_CONST_STRING("RFC822", DATE_FORMAT_RFC822); + REGISTER_DATE_CLASS_CONST_STRING("RFC850", DATE_FORMAT_RFC850); + REGISTER_DATE_CLASS_CONST_STRING("RFC1036", DATE_FORMAT_RFC1036); + REGISTER_DATE_CLASS_CONST_STRING("RFC1123", DATE_FORMAT_RFC1123); + REGISTER_DATE_CLASS_CONST_STRING("RFC2822", DATE_FORMAT_RFC2822); + REGISTER_DATE_CLASS_CONST_STRING("RFC3339", DATE_FORMAT_RFC3339); + REGISTER_DATE_CLASS_CONST_STRING("RFC3339_EXTENDED", DATE_FORMAT_RFC3339_EXTENDED); + REGISTER_DATE_CLASS_CONST_STRING("RSS", DATE_FORMAT_RFC1123); + REGISTER_DATE_CLASS_CONST_STRING("W3C", DATE_FORMAT_RFC3339); INIT_CLASS_ENTRY(ce_immutable, "DateTimeImmutable", date_funcs_immutable); ce_immutable.create_object = date_object_new_date; - date_ce_immutable = zend_register_internal_class_ex(&ce_immutable, NULL, NULL TSRMLS_CC); + date_ce_immutable = zend_register_internal_class_ex(&ce_immutable, NULL); memcpy(&date_object_handlers_immutable, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); date_object_handlers_immutable.clone_obj = date_object_clone_date; date_object_handlers_immutable.compare_objects = date_object_compare_date; date_object_handlers_immutable.get_properties = date_object_get_properties; - zend_class_implements(date_ce_immutable TSRMLS_CC, 1, date_ce_interface); + zend_class_implements(date_ce_immutable, 1, date_ce_interface); INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone); ce_timezone.create_object = date_object_new_timezone; - date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL, NULL TSRMLS_CC); + date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL); memcpy(&date_object_handlers_timezone, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_timezone.offset = XtOffsetOf(php_timezone_obj, std); + date_object_handlers_timezone.free_obj = date_object_free_storage_timezone; date_object_handlers_timezone.clone_obj = date_object_clone_timezone; date_object_handlers_timezone.get_properties = date_object_get_properties_timezone; date_object_handlers_timezone.get_gc = date_object_get_gc_timezone; #define REGISTER_TIMEZONE_CLASS_CONST_STRING(const_name, value) \ - zend_declare_class_constant_long(date_ce_timezone, const_name, sizeof(const_name)-1, value TSRMLS_CC); + zend_declare_class_constant_long(date_ce_timezone, const_name, sizeof(const_name)-1, value); REGISTER_TIMEZONE_CLASS_CONST_STRING("AFRICA", PHP_DATE_TIMEZONE_GROUP_AFRICA); REGISTER_TIMEZONE_CLASS_CONST_STRING("AMERICA", PHP_DATE_TIMEZONE_GROUP_AMERICA); @@ -2089,8 +2045,10 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_interval, "DateInterval", date_funcs_interval); ce_interval.create_object = date_object_new_interval; - date_ce_interval = zend_register_internal_class_ex(&ce_interval, NULL, NULL TSRMLS_CC); + date_ce_interval = zend_register_internal_class_ex(&ce_interval, NULL); memcpy(&date_object_handlers_interval, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_interval.offset = XtOffsetOf(php_interval_obj, std); + date_object_handlers_interval.free_obj = date_object_free_storage_interval; date_object_handlers_interval.clone_obj = date_object_clone_interval; date_object_handlers_interval.read_property = date_interval_read_property; date_object_handlers_interval.write_property = date_interval_write_property; @@ -2100,11 +2058,13 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_period, "DatePeriod", date_funcs_period); ce_period.create_object = date_object_new_period; - date_ce_period = zend_register_internal_class_ex(&ce_period, NULL, NULL TSRMLS_CC); + date_ce_period = zend_register_internal_class_ex(&ce_period, NULL); date_ce_period->get_iterator = date_object_period_get_iterator; date_ce_period->iterator_funcs.funcs = &date_period_it_funcs; - zend_class_implements(date_ce_period TSRMLS_CC, 1, zend_ce_traversable); + zend_class_implements(date_ce_period, 1, zend_ce_traversable); memcpy(&date_object_handlers_period, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_period.offset = XtOffsetOf(php_period_obj, std); + date_object_handlers_period.free_obj = date_object_free_storage_period; date_object_handlers_period.clone_obj = date_object_clone_period; date_object_handlers_period.get_properties = date_object_get_properties_period; date_object_handlers_period.get_property_ptr_ptr = NULL; @@ -2113,80 +2073,66 @@ static void date_register_classes(TSRMLS_D) date_object_handlers_period.write_property = date_period_write_property; #define REGISTER_PERIOD_CLASS_CONST_STRING(const_name, value) \ - zend_declare_class_constant_long(date_ce_period, const_name, sizeof(const_name)-1, value TSRMLS_CC); + zend_declare_class_constant_long(date_ce_period, const_name, sizeof(const_name)-1, value); REGISTER_PERIOD_CLASS_CONST_STRING("EXCLUDE_START_DATE", PHP_DATE_PERIOD_EXCLUDE_START_DATE); -} +} /* }}} */ -static inline zend_object_value date_object_new_date_ex(zend_class_entry *class_type, php_date_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_date_ex(zend_class_entry *class_type, int init_props) /* {{{ */ { php_date_obj *intern; - zend_object_value retval; - - intern = emalloc(sizeof(php_date_obj)); - memset(intern, 0, sizeof(php_date_obj)); - if (ptr) { - *ptr = intern; - } - zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); + intern = ecalloc(1, sizeof(php_date_obj) + zend_object_properties_size(class_type)); - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_date, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_date; + zend_object_std_init(&intern->std, class_type); + if (init_props) { + object_properties_init(&intern->std, class_type); + } + intern->std.handlers = &date_object_handlers_date; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_date(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_date(zend_class_entry *class_type) /* {{{ */ { - return date_object_new_date_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_date_ex(class_type, 1); +} /* }}} */ -static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_date(zval *this_ptr) /* {{{ */ { - php_date_obj *new_obj = NULL; - php_date_obj *old_obj = (php_date_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_date_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_date_obj *old_obj = Z_PHPDATE_P(this_ptr); + php_date_obj *new_obj = php_date_obj_from_obj(date_object_new_date_ex(old_obj->std.ce, 0)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std); if (!old_obj->time) { - return new_ov; + return &new_obj->std; } /* this should probably moved to a new `timelib_time *timelime_time_clone(timelib_time *)` */ new_obj->time = timelib_time_ctor(); *new_obj->time = *old_obj->time; if (old_obj->time->tz_abbr) { - new_obj->time->tz_abbr = strdup(old_obj->time->tz_abbr); + new_obj->time->tz_abbr = timelib_strdup(old_obj->time->tz_abbr); } if (old_obj->time->tz_info) { new_obj->time->tz_info = old_obj->time->tz_info; } - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static zval* date_clone_immutable(zval *object TSRMLS_DC) +static void date_clone_immutable(zval *object, zval *new_object) /* {{{ */ { - zval *new_object; - - ALLOC_ZVAL(new_object); - Z_OBJVAL_P(new_object) = date_object_clone_date(object TSRMLS_CC); - Z_SET_REFCOUNT_P(new_object, 1); - Z_SET_ISREF_P(new_object); - Z_TYPE_P(new_object) = IS_OBJECT; - - return new_object; -} + ZVAL_OBJ(new_object, date_object_clone_date(object)); +} /* }}} */ -static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC) +static int date_object_compare_date(zval *d1, zval *d2) /* {{{ */ { - php_date_obj *o1 = zend_object_store_get_object(d1 TSRMLS_CC); - php_date_obj *o2 = zend_object_store_get_object(d2 TSRMLS_CC); + php_date_obj *o1 = Z_PHPDATE_P(d1); + php_date_obj *o2 = Z_PHPDATE_P(d2); if (!o1->time || !o2->time) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to compare an incomplete DateTime or DateTimeImmutable object"); + php_error_docref(NULL, E_WARNING, "Trying to compare an incomplete DateTime or DateTimeImmutable object"); return 1; } if (!o1->time->sse_uptodate) { @@ -2195,112 +2141,102 @@ static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC) if (!o2->time->sse_uptodate) { timelib_update_ts(o2->time, o2->time->tz_info); } - + return (o1->time->sse == o2->time->sse) ? 0 : ((o1->time->sse < o2->time->sse) ? -1 : 1); -} +} /* }}} */ -static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc(zval *object, zval **table, int *n) /* {{{ */ { *table = NULL; *n = 0; - return zend_std_get_properties(object TSRMLS_CC); -} + return zend_std_get_properties(object); +} /* }}} */ -static HashTable *date_object_get_gc_timezone(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc_timezone(zval *object, zval **table, int *n) /* {{{ */ { - *table = NULL; *n = 0; - return zend_std_get_properties(object TSRMLS_CC); -} + return zend_std_get_properties(object); +} /* }}} */ -static HashTable *date_object_get_properties(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties(zval *object) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); - props = zend_std_get_properties(object TSRMLS_CC); + props = zend_std_get_properties(object); if (!dateobj->time || GC_G(gc_active)) { return props; } /* first we add the date and time in ISO format */ - MAKE_STD_ZVAL(zv); - ZVAL_STRING(zv, date_format("Y-m-d H:i:s.u", 14, dateobj->time, 1), 0); - zend_hash_update(props, "date", 5, &zv, sizeof(zv), NULL); + ZVAL_STR(&zv, date_format("Y-m-d H:i:s.u", sizeof("Y-m-d H:i:s.u")-1, dateobj->time, 1)); + zend_hash_str_update(props, "date", sizeof("date")-1, &zv); /* then we add the timezone name (or similar) */ if (dateobj->time->is_localtime) { - MAKE_STD_ZVAL(zv); - ZVAL_LONG(zv, dateobj->time->zone_type); - zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, dateobj->time->zone_type); + zend_hash_str_update(props, "timezone_type", sizeof("timezone_type")-1, &zv); - MAKE_STD_ZVAL(zv); switch (dateobj->time->zone_type) { case TIMELIB_ZONETYPE_ID: - ZVAL_STRING(zv, dateobj->time->tz_info->name, 1); + ZVAL_STRING(&zv, dateobj->time->tz_info->name); break; case TIMELIB_ZONETYPE_OFFSET: { - char *tmpstr = emalloc(sizeof("UTC+05:00")); + zend_string *tmpstr = zend_string_alloc(sizeof("UTC+05:00")-1, 0); timelib_sll utc_offset = dateobj->time->z; - snprintf(tmpstr, sizeof("+05:00"), "%c%02d:%02d", + ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d", utc_offset > 0 ? '-' : '+', abs(utc_offset / 60), abs((utc_offset % 60))); - ZVAL_STRING(zv, tmpstr, 0); + ZVAL_NEW_STR(&zv, tmpstr); } break; case TIMELIB_ZONETYPE_ABBR: - ZVAL_STRING(zv, dateobj->time->tz_abbr, 1); + ZVAL_STRING(&zv, dateobj->time->tz_abbr); break; } - zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "timezone", sizeof("timezone")-1, &zv); } return props; -} +} /* }}} */ -static inline zend_object_value date_object_new_timezone_ex(zend_class_entry *class_type, php_timezone_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_timezone_ex(zend_class_entry *class_type, int init_props) /* {{{ */ { php_timezone_obj *intern; - zend_object_value retval; - intern = emalloc(sizeof(php_timezone_obj)); - memset(intern, 0, sizeof(php_timezone_obj)); - if (ptr) { - *ptr = intern; - } + intern = ecalloc(1, sizeof(php_timezone_obj) + zend_object_properties_size(class_type)); - zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); + zend_object_std_init(&intern->std, class_type); + if (init_props) { + object_properties_init(&intern->std, class_type); + } + intern->std.handlers = &date_object_handlers_timezone; - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_timezone; + return &intern->std; +} /* }}} */ - return retval; -} - -static zend_object_value date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_timezone(zend_class_entry *class_type) /* {{{ */ { - return date_object_new_timezone_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_timezone_ex(class_type, 1); +} /* }}} */ -static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_timezone(zval *this_ptr) /* {{{ */ { - php_timezone_obj *new_obj = NULL; - php_timezone_obj *old_obj = (php_timezone_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_timezone_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_timezone_obj *old_obj = Z_PHPTIMEZONE_P(this_ptr); + php_timezone_obj *new_obj = php_timezone_obj_from_obj(date_object_new_timezone_ex(old_obj->std.ce, 0)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std); if (!old_obj->initialized) { - return new_ov; + return &new_obj->std; } new_obj->type = old_obj->type; @@ -2315,120 +2251,111 @@ static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC) case TIMELIB_ZONETYPE_ABBR: new_obj->tzi.z.utc_offset = old_obj->tzi.z.utc_offset; new_obj->tzi.z.dst = old_obj->tzi.z.dst; - new_obj->tzi.z.abbr = strdup(old_obj->tzi.z.abbr); + new_obj->tzi.z.abbr = timelib_strdup(old_obj->tzi.z.abbr); break; } - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties_timezone(zval *object) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_timezone_obj *tzobj; - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); - props = zend_std_get_properties(object TSRMLS_CC); + props = zend_std_get_properties(object); if (!tzobj->initialized) { return props; } - MAKE_STD_ZVAL(zv); - ZVAL_LONG(zv, tzobj->type); - zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, tzobj->type); + zend_hash_str_update(props, "timezone_type", sizeof("timezone_type")-1, &zv); - MAKE_STD_ZVAL(zv); switch (tzobj->type) { case TIMELIB_ZONETYPE_ID: - ZVAL_STRING(zv, tzobj->tzi.tz->name, 1); + ZVAL_STRING(&zv, tzobj->tzi.tz->name); break; case TIMELIB_ZONETYPE_OFFSET: { - char *tmpstr = emalloc(sizeof("UTC+05:00")); + zend_string *tmpstr = zend_string_alloc(sizeof("UTC+05:00")-1, 0); - snprintf(tmpstr, sizeof("+05:00"), "%c%02d:%02d", + ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d", tzobj->tzi.utc_offset > 0 ? '-' : '+', abs(tzobj->tzi.utc_offset / 60), abs((tzobj->tzi.utc_offset % 60))); - ZVAL_STRING(zv, tmpstr, 0); + ZVAL_NEW_STR(&zv, tmpstr); } break; case TIMELIB_ZONETYPE_ABBR: - ZVAL_STRING(zv, tzobj->tzi.z.abbr, 1); + ZVAL_STRING(&zv, tzobj->tzi.z.abbr); break; } - zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "timezone", sizeof("timezone")-1, &zv); return props; -} +} /* }}} */ -static inline zend_object_value date_object_new_interval_ex(zend_class_entry *class_type, php_interval_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_interval_ex(zend_class_entry *class_type, int init_props) /* {{{ */ { php_interval_obj *intern; - zend_object_value retval; - - intern = emalloc(sizeof(php_interval_obj)); - memset(intern, 0, sizeof(php_interval_obj)); - if (ptr) { - *ptr = intern; - } - zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); + intern = ecalloc(1, sizeof(php_interval_obj) + zend_object_properties_size(class_type)); - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_interval, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_interval; + zend_object_std_init(&intern->std, class_type); + if (init_props) { + object_properties_init(&intern->std, class_type); + } + intern->std.handlers = &date_object_handlers_interval; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_interval(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_interval(zend_class_entry *class_type) /* {{{ */ { - return date_object_new_interval_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_interval_ex(class_type, 1); +} /* }}} */ -static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_interval(zval *this_ptr) /* {{{ */ { - php_interval_obj *new_obj = NULL; - php_interval_obj *old_obj = (php_interval_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_interval_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_interval_obj *old_obj = Z_PHPINTERVAL_P(this_ptr); + php_interval_obj *new_obj = php_interval_obj_from_obj(date_object_new_interval_ex(old_obj->std.ce, 0)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std); /** FIX ME ADD CLONE STUFF **/ - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static HashTable *date_object_get_gc_interval(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc_interval(zval *object, zval **table, int *n) /* {{{ */ { *table = NULL; *n = 0; - return zend_std_get_properties(object TSRMLS_CC); -} + return zend_std_get_properties(object); +} /* }}} */ -static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties_interval(zval *object) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_interval_obj *intervalobj; - intervalobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC); + intervalobj = Z_PHPINTERVAL_P(object); - props = zend_std_get_properties(object TSRMLS_CC); + props = zend_std_get_properties(object); if (!intervalobj->initialized) { return props; } #define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \ - MAKE_STD_ZVAL(zv); \ - ZVAL_LONG(zv, (long)intervalobj->diff->f); \ - zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, (zend_long)intervalobj->diff->f); \ + zend_hash_str_update(props, n, sizeof(n)-1, &zv); PHP_DATE_INTERVAL_ADD_PROPERTY("y", y); PHP_DATE_INTERVAL_ADD_PROPERTY("m", m); @@ -2443,9 +2370,8 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) if (intervalobj->diff->days != -99999) { PHP_DATE_INTERVAL_ADD_PROPERTY("days", days); } else { - MAKE_STD_ZVAL(zv); - ZVAL_FALSE(zv); - zend_hash_update(props, "days", 5, &zv, sizeof(zv), NULL); + ZVAL_FALSE(&zv); + zend_hash_str_update(props, "days", sizeof("days")-1, &zv); } PHP_DATE_INTERVAL_ADD_PROPERTY("special_type", special.type); PHP_DATE_INTERVAL_ADD_PROPERTY("special_amount", special.amount); @@ -2453,80 +2379,72 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) PHP_DATE_INTERVAL_ADD_PROPERTY("have_special_relative", have_special_relative); return props; -} +} /* }}} */ -static inline zend_object_value date_object_new_period_ex(zend_class_entry *class_type, php_period_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_period_ex(zend_class_entry *class_type, int init_props) /* {{{ */ { php_period_obj *intern; - zend_object_value retval; - intern = emalloc(sizeof(php_period_obj)); - memset(intern, 0, sizeof(php_period_obj)); - if (ptr) { - *ptr = intern; - } + intern = ecalloc(1, sizeof(php_period_obj) + zend_object_properties_size(class_type)); - zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); + zend_object_std_init(&intern->std, class_type); + if (init_props) { + object_properties_init(&intern->std, class_type); + } - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_period, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_period; + intern->std.handlers = &date_object_handlers_period; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_period(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_period(zend_class_entry *class_type) /* {{{ */ { - return date_object_new_period_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_period_ex(class_type, 1); +} /* }}} */ -static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_period(zval *this_ptr) /* {{{ */ { - php_period_obj *new_obj = NULL; - php_period_obj *old_obj = (php_period_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_period_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_period_obj *old_obj = Z_PHPPERIOD_P(this_ptr); + php_period_obj *new_obj = php_period_obj_from_obj(date_object_new_period_ex(old_obj->std.ce, 0)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std); /** FIX ME ADD CLONE STUFF **/ - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static void date_object_free_storage_date(void *object TSRMLS_DC) +static void date_object_free_storage_date(zend_object *object) /* {{{ */ { - php_date_obj *intern = (php_date_obj *)object; + php_date_obj *intern = php_date_obj_from_obj(object); if (intern->time) { timelib_time_dtor(intern->time); } - zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} + zend_object_std_dtor(&intern->std); +} /* }}} */ -static void date_object_free_storage_timezone(void *object TSRMLS_DC) +static void date_object_free_storage_timezone(zend_object *object) /* {{{ */ { - php_timezone_obj *intern = (php_timezone_obj *)object; + php_timezone_obj *intern = php_timezone_obj_from_obj(object); if (intern->type == TIMELIB_ZONETYPE_ABBR) { - free(intern->tzi.z.abbr); + timelib_free(intern->tzi.z.abbr); } - zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} + zend_object_std_dtor(&intern->std); +} /* }}} */ -static void date_object_free_storage_interval(void *object TSRMLS_DC) +static void date_object_free_storage_interval(zend_object *object) /* {{{ */ { - php_interval_obj *intern = (php_interval_obj *)object; + php_interval_obj *intern = php_interval_obj_from_obj(object); timelib_rel_time_dtor(intern->diff); - zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} + zend_object_std_dtor(&intern->std); +} /* }}} */ -static void date_object_free_storage_period(void *object TSRMLS_DC) +static void date_object_free_storage_period(zend_object *object) /* {{{ */ { - php_period_obj *intern = (php_period_obj *)object; + php_period_obj *intern = php_period_obj_from_obj(object); if (intern->start) { timelib_time_dtor(intern->start); @@ -2541,36 +2459,35 @@ static void date_object_free_storage_period(void *object TSRMLS_DC) } timelib_rel_time_dtor(intern->interval); - zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} + zend_object_std_dtor(&intern->std); +} /* }}} */ /* Advanced Interface */ -PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC) +PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object) /* {{{ */ { object_init_ex(object, pce); return object; -} +} /* }}} */ /* Helper function used to store the latest found warnings and errors while * parsing, from either strtotime or parse_from_format. */ -static void update_errors_warnings(timelib_error_container *last_errors TSRMLS_DC) +static void update_errors_warnings(timelib_error_container *last_errors) /* {{{ */ { if (DATEG(last_errors)) { timelib_error_container_dtor(DATEG(last_errors)); DATEG(last_errors) = NULL; } DATEG(last_errors) = last_errors; -} +} /* }}} */ -PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC) +PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, size_t time_str_len, char *format, zval *timezone_object, int ctor) /* {{{ */ { timelib_time *now; timelib_tzinfo *tzi = NULL; timelib_error_container *err = NULL; int type = TIMELIB_ZONETYPE_ID, new_dst = 0; char *new_abbr = NULL; - timelib_sll new_offset; + timelib_sll new_offset = 0; if (dateobj->time) { timelib_time_dtor(dateobj->time); @@ -2582,12 +2499,12 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, } /* update last errors and warnings */ - update_errors_warnings(err TSRMLS_CC); + update_errors_warnings(err); if (ctor && err && err->error_count) { /* spit out the first library error message, at least */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", time_str, + php_error_docref(NULL, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", time_str, err->error_messages[0].position, err->error_messages[0].character, err->error_messages[0].message); } if (err && err->error_count) { @@ -2599,7 +2516,7 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, if (timezone_object) { php_timezone_obj *tzobj; - tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone_object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(timezone_object); switch (tzobj->type) { case TIMELIB_ZONETYPE_ID: tzi = tzobj->tzi.tz; @@ -2610,14 +2527,14 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, case TIMELIB_ZONETYPE_ABBR: new_offset = tzobj->tzi.z.utc_offset; new_dst = tzobj->tzi.z.dst; - new_abbr = strdup(tzobj->tzi.z.abbr); + new_abbr = timelib_strdup(tzobj->tzi.z.abbr); break; } type = tzobj->type; } else if (dateobj->time->tz_info) { tzi = dateobj->time->tz_info; } else { - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); } now = timelib_time_ctor(); @@ -2646,7 +2563,7 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, timelib_time_dtor(now); return 1; -} +} /* }}} */ /* {{{ proto DateTime date_create([string time[, DateTimeZone object]]) Returns new DateTime object @@ -2655,19 +2572,17 @@ PHP_FUNCTION(date_create) { zval *timezone_object = NULL; char *time_str = NULL; - int time_str_len = 0; - zval datetime_object; + size_t time_str_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - php_date_instantiate(date_ce_date, &datetime_object TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(&datetime_object TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) { - zval_dtor(&datetime_object); + php_date_instantiate(date_ce_date, return_value); + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, NULL, timezone_object, 0)) { + zval_ptr_dtor(return_value); RETURN_FALSE; } - RETVAL_ZVAL(&datetime_object, 0, 0); } /* }}} */ @@ -2678,19 +2593,17 @@ PHP_FUNCTION(date_create_immutable) { zval *timezone_object = NULL; char *time_str = NULL; - int time_str_len = 0; - zval datetime_object; + size_t time_str_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - php_date_instantiate(date_ce_immutable, &datetime_object TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(&datetime_object TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) { - zval_dtor(&datetime_object); + php_date_instantiate(date_ce_immutable, return_value); + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, NULL, timezone_object, 0)) { + zval_ptr_dtor(return_value); RETURN_FALSE; } - RETVAL_ZVAL(&datetime_object, 0, 0); } /* }}} */ @@ -2701,19 +2614,17 @@ PHP_FUNCTION(date_create_from_format) { zval *timezone_object = NULL; char *time_str = NULL, *format_str = NULL; - int time_str_len = 0, format_str_len = 0; - zval datetime_object; + size_t time_str_len = 0, format_str_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|O", &format_str, &format_str_len, &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|O!", &format_str, &format_str_len, &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - php_date_instantiate(date_ce_date, &datetime_object TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(&datetime_object TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) { - zval_dtor(&datetime_object); + php_date_instantiate(date_ce_date, return_value); + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, 0)) { + zval_ptr_dtor(return_value); RETURN_FALSE; } - RETVAL_ZVAL(&datetime_object, 0, 0); } /* }}} */ @@ -2724,19 +2635,17 @@ PHP_FUNCTION(date_create_immutable_from_format) { zval *timezone_object = NULL; char *time_str = NULL, *format_str = NULL; - int time_str_len = 0, format_str_len = 0; - zval datetime_object; + size_t time_str_len = 0, format_str_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|O", &format_str, &format_str_len, &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|O!", &format_str, &format_str_len, &time_str, &time_str_len, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - php_date_instantiate(date_ce_immutable, &datetime_object TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(&datetime_object TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) { - zval_dtor(&datetime_object); + php_date_instantiate(date_ce_immutable, return_value); + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, 0)) { + zval_ptr_dtor(return_value); RETURN_FALSE; } - RETVAL_ZVAL(&datetime_object, 0, 0); } /* }}} */ @@ -2747,14 +2656,16 @@ PHP_METHOD(DateTime, __construct) { zval *timezone_object = NULL; char *time_str = NULL; - int time_str_len = 0; + size_t time_str_len = 0; zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { - php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC); + if (FAILURE == zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { + return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + + zend_replace_error_handling(EH_THROW, NULL, &error_handling); + php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1); + zend_restore_error_handling(&error_handling); } /* }}} */ @@ -2765,14 +2676,16 @@ PHP_METHOD(DateTimeImmutable, __construct) { zval *timezone_object = NULL; char *time_str = NULL; - int time_str_len = 0; + size_t time_str_len = 0; zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { - php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC); + if (FAILURE == zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { + return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + + zend_replace_error_handling(EH_THROW, NULL, &error_handling); + php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1); + zend_restore_error_handling(&error_handling); } /* }}} */ @@ -2785,18 +2698,18 @@ PHP_METHOD(DateTimeImmutable, createFromMutable) php_date_obj *new_obj = NULL; php_date_obj *old_obj = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &datetime_object, date_ce_date) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &datetime_object, date_ce_date) == FAILURE) { return; } - php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC); - old_obj = (php_date_obj *) zend_object_store_get_object(datetime_object TSRMLS_CC); - new_obj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + php_date_instantiate(date_ce_immutable, return_value); + old_obj = Z_PHPDATE_P(datetime_object); + new_obj = Z_PHPDATE_P(return_value); new_obj->time = timelib_time_ctor(); *new_obj->time = *old_obj->time; if (old_obj->time->tz_abbr) { - new_obj->time->tz_abbr = strdup(old_obj->time->tz_abbr); + new_obj->time->tz_abbr = timelib_strdup(old_obj->time->tz_abbr); } if (old_obj->time->tz_info) { new_obj->time->tz_info = old_obj->time->tz_info; @@ -2804,26 +2717,28 @@ PHP_METHOD(DateTimeImmutable, createFromMutable) } /* }}} */ -static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht TSRMLS_DC) +static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht) { - zval **z_date = NULL; - zval **z_timezone = NULL; - zval **z_timezone_type = NULL; - zval *tmp_obj = NULL; + zval *z_date; + zval *z_timezone; + zval *z_timezone_type; + zval tmp_obj; timelib_tzinfo *tzi; php_timezone_obj *tzobj; - if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) { - if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { - if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { - - switch (Z_LVAL_PP(z_timezone_type)) { + z_date = zend_hash_str_find(myht, "date", sizeof("data")-1); + if (z_date && Z_TYPE_P(z_date) == IS_STRING) { + z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1); + if (z_timezone_type && Z_TYPE_P(z_timezone_type) == IS_LONG) { + z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1); + if (z_timezone && Z_TYPE_P(z_timezone) == IS_STRING) { + switch (Z_LVAL_P(z_timezone_type)) { case TIMELIB_ZONETYPE_OFFSET: case TIMELIB_ZONETYPE_ABBR: { - char *tmp = emalloc(Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 2); + char *tmp = emalloc(Z_STRLEN_P(z_date) + Z_STRLEN_P(z_timezone) + 2); int ret; - snprintf(tmp, Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 2, "%s %s", Z_STRVAL_PP(z_date), Z_STRVAL_PP(z_timezone)); - ret = php_date_initialize(*dateobj, tmp, Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 1, NULL, NULL, 0 TSRMLS_CC); + snprintf(tmp, Z_STRLEN_P(z_date) + Z_STRLEN_P(z_timezone) + 2, "%s %s", Z_STRVAL_P(z_date), Z_STRVAL_P(z_timezone)); + ret = php_date_initialize(*dateobj, tmp, Z_STRLEN_P(z_date) + Z_STRLEN_P(z_timezone) + 1, NULL, NULL, 0); efree(tmp); return 1 == ret; } @@ -2831,19 +2746,18 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht case TIMELIB_ZONETYPE_ID: { int ret; - tzi = php_date_parse_tzfile(Z_STRVAL_PP(z_timezone), DATE_TIMEZONEDB TSRMLS_CC); + tzi = php_date_parse_tzfile(Z_STRVAL_P(z_timezone), DATE_TIMEZONEDB); if (tzi == NULL) { return 0; } - ALLOC_INIT_ZVAL(tmp_obj); - tzobj = zend_object_store_get_object(php_date_instantiate(date_ce_timezone, tmp_obj TSRMLS_CC) TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(php_date_instantiate(date_ce_timezone, &tmp_obj)); tzobj->type = TIMELIB_ZONETYPE_ID; tzobj->tzi.tz = tzi; tzobj->initialized = 1; - ret = php_date_initialize(*dateobj, Z_STRVAL_PP(z_date), Z_STRLEN_PP(z_date), NULL, tmp_obj, 0 TSRMLS_CC); + ret = php_date_initialize(*dateobj, Z_STRVAL_P(z_date), Z_STRLEN_P(z_date), NULL, &tmp_obj, 0); zval_ptr_dtor(&tmp_obj); return 1 == ret; } @@ -2852,7 +2766,7 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht } } return 0; -} +} /* }}} */ /* {{{ proto DateTime::__set_state() */ @@ -2862,15 +2776,15 @@ PHP_METHOD(DateTime, __set_state) zval *array; HashTable *myht; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) { RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); - php_date_instantiate(date_ce_date, return_value TSRMLS_CC); - dateobj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC); - if (!php_date_initialize_from_hash(&dateobj, myht TSRMLS_CC)) { + php_date_instantiate(date_ce_date, return_value); + dateobj = Z_PHPDATE_P(return_value); + if (!php_date_initialize_from_hash(&dateobj, myht)) { php_error(E_ERROR, "Invalid serialization data for DateTime object"); } } @@ -2884,15 +2798,15 @@ PHP_METHOD(DateTimeImmutable, __set_state) zval *array; HashTable *myht; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) { RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); - php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC); - dateobj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC); - if (!php_date_initialize_from_hash(&dateobj, myht TSRMLS_CC)) { + php_date_instantiate(date_ce_immutable, return_value); + dateobj = Z_PHPDATE_P(return_value); + if (!php_date_initialize_from_hash(&dateobj, myht)) { php_error(E_ERROR, "Invalid serialization data for DateTimeImmutable object"); } } @@ -2906,38 +2820,36 @@ PHP_METHOD(DateTime, __wakeup) php_date_obj *dateobj; HashTable *myht; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); myht = Z_OBJPROP_P(object); - if (!php_date_initialize_from_hash(&dateobj, myht TSRMLS_CC)) { + if (!php_date_initialize_from_hash(&dateobj, myht)) { php_error(E_ERROR, "Invalid serialization data for DateTime object"); } } /* }}} */ /* Helper function used to add an associative array of warnings and errors to a zval */ -static void zval_from_error_container(zval *z, timelib_error_container *error) +static void zval_from_error_container(zval *z, timelib_error_container *error) /* {{{ */ { int i; - zval *element; + zval element; add_assoc_long(z, "warning_count", error->warning_count); - MAKE_STD_ZVAL(element); - array_init(element); + array_init(&element); for (i = 0; i < error->warning_count; i++) { - add_index_string(element, error->warning_messages[i].position, error->warning_messages[i].message, 1); + add_index_string(&element, error->warning_messages[i].position, error->warning_messages[i].message); } - add_assoc_zval(z, "warnings", element); + add_assoc_zval(z, "warnings", &element); add_assoc_long(z, "error_count", error->error_count); - MAKE_STD_ZVAL(element); - array_init(element); + array_init(&element); for (i = 0; i < error->error_count; i++) { - add_index_string(element, error->error_messages[i].position, error->error_messages[i].message, 1); + add_index_string(&element, error->error_messages[i].position, error->error_messages[i].message); } - add_assoc_zval(z, "errors", element); -} + add_assoc_zval(z, "errors", &element); +} /* }}} */ /* {{{ proto array date_get_last_errors() Returns the warnings and errors found while parsing a date/time string. @@ -2953,9 +2865,9 @@ PHP_FUNCTION(date_get_last_errors) } /* }}} */ -void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *parsed_time, struct timelib_error_container *error) +void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *parsed_time, struct timelib_error_container *error) /* {{{ */ { - zval *element; + zval element; array_init(return_value); #define PHP_DATE_PARSE_DATE_SET_TIME_ELEMENT(name, elem) \ @@ -2992,41 +2904,40 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time * break; case TIMELIB_ZONETYPE_ID: if (parsed_time->tz_abbr) { - add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr, 1); + add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr); } if (parsed_time->tz_info) { - add_assoc_string(return_value, "tz_id", parsed_time->tz_info->name, 1); + add_assoc_string(return_value, "tz_id", parsed_time->tz_info->name); } break; case TIMELIB_ZONETYPE_ABBR: PHP_DATE_PARSE_DATE_SET_TIME_ELEMENT(zone, z); add_assoc_bool(return_value, "is_dst", parsed_time->dst); - add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr, 1); + add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr); break; } } if (parsed_time->have_relative) { - MAKE_STD_ZVAL(element); - array_init(element); - add_assoc_long(element, "year", parsed_time->relative.y); - add_assoc_long(element, "month", parsed_time->relative.m); - add_assoc_long(element, "day", parsed_time->relative.d); - add_assoc_long(element, "hour", parsed_time->relative.h); - add_assoc_long(element, "minute", parsed_time->relative.i); - add_assoc_long(element, "second", parsed_time->relative.s); + array_init(&element); + add_assoc_long(&element, "year", parsed_time->relative.y); + add_assoc_long(&element, "month", parsed_time->relative.m); + add_assoc_long(&element, "day", parsed_time->relative.d); + add_assoc_long(&element, "hour", parsed_time->relative.h); + add_assoc_long(&element, "minute", parsed_time->relative.i); + add_assoc_long(&element, "second", parsed_time->relative.s); if (parsed_time->relative.have_weekday_relative) { - add_assoc_long(element, "weekday", parsed_time->relative.weekday); + add_assoc_long(&element, "weekday", parsed_time->relative.weekday); } if (parsed_time->relative.have_special_relative && (parsed_time->relative.special.type == TIMELIB_SPECIAL_WEEKDAY)) { - add_assoc_long(element, "weekdays", parsed_time->relative.special.amount); + add_assoc_long(&element, "weekdays", parsed_time->relative.special.amount); } if (parsed_time->relative.first_last_day_of) { - add_assoc_bool(element, parsed_time->relative.first_last_day_of == TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month", 1); + add_assoc_bool(&element, parsed_time->relative.first_last_day_of == TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month", 1); } - add_assoc_zval(return_value, "relative", element); + add_assoc_zval(return_value, "relative", &element); } timelib_time_dtor(parsed_time); -} +} /* }}} */ /* {{{ proto array date_parse(string date) Returns associative array with detailed info about given date @@ -3034,11 +2945,11 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time * PHP_FUNCTION(date_parse) { char *date; - int date_len; + size_t date_len; struct timelib_error_container *error; timelib_time *parsed_time; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &date, &date_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &date, &date_len) == FAILURE) { RETURN_FALSE; } @@ -3053,11 +2964,11 @@ PHP_FUNCTION(date_parse) PHP_FUNCTION(date_parse_from_format) { char *date, *format; - int date_len, format_len; + size_t date_len, format_len; struct timelib_error_container *error; timelib_time *parsed_time; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &format, &format_len, &date, &date_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &format, &format_len, &date, &date_len) == FAILURE) { RETURN_FALSE; } @@ -3074,37 +2985,37 @@ PHP_FUNCTION(date_format) zval *object; php_date_obj *dateobj; char *format; - int format_len; + size_t format_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_interface, &format, &format_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_interface, &format, &format_len) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - RETURN_STRING(date_format(format, format_len, dateobj->time, dateobj->time->is_localtime), 0); + RETURN_STR(date_format(format, format_len, dateobj->time, dateobj->time->is_localtime)); } /* }}} */ -static int php_date_modify(zval *object, char *modify, int modify_len TSRMLS_DC) +static int php_date_modify(zval *object, char *modify, size_t modify_len) /* {{{ */ { php_date_obj *dateobj; timelib_time *tmp_time; timelib_error_container *err = NULL; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); if (!(dateobj->time)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The DateTime object has not been correctly initialized by its constructor"); + php_error_docref(NULL, E_WARNING, "The DateTime object has not been correctly initialized by its constructor"); return 0; } tmp_time = timelib_strtotime(modify, modify_len, &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); /* update last errors and warnings */ - update_errors_warnings(err TSRMLS_CC); + update_errors_warnings(err); if (err && err->error_count) { /* spit out the first library error message, at least */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", modify, + php_error_docref(NULL, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", modify, err->error_messages[0].position, err->error_messages[0].character, err->error_messages[0].message); timelib_time_dtor(tmp_time); return 0; @@ -3143,9 +3054,9 @@ static int php_date_modify(zval *object, char *modify, int modify_len TSRMLS_DC) timelib_update_ts(dateobj->time, NULL); timelib_update_from_sse(dateobj->time); dateobj->time->have_relative = 0; - + return 1; -} +} /* }}} */ /* {{{ proto DateTime date_modify(DateTime object, string modify) Alters the timestamp. @@ -3154,17 +3065,18 @@ PHP_FUNCTION(date_modify) { zval *object; char *modify; - int modify_len; + size_t modify_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_date, &modify, &modify_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_date, &modify, &modify_len) == FAILURE) { RETURN_FALSE; } - if (php_date_modify(object, modify, modify_len TSRMLS_CC)) { - RETURN_ZVAL(object, 1, 0); + if (!php_date_modify(object, modify, modify_len)) { + RETURN_FALSE; } - RETURN_FALSE; + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3172,38 +3084,38 @@ PHP_FUNCTION(date_modify) */ PHP_METHOD(DateTimeImmutable, modify) { - zval *object, *new_object; + zval *object, new_object; char *modify; - int modify_len; + size_t modify_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_immutable, &modify, &modify_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_immutable, &modify, &modify_len) == FAILURE) { RETURN_FALSE; } - - new_object = date_clone_immutable(object TSRMLS_CC); - if (php_date_modify(new_object, modify, modify_len TSRMLS_CC)) { - RETURN_ZVAL(new_object, 0, 1); + + date_clone_immutable(object, &new_object); + if (!php_date_modify(&new_object, modify, modify_len)) { + RETURN_FALSE; } - RETURN_FALSE; + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ -static void php_date_add(zval *object, zval *interval, zval *return_value TSRMLS_DC) +static void php_date_add(zval *object, zval *interval, zval *return_value) /* {{{ */ { php_date_obj *dateobj; php_interval_obj *intobj; timelib_time *new_time; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(interval); DATE_CHECK_INITIALIZED(intobj->initialized, DateInterval); new_time = timelib_add(dateobj->time, intobj->diff); timelib_time_dtor(dateobj->time); dateobj->time = new_time; -} +} /* }}} */ /* {{{ proto DateTime date_add(DateTime object, DateInterval interval) Adds an interval to the current date in object. @@ -3212,13 +3124,14 @@ PHP_FUNCTION(date_add) { zval *object, *interval; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) { RETURN_FALSE; } - php_date_add(object, interval, return_value TSRMLS_CC); + php_date_add(object, interval, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3226,39 +3139,39 @@ PHP_FUNCTION(date_add) */ PHP_METHOD(DateTimeImmutable, add) { - zval *object, *interval, *new_object; + zval *object, *interval, new_object; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_immutable, &interval, date_ce_interval) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_immutable, &interval, date_ce_interval) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_add(new_object, interval, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_add(&new_object, interval, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ -static void php_date_sub(zval *object, zval *interval, zval *return_value TSRMLS_DC) +static void php_date_sub(zval *object, zval *interval, zval *return_value) /* {{{ */ { php_date_obj *dateobj; php_interval_obj *intobj; timelib_time *new_time; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(interval); DATE_CHECK_INITIALIZED(intobj->initialized, DateInterval); if (intobj->diff->have_special_relative) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only non-special relative time specifications are supported for subtraction"); + php_error_docref(NULL, E_WARNING, "Only non-special relative time specifications are supported for subtraction"); return; } new_time = timelib_sub(dateobj->time, intobj->diff); timelib_time_dtor(dateobj->time); dateobj->time = new_time; -} +} /* }}} */ /* {{{ proto DateTime date_sub(DateTime object, DateInterval interval) Subtracts an interval to the current date in object. @@ -3267,13 +3180,14 @@ PHP_FUNCTION(date_sub) { zval *object, *interval; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) { RETURN_FALSE; } - php_date_sub(object, interval, return_value TSRMLS_CC); + php_date_sub(object, interval, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3281,16 +3195,16 @@ PHP_FUNCTION(date_sub) */ PHP_METHOD(DateTimeImmutable, sub) { - zval *object, *interval, *new_object; + zval *object, *interval, new_object; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_immutable, &interval, date_ce_interval) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_immutable, &interval, date_ce_interval) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_sub(new_object, interval, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_sub(&new_object, interval, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ @@ -3308,7 +3222,7 @@ static void set_timezone_from_timelib_time(php_timezone_obj *tzobj, timelib_time case TIMELIB_ZONETYPE_ABBR: tzobj->tzi.z.utc_offset = t->z; tzobj->tzi.z.dst = t->dst; - tzobj->tzi.z.abbr = strdup(t->tz_abbr); + tzobj->tzi.z.abbr = timelib_strdup(t->tz_abbr); break; } } @@ -3323,14 +3237,14 @@ PHP_FUNCTION(date_timezone_get) php_date_obj *dateobj; php_timezone_obj *tzobj; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_interface) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_interface) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); if (dateobj->time->is_localtime/* && dateobj->time->tz_info*/) { - php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC); - tzobj = (php_timezone_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + php_date_instantiate(date_ce_timezone, return_value); + tzobj = Z_PHPTIMEZONE_P(return_value); set_timezone_from_timelib_time(tzobj, dateobj->time); } else { RETURN_FALSE; @@ -3338,14 +3252,14 @@ PHP_FUNCTION(date_timezone_get) } /* }}} */ -static void php_date_timezone_set(zval *object, zval *timezone_object, zval *return_value TSRMLS_DC) +static void php_date_timezone_set(zval *object, zval *timezone_object, zval *return_value) /* {{{ */ { php_date_obj *dateobj; php_timezone_obj *tzobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone_object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(timezone_object); switch (tzobj->type) { case TIMELIB_ZONETYPE_OFFSET: @@ -3359,7 +3273,7 @@ static void php_date_timezone_set(zval *object, zval *timezone_object, zval *ret break; } timelib_unixtime2local(dateobj->time, dateobj->time->sse); -} +} /* }}} */ /* {{{ proto DateTime date_timezone_set(DateTime object, DateTimeZone object) Sets the timezone for the DateTime object. @@ -3369,13 +3283,14 @@ PHP_FUNCTION(date_timezone_set) zval *object; zval *timezone_object; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_date, &timezone_object, date_ce_timezone) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_date, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - php_date_timezone_set(object, timezone_object, return_value TSRMLS_CC); + php_date_timezone_set(object, timezone_object, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3383,17 +3298,17 @@ PHP_FUNCTION(date_timezone_set) */ PHP_METHOD(DateTimeImmutable, setTimezone) { - zval *object, *new_object; + zval *object, new_object; zval *timezone_object; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_immutable, &timezone_object, date_ce_timezone) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_immutable, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_timezone_set(new_object, timezone_object, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_timezone_set(&new_object, timezone_object, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ @@ -3406,10 +3321,10 @@ PHP_FUNCTION(date_offset_get) php_date_obj *dateobj; timelib_time_offset *offset; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_interface) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_interface) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); if (dateobj->time->is_localtime/* && dateobj->time->tz_info*/) { switch (dateobj->time->zone_type) { @@ -3432,17 +3347,17 @@ PHP_FUNCTION(date_offset_get) } /* }}} */ -static void php_date_time_set(zval *object, long h, long i, long s, zval *return_value TSRMLS_DC) +static void php_date_time_set(zval *object, zend_long h, zend_long i, zend_long s, zval *return_value) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); dateobj->time->h = h; dateobj->time->i = i; dateobj->time->s = s; timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_time_set(DateTime object, long hour, long minute[, long second]) Sets the time. @@ -3450,15 +3365,16 @@ static void php_date_time_set(zval *object, long h, long i, long s, zval *return PHP_FUNCTION(date_time_set) { zval *object; - long h, i, s = 0; + zend_long h, i, s = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll|l", &object, date_ce_date, &h, &i, &s) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll|l", &object, date_ce_date, &h, &i, &s) == FAILURE) { RETURN_FALSE; } - php_date_time_set(object, h, i, s, return_value TSRMLS_CC); + php_date_time_set(object, h, i, s, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3466,31 +3382,31 @@ PHP_FUNCTION(date_time_set) */ PHP_METHOD(DateTimeImmutable, setTime) { - zval *object, *new_object; - long h, i, s = 0; + zval *object, new_object; + zend_long h, i, s = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll|l", &object, date_ce_immutable, &h, &i, &s) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll|l", &object, date_ce_immutable, &h, &i, &s) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_time_set(new_object, h, i, s, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_time_set(&new_object, h, i, s, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ -static void php_date_date_set(zval *object, long y, long m, long d, zval *return_value TSRMLS_DC) +static void php_date_date_set(zval *object, zend_long y, zend_long m, zend_long d, zval *return_value) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); dateobj->time->y = y; dateobj->time->m = m; dateobj->time->d = d; timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_date_set(DateTime object, long year, long month, long day) Sets the date. @@ -3498,15 +3414,16 @@ static void php_date_date_set(zval *object, long y, long m, long d, zval *return PHP_FUNCTION(date_date_set) { zval *object; - long y, m, d; + zend_long y, m, d; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olll", &object, date_ce_date, &y, &m, &d) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olll", &object, date_ce_date, &y, &m, &d) == FAILURE) { RETURN_FALSE; } - php_date_date_set(object, y, m, d, return_value TSRMLS_CC); + php_date_date_set(object, y, m, d, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3514,25 +3431,25 @@ PHP_FUNCTION(date_date_set) */ PHP_METHOD(DateTimeImmutable, setDate) { - zval *object, *new_object; - long y, m, d; + zval *object, new_object; + zend_long y, m, d; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olll", &object, date_ce_immutable, &y, &m, &d) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olll", &object, date_ce_immutable, &y, &m, &d) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_date_set(new_object, y, m, d, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_date_set(&new_object, y, m, d, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ -static void php_date_isodate_set(zval *object, long y, long w, long d, zval *return_value TSRMLS_DC) +static void php_date_isodate_set(zval *object, zend_long y, zend_long w, zend_long d, zval *return_value) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); dateobj->time->y = y; dateobj->time->m = 1; @@ -3542,7 +3459,7 @@ static void php_date_isodate_set(zval *object, long y, long w, long d, zval *ret dateobj->time->have_relative = 1; timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_isodate_set(DateTime object, long year, long week[, long day]) Sets the ISO date. @@ -3550,15 +3467,16 @@ static void php_date_isodate_set(zval *object, long y, long w, long d, zval *ret PHP_FUNCTION(date_isodate_set) { zval *object; - long y, w, d = 1; + zend_long y, w, d = 1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll|l", &object, date_ce_date, &y, &w, &d) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll|l", &object, date_ce_date, &y, &w, &d) == FAILURE) { RETURN_FALSE; } - php_date_isodate_set(object, y, w, d, return_value TSRMLS_CC); + php_date_isodate_set(object, y, w, d, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3566,29 +3484,29 @@ PHP_FUNCTION(date_isodate_set) */ PHP_METHOD(DateTimeImmutable, setISODate) { - zval *object, *new_object; - long y, w, d = 1; + zval *object, new_object; + zend_long y, w, d = 1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll|l", &object, date_ce_immutable, &y, &w, &d) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll|l", &object, date_ce_immutable, &y, &w, &d) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_isodate_set(new_object, y, w, d, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_isodate_set(&new_object, y, w, d, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ -static void php_date_timestamp_set(zval *object, long timestamp, zval *return_value TSRMLS_DC) +static void php_date_timestamp_set(zval *object, zend_long timestamp, zval *return_value) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); timelib_unixtime2local(dateobj->time, (timelib_sll)timestamp); timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_timestamp_set(DateTime object, long unixTimestamp) Sets the date and time based on an Unix timestamp. @@ -3596,15 +3514,16 @@ static void php_date_timestamp_set(zval *object, long timestamp, zval *return_va PHP_FUNCTION(date_timestamp_set) { zval *object; - long timestamp; + zend_long timestamp; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &object, date_ce_date, ×tamp) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &object, date_ce_date, ×tamp) == FAILURE) { RETURN_FALSE; } - php_date_timestamp_set(object, timestamp, return_value TSRMLS_CC); + php_date_timestamp_set(object, timestamp, return_value); - RETURN_ZVAL(object, 1, 0); + Z_ADDREF_P(object); + ZVAL_COPY_VALUE(return_value, object); } /* }}} */ @@ -3612,17 +3531,17 @@ PHP_FUNCTION(date_timestamp_set) */ PHP_METHOD(DateTimeImmutable, setTimestamp) { - zval *object, *new_object; - long timestamp; + zval *object, new_object; + zend_long timestamp; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &object, date_ce_immutable, ×tamp) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &object, date_ce_immutable, ×tamp) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_timestamp_set(new_object, timestamp, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object); + php_date_timestamp_set(&new_object, timestamp, return_value); - RETURN_ZVAL(new_object, 0, 1); + ZVAL_COPY_VALUE(return_value, &new_object); } /* }}} */ @@ -3633,13 +3552,13 @@ PHP_FUNCTION(date_timestamp_get) { zval *object; php_date_obj *dateobj; - long timestamp; + zend_long timestamp; int error; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_interface) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_interface) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); timelib_update_ts(dateobj->time, NULL); @@ -3660,20 +3579,20 @@ PHP_FUNCTION(date_diff) zval *object1, *object2; php_date_obj *dateobj1, *dateobj2; php_interval_obj *interval; - long absolute = 0; + zend_bool absolute = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|b", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { RETURN_FALSE; } - dateobj1 = (php_date_obj *) zend_object_store_get_object(object1 TSRMLS_CC); - dateobj2 = (php_date_obj *) zend_object_store_get_object(object2 TSRMLS_CC); + dateobj1 = Z_PHPDATE_P(object1); + dateobj2 = Z_PHPDATE_P(object2); DATE_CHECK_INITIALIZED(dateobj1->time, DateTimeInterface); DATE_CHECK_INITIALIZED(dateobj2->time, DateTimeInterface); timelib_update_ts(dateobj1->time, NULL); timelib_update_ts(dateobj2->time, NULL); - php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); - interval = zend_object_store_get_object(return_value TSRMLS_CC); + php_date_instantiate(date_ce_interval, return_value); + interval = Z_PHPINTERVAL_P(return_value); interval->diff = timelib_diff(dateobj1->time, dateobj2->time); if (absolute) { interval->diff->invert = 0; @@ -3682,29 +3601,29 @@ PHP_FUNCTION(date_diff) } /* }}} */ -static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size_t tz_len TSRMLS_DC) +static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size_t tz_len) /* {{{ */ { timelib_time *dummy_t = ecalloc(1, sizeof(timelib_time)); int dst, not_found; char *orig_tz = tz; if (strlen(tz) != tz_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Timezone must not contain null bytes"); + php_error_docref(NULL, E_WARNING, "Timezone must not contain null bytes"); return FAILURE; } dummy_t->z = timelib_parse_zone(&tz, &dst, dummy_t, ¬_found, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); if (not_found) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or bad timezone (%s)", orig_tz); + php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz); efree(dummy_t); return FAILURE; } else { set_timezone_from_timelib_time(tzobj, dummy_t); - free(dummy_t->tz_abbr); + timelib_free(dummy_t->tz_abbr); efree(dummy_t); return SUCCESS; } -} +} /* }}} */ /* {{{ proto DateTimeZone timezone_open(string timezone) Returns new DateTimeZone object @@ -3712,14 +3631,15 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size PHP_FUNCTION(timezone_open) { char *tz; - int tz_len; + size_t tz_len; php_timezone_obj *tzobj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &tz, &tz_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &tz, &tz_len) == FAILURE) { RETURN_FALSE; } - tzobj = zend_object_store_get_object(php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC) TSRMLS_CC); - if (SUCCESS != timezone_initialize(tzobj, tz, tz_len TSRMLS_CC)) { + tzobj = Z_PHPTIMEZONE_P(php_date_instantiate(date_ce_timezone, return_value)); + if (SUCCESS != timezone_initialize(tzobj, tz, tz_len)) { + zval_ptr_dtor(return_value); RETURN_FALSE; } } @@ -3731,35 +3651,41 @@ PHP_FUNCTION(timezone_open) PHP_METHOD(DateTimeZone, __construct) { char *tz; - int tz_len; + size_t tz_len; php_timezone_obj *tzobj; zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &tz, &tz_len)) { - tzobj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (FAILURE == timezone_initialize(tzobj, tz, tz_len TSRMLS_CC)) { - ZVAL_NULL(getThis()); - } + if (FAILURE == zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &tz, &tz_len)) { + return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + + zend_replace_error_handling(EH_THROW, NULL, &error_handling); + tzobj = Z_PHPTIMEZONE_P(getThis()); + timezone_initialize(tzobj, tz, tz_len); + zend_restore_error_handling(&error_handling); } /* }}} */ -static int php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, HashTable *myht TSRMLS_DC) +static int php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, HashTable *myht) /* {{{ */ { - zval **z_timezone = NULL; - zval **z_timezone_type = NULL; + zval *z_timezone; + zval *z_timezone_type; - if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { - if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { - if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_PP(z_timezone), Z_STRLEN_PP(z_timezone) TSRMLS_CC)) { + if ((z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type") - 1)) != NULL) { + if ((z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone") - 1)) != NULL) { + if (Z_TYPE_P(z_timezone_type) != IS_LONG) { + return FAILURE; + } + if (Z_TYPE_P(z_timezone) != IS_STRING) { + return FAILURE; + } + if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_P(z_timezone), Z_STRLEN_P(z_timezone))) { return SUCCESS; } } } return FAILURE; -} +} /* }}} */ /* {{{ proto DateTimeZone::__set_state() * */ @@ -3769,16 +3695,16 @@ PHP_METHOD(DateTimeZone, __set_state) zval *array; HashTable *myht; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) { RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); - php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC); - tzobj = (php_timezone_obj *) zend_object_store_get_object(return_value TSRMLS_CC); - if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC) != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone initialization failed"); + php_date_instantiate(date_ce_timezone, return_value); + tzobj = Z_PHPTIMEZONE_P(return_value); + if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht) != SUCCESS) { + php_error_docref(NULL, E_ERROR, "Timezone initialization failed"); } } /* }}} */ @@ -3791,12 +3717,12 @@ PHP_METHOD(DateTimeZone, __wakeup) php_timezone_obj *tzobj; HashTable *myht; - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); myht = Z_OBJPROP_P(object); - - if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC) != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone initialization failed"); + + if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht) != SUCCESS) { + php_error_docref(NULL, E_ERROR, "Timezone initialization failed"); } } /* }}} */ @@ -3809,30 +3735,30 @@ PHP_FUNCTION(timezone_name_get) zval *object; php_timezone_obj *tzobj; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_timezone) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); switch (tzobj->type) { case TIMELIB_ZONETYPE_ID: - RETURN_STRING(tzobj->tzi.tz->name, 1); + RETURN_STRING(tzobj->tzi.tz->name); break; case TIMELIB_ZONETYPE_OFFSET: { - char *tmpstr = emalloc(sizeof("UTC+05:00")); + zend_string *tmpstr = zend_string_alloc(sizeof("UTC+05:00")-1, 0); timelib_sll utc_offset = tzobj->tzi.utc_offset; - snprintf(tmpstr, sizeof("+05:00"), "%c%02d:%02d", + ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d", utc_offset > 0 ? '-' : '+', abs(utc_offset / 60), abs((utc_offset % 60))); - RETURN_STRING(tmpstr, 0); + RETURN_NEW_STR(tmpstr); } break; case TIMELIB_ZONETYPE_ABBR: - RETURN_STRING(tzobj->tzi.z.abbr, 1); + RETURN_STRING(tzobj->tzi.z.abbr); break; } } @@ -3845,24 +3771,24 @@ PHP_FUNCTION(timezone_name_from_abbr) { char *abbr; char *tzid; - int abbr_len; - long gmtoffset = -1; - long isdst = -1; + size_t abbr_len; + zend_long gmtoffset = -1; + zend_long isdst = -1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &abbr, &abbr_len, &gmtoffset, &isdst) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ll", &abbr, &abbr_len, &gmtoffset, &isdst) == FAILURE) { RETURN_FALSE; } tzid = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst); if (tzid) { - RETURN_STRING(tzid, 1); + RETURN_STRING(tzid); } else { RETURN_FALSE; } } /* }}} */ -/* {{{ proto long timezone_offset_get(DateTimeZone object, DateTimeInterface object) +/* {{{ proto long timezone_offset_get(DateTimeZone object, DateTimeInterface datetime) Returns the timezone offset. */ PHP_FUNCTION(timezone_offset_get) @@ -3872,12 +3798,12 @@ PHP_FUNCTION(timezone_offset_get) php_date_obj *dateobj; timelib_time_offset *offset; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_timezone, &dateobject, date_ce_interface) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_timezone, &dateobject, date_ce_interface) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); - dateobj = (php_date_obj *) zend_object_store_get_object(dateobject TSRMLS_CC); + dateobj = Z_PHPDATE_P(dateobject); DATE_CHECK_INITIALIZED(dateobj->time, DateTimeInterface); switch (tzobj->type) { @@ -3901,45 +3827,43 @@ PHP_FUNCTION(timezone_offset_get) */ PHP_FUNCTION(timezone_transitions_get) { - zval *object, *element; + zval *object, element; php_timezone_obj *tzobj; unsigned int i, begin = 0, found; - long timestamp_begin = LONG_MIN, timestamp_end = LONG_MAX; + zend_long timestamp_begin = ZEND_LONG_MIN, timestamp_end = ZEND_LONG_MAX; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ll", &object, date_ce_timezone, ×tamp_begin, ×tamp_end) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|ll", &object, date_ce_timezone, ×tamp_begin, ×tamp_end) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); if (tzobj->type != TIMELIB_ZONETYPE_ID) { RETURN_FALSE; } #define add_nominal() \ - MAKE_STD_ZVAL(element); \ - array_init(element); \ - add_assoc_long(element, "ts", timestamp_begin); \ - add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0); \ - add_assoc_long(element, "offset", tzobj->tzi.tz->type[0].offset); \ - add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[0].isdst); \ - add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx], 1); \ - add_next_index_zval(return_value, element); + array_init(&element); \ + add_assoc_long(&element, "ts", timestamp_begin); \ + add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0)); \ + add_assoc_long(&element, "offset", tzobj->tzi.tz->type[0].offset); \ + add_assoc_bool(&element, "isdst", tzobj->tzi.tz->type[0].isdst); \ + add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx]); \ + add_next_index_zval(return_value, &element); #define add(i,ts) \ - MAKE_STD_ZVAL(element); \ - array_init(element); \ - add_assoc_long(element, "ts", ts); \ - add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0 TSRMLS_CC), 0); \ - add_assoc_long(element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \ - add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \ - add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx], 1); \ - add_next_index_zval(return_value, element); + array_init(&element); \ + add_assoc_long(&element, "ts", ts); \ + add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0)); \ + add_assoc_long(&element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \ + add_assoc_bool(&element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \ + add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]); \ + add_next_index_zval(return_value, &element); #define add_last() add(tzobj->tzi.tz->bit32.timecnt - 1, timestamp_begin) array_init(return_value); - if (timestamp_begin == LONG_MIN) { + if (timestamp_begin == ZEND_LONG_MIN) { add_nominal(); begin = 0; found = 1; @@ -3986,24 +3910,24 @@ PHP_FUNCTION(timezone_location_get) zval *object; php_timezone_obj *tzobj; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_timezone) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); if (tzobj->type != TIMELIB_ZONETYPE_ID) { RETURN_FALSE; } array_init(return_value); - add_assoc_string(return_value, "country_code", tzobj->tzi.tz->location.country_code, 1); + add_assoc_string(return_value, "country_code", tzobj->tzi.tz->location.country_code); add_assoc_double(return_value, "latitude", tzobj->tzi.tz->location.latitude); add_assoc_double(return_value, "longitude", tzobj->tzi.tz->location.longitude); - add_assoc_string(return_value, "comments", tzobj->tzi.tz->location.comments, 1); + add_assoc_string(return_value, "comments", tzobj->tzi.tz->location.comments); } /* }}} */ -static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *format, int format_length TSRMLS_DC) +static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *format, size_t format_length) /* {{{ */ { timelib_time *b = NULL, *e = NULL; timelib_rel_time *p = NULL; @@ -4014,7 +3938,7 @@ static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *forma timelib_strtointerval(format, format_length, &b, &e, &p, &r, &errors); if (errors->error_count > 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or bad format (%s)", format); + php_error_docref(NULL, E_WARNING, "Unknown or bad format (%s)", format); retval = FAILURE; } else { if(p) { @@ -4027,35 +3951,37 @@ static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *forma *rt = timelib_diff(b, e); retval = SUCCESS; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse interval (%s)", format); + php_error_docref(NULL, E_WARNING, "Failed to parse interval (%s)", format); retval = FAILURE; } } } timelib_error_container_dtor(errors); + timelib_free(b); + timelib_free(e); return retval; -} +} /* }}} */ /* {{{ date_interval_read_property */ -zval *date_interval_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +zval *date_interval_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) { php_interval_obj *obj; zval *retval; zval tmp_member; timelib_sll value = -1; - if (member->type != IS_STRING) { + if (Z_TYPE_P(member) != IS_STRING) { tmp_member = *member; zval_copy_ctor(&tmp_member); convert_to_string(&tmp_member); member = &tmp_member; - key = NULL; + cache_slot = NULL; } - obj = (php_interval_obj *)zend_objects_get_address(object TSRMLS_CC); + obj = Z_PHPINTERVAL_P(object); if (!obj->initialized) { - retval = (zend_get_std_object_handlers())->read_property(object, member, type, key TSRMLS_CC); + retval = (zend_get_std_object_handlers())->read_property(object, member, type, cache_slot, rv); if (member == &tmp_member) { zval_dtor(member); } @@ -4077,7 +4003,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze GET_VALUE_FROM_STRUCT(invert, "invert"); GET_VALUE_FROM_STRUCT(days, "days"); /* didn't find any */ - retval = (zend_get_std_object_handlers())->read_property(object, member, type, key TSRMLS_CC); + retval = (zend_get_std_object_handlers())->read_property(object, member, type, cache_slot, rv); if (member == &tmp_member) { zval_dtor(member); @@ -4086,8 +4012,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze return retval; } while(0); - ALLOC_INIT_ZVAL(retval); - Z_SET_REFCOUNT_P(retval, 0); + retval = rv; if (value != -99999) { ZVAL_LONG(retval, value); @@ -4104,23 +4029,23 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze /* }}} */ /* {{{ date_interval_write_property */ -void date_interval_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +void date_interval_write_property(zval *object, zval *member, zval *value, void **cache_slot) { php_interval_obj *obj; - zval tmp_member, tmp_value; + zval tmp_member; - if (member->type != IS_STRING) { + if (Z_TYPE_P(member) != IS_STRING) { tmp_member = *member; zval_copy_ctor(&tmp_member); convert_to_string(&tmp_member); member = &tmp_member; - key = NULL; + cache_slot = NULL; } - obj = (php_interval_obj *)zend_objects_get_address(object TSRMLS_CC); + obj = Z_PHPINTERVAL_P(object); if (!obj->initialized) { - (zend_get_std_object_handlers())->write_property(object, member, value, key TSRMLS_CC); + (zend_get_std_object_handlers())->write_property(object, member, value, cache_slot); if (member == &tmp_member) { zval_dtor(member); } @@ -4129,16 +4054,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const #define SET_VALUE_FROM_STRUCT(n,m) \ if (strcmp(Z_STRVAL_P(member), m) == 0) { \ - if (value->type != IS_LONG) { \ - tmp_value = *value; \ - zval_copy_ctor(&tmp_value); \ - convert_to_long(&tmp_value); \ - value = &tmp_value; \ - } \ - obj->diff->n = Z_LVAL_P(value); \ - if (value == &tmp_value) { \ - zval_dtor(value); \ - } \ + obj->diff->n = zval_get_long(value); \ break; \ } @@ -4151,7 +4067,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const SET_VALUE_FROM_STRUCT(s, "s"); SET_VALUE_FROM_STRUCT(invert, "invert"); /* didn't find any */ - (zend_get_std_object_handlers())->write_property(object, member, value, key TSRMLS_CC); + (zend_get_std_object_handlers())->write_property(object, member, value, cache_slot); } while(0); if (member == &tmp_member) { @@ -4167,35 +4083,35 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const PHP_METHOD(DateInterval, __construct) { char *interval_string = NULL; - int interval_string_length; + size_t interval_string_length; php_interval_obj *diobj; timelib_rel_time *reltime; zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &interval_string, &interval_string_length) == SUCCESS) { - if (date_interval_initialize(&reltime, interval_string, interval_string_length TSRMLS_CC) == SUCCESS) { - diobj = zend_object_store_get_object(getThis() TSRMLS_CC); - diobj->diff = reltime; - diobj->initialized = 1; - } else { - ZVAL_NULL(getThis()); - } + if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &interval_string, &interval_string_length) == FAILURE) { + return; + } + + zend_replace_error_handling(EH_THROW, NULL, &error_handling); + if (date_interval_initialize(&reltime, interval_string, interval_string_length) == SUCCESS) { + diobj = Z_PHPINTERVAL_P(getThis()); + diobj->diff = reltime; + diobj->initialized = 1; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); } /* }}} */ -static int php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, HashTable *myht TSRMLS_DC) +static int php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, HashTable *myht) /* {{{ */ { (*intobj)->diff = timelib_rel_time_ctor(); #define PHP_DATE_INTERVAL_READ_PROPERTY(element, member, itype, def) \ do { \ - zval **z_arg = NULL; \ - if (zend_hash_find(myht, element, strlen(element) + 1, (void**) &z_arg) == SUCCESS && Z_TYPE_PP(z_arg) == IS_LONG) { \ - (*intobj)->diff->member = (itype)Z_LVAL_PP(z_arg); \ + zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \ + if (z_arg) { \ + (*intobj)->diff->member = (itype)zval_get_long(z_arg); \ } else { \ (*intobj)->diff->member = (itype)def; \ } \ @@ -4203,17 +4119,11 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter #define PHP_DATE_INTERVAL_READ_PROPERTY_I64(element, member) \ do { \ - zval **z_arg = NULL; \ - if (zend_hash_find(myht, element, strlen(element) + 1, (void**) &z_arg) == SUCCESS) { \ - if (Z_TYPE_PP(z_arg) == IS_STRING) { \ - DATE_A64I((*intobj)->diff->member, Z_STRVAL_PP(z_arg)); \ - } else if (Z_TYPE_PP(z_arg) == IS_LONG || Z_TYPE_PP(z_arg) == IS_BOOL) { \ - (*intobj)->diff->member = (timelib_sll)Z_LVAL_PP(z_arg); \ - } else if (Z_TYPE_PP(z_arg) == IS_DOUBLE) { \ - (*intobj)->diff->member = (timelib_sll)Z_DVAL_PP(z_arg); \ - } else { \ - (*intobj)->diff->member = -1LL; \ - } \ + zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \ + if (z_arg) { \ + zend_string *str = zval_get_string(z_arg); \ + DATE_A64I((*intobj)->diff->member, ZSTR_VAL(str)); \ + zend_string_release(str); \ } else { \ (*intobj)->diff->member = -1LL; \ } \ @@ -4237,7 +4147,7 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter (*intobj)->initialized = 1; return 0; -} +} /* }}} */ /* {{{ proto DateInterval::__set_state() */ @@ -4247,15 +4157,15 @@ PHP_METHOD(DateInterval, __set_state) zval *array; HashTable *myht; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) { RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); - php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); - intobj = (php_interval_obj *) zend_object_store_get_object(return_value TSRMLS_CC); - php_date_interval_initialize_from_hash(&return_value, &intobj, myht TSRMLS_CC); + php_date_instantiate(date_ce_interval, return_value); + intobj = Z_PHPINTERVAL_P(return_value); + php_date_interval_initialize_from_hash(&return_value, &intobj, myht); } /* }}} */ @@ -4267,32 +4177,33 @@ PHP_METHOD(DateInterval, __wakeup) php_interval_obj *intobj; HashTable *myht; - intobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(object); myht = Z_OBJPROP_P(object); - php_date_interval_initialize_from_hash(&return_value, &intobj, myht TSRMLS_CC); + php_date_interval_initialize_from_hash(&return_value, &intobj, myht); } /* }}} */ + /* {{{ proto DateInterval date_interval_create_from_date_string(string time) Uses the normal date parsers and sets up a DateInterval from the relative parts of the parsed string */ PHP_FUNCTION(date_interval_create_from_date_string) { char *time_str = NULL; - int time_str_len = 0; + size_t time_str_len = 0; timelib_time *time; timelib_error_container *err = NULL; php_interval_obj *diobj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &time_str, &time_str_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &time_str, &time_str_len) == FAILURE) { RETURN_FALSE; } - php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); + php_date_instantiate(date_ce_interval, return_value); time = timelib_strtotime(time_str, time_str_len, &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); - diobj = (php_interval_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + diobj = Z_PHPINTERVAL_P(return_value); diobj->diff = timelib_rel_time_clone(&time->relative); diobj->initialized = 1; timelib_time_dtor(time); @@ -4301,14 +4212,14 @@ PHP_FUNCTION(date_interval_create_from_date_string) /* }}} */ /* {{{ date_interval_format - */ -static char *date_interval_format(char *format, int format_len, timelib_rel_time *t) +static zend_string *date_interval_format(char *format, size_t format_len, timelib_rel_time *t) { smart_str string = {0}; int i, length, have_format_spec = 0; char buffer[33]; if (!format_len) { - return estrdup(""); + return ZSTR_EMPTY_ALLOC(); } for (i = 0; i < format_len; i++) { @@ -4329,8 +4240,8 @@ static char *date_interval_format(char *format, int format_len, timelib_rel_time case 'I': length = slprintf(buffer, 32, "%02d", (int) t->i); break; case 'i': length = slprintf(buffer, 32, "%d", (int) t->i); break; - case 'S': length = slprintf(buffer, 32, "%02ld", (long) t->s); break; - case 's': length = slprintf(buffer, 32, "%ld", (long) t->s); break; + case 'S': length = slprintf(buffer, 32, "%02" ZEND_LONG_FMT_SPEC, (zend_long) t->s); break; + case 's': length = slprintf(buffer, 32, ZEND_LONG_FMT, (zend_long) t->s); break; case 'a': { if ((int) t->days != -99999) { @@ -4358,7 +4269,7 @@ static char *date_interval_format(char *format, int format_len, timelib_rel_time smart_str_0(&string); - return string.c; + return string.s; } /* }}} */ @@ -4370,19 +4281,19 @@ PHP_FUNCTION(date_interval_format) zval *object; php_interval_obj *diobj; char *format; - int format_len; + size_t format_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_interval, &format, &format_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_interval, &format, &format_len) == FAILURE) { RETURN_FALSE; } - diobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC); + diobj = Z_PHPINTERVAL_P(object); DATE_CHECK_INITIALIZED(diobj->initialized, DateInterval); - RETURN_STRING(date_interval_format(format, format_len, diobj->diff), 0); + RETURN_STR(date_interval_format(format, format_len, diobj->diff)); } /* }}} */ -static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, long *recurrences, /*const*/ char *format, int format_length TSRMLS_DC) +static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, zend_long *recurrences, /*const*/ char *format, size_t format_length) /* {{{ */ { timelib_time *b = NULL, *e = NULL; timelib_rel_time *p = NULL; @@ -4393,7 +4304,7 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_ timelib_strtointerval(format, format_length, &b, &e, &p, &r, &errors); if (errors->error_count > 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or bad format (%s)", format); + php_error_docref(NULL, E_WARNING, "Unknown or bad format (%s)", format); retval = FAILURE; } else { *st = b; @@ -4404,7 +4315,7 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_ } timelib_error_container_dtor(errors); return retval; -} +} /* }}} */ /* {{{ proto DatePeriod::__construct(DateTime $start, DateInterval $interval, int recurrences|DateTime $end) Creates new DatePeriod object. @@ -4415,36 +4326,36 @@ PHP_METHOD(DatePeriod, __construct) php_date_obj *dateobj; php_interval_obj *intobj; zval *start, *end = NULL, *interval; - long recurrences = 0, options = 0; + zend_long recurrences = 0, options = 0; char *isostr = NULL; - int isostr_len = 0; + size_t isostr_len = 0; timelib_time *clone; zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOl|l", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) { - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) { - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &isostr, &isostr_len, &options) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments."); - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_replace_error_handling(EH_THROW, NULL, &error_handling); + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "OOl|l", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) { + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) { + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "s|l", &isostr, &isostr_len, &options) == FAILURE) { + php_error_docref(NULL, E_WARNING, "This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments."); + zend_restore_error_handling(&error_handling); return; } } } - dpobj = zend_object_store_get_object(getThis() TSRMLS_CC); + dpobj = Z_PHPPERIOD_P(getThis()); dpobj->current = NULL; if (isostr) { - date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), &recurrences, isostr, isostr_len TSRMLS_CC); + date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), &recurrences, isostr, isostr_len); if (dpobj->start == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ISO interval '%s' did not contain a start date.", isostr); + php_error_docref(NULL, E_WARNING, "The ISO interval '%s' did not contain a start date.", isostr); } if (dpobj->interval == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ISO interval '%s' did not contain an interval.", isostr); + php_error_docref(NULL, E_WARNING, "The ISO interval '%s' did not contain an interval.", isostr); } if (dpobj->end == NULL && recurrences == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ISO interval '%s' did not contain an end date or a recurrence count.", isostr); + php_error_docref(NULL, E_WARNING, "The ISO interval '%s' did not contain an end date or a recurrence count.", isostr); } if (dpobj->start) { @@ -4456,14 +4367,14 @@ PHP_METHOD(DatePeriod, __construct) dpobj->start_ce = date_ce_date; } else { /* init */ - intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(interval); /* start date */ - dateobj = (php_date_obj *) zend_object_store_get_object(start TSRMLS_CC); + dateobj = Z_PHPDATE_P(start); clone = timelib_time_ctor(); memcpy(clone, dateobj->time, sizeof(timelib_time)); if (dateobj->time->tz_abbr) { - clone->tz_abbr = strdup(dateobj->time->tz_abbr); + clone->tz_abbr = timelib_strdup(dateobj->time->tz_abbr); } if (dateobj->time->tz_info) { clone->tz_info = dateobj->time->tz_info; @@ -4476,7 +4387,7 @@ PHP_METHOD(DatePeriod, __construct) /* end date */ if (end) { - dateobj = (php_date_obj *) zend_object_store_get_object(end TSRMLS_CC); + dateobj = Z_PHPDATE_P(end); clone = timelib_time_clone(dateobj->time); dpobj->end = clone; } @@ -4490,7 +4401,7 @@ PHP_METHOD(DatePeriod, __construct) dpobj->initialized = 1; - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); } /* }}} */ @@ -4506,14 +4417,14 @@ PHP_METHOD(DatePeriod, getStartDate) return; } - dpobj = (php_period_obj *)zend_object_store_get_object(getThis() TSRMLS_CC); + dpobj = Z_PHPPERIOD_P(getThis()); - php_date_instantiate(dpobj->start_ce, return_value TSRMLS_CC); - dateobj = (php_date_obj *)zend_object_store_get_object(return_value TSRMLS_CC); + php_date_instantiate(dpobj->start_ce, return_value); + dateobj = Z_PHPDATE_P(return_value); dateobj->time = timelib_time_ctor(); *dateobj->time = *dpobj->start; if (dpobj->start->tz_abbr) { - dateobj->time->tz_abbr = strdup(dpobj->start->tz_abbr); + dateobj->time->tz_abbr = timelib_strdup(dpobj->start->tz_abbr); } if (dpobj->start->tz_info) { dateobj->time->tz_info = dpobj->start->tz_info; @@ -4533,14 +4444,14 @@ PHP_METHOD(DatePeriod, getEndDate) return; } - dpobj = (php_period_obj *)zend_object_store_get_object(getThis() TSRMLS_CC); + dpobj = Z_PHPPERIOD_P(getThis()); - php_date_instantiate(dpobj->start_ce, return_value TSRMLS_CC); - dateobj = (php_date_obj *)zend_object_store_get_object(return_value TSRMLS_CC); + php_date_instantiate(dpobj->start_ce, return_value); + dateobj = Z_PHPDATE_P(return_value); dateobj->time = timelib_time_ctor(); *dateobj->time = *dpobj->end; if (dpobj->end->tz_abbr) { - dateobj->time->tz_abbr = strdup(dpobj->end->tz_abbr); + dateobj->time->tz_abbr = timelib_strdup(dpobj->end->tz_abbr); } if (dpobj->end->tz_info) { dateobj->time->tz_info = dpobj->end->tz_info; @@ -4550,26 +4461,26 @@ PHP_METHOD(DatePeriod, getEndDate) /* {{{ proto DatePeriod::getDateInterval() Get date interval. -*/ +*/ PHP_METHOD(DatePeriod, getDateInterval) { php_period_obj *dpobj; php_interval_obj *diobj; - + if (zend_parse_parameters_none() == FAILURE) { return; } - dpobj = (php_period_obj *)zend_object_store_get_object(getThis() TSRMLS_CC); + dpobj = Z_PHPPERIOD_P(getThis()); - php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); - diobj = (php_interval_obj *)zend_object_store_get_object(return_value TSRMLS_CC); + php_date_instantiate(date_ce_interval, return_value); + diobj = Z_PHPINTERVAL_P(return_value); diobj->diff = timelib_rel_time_clone(dpobj->interval); diobj->initialized = 1; } /* }}} */ -static int check_id_allowed(char *id, long what) /* {{{ */ +static int check_id_allowed(char *id, zend_long what) /* {{{ */ { if (what & PHP_DATE_TIMEZONE_GROUP_AFRICA && strncasecmp(id, "Africa/", 7) == 0) return 1; if (what & PHP_DATE_TIMEZONE_GROUP_AMERICA && strncasecmp(id, "America/", 8) == 0) return 1; @@ -4583,7 +4494,7 @@ static int check_id_allowed(char *id, long what) /* {{{ */ if (what & PHP_DATE_TIMEZONE_GROUP_PACIFIC && strncasecmp(id, "Pacific/", 8) == 0) return 1; if (what & PHP_DATE_TIMEZONE_GROUP_UTC && strncasecmp(id, "UTC", 3) == 0) return 1; return 0; -} +} /* }}} */ /* {{{ proto array timezone_identifiers_list([long what[, string country]]) Returns numerically index array with all timezone identifiers. @@ -4593,17 +4504,17 @@ PHP_FUNCTION(timezone_identifiers_list) const timelib_tzdb *tzdb; const timelib_tzdb_index_entry *table; int i, item_count; - long what = PHP_DATE_TIMEZONE_GROUP_ALL; + zend_long what = PHP_DATE_TIMEZONE_GROUP_ALL; char *option = NULL; - int option_len = 0; + size_t option_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ls", &what, &option, &option_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ls", &what, &option, &option_len) == FAILURE) { RETURN_FALSE; } /* Extra validation */ if (what == PHP_DATE_TIMEZONE_PER_COUNTRY && option_len != 2) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "A two-letter ISO 3166-1 compatible country code is expected"); + php_error_docref(NULL, E_NOTICE, "A two-letter ISO 3166-1 compatible country code is expected"); RETURN_FALSE; } @@ -4616,10 +4527,10 @@ PHP_FUNCTION(timezone_identifiers_list) for (i = 0; i < item_count; ++i) { if (what == PHP_DATE_TIMEZONE_PER_COUNTRY) { if (tzdb->data[table[i].pos + 5] == option[0] && tzdb->data[table[i].pos + 6] == option[1]) { - add_next_index_string(return_value, table[i].id, 1); + add_next_index_string(return_value, table[i].id); } } else if (what == PHP_DATE_TIMEZONE_GROUP_ALL_W_BC || (check_id_allowed(table[i].id, what) && (tzdb->data[table[i].pos + 4] == '\1'))) { - add_next_index_string(return_value, table[i].id, 1); + add_next_index_string(return_value, table[i].id); } }; } @@ -4633,7 +4544,7 @@ PHP_FUNCTION(timezone_version_get) const timelib_tzdb *tzdb; tzdb = DATE_TIMEZONEDB; - RETURN_STRING(tzdb->version, 1); + RETURN_STRING(tzdb->version); } /* }}} */ @@ -4643,31 +4554,30 @@ PHP_FUNCTION(timezone_version_get) PHP_FUNCTION(timezone_abbreviations_list) { const timelib_tz_lookup_table *table, *entry; - zval *element, **abbr_array_pp, *abbr_array; + zval element, *abbr_array_p, abbr_array; table = timelib_timezone_abbreviations_list(); array_init(return_value); entry = table; do { - MAKE_STD_ZVAL(element); - array_init(element); - add_assoc_bool(element, "dst", entry->type); - add_assoc_long(element, "offset", entry->gmtoffset); + array_init(&element); + add_assoc_bool_ex(&element, "dst", sizeof("dst") -1, entry->type); + add_assoc_long_ex(&element, "offset", sizeof("offset") - 1, entry->gmtoffset); if (entry->full_tz_name) { - add_assoc_string(element, "timezone_id", entry->full_tz_name, 1); + add_assoc_string_ex(&element, "timezone_id", sizeof("timezone_id") - 1, entry->full_tz_name); } else { - add_assoc_null(element, "timezone_id"); + add_assoc_null_ex(&element, "timezone_id", sizeof("timezone_id") - 1); } - if (zend_hash_find(HASH_OF(return_value), entry->name, strlen(entry->name) + 1, (void **) &abbr_array_pp) == FAILURE) { - MAKE_STD_ZVAL(abbr_array); - array_init(abbr_array); - add_assoc_zval(return_value, entry->name, abbr_array); + abbr_array_p = zend_hash_str_find(Z_ARRVAL_P(return_value), entry->name, strlen(entry->name)); + if (!abbr_array_p) { + array_init(&abbr_array); + add_assoc_zval(return_value, entry->name, &abbr_array); } else { - abbr_array = *abbr_array_pp; + ZVAL_COPY_VALUE(&abbr_array, abbr_array_p); } - add_next_index_zval(abbr_array, element); + add_next_index_zval(&abbr_array, &element); entry++; } while (entry->name); } @@ -4678,13 +4588,13 @@ PHP_FUNCTION(timezone_abbreviations_list) PHP_FUNCTION(date_default_timezone_set) { char *zone; - int zone_len; + size_t zone_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &zone, &zone_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &zone, &zone_len) == FAILURE) { RETURN_FALSE; } if (!timelib_timezone_id_is_valid(zone, DATE_TIMEZONEDB)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Timezone ID '%s' is invalid", zone); + php_error_docref(NULL, E_NOTICE, "Timezone ID '%s' is invalid", zone); RETURN_FALSE; } if (DATEG(timezone)) { @@ -4702,8 +4612,8 @@ PHP_FUNCTION(date_default_timezone_get) { timelib_tzinfo *default_tz; - default_tz = get_timezone_info(TSRMLS_C); - RETVAL_STRING(default_tz->name, 1); + default_tz = get_timezone_info(); + RETVAL_STRING(default_tz->name); } /* }}} */ @@ -4715,13 +4625,13 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su double latitude = 0.0, longitude = 0.0, zenith = 0.0, gmt_offset = 0, altitude; double h_rise, h_set, N; timelib_sll rise, set, transit; - long time, retformat = 0; + zend_long time, retformat = 0; int rs; timelib_time *t; timelib_tzinfo *tzi; - char *retstr; + zend_string *retstr; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|ldddd", &time, &retformat, &latitude, &longitude, &zenith, &gmt_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|ldddd", &time, &retformat, &latitude, &longitude, &zenith, &gmt_offset) == FAILURE) { RETURN_FALSE; } @@ -4742,7 +4652,7 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su case 6: break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid format"); + php_error_docref(NULL, E_WARNING, "invalid format"); RETURN_FALSE; break; } @@ -4750,14 +4660,14 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su retformat != SUNFUNCS_RET_STRING && retformat != SUNFUNCS_RET_DOUBLE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong return format given, pick one of SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING or SUNFUNCS_RET_DOUBLE"); + php_error_docref(NULL, E_WARNING, "Wrong return format given, pick one of SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING or SUNFUNCS_RET_DOUBLE"); RETURN_FALSE; } altitude = 90 - zenith; /* Initialize time struct */ t = timelib_time_ctor(); - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); t->tz_info = tzi; t->zone_type = TIMELIB_ZONETYPE_ID; @@ -4784,8 +4694,8 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su switch (retformat) { case SUNFUNCS_RET_STRING: - spprintf(&retstr, 0, "%02d:%02d", (int) N, (int) (60 * (N - (int) N))); - RETURN_STRINGL(retstr, 5, 0); + retstr = strpprintf(0, "%02d:%02d", (int) N, (int) (60 * (N - (int) N))); + RETURN_NEW_STR(retstr); break; case SUNFUNCS_RET_DOUBLE: RETURN_DOUBLE(N); @@ -4814,7 +4724,7 @@ PHP_FUNCTION(date_sunset) Returns an array with information about sun set/rise and twilight begin/end */ PHP_FUNCTION(date_sun_info) { - long time; + zend_long time; double latitude, longitude; timelib_time *t, *t2; timelib_tzinfo *tzi; @@ -4823,12 +4733,12 @@ PHP_FUNCTION(date_sun_info) int dummy; double ddummy; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ldd", &time, &latitude, &longitude) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ldd", &time, &latitude, &longitude) == FAILURE) { RETURN_FALSE; } /* Initialize time struct */ t = timelib_time_ctor(); - tzi = get_timezone_info(TSRMLS_C); + tzi = get_timezone_info(); t->tz_info = tzi; t->zone_type = TIMELIB_ZONETYPE_ID; timelib_unixtime2local(t, time); @@ -4915,131 +4825,129 @@ PHP_FUNCTION(date_sun_info) } /* }}} */ -static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc_period(zval *object, zval **table, int *n) /* {{{ */ { *table = NULL; *n = 0; - return zend_std_get_properties(object TSRMLS_CC); -} + return zend_std_get_properties(object); +} /* }}} */ -static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties_period(zval *object) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_period_obj *period_obj; - period_obj = zend_object_store_get_object(object TSRMLS_CC); + period_obj = Z_PHPPERIOD_P(object); - props = zend_std_get_properties(object TSRMLS_CC); + props = zend_std_get_properties(object); if (!period_obj->start || GC_G(gc_active)) { return props; } - MAKE_STD_ZVAL(zv); if (period_obj->start) { php_date_obj *date_obj; - object_init_ex(zv, date_ce_date); - date_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_date); + date_obj = Z_PHPDATE_P(&zv); date_obj->time = timelib_time_clone(period_obj->start); } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "start", sizeof("start"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "start", sizeof("start")-1, &zv); - MAKE_STD_ZVAL(zv); if (period_obj->current) { php_date_obj *date_obj; - object_init_ex(zv, date_ce_date); - date_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_date); + date_obj = Z_PHPDATE_P(&zv); date_obj->time = timelib_time_clone(period_obj->current); } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "current", sizeof("current"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "current", sizeof("current")-1, &zv); - MAKE_STD_ZVAL(zv); if (period_obj->end) { php_date_obj *date_obj; - object_init_ex(zv, date_ce_date); - date_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_date); + date_obj = Z_PHPDATE_P(&zv); date_obj->time = timelib_time_clone(period_obj->end); } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "end", sizeof("end"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "end", sizeof("end")-1, &zv); - MAKE_STD_ZVAL(zv); if (period_obj->interval) { php_interval_obj *interval_obj; - object_init_ex(zv, date_ce_interval); - interval_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_interval); + interval_obj = Z_PHPINTERVAL_P(&zv); interval_obj->diff = timelib_rel_time_clone(period_obj->interval); interval_obj->initialized = 1; } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "interval", sizeof("interval"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "interval", sizeof("interval")-1, &zv); /* converted to larger type (int->long); must check when unserializing */ - MAKE_STD_ZVAL(zv); - ZVAL_LONG(zv, (long) period_obj->recurrences); - zend_hash_update(props, "recurrences", sizeof("recurrences"), &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, (zend_long) period_obj->recurrences); + zend_hash_str_update(props, "recurrences", sizeof("recurrences")-1, &zv); - MAKE_STD_ZVAL(zv); - ZVAL_BOOL(zv, period_obj->include_start_date); - zend_hash_update(props, "include_start_date", sizeof("include_start_date"), &zv, sizeof(zv), NULL); + ZVAL_BOOL(&zv, period_obj->include_start_date); + zend_hash_str_update(props, "include_start_date", sizeof("include_start_date")-1, &zv); return props; -} +} /* }}} */ -static int php_date_period_initialize_from_hash(php_period_obj *period_obj, HashTable *myht TSRMLS_DC) +static int php_date_period_initialize_from_hash(php_period_obj *period_obj, HashTable *myht) /* {{{ */ { - zval **ht_entry; + zval *ht_entry; /* this function does no rollback on error */ - if (zend_hash_find(myht, "start", sizeof("start"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) { + ht_entry = zend_hash_str_find(myht, "start", sizeof("start")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) { php_date_obj *date_obj; - date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + date_obj = Z_PHPDATE_P(ht_entry); period_obj->start = timelib_time_clone(date_obj->time); - period_obj->start_ce = Z_OBJCE_PP(ht_entry); - } else if (Z_TYPE_PP(ht_entry) != IS_NULL) { + period_obj->start_ce = Z_OBJCE_P(ht_entry); + } else if (Z_TYPE_P(ht_entry) != IS_NULL) { return 0; } } else { return 0; } - if (zend_hash_find(myht, "end", sizeof("end"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) { + ht_entry = zend_hash_str_find(myht, "end", sizeof("end")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) { php_date_obj *date_obj; - date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + date_obj = Z_PHPDATE_P(ht_entry); period_obj->end = timelib_time_clone(date_obj->time); - } else if (Z_TYPE_PP(ht_entry) != IS_NULL) { + } else if (Z_TYPE_P(ht_entry) != IS_NULL) { return 0; } } else { return 0; } - if (zend_hash_find(myht, "current", sizeof("current"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) { + ht_entry = zend_hash_str_find(myht, "current", sizeof("current")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) { php_date_obj *date_obj; - date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + date_obj = Z_PHPDATE_P(ht_entry); period_obj->current = timelib_time_clone(date_obj->time); - } else if (Z_TYPE_PP(ht_entry) != IS_NULL) { + } else if (Z_TYPE_P(ht_entry) != IS_NULL) { return 0; } } else { return 0; } - if (zend_hash_find(myht, "interval", sizeof("interval"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_interval) { + ht_entry = zend_hash_str_find(myht, "interval", sizeof("interval")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_interval) { php_interval_obj *interval_obj; - interval_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + interval_obj = Z_PHPINTERVAL_P(ht_entry); period_obj->interval = timelib_rel_time_clone(interval_obj->diff); } else { /* interval is required */ return 0; @@ -5048,16 +4956,18 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash return 0; } - if (zend_hash_find(myht, "recurrences", sizeof("recurrences"), (void**) &ht_entry) == SUCCESS && - Z_TYPE_PP(ht_entry) == IS_LONG && Z_LVAL_PP(ht_entry) >= 0 && Z_LVAL_PP(ht_entry) <= INT_MAX) { - period_obj->recurrences = Z_LVAL_PP(ht_entry); + ht_entry = zend_hash_str_find(myht, "recurrences", sizeof("recurrences")-1); + if (ht_entry && + Z_TYPE_P(ht_entry) == IS_LONG && Z_LVAL_P(ht_entry) >= 0 && Z_LVAL_P(ht_entry) <= INT_MAX) { + period_obj->recurrences = Z_LVAL_P(ht_entry); } else { return 0; } - if (zend_hash_find(myht, "include_start_date", sizeof("include_start_date"), (void**) &ht_entry) == SUCCESS && - Z_TYPE_PP(ht_entry) == IS_BOOL) { - period_obj->include_start_date = Z_BVAL_PP(ht_entry); + ht_entry = zend_hash_str_find(myht, "include_start_date", sizeof("include_start_date")-1); + if (ht_entry && + (Z_TYPE_P(ht_entry) == IS_FALSE || Z_TYPE_P(ht_entry) == IS_TRUE)) { + period_obj->include_start_date = (Z_TYPE_P(ht_entry) == IS_TRUE); } else { return 0; } @@ -5065,7 +4975,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash period_obj->initialized = 1; return 1; -} +} /* }}} */ /* {{{ proto DatePeriod::__set_state() */ @@ -5075,15 +4985,15 @@ PHP_METHOD(DatePeriod, __set_state) zval *array; HashTable *myht; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) { RETURN_FALSE; } myht = Z_ARRVAL_P(array); object_init_ex(return_value, date_ce_period); - period_obj = zend_object_store_get_object(return_value TSRMLS_CC); - if (!php_date_period_initialize_from_hash(period_obj, myht TSRMLS_CC)) { + period_obj = Z_PHPPERIOD_P(return_value); + if (!php_date_period_initialize_from_hash(period_obj, myht)) { php_error(E_ERROR, "Invalid serialization data for DatePeriod object"); } } @@ -5097,33 +5007,30 @@ PHP_METHOD(DatePeriod, __wakeup) php_period_obj *period_obj; HashTable *myht; - period_obj = zend_object_store_get_object(object TSRMLS_CC); + period_obj = Z_PHPPERIOD_P(object); myht = Z_OBJPROP_P(object); - if (!php_date_period_initialize_from_hash(period_obj, myht TSRMLS_CC)) { + if (!php_date_period_initialize_from_hash(period_obj, myht)) { php_error(E_ERROR, "Invalid serialization data for DatePeriod object"); } } /* }}} */ /* {{{ date_period_read_property */ -static zval *date_period_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) { zval *zv; if (type != BP_VAR_IS && type != BP_VAR_R) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Retrieval of DatePeriod properties for modification is unsupported"); + php_error_docref(NULL, E_ERROR, "Retrieval of DatePeriod properties for modification is unsupported"); } Z_OBJPROP_P(object); /* build properties hash table */ - zv = std_object_handlers.read_property(object, member, type, key TSRMLS_CC); + zv = std_object_handlers.read_property(object, member, type, cache_slot, rv); if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) { /* defensive copy */ - zend_object_value zov = Z_OBJ_HANDLER_P(zv, clone_obj)(zv TSRMLS_CC); - MAKE_STD_ZVAL(zv); - Z_TYPE_P(zv) = IS_OBJECT; - Z_OBJVAL_P(zv) = zov; + ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(zv)); } return zv; @@ -5131,13 +5038,12 @@ static zval *date_period_read_property(zval *object, zval *member, int type, con /* }}} */ /* {{{ date_period_write_property */ -static void date_period_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +static void date_period_write_property(zval *object, zval *member, zval *value, void **cache_slot) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Writing to DatePeriod properties is unsupported"); + php_error_docref(NULL, E_ERROR, "Writing to DatePeriod properties is unsupported"); } /* }}} */ - /* * Local variables: * tab-width: 4 diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 9c729558bc..c336268a95 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -1,6 +1,6 @@ -/* +/* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ @@ -24,6 +24,9 @@ #include "lib/timelib.h" #include "Zend/zend_hash.h" +#include "php_version.h" +#define PHP_DATE_VERSION PHP_VERSION + extern zend_module_entry date_module_entry; #define phpext_date_ptr &date_module_entry @@ -131,13 +134,18 @@ typedef struct _php_interval_obj php_interval_obj; typedef struct _php_period_obj php_period_obj; struct _php_date_obj { - zend_object std; timelib_time *time; HashTable *props; + zend_object std; }; +static inline php_date_obj *php_date_obj_from_obj(zend_object *obj) { + return (php_date_obj*)((char*)(obj) - XtOffsetOf(php_date_obj, std)); +} + +#define Z_PHPDATE_P(zv) php_date_obj_from_obj(Z_OBJ_P((zv))) + struct _php_timezone_obj { - zend_object std; int initialized; int type; union { @@ -146,17 +154,29 @@ struct _php_timezone_obj { timelib_abbr_info z; /* TIMELIB_ZONETYPE_ABBR */ } tzi; HashTable *props; + zend_object std; }; +static inline php_timezone_obj *php_timezone_obj_from_obj(zend_object *obj) { + return (php_timezone_obj*)((char*)(obj) - XtOffsetOf(php_timezone_obj, std)); +} + +#define Z_PHPTIMEZONE_P(zv) php_timezone_obj_from_obj(Z_OBJ_P((zv))) + struct _php_interval_obj { - zend_object std; timelib_rel_time *diff; HashTable *props; int initialized; + zend_object std; }; +static inline php_interval_obj *php_interval_obj_from_obj(zend_object *obj) { + return (php_interval_obj*)((char*)(obj) - XtOffsetOf(php_interval_obj, std)); +} + +#define Z_PHPINTERVAL_P(zv) php_interval_obj_from_obj(Z_OBJ_P((zv))) + struct _php_period_obj { - zend_object std; timelib_time *start; zend_class_entry *start_ce; timelib_time *current; @@ -165,8 +185,15 @@ struct _php_period_obj { int recurrences; int initialized; int include_start_date; + zend_object std; }; +static inline php_period_obj *php_period_obj_from_obj(zend_object *obj) { + return (php_period_obj*)((char*)(obj) - XtOffsetOf(php_period_obj, std)); +} + +#define Z_PHPPERIOD_P(zv) php_period_obj_from_obj(Z_OBJ_P((zv))) + ZEND_BEGIN_MODULE_GLOBALS(date) char *default_timezone; char *timezone; @@ -175,25 +202,21 @@ ZEND_BEGIN_MODULE_GLOBALS(date) int timezone_valid; ZEND_END_MODULE_GLOBALS(date) -#ifdef ZTS -#define DATEG(v) TSRMG(date_globals_id, zend_date_globals *, v) -#else -#define DATEG(v) (date_globals.v) -#endif +#define DATEG(v) ZEND_MODULE_GLOBALS_ACCESSOR(date, v) /* Backwards compatibility wrapper */ -PHPAPI signed long php_parse_date(char *string, signed long *now); +PHPAPI zend_long php_parse_date(char *string, zend_long *now); PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt); -PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC); +PHPAPI int php_idate(char format, time_t ts, int localtime); #if HAVE_STRFTIME #define _php_strftime php_strftime PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm); #endif -PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localtime TSRMLS_DC); +PHPAPI zend_string *php_format_date(char *format, size_t format_len, time_t ts, int localtime); /* Mechanism to set new TZ database */ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb); -PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D); +PHPAPI timelib_tzinfo *get_timezone_info(void); /* Grabbing CE's so that other exts can use the date objects too */ PHPAPI zend_class_entry *php_date_get_date_ce(void); @@ -201,8 +224,8 @@ PHPAPI zend_class_entry *php_date_get_immutable_ce(void); PHPAPI zend_class_entry *php_date_get_timezone_ce(void); /* Functions for creating DateTime objects, and initializing them from a string */ -PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC); -PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC); +PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object); +PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, size_t time_str_len, char *format, zval *timezone_object, int ctor); #endif /* PHP_DATE_H */ diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt index cbdc8b7c0a..3ad04f5849 100644 --- a/ext/date/tests/009_win32.phpt +++ b/ext/date/tests/009_win32.phpt @@ -4,11 +4,15 @@ strftime() and gmstrftime() tests <?php if (substr(PHP_OS, 0, 3) != 'WIN') die('skip only windows test.'); if (!function_exists('strftime')) die("skip, strftime not available"); +if (false === setlocale(LC_TIME, "en-us")) die("skip, couldn't set the locale to en-us"); ?> --FILE-- <?php date_default_timezone_set('Asia/Jerusalem'); +$loc = setlocale(LC_TIME, "0"); +setlocale(LC_TIME, "en-us"); + $t = mktime(0,0,0, 6, 27, 2006); var_dump(strftime()); @@ -32,19 +36,21 @@ var_dump(gmstrftime("%%q %%a", $t)); var_dump(gmstrftime("blah", $t)); echo "Done\n"; + +setlocale(LC_TIME, $loc); ?> --EXPECTF-- Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) -string(%d) "Tue Tuesday Jun June 06/27/06 00:00:00 27 00 12 178 06 00 AM 00 26 26 2 06/27/06 00:00:00 06 2006 %s" +string(%d) "Tue Tuesday Jun June 6/27/2006 12:00:00 AM 27 00 12 178 06 00 AM 00 26 26 2 6/27/2006 12:00:00 AM 06 2006 %s" string(5) "%q %a" string(4) "blah" Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) -string(%d) "Mon Monday Jun June 06/26/06 21:00:00 26 21 09 177 06 00 PM 00 26 26 1 06/26/06 21:00:00 06 2006 %s" +string(%d) "Mon Monday Jun June 6/26/2006 9:00:00 PM 26 21 09 177 06 00 PM 00 26 26 1 6/26/2006 9:00:00 PM 06 2006 %s" string(5) "%q %a" string(4) "blah" Done diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index 3adb32c965..5cc31aa93a 100644 --- a/ext/date/tests/014.phpt +++ b/ext/date/tests/014.phpt @@ -37,6 +37,8 @@ Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on li bool(false) int(0) -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d -bool(false) -Done +Fatal error: Uncaught TypeError: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s:%d +Stack trace: +#0 %s(%d): timezone_offset_get(Object(DateTime), Object(DateTimeZone)) +#1 {main} + thrown in %s on line %d diff --git a/ext/date/tests/DatePeriod_wrong_constructor.phpt b/ext/date/tests/DatePeriod_wrong_constructor.phpt index 744ca26c87..8acdc5d386 100644 --- a/ext/date/tests/DatePeriod_wrong_constructor.phpt +++ b/ext/date/tests/DatePeriod_wrong_constructor.phpt @@ -10,7 +10,7 @@ date.timezone=UTC new DatePeriod(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'DatePeriod::__construct(): This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments.' in %s:%d +Fatal error: Uncaught Exception: DatePeriod::__construct(): This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments. in %s:%d Stack trace: #0 %s(%d): DatePeriod->__construct() #1 {main} diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt index 8ffe322176..8c8b14f12c 100644 --- a/ext/date/tests/DateTimeZone_construct_error.phpt +++ b/ext/date/tests/DateTimeZone_construct_error.phpt @@ -15,7 +15,11 @@ echo "*** Testing DateTimeZone() : error conditions ***\n"; echo "\n-- Testing new DateTimeZone() with more than expected no. of arguments --\n"; $timezone = "GMT"; $extra_arg = 99; -var_dump( new DateTimeZone($timezone, $extra_arg) ); +try { + new DateTimeZone($timezone, $extra_arg); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== @@ -23,10 +27,5 @@ var_dump( new DateTimeZone($timezone, $extra_arg) ); *** Testing DateTimeZone() : error conditions *** -- Testing new DateTimeZone() with more than expected no. of arguments -- - -Fatal error: Uncaught exception 'Exception' with message 'DateTimeZone::__construct() expects exactly 1 parameter, 2 given' in %s:%d -Stack trace: -#0 %s(%d): DateTimeZone->__construct('GMT', 99) -#1 {main} - thrown in %s on line %d -
\ No newline at end of file +DateTimeZone::__construct() expects exactly 1 parameter, 2 given +===DONE=== diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt index 025c6e2678..d9625eedc0 100644 --- a/ext/date/tests/DateTimeZone_construct_variation1.phpt +++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt @@ -97,7 +97,7 @@ foreach($inputs as $variation =>$timezone) { echo "\n-- $variation --\n"; try { var_dump( new DateTimezone($timezone) ); - } catch(Exception $e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } diff --git a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt index ecd99d5bc3..2ee21a5262 100644 --- a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt @@ -132,17 +132,17 @@ bool(false) -- float 10.5 -- -Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float .5 -- -Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/DateTimeZone_verify.phpt b/ext/date/tests/DateTimeZone_verify.phpt index 241d91e665..f28742d26a 100644 --- a/ext/date/tests/DateTimeZone_verify.phpt +++ b/ext/date/tests/DateTimeZone_verify.phpt @@ -28,63 +28,63 @@ object(ReflectionClass)#%d (1) { ..and get names of all its methods array(9) { [0]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "__construct" ["class"]=> string(12) "DateTimeZone" } [1]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(8) "__wakeup" ["class"]=> string(12) "DateTimeZone" } [2]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "__set_state" ["class"]=> string(12) "DateTimeZone" } [3]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(7) "getName" ["class"]=> string(12) "DateTimeZone" } [4]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(9) "getOffset" ["class"]=> string(12) "DateTimeZone" } [5]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(14) "getTransitions" ["class"]=> string(12) "DateTimeZone" } [6]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "getLocation" ["class"]=> string(12) "DateTimeZone" } [7]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(17) "listAbbreviations" ["class"]=> string(12) "DateTimeZone" } [8]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(15) "listIdentifiers" ["class"]=> diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt index ef79eb4554..d0a453fd9d 100644 --- a/ext/date/tests/DateTime_construct_error.phpt +++ b/ext/date/tests/DateTime_construct_error.phpt @@ -16,7 +16,11 @@ echo "\n-- Testing new DateTime() with more than expected no. of arguments --\n" $time = "GMT"; $timezone = timezone_open("GMT"); $extra_arg = 99; -var_dump( new DateTime($time, $timezone, $extra_arg) ); +try { + var_dump( new DateTime($time, $timezone, $extra_arg) ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== @@ -24,9 +28,5 @@ var_dump( new DateTime($time, $timezone, $extra_arg) ); *** Testing date_create() : error conditions *** -- Testing new DateTime() with more than expected no. of arguments -- - -Fatal error: Uncaught exception 'Exception' with message 'DateTime::__construct() expects at most 2 parameters, 3 given' in %s:%d -Stack trace: -#0 %s(%d): DateTime->__construct('GMT', Object(DateTimeZone), 99) -#1 {main} - thrown in %s on line %d
\ No newline at end of file +DateTime::__construct() expects at most 2 parameters, 3 given +===DONE=== diff --git a/ext/date/tests/DateTime_construct_variation1.phpt b/ext/date/tests/DateTime_construct_variation1.phpt index f106a40935..8ff7f7e89c 100644 --- a/ext/date/tests/DateTime_construct_variation1.phpt +++ b/ext/date/tests/DateTime_construct_variation1.phpt @@ -102,14 +102,14 @@ foreach($inputs as $variation =>$time) { try { var_dump( new DateTime($time) ); - } catch(Exception $e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } try { var_dump( new DateTime($time, $timezone) ); - } catch(Exception$e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index dfc1047bc4..e75e14d8e3 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -102,7 +102,7 @@ foreach($inputs as $variation =>$timezone) { try { var_dump( new DateTime($time, $timezone) ); - } catch(Exception $e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } @@ -130,13 +130,13 @@ FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given -- float 10.5 -- -FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, double given +FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, float given -- float -10.5 -- -FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, double given +FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, float given -- float .5 -- -FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, double given +FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, float given -- empty array -- FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, array given diff --git a/ext/date/tests/DateTime_setDate_variation1.phpt b/ext/date/tests/DateTime_setDate_variation1.phpt index f5ca4cb727..945f7ae973 100644 --- a/ext/date/tests/DateTime_setDate_variation1.phpt +++ b/ext/date/tests/DateTime_setDate_variation1.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setDate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setDate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setDate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setDate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setDate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setDate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setDate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setDate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setDate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setDate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setDate() expects parameter 1 to be long, object given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setDate() expects parameter 1 to be long, object given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setDate() expects parameter 1 to be long, resource given in %s on line %d +Warning: DateTime::setDate() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setDate_variation2.phpt b/ext/date/tests/DateTime_setDate_variation2.phpt index ab715c39a6..e335d21059 100644 --- a/ext/date/tests/DateTime_setDate_variation2.phpt +++ b/ext/date/tests/DateTime_setDate_variation2.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setDate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setDate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setDate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setDate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setDate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setDate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setDate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setDate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setDate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setDate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setDate() expects parameter 2 to be long, object given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setDate() expects parameter 2 to be long, object given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setDate() expects parameter 2 to be long, resource given in %s on line %d +Warning: DateTime::setDate() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setDate_variation3.phpt b/ext/date/tests/DateTime_setDate_variation3.phpt index 8f2e894b1f..ef65e45e0e 100644 --- a/ext/date/tests/DateTime_setDate_variation3.phpt +++ b/ext/date/tests/DateTime_setDate_variation3.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setDate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setDate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setDate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setDate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setDate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setDate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setDate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setDate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setDate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setDate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setDate() expects parameter 3 to be long, object given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setDate() expects parameter 3 to be long, object given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setDate() expects parameter 3 to be long, resource given in %s on line %d +Warning: DateTime::setDate() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setISODate_variation1.phpt b/ext/date/tests/DateTime_setISODate_variation1.phpt index a4e8865e73..58043e5689 100644 --- a/ext/date/tests/DateTime_setISODate_variation1.phpt +++ b/ext/date/tests/DateTime_setISODate_variation1.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setISODate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setISODate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setISODate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setISODate() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setISODate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setISODate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setISODate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setISODate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setISODate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setISODate() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setISODate() expects parameter 1 to be long, object given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setISODate() expects parameter 1 to be long, object given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setISODate() expects parameter 1 to be long, resource given in %s on line %d +Warning: DateTime::setISODate() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setISODate_variation2.phpt b/ext/date/tests/DateTime_setISODate_variation2.phpt index 496e1c91f6..c40665950a 100644 --- a/ext/date/tests/DateTime_setISODate_variation2.phpt +++ b/ext/date/tests/DateTime_setISODate_variation2.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setISODate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setISODate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setISODate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setISODate() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setISODate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setISODate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setISODate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setISODate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setISODate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setISODate() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setISODate() expects parameter 2 to be long, object given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setISODate() expects parameter 2 to be long, object given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setISODate() expects parameter 2 to be long, resource given in %s on line %d +Warning: DateTime::setISODate() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setISODate_variation3.phpt b/ext/date/tests/DateTime_setISODate_variation3.phpt index 5b69b2faad..87c39264a7 100644 --- a/ext/date/tests/DateTime_setISODate_variation3.phpt +++ b/ext/date/tests/DateTime_setISODate_variation3.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setISODate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setISODate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setISODate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setISODate() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setISODate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setISODate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setISODate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setISODate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setISODate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setISODate() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setISODate() expects parameter 3 to be long, object given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setISODate() expects parameter 3 to be long, object given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setISODate() expects parameter 3 to be long, resource given in %s on line %d +Warning: DateTime::setISODate() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setTime_variation1.phpt b/ext/date/tests/DateTime_setTime_variation1.phpt index 1805081912..3f3c1e4c21 100644 --- a/ext/date/tests/DateTime_setTime_variation1.phpt +++ b/ext/date/tests/DateTime_setTime_variation1.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setTime() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setTime() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setTime() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setTime() expects parameter 1 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setTime() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setTime() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setTime() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setTime() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setTime() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setTime() expects parameter 1 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setTime() expects parameter 1 to be long, object given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setTime() expects parameter 1 to be long, object given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setTime() expects parameter 1 to be long, resource given in %s on line %d +Warning: DateTime::setTime() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setTime_variation2.phpt b/ext/date/tests/DateTime_setTime_variation2.phpt index fc034bf212..e2bc153b74 100644 --- a/ext/date/tests/DateTime_setTime_variation2.phpt +++ b/ext/date/tests/DateTime_setTime_variation2.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setTime() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setTime() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setTime() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setTime() expects parameter 2 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setTime() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setTime() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setTime() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setTime() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setTime() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setTime() expects parameter 2 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setTime() expects parameter 2 to be long, object given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setTime() expects parameter 2 to be long, object given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setTime() expects parameter 2 to be long, resource given in %s on line %d +Warning: DateTime::setTime() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setTime_variation3.phpt b/ext/date/tests/DateTime_setTime_variation3.phpt index 21c62e0012..59e0cefe1d 100644 --- a/ext/date/tests/DateTime_setTime_variation3.phpt +++ b/ext/date/tests/DateTime_setTime_variation3.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: DateTime::setTime() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: DateTime::setTime() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: DateTime::setTime() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: DateTime::setTime() expects parameter 3 to be long, array given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: DateTime::setTime() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: DateTime::setTime() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: DateTime::setTime() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: DateTime::setTime() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: DateTime::setTime() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: DateTime::setTime() expects parameter 3 to be long, string given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: DateTime::setTime() expects parameter 3 to be long, object given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: DateTime::setTime() expects parameter 3 to be long, object given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: DateTime::setTime() expects parameter 3 to be long, resource given in %s on line %d +Warning: DateTime::setTime() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/DateTime_setTimezone_variation1.phpt b/ext/date/tests/DateTime_setTimezone_variation1.phpt index 9ccfce0b76..b61edcb3f6 100644 --- a/ext/date/tests/DateTime_setTimezone_variation1.phpt +++ b/ext/date/tests/DateTime_setTimezone_variation1.phpt @@ -132,17 +132,17 @@ bool(false) -- float 10.5 -- -Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, double given in %s on line %d +Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, double given in %s on line %d +Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, float given in %s on line %d bool(false) -- float .5 -- -Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, double given in %s on line %d +Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/DateTime_verify.phpt b/ext/date/tests/DateTime_verify.phpt index c790974729..33768969dc 100644 --- a/ext/date/tests/DateTime_verify.phpt +++ b/ext/date/tests/DateTime_verify.phpt @@ -29,126 +29,126 @@ object(ReflectionClass)#%d (1) { ..and get names of all its methods array(18) { [0]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "__construct" ["class"]=> string(8) "DateTime" } [1]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(8) "__wakeup" ["class"]=> string(8) "DateTime" } [2]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "__set_state" ["class"]=> string(8) "DateTime" } [3]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(16) "createFromFormat" ["class"]=> string(8) "DateTime" } [4]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(13) "getLastErrors" ["class"]=> string(8) "DateTime" } [5]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(6) "format" ["class"]=> string(8) "DateTime" } [6]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(6) "modify" ["class"]=> string(8) "DateTime" } [7]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(3) "add" ["class"]=> string(8) "DateTime" } [8]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(3) "sub" ["class"]=> string(8) "DateTime" } [9]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "getTimezone" ["class"]=> string(8) "DateTime" } [10]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(11) "setTimezone" ["class"]=> string(8) "DateTime" } [11]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(9) "getOffset" ["class"]=> string(8) "DateTime" } [12]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(7) "setTime" ["class"]=> string(8) "DateTime" } [13]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(7) "setDate" ["class"]=> string(8) "DateTime" } [14]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(10) "setISODate" ["class"]=> string(8) "DateTime" } [15]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(12) "setTimestamp" ["class"]=> string(8) "DateTime" } [16]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(12) "getTimestamp" ["class"]=> string(8) "DateTime" } [17]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(4) "diff" ["class"]=> @@ -156,7 +156,7 @@ array(18) { } } ..and get names of all its class constants -array(11) { +array(12) { ["ATOM"]=> string(13) "Y-m-d\TH:i:sP" ["COOKIE"]=> @@ -175,6 +175,8 @@ array(11) { string(16) "D, d M Y H:i:s O" ["RFC3339"]=> string(13) "Y-m-d\TH:i:sP" + ["RFC3339_EXTENDED"]=> + string(15) "Y-m-d\TH:i:s.vP" ["RSS"]=> string(16) "D, d M Y H:i:s O" ["W3C"]=> diff --git a/ext/date/tests/bug27719.phpt b/ext/date/tests/bug27719.phpt deleted file mode 100644 index 88c17704e5..0000000000 --- a/ext/date/tests/bug27719.phpt +++ /dev/null @@ -1,67 +0,0 @@ ---TEST-- -Bug #27719 (mktime returns incorrect timestamp for dst days) ---INI-- -date.timezone=EST -error_reporting=2047 ---FILE-- -<?php /* $Id$ */ - $a = mktime(0, 0, 0, 4, 4, 2004, 0); - $b = mktime(0, 0, 0, 4, 4, 2004, 1); - $c = mktime(0, 0, 0, 4, 4, 2004, -1); - echo "$a ".date("m/d/y h:i:s\n",$a); - echo "$b ".date("m/d/y h:i:s\n",$b); - echo "$c ".date("m/d/y h:i:s\n",$c); - echo "\n"; - date_default_timezone_set('EST5EDT'); // DST not in effect - $a = mktime(0, 0, 0, 2, 4, 2004, 0); - $b = mktime(0, 0, 0, 2, 4, 2004, 1); - $c = mktime(0, 0, 0, 2, 4, 2004, -1); - echo "$a ".date("m/d/y h:i:s\n",$a); - echo "$b ".date("m/d/y h:i:s\n",$b); - echo "$c ".date("m/d/y h:i:s\n",$c); - echo "\n"; - date_default_timezone_set('EST5EDT'); - $a = mktime(0, 0, 0, 4, 4, 2004, 0); - $b = mktime(0, 0, 0, 4, 4, 2004, 1); - $c = mktime(0, 0, 0, 4, 4, 2004, -1); - echo "$a ".date("m/d/y h:i:s\n",$a); - echo "$b ".date("m/d/y h:i:s\n",$b); - echo "$c ".date("m/d/y h:i:s\n",$c); - echo "\n"; - date_default_timezone_set('EST5EDT'); - $a = mktime(3, 0, 0, 4, 4, 2004, 0); - $b = mktime(3, 0, 0, 4, 4, 2004, 1); - $c = mktime(3, 0, 0, 4, 4, 2004, -1); - echo "$a ".date("m/d/y h:i:s\n",$a); - echo "$b ".date("m/d/y h:i:s\n",$b); - echo "$c ".date("m/d/y h:i:s\n",$c); - echo "\n"; - date_default_timezone_set('EST5EDT'); - $a = mktime(0, 0, 0, 6, 4, 2004, 0); - $b = mktime(0, 0, 0, 6, 4, 2004, 1); - $c = mktime(0, 0, 0, 6, 4, 2004, -1); - echo "$a ".date("m/d/y h:i:s\n",$a); - echo "$b ".date("m/d/y h:i:s\n",$b); - echo "$c ".date("m/d/y h:i:s\n",$c); - echo "\n"; -?> ---EXPECTF-- -1081054800 04/04/04 12:00:00 -%s -1081054800 04/04/04 12:00:00 - -1075870800 02/04/04 12:00:00 -1075867200 02/03/04 11:00:00 -1075870800 02/04/04 12:00:00 - -1081054800 04/04/04 12:00:00 -1081051200 04/03/04 11:00:00 -1081054800 04/04/04 12:00:00 - -1081065600 04/04/04 04:00:00 -1081062000 04/04/04 03:00:00 -1081062000 04/04/04 03:00:00 - -1086325200 06/04/04 01:00:00 -1086321600 06/04/04 12:00:00 -1086321600 06/04/04 12:00:00 diff --git a/ext/date/tests/bug36988.phpt b/ext/date/tests/bug36988.phpt index c37d1fb768..1223150988 100644 --- a/ext/date/tests/bug36988.phpt +++ b/ext/date/tests/bug36988.phpt @@ -1,11 +1,12 @@ --TEST-- Bug #36988 (mktime freezes on long numbers) +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php date_default_timezone_set('GMT'); $start = microtime(true); $a = mktime(1, 1, 1, 1, 1, 11111111111); -echo (microtime(true) - $start) < 1 ? "smaller than one second" : "more than a second"; ?> ---EXPECT-- -smaller than one second +--EXPECTF-- +Warning: mktime() expects parameter 6 to be integer, float given in %s on line %d diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt index 81e767b0f0..d8517e6a13 100644 --- a/ext/date/tests/bug52062.phpt +++ b/ext/date/tests/bug52062.phpt @@ -2,7 +2,7 @@ Bug #52062 (large timestamps with DateTime::getTimestamp and DateTime::setTimestamp) (32 bit) --SKIPIF-- <?php -if (PHP_INT_SIZE == 8) die('skip 32-bit only'); +if (PHP_INT_SIZE != 4) die('skip 32-bit only'); ?> --INI-- date.timezone=UTC @@ -20,10 +20,12 @@ var_dump($d->getTimestamp()); $i = new DateInterval('PT100000000000S'); var_dump($i->format('%s')); ?> ---EXPECT-- +--EXPECTF-- string(32) "5138-11-16 09:46:40 100000000000" bool(false) string(12) "100000000000" -string(30) "2008-07-11 04:56:32 1215752192" -int(1215752192) -string(10) "1215752192" + +Warning: DateTime::setTimestamp() expects parameter 1 to be integer, float given in %s on line %d +string(32) "5138-11-16 09:46:40 100000000000" +bool(false) +string(10) "1215752192"
\ No newline at end of file diff --git a/ext/date/tests/bug53437_var3.phpt b/ext/date/tests/bug53437_var3.phpt index d3a0652ee6..82b90f559b 100644 --- a/ext/date/tests/bug53437_var3.phpt +++ b/ext/date/tests/bug53437_var3.phpt @@ -14,17 +14,17 @@ var_dump($di); --EXPECTF-- object(DateInterval)#%d (15) { ["y"]=> - int(-1) + int(2) ["m"]=> - int(-1) + int(0) ["d"]=> - int(-1) + int(0) ["h"]=> - int(-1) + int(6) ["i"]=> - int(-1) + int(8) ["s"]=> - int(-1) + int(0) ["weekday"]=> int(10) ["weekday_behavior"]=> diff --git a/ext/date/tests/bug53437_var5.phpt b/ext/date/tests/bug53437_var5.phpt index e9b3a3cd82..e95fcdae96 100644 --- a/ext/date/tests/bug53437_var5.phpt +++ b/ext/date/tests/bug53437_var5.phpt @@ -14,17 +14,17 @@ var_dump($di); --EXPECTF-- object(DateInterval)#%d (15) { ["y"]=> - int(-1) + int(2) ["m"]=> - int(-1) + int(0) ["d"]=> - int(-1) + int(0) ["h"]=> - int(-1) + int(6) ["i"]=> - int(-1) + int(8) ["s"]=> - int(-1) + int(0) ["weekday"]=> int(10) ["weekday_behavior"]=> diff --git a/ext/date/tests/bug55407.phpt b/ext/date/tests/bug55407.phpt new file mode 100644 index 0000000000..925640554a --- /dev/null +++ b/ext/date/tests/bug55407.phpt @@ -0,0 +1,19 @@ +--TEST-- +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) { + return new DateTime(parent::createFromFormat($format, $time, $timezone)); + } +} + +echo "DONE\n"; +?> +--EXPECTF-- +DONE diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt index 973b4eb8d5..4884d77bac 100644 --- a/ext/date/tests/bug67118.phpt +++ b/ext/date/tests/bug67118.phpt @@ -23,5 +23,7 @@ class mydt extends datetime new mydt("Funktionsansvarig rådgivning och juridik", "UTC"); ?> --EXPECTF-- -Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %sbug67118.php on line %d + +Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %s on line %d Bad date + diff --git a/ext/date/tests/bug67118_2.phpt b/ext/date/tests/bug67118_2.phpt index b4904a1583..9b6f545525 100644 --- a/ext/date/tests/bug67118_2.phpt +++ b/ext/date/tests/bug67118_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Regression introduce in fix for Bug #67118 +Regression introduce in fix for Bug #67118 - Invalid code --INI-- date.timezone=Europe/Paris --FILE-- @@ -26,7 +26,7 @@ First try Second try object(Foo)#1 (3) { ["date"]=> - string(%d) "2007-09-12 15:49:%s" + string(26) "2007-09-12 15:49:12.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug68669.phpt b/ext/date/tests/bug68669.phpt new file mode 100644 index 0000000000..8aac1d2ceb --- /dev/null +++ b/ext/date/tests/bug68669.phpt @@ -0,0 +1,25 @@ +--TEST-- +DateTime::createFromFormat() does not allow NULL $timezone +--FILE-- +<?php + +date_default_timezone_set('America/Los_Angeles'); +var_dump(DateTime::createFromFormat('Y/m/d H:i:s', '1995/06/08 12:34:56', null)); +var_dump(DateTimeImmutable::createFromFormat('Y/m/d H:i:s', '1995/06/08 12:34:56', null)); +--EXPECT-- +object(DateTime)#1 (3) { + ["date"]=> + string(26) "1995-06-08 12:34:56.000000" + ["timezone_type"]=> + int(3) + ["timezone"]=> + string(19) "America/Los_Angeles" +} +object(DateTimeImmutable)#1 (3) { + ["date"]=> + string(26) "1995-06-08 12:34:56.000000" + ["timezone_type"]=> + int(3) + ["timezone"]=> + string(19) "America/Los_Angeles" +} diff --git a/ext/date/tests/bug69089.phpt b/ext/date/tests/bug69089.phpt new file mode 100644 index 0000000000..21a5cd125c --- /dev/null +++ b/ext/date/tests/bug69089.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #69089 (Add support for RFC3339 extended to DateTime::format) +--CREDITS-- +Mariano Iglesias <mariano@cricava.com> +--FILE-- +<?php +date_default_timezone_set('America/Buenos_Aires'); + +$date = new DateTime('2009-09-28 09:45:31.918312'); + +var_dump($date->format(DateTime::RFC3339_EXTENDED)); +var_dump($date->format('u')); +var_dump($date->format('v')); +--EXPECT-- +string(29) "2009-09-28T09:45:31.918-03:00" +string(6) "918312" +string(3) "918" diff --git a/ext/date/tests/bug70245.phpt b/ext/date/tests/bug70245.phpt new file mode 100644 index 0000000000..4bf6256600 --- /dev/null +++ b/ext/date/tests/bug70245.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #70245 (strtotime does not emit warning when 2nd parameter is object or string) +--FILE-- +<?php +$d = new DateTime('2011-01-15 00:00:00'); +var_dump(strtotime('-1 month', $d)); +?> +--EXPECTF-- +Warning: strtotime() expects parameter 2 to be integer, object given in %sbug70245.php on line %d +bool(false) diff --git a/ext/date/tests/bug70277.phpt b/ext/date/tests/bug70277.phpt index b6522dff1a..648bd19c77 100644 --- a/ext/date/tests/bug70277.phpt +++ b/ext/date/tests/bug70277.phpt @@ -10,7 +10,7 @@ var_dump(new DateTimeZone($timezone)); Warning: timezone_open(): Timezone must not contain null bytes in %sbug70277.php on line %d bool(false) -Fatal error: Uncaught exception 'Exception' with message 'DateTimeZone::__construct(): Timezone must not contain null bytes' in %sbug70277.php:%d +Fatal error: Uncaught Exception: DateTimeZone::__construct(): Timezone must not contain null bytes in %sbug70277.php:%d Stack trace: #0 %sbug70277.php(%d): DateTimeZone->__construct('Europe/Zurich\x00F...') #1 {main} diff --git a/ext/date/tests/call_function_from_method.phpt b/ext/date/tests/call_function_from_method.phpt new file mode 100644 index 0000000000..7cbe68481e --- /dev/null +++ b/ext/date/tests/call_function_from_method.phpt @@ -0,0 +1,29 @@ +--TEST-- +Call to date function from a method and call to date method from call_user_func +--INI-- +date.timezone=UTC +--FILE-- +<?php + +class Date { + public function __construct($in) { + $this->date = date_create($in); + } + + public function getYear1() { + return date_format($this->date, 'Y'); + } + + public function getYear2() { + return call_user_func([$this->date, 'format'], 'Y'); + } +} + +$d = new Date('NOW'); +var_dump($d->getYear1()); +var_dump($d->getYear2()); + +?> +--EXPECTF-- +string(4) "%d" +string(4) "%d" diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt index 378270cc80..a3539dd976 100644 --- a/ext/date/tests/checkdate_variation1.phpt +++ b/ext/date/tests/checkdate_variation1.phpt @@ -112,22 +112,22 @@ bool(false) -- empty array -- -Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -150,42 +150,42 @@ bool(false) -- empty string DQ -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: checkdate() expects parameter 1 to be long, object given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: checkdate() expects parameter 1 to be long, object given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -196,7 +196,7 @@ bool(false) -- resource -- -Warning: checkdate() expects parameter 1 to be long, resource given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt index 76afbdce74..9948faf86f 100644 --- a/ext/date/tests/checkdate_variation2.phpt +++ b/ext/date/tests/checkdate_variation2.phpt @@ -112,22 +112,22 @@ bool(false) -- empty array -- -Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -150,42 +150,42 @@ bool(false) -- empty string DQ -- -Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: checkdate() expects parameter 2 to be long, object given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: checkdate() expects parameter 2 to be long, object given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -196,7 +196,7 @@ bool(false) -- resource -- -Warning: checkdate() expects parameter 2 to be long, resource given in %s on line %d +Warning: checkdate() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/checkdate_variation3.phpt b/ext/date/tests/checkdate_variation3.phpt index b94605646a..a92bc0ce8c 100644 --- a/ext/date/tests/checkdate_variation3.phpt +++ b/ext/date/tests/checkdate_variation3.phpt @@ -112,22 +112,22 @@ bool(false) -- empty array -- -Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -150,42 +150,42 @@ bool(false) -- empty string DQ -- -Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: checkdate() expects parameter 3 to be long, object given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: checkdate() expects parameter 3 to be long, object given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -196,6 +196,6 @@ bool(false) -- resource -- -Warning: checkdate() expects parameter 3 to be long, resource given in %s on line %d +Warning: checkdate() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt index ad5d0e8705..63a5723cd7 100644 --- a/ext/date/tests/date_create_variation2.phpt +++ b/ext/date/tests/date_create_variation2.phpt @@ -132,17 +132,17 @@ bool(false) -- float 10.5 -- -Warning: date_create() expects parameter 2 to be DateTimeZone, double given in %s on line %d +Warning: date_create() expects parameter 2 to be DateTimeZone, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_create() expects parameter 2 to be DateTimeZone, double given in %s on line %d +Warning: date_create() expects parameter 2 to be DateTimeZone, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_create() expects parameter 2 to be DateTimeZone, double given in %s on line %d +Warning: date_create() expects parameter 2 to be DateTimeZone, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt index 29365b9ca3..59823f12b3 100644 --- a/ext/date/tests/date_date_set_variation1.phpt +++ b/ext/date/tests/date_date_set_variation1.phpt @@ -134,17 +134,17 @@ bool(false) -- float 10.5 -- -Warning: date_date_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_date_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_date_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_date_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_date_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_date_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt index 85bfc5e82d..ef4e8bb868 100644 --- a/ext/date/tests/date_date_set_variation2.phpt +++ b/ext/date/tests/date_date_set_variation2.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_date_set() expects parameter 2 to be long, object given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_date_set() expects parameter 2 to be long, object given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_date_set() expects parameter 2 to be long, resource given in %s on line %d +Warning: date_date_set() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt index 2cca53d651..f304dddba2 100644 --- a/ext/date/tests/date_date_set_variation3.phpt +++ b/ext/date/tests/date_date_set_variation3.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_date_set() expects parameter 3 to be long, object given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_date_set() expects parameter 3 to be long, object given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_date_set() expects parameter 3 to be long, resource given in %s on line %d +Warning: date_date_set() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_date_set_variation4.phpt b/ext/date/tests/date_date_set_variation4.phpt index f87988e51e..e285afd69f 100644 --- a/ext/date/tests/date_date_set_variation4.phpt +++ b/ext/date/tests/date_date_set_variation4.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_date_set() expects parameter 4 to be long, object given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_date_set() expects parameter 4 to be long, object given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_date_set() expects parameter 4 to be long, resource given in %s on line %d +Warning: date_date_set() expects parameter 4 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt index ed9ac1a478..fbd5c6d856 100644 --- a/ext/date/tests/date_default_timezone_get-1-win32.phpt +++ b/ext/date/tests/date_default_timezone_get-1-win32.phpt @@ -17,8 +17,5 @@ date.timezone= parametrized so there is no hardcoded timezone data.*/ ?> --EXPECTF-- -Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone '%s' for now, but please set date.timezone to select your timezone. in %s on line %d -%s - -Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone '%s' for now, but please set date.timezone to select your timezone. in %s on line %d -%s +UTC +UTC diff --git a/ext/date/tests/date_default_timezone_get-1.phpt b/ext/date/tests/date_default_timezone_get-1.phpt index 4bff31a783..ba0607643b 100644 --- a/ext/date/tests/date_default_timezone_get-1.phpt +++ b/ext/date/tests/date_default_timezone_get-1.phpt @@ -12,9 +12,6 @@ date.timezone= echo date_default_timezone_get(), "\n"; echo date('e'), "\n"; ?> ---EXPECTF-- -Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_get-1.php on line 3 +--EXPECT-- UTC - -Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_get-1.php on line 4 UTC diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt index f58938d35b..b2f4b8232f 100644 --- a/ext/date/tests/date_default_timezone_get-2.phpt +++ b/ext/date/tests/date_default_timezone_get-2.phpt @@ -12,5 +12,4 @@ date.timezone= echo date_default_timezone_get(), "\n"; ?> --EXPECTF-- -Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_get-2.php on line 3 UTC diff --git a/ext/date/tests/date_default_timezone_set-1.phpt b/ext/date/tests/date_default_timezone_set-1.phpt index 7afa2b1a16..7e7ba7972f 100644 --- a/ext/date/tests/date_default_timezone_set-1.phpt +++ b/ext/date/tests/date_default_timezone_set-1.phpt @@ -21,10 +21,7 @@ date.timezone= echo date(DATE_ISO8601, $date3), "\n"; echo date(DATE_ISO8601, $date4), "\n"; ?> ---EXPECTF-- -Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 3 - -Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 4 +--EXPECT-- America/Indiana/Knox 2005-01-12T03:00:00-0500 2005-07-12T03:00:00-0500 diff --git a/ext/date/tests/date_error.phpt b/ext/date/tests/date_error.phpt index ee9b8f9806..ec7ff9da41 100644 --- a/ext/date/tests/date_error.phpt +++ b/ext/date/tests/date_error.phpt @@ -34,6 +34,6 @@ bool(false) -- Testing date function with more than expected no. of arguments -- -Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d +Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt index e5efc07356..af76a7ef90 100644 --- a/ext/date/tests/date_format_variation1.phpt +++ b/ext/date/tests/date_format_variation1.phpt @@ -132,17 +132,17 @@ bool(false) -- float 10.5 -- -Warning: date_format() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_format() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_format() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_format() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_format() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_format() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt index a234d4772d..900dc84475 100644 --- a/ext/date/tests/date_isodate_set_variation1.phpt +++ b/ext/date/tests/date_isodate_set_variation1.phpt @@ -134,17 +134,17 @@ bool(false) -- float 10.5 -- -Warning: date_isodate_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_isodate_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_isodate_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_isodate_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_isodate_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_isodate_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt index 3c3b6924bb..fe667801a2 100644 --- a/ext/date/tests/date_isodate_set_variation2.phpt +++ b/ext/date/tests/date_isodate_set_variation2.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_isodate_set() expects parameter 2 to be long, object given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_isodate_set() expects parameter 2 to be long, object given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_isodate_set() expects parameter 2 to be long, resource given in %s on line %d +Warning: date_isodate_set() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt index 52c2348fe3..5a7a4a2802 100644 --- a/ext/date/tests/date_isodate_set_variation3.phpt +++ b/ext/date/tests/date_isodate_set_variation3.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_isodate_set() expects parameter 3 to be long, object given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_isodate_set() expects parameter 3 to be long, object given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_isodate_set() expects parameter 3 to be long, resource given in %s on line %d +Warning: date_isodate_set() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt index b223f39b69..074df8452f 100644 --- a/ext/date/tests/date_isodate_set_variation4.phpt +++ b/ext/date/tests/date_isodate_set_variation4.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_isodate_set() expects parameter 4 to be long, object given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_isodate_set() expects parameter 4 to be long, object given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_isodate_set() expects parameter 4 to be long, resource given in %s on line %d +Warning: date_isodate_set() expects parameter 4 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt index 00c9939ce6..afe75e2c69 100644 --- a/ext/date/tests/date_modify_variation1.phpt +++ b/ext/date/tests/date_modify_variation1.phpt @@ -132,17 +132,17 @@ bool(false) -- float 10.5 -- -Warning: date_modify() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_modify() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_modify() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_modify() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_modify() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_modify() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt index 4b67b90646..a3d93b3f23 100644 --- a/ext/date/tests/date_offset_get_variation1.phpt +++ b/ext/date/tests/date_offset_get_variation1.phpt @@ -130,17 +130,17 @@ bool(false) -- float 10.5 -- -Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_sun_info_variation1.phpt b/ext/date/tests/date_sun_info_variation1.phpt index 382ba28cd9..9c056e9dc0 100644 --- a/ext/date/tests/date_sun_info_variation1.phpt +++ b/ext/date/tests/date_sun_info_variation1.phpt @@ -413,32 +413,32 @@ array(9) { -- Iteration 16 -- -Warning: date_sun_info() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- Iteration 17 -- -Warning: date_sun_info() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- Iteration 18 -- -Warning: date_sun_info() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- Iteration 19 -- -Warning: date_sun_info() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- Iteration 20 -- -Warning: date_sun_info() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- Iteration 21 -- -Warning: date_sun_info() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- Iteration 22 -- @@ -487,6 +487,6 @@ array(9) { -- Iteration 24 -- -Warning: date_sun_info() expects parameter 1 to be long, resource given in %s on line %d +Warning: date_sun_info() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===Done===
\ No newline at end of file diff --git a/ext/date/tests/date_sun_info_variation2.phpt b/ext/date/tests/date_sun_info_variation2.phpt index fb5ed317f1..61f9b29bf8 100644 --- a/ext/date/tests/date_sun_info_variation2.phpt +++ b/ext/date/tests/date_sun_info_variation2.phpt @@ -413,32 +413,32 @@ array(9) { -- Iteration 16 -- -Warning: date_sun_info() expects parameter 2 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, string given in %s on line %d bool(false) -- Iteration 17 -- -Warning: date_sun_info() expects parameter 2 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, string given in %s on line %d bool(false) -- Iteration 18 -- -Warning: date_sun_info() expects parameter 2 to be double, array given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, array given in %s on line %d bool(false) -- Iteration 19 -- -Warning: date_sun_info() expects parameter 2 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, string given in %s on line %d bool(false) -- Iteration 20 -- -Warning: date_sun_info() expects parameter 2 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, string given in %s on line %d bool(false) -- Iteration 21 -- -Warning: date_sun_info() expects parameter 2 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, string given in %s on line %d bool(false) -- Iteration 22 -- @@ -487,6 +487,6 @@ array(9) { -- Iteration 24 -- -Warning: date_sun_info() expects parameter 2 to be double, resource given in %s on line %d +Warning: date_sun_info() expects parameter 2 to be float, resource given in %s on line %d bool(false) ===Done=== diff --git a/ext/date/tests/date_sun_info_variation3.phpt b/ext/date/tests/date_sun_info_variation3.phpt index 673d1c6968..909ecf06fb 100644 --- a/ext/date/tests/date_sun_info_variation3.phpt +++ b/ext/date/tests/date_sun_info_variation3.phpt @@ -414,32 +414,32 @@ array(9) { -- Iteration 16 -- -Warning: date_sun_info() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, string given in %s on line %d bool(false) -- Iteration 17 -- -Warning: date_sun_info() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, string given in %s on line %d bool(false) -- Iteration 18 -- -Warning: date_sun_info() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, array given in %s on line %d bool(false) -- Iteration 19 -- -Warning: date_sun_info() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, string given in %s on line %d bool(false) -- Iteration 20 -- -Warning: date_sun_info() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, string given in %s on line %d bool(false) -- Iteration 21 -- -Warning: date_sun_info() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, string given in %s on line %d bool(false) -- Iteration 22 -- @@ -488,6 +488,6 @@ array(9) { -- Iteration 24 -- -Warning: date_sun_info() expects parameter 3 to be double, resource given in %s on line %d +Warning: date_sun_info() expects parameter 3 to be float, resource given in %s on line %d bool(false) ===Done=== diff --git a/ext/date/tests/date_sunrise_variation1.phpt b/ext/date/tests/date_sunrise_variation1.phpt index 35f964fe58..c9b8aa37ca 100644 --- a/ext/date/tests/date_sunrise_variation1.phpt +++ b/ext/date/tests/date_sunrise_variation1.phpt @@ -144,46 +144,46 @@ int(28599) --empty array-- -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -218,90 +218,90 @@ int(28599) --empty string DQ-- -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunrise() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunrise() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunrise_variation2.phpt b/ext/date/tests/date_sunrise_variation2.phpt index b613b35f96..6212f0ec5d 100644 --- a/ext/date/tests/date_sunrise_variation2.phpt +++ b/ext/date/tests/date_sunrise_variation2.phpt @@ -1,5 +1,7 @@ --TEST-- Test date_sunrise() function : usage variation - Passing unexpected values to second argument format. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) @@ -114,12 +116,12 @@ bool(false) --float 12.3456789000e10-- -Warning: date_sunrise(): Wrong return format given, pick one of SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING or SUNFUNCS_RET_DOUBLE in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on line %d bool(false) --float -12.3456789000e10-- -Warning: date_sunrise(): Wrong return format given, pick one of SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING or SUNFUNCS_RET_DOUBLE in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on line %d bool(false) --float .5-- @@ -127,22 +129,22 @@ int(1218174483) --empty array-- -Warning: date_sunrise() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunrise() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunrise() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunrise() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -165,42 +167,42 @@ int(1218174483) --empty string DQ-- -Warning: date_sunrise() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunrise() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunrise() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunrise() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunrise() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunrise() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunrise() expects parameter 2 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunrise() expects parameter 2 to be long, object given in %s on line %d +Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunrise_variation3.phpt b/ext/date/tests/date_sunrise_variation3.phpt index 1911e30d54..b93c53e9e6 100644 --- a/ext/date/tests/date_sunrise_variation3.phpt +++ b/ext/date/tests/date_sunrise_variation3.phpt @@ -122,46 +122,46 @@ bool(false) --empty array-- -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -196,90 +196,90 @@ int(1218177627) --empty string DQ-- -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunrise() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunrise() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 3 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunrise_variation4.phpt b/ext/date/tests/date_sunrise_variation4.phpt index c48f53831d..94c2890272 100644 --- a/ext/date/tests/date_sunrise_variation4.phpt +++ b/ext/date/tests/date_sunrise_variation4.phpt @@ -124,46 +124,46 @@ int(1218199315) --empty array-- -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -198,90 +198,90 @@ int(1218172321) --empty string DQ-- -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunrise() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunrise() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 4 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunrise_variation5.phpt b/ext/date/tests/date_sunrise_variation5.phpt index 42674789fc..c7925dada3 100644 --- a/ext/date/tests/date_sunrise_variation5.phpt +++ b/ext/date/tests/date_sunrise_variation5.phpt @@ -124,46 +124,46 @@ int(1218169475) --empty array-- -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -198,90 +198,90 @@ bool(false) --empty string DQ-- -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunrise() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunrise() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 5 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunrise_variation6.phpt b/ext/date/tests/date_sunrise_variation6.phpt index a96b95f564..360f756438 100644 --- a/ext/date/tests/date_sunrise_variation6.phpt +++ b/ext/date/tests/date_sunrise_variation6.phpt @@ -123,46 +123,46 @@ int(1218174483) --empty array-- -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -197,90 +197,90 @@ int(1218174483) --empty string DQ-- -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunrise() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunrise() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunrise() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunrise() expects parameter 6 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt index 49af06d524..979fa455a0 100644 --- a/ext/date/tests/date_sunrise_variation9.phpt +++ b/ext/date/tests/date_sunrise_variation9.phpt @@ -1,5 +1,7 @@ --TEST-- Test date_sunrise() function : usage variation - Passing high positive and negative float values to time argument. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) @@ -32,16 +34,28 @@ var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $ze ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing date_sunrise\(\) : usage variation \*\*\* - --- Testing date_sunrise\(\) function by passing float 12.3456789000e10 value to time -- -string\(5\) "(07:34|07:49)" -float\((7.566[0-9]*|7.821[0-9]*)\) -int\((-1097256359|123456811756)\) - --- Testing date_sunrise\(\) function by passing float -12.3456789000e10 value to time -- -string\(5\) "(07:42|08:48|08:04)" -float\((7.713[0-9]*|8.810[0-9]*|8.074[0-9]*)\) -int\((1097304168|-2147443882|-123456761731)\) -===DONE=== +--EXPECTF-- +*** Testing date_sunrise() : usage variation *** + +-- Testing date_sunrise() function by passing float 12.3456789000e10 value to time -- + +Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +-- Testing date_sunrise() function by passing float -12.3456789000e10 value to time -- + +Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d +bool(false) +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/date_sunset_variation1.phpt b/ext/date/tests/date_sunset_variation1.phpt index c2e1195713..9c7307082f 100644 --- a/ext/date/tests/date_sunset_variation1.phpt +++ b/ext/date/tests/date_sunset_variation1.phpt @@ -144,46 +144,46 @@ int(62558) --empty array-- -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -218,90 +218,90 @@ int(62558) --empty string DQ-- -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunset() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunset() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 1 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunset_variation2.phpt b/ext/date/tests/date_sunset_variation2.phpt index 575b64a22c..952b821c73 100644 --- a/ext/date/tests/date_sunset_variation2.phpt +++ b/ext/date/tests/date_sunset_variation2.phpt @@ -1,5 +1,7 @@ --TEST-- Test date_sunset() function : usage variation - Passing unexpected values to second argument format. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) @@ -114,12 +116,12 @@ bool(false) --float 12.3456789000e10-- -Warning: date_sunset(): Wrong return format given, pick one of SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING or SUNFUNCS_RET_DOUBLE in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, float given in %s on line %d bool(false) --float -12.3456789000e10-- -Warning: date_sunset(): Wrong return format given, pick one of SUNFUNCS_RET_TIMESTAMP, SUNFUNCS_RET_STRING or SUNFUNCS_RET_DOUBLE in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, float given in %s on line %d bool(false) --float .5-- @@ -127,22 +129,22 @@ int(1218199253) --empty array-- -Warning: date_sunset() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunset() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunset() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunset() expects parameter 2 to be long, array given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -165,42 +167,42 @@ int(1218199253) --empty string DQ-- -Warning: date_sunset() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunset() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunset() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunset() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunset() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunset() expects parameter 2 to be long, string given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunset() expects parameter 2 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunset() expects parameter 2 to be long, object given in %s on line %d +Warning: date_sunset() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- @@ -208,4 +210,4 @@ int(1218199253) --unset var-- int(1218199253) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/date_sunset_variation3.phpt b/ext/date/tests/date_sunset_variation3.phpt index e0f6678783..0bc98c148d 100644 --- a/ext/date/tests/date_sunset_variation3.phpt +++ b/ext/date/tests/date_sunset_variation3.phpt @@ -125,46 +125,46 @@ int(1218197155) --empty array-- -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -199,90 +199,90 @@ int(1218197630) --empty string DQ-- -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunset() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunset() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 3 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 3 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunset_variation4.phpt b/ext/date/tests/date_sunset_variation4.phpt index 7840f8f8f0..a9798a6b9f 100644 --- a/ext/date/tests/date_sunset_variation4.phpt +++ b/ext/date/tests/date_sunset_variation4.phpt @@ -124,46 +124,46 @@ int(1218178138) --empty array-- -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -198,90 +198,90 @@ int(1218220414) --empty string DQ-- -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunset() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunset() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 4 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 4 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunset_variation5.phpt b/ext/date/tests/date_sunset_variation5.phpt index 0719633628..c5c333f3d2 100644 --- a/ext/date/tests/date_sunset_variation5.phpt +++ b/ext/date/tests/date_sunset_variation5.phpt @@ -124,46 +124,46 @@ bool(false) --empty array-- -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -198,90 +198,90 @@ bool(false) --empty string DQ-- -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunset() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunset() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 5 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 5 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunset_variation6.phpt b/ext/date/tests/date_sunset_variation6.phpt index a434de8716..d34f897bb1 100644 --- a/ext/date/tests/date_sunset_variation6.phpt +++ b/ext/date/tests/date_sunset_variation6.phpt @@ -124,46 +124,46 @@ int(1218199253) --empty array-- -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) --int indexed array-- -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) --associative array-- -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) --nested arrays-- -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, array given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, array given in %s on line %d bool(false) --uppercase NULL-- @@ -198,90 +198,90 @@ int(1218199253) --empty string DQ-- -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) --empty string SQ-- -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) --string DQ-- -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) --string SQ-- -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) --mixed case string-- -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) --heredoc-- -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, string given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: date_sunset() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: date_sunset() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, object given in %s on line %d bool(false) -Warning: date_sunset() expects parameter 6 to be double, object given in %s on line %d +Warning: date_sunset() expects parameter 6 to be float, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt index 59a4b584a5..c18d48e42c 100644 --- a/ext/date/tests/date_sunset_variation9.phpt +++ b/ext/date/tests/date_sunset_variation9.phpt @@ -1,5 +1,7 @@ --TEST-- Test date_sunset() function : usage variation - Passing high positive and negative float values to time argument. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) @@ -32,16 +34,28 @@ var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zen ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing date_sunset\(\) : usage variation \*\*\* - --- Testing date_sunset\(\) function by passing float 12.3456789000e10 value to time -- -string\(5\) "(19:49|19:28)" -float\((19.830[0-9]*|19.830[0-9]*|19.480[0-9]*)\) -int\((-1097212211|123456853728)\) - --- Testing date_sunset\(\) function by passing float -12.3456789000e10 value to time -- -string\(5\) "(19:03|18:12|18:48)" -float\((19.056[0-9]*|18.213[0-9]*|18.808[0-9]*)\) -int\((1097345002|-2147410031|-123456723090)\) +--EXPECTF-- +*** Testing date_sunset() : usage variation *** + +-- Testing date_sunset() function by passing float 12.3456789000e10 value to time -- + +Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +-- Testing date_sunset() function by passing float -12.3456789000e10 value to time -- + +Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d +bool(false) ===DONE=== diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt index 651f8a00c5..64e65d58b8 100644 --- a/ext/date/tests/date_time_set_variation1.phpt +++ b/ext/date/tests/date_time_set_variation1.phpt @@ -134,17 +134,17 @@ bool(false) -- float 10.5 -- -Warning: date_time_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_time_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_time_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_time_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_time_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_time_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt index c19650c161..3e77fffada 100644 --- a/ext/date/tests/date_time_set_variation2.phpt +++ b/ext/date/tests/date_time_set_variation2.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_time_set() expects parameter 2 to be long, array given in %s +Warning: date_time_set() expects parameter 2 to be integer, array given in %s bool(false) -- int indexed array -- -Warning: date_time_set() expects parameter 2 to be long, array given in %s +Warning: date_time_set() expects parameter 2 to be integer, array given in %s bool(false) -- associative array -- -Warning: date_time_set() expects parameter 2 to be long, array given in %s +Warning: date_time_set() expects parameter 2 to be integer, array given in %s bool(false) -- nested arrays -- -Warning: date_time_set() expects parameter 2 to be long, array given in %s +Warning: date_time_set() expects parameter 2 to be integer, array given in %s bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_time_set() expects parameter 2 to be long, string given in %s +Warning: date_time_set() expects parameter 2 to be integer, string given in %s bool(false) -- empty string SQ -- -Warning: date_time_set() expects parameter 2 to be long, string given in %s +Warning: date_time_set() expects parameter 2 to be integer, string given in %s bool(false) -- string DQ -- -Warning: date_time_set() expects parameter 2 to be long, string given in %s +Warning: date_time_set() expects parameter 2 to be integer, string given in %s bool(false) -- string SQ -- -Warning: date_time_set() expects parameter 2 to be long, string given in %s +Warning: date_time_set() expects parameter 2 to be integer, string given in %s bool(false) -- mixed case string -- -Warning: date_time_set() expects parameter 2 to be long, string given in %s +Warning: date_time_set() expects parameter 2 to be integer, string given in %s bool(false) -- heredoc -- -Warning: date_time_set() expects parameter 2 to be long, string given in %s +Warning: date_time_set() expects parameter 2 to be integer, string given in %s bool(false) -- instance of classWithToString -- -Warning: date_time_set() expects parameter 2 to be long, object given in %s +Warning: date_time_set() expects parameter 2 to be integer, object given in %s bool(false) -- instance of classWithoutToString -- -Warning: date_time_set() expects parameter 2 to be long, object given in %s +Warning: date_time_set() expects parameter 2 to be integer, object given in %s bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_time_set() expects parameter 2 to be long, resource given in %s +Warning: date_time_set() expects parameter 2 to be integer, resource given in %s bool(false) ===DONE=== diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt index 0ad04c8a66..12a60a118c 100644 --- a/ext/date/tests/date_time_set_variation3.phpt +++ b/ext/date/tests/date_time_set_variation3.phpt @@ -184,22 +184,22 @@ object(DateTime)#3 (3) { -- empty array -- -Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_time_set() expects parameter 3 to be long, object given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_time_set() expects parameter 3 to be long, object given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_time_set() expects parameter 3 to be long, resource given in %s on line %d +Warning: date_time_set() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt index 8e6fbfb606..aa05f7dd40 100644 --- a/ext/date/tests/date_time_set_variation4.phpt +++ b/ext/date/tests/date_time_set_variation4.phpt @@ -184,22 +184,22 @@ object(DateTime)#%d (3) { -- empty array -- -Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -264,42 +264,42 @@ object(DateTime)#%d (3) { -- empty string DQ -- -Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date_time_set() expects parameter 4 to be long, object given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date_time_set() expects parameter 4 to be long, object given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -324,6 +324,6 @@ object(DateTime)#%d (3) { -- resource -- -Warning: date_time_set() expects parameter 4 to be long, resource given in %s on line %d +Warning: date_time_set() expects parameter 4 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt index f965334d9d..387313b13b 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt @@ -16,4 +16,4 @@ $wrong_parameter = array(); date_timestamp_set($dtms021, $wrong_parameter); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file +Warning: date_timestamp_set() expects parameter 2 to be integer, array given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt index dd346e9d92..4bbd414895 100644 --- a/ext/date/tests/date_timezone_get_variation1.phpt +++ b/ext/date/tests/date_timezone_get_variation1.phpt @@ -130,17 +130,17 @@ bool(false) -- float 10.5 -- -Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, double given in %s on line %d +Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt index cde2d6985a..0adaf14b94 100644 --- a/ext/date/tests/date_timezone_set_variation1.phpt +++ b/ext/date/tests/date_timezone_set_variation1.phpt @@ -133,17 +133,17 @@ bool(false) -- float 10.5 -- -Warning: date_timezone_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_timezone_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_timezone_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_timezone_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_timezone_set() expects parameter 1 to be DateTime, double given in %s on line %d +Warning: date_timezone_set() expects parameter 1 to be DateTime, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt index b85ddef389..46ce4e5814 100644 --- a/ext/date/tests/date_timezone_set_variation2.phpt +++ b/ext/date/tests/date_timezone_set_variation2.phpt @@ -132,17 +132,17 @@ bool(false) -- float 10.5 -- -Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, double given in %s on line %d +Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, double given in %s on line %d +Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, float given in %s on line %d bool(false) -- float .5 -- -Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, double given in %s on line %d +Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt index f30e6ede73..597c4d83bb 100644 --- a/ext/date/tests/date_variation2.phpt +++ b/ext/date/tests/date_variation2.phpt @@ -132,22 +132,22 @@ string(24) "January 1, 1970, 1:00 am" -- empty array -- -Warning: date() expects parameter 2 to be long, array given in %s on line %d +Warning: date() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: date() expects parameter 2 to be long, array given in %s on line %d +Warning: date() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: date() expects parameter 2 to be long, array given in %s on line %d +Warning: date() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: date() expects parameter 2 to be long, array given in %s on line %d +Warning: date() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -170,42 +170,42 @@ string(24) "January 1, 1970, 1:00 am" -- empty string DQ -- -Warning: date() expects parameter 2 to be long, string given in %s on line %d +Warning: date() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: date() expects parameter 2 to be long, string given in %s on line %d +Warning: date() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: date() expects parameter 2 to be long, string given in %s on line %d +Warning: date() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: date() expects parameter 2 to be long, string given in %s on line %d +Warning: date() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: date() expects parameter 2 to be long, string given in %s on line %d +Warning: date() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: date() expects parameter 2 to be long, string given in %s on line %d +Warning: date() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: date() expects parameter 2 to be long, object given in %s on line %d +Warning: date() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: date() expects parameter 2 to be long, object given in %s on line %d +Warning: date() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -216,7 +216,7 @@ string(24) "January 1, 1970, 1:00 am" -- resource -- -Warning: date() expects parameter 2 to be long, resource given in %s on line %d +Warning: date() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/getdate_variation1.phpt b/ext/date/tests/getdate_variation1.phpt index 74754c944a..e0b8bab008 100644 --- a/ext/date/tests/getdate_variation1.phpt +++ b/ext/date/tests/getdate_variation1.phpt @@ -175,22 +175,22 @@ array(11) { --empty array-- -Warning: getdate() expects parameter 1 to be long, array given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: getdate() expects parameter 1 to be long, array given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: getdate() expects parameter 1 to be long, array given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: getdate() expects parameter 1 to be long, array given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -351,42 +351,42 @@ array(11) { --empty string DQ-- -Warning: getdate() expects parameter 1 to be long, string given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: getdate() expects parameter 1 to be long, string given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: getdate() expects parameter 1 to be long, string given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: getdate() expects parameter 1 to be long, string given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: getdate() expects parameter 1 to be long, string given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: getdate() expects parameter 1 to be long, string given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: getdate() expects parameter 1 to be long, object given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: getdate() expects parameter 1 to be long, object given in %s on line %d +Warning: getdate() expects parameter 1 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt index 3e47cc4592..0f0165edea 100644 --- a/ext/date/tests/getdate_variation7.phpt +++ b/ext/date/tests/getdate_variation7.phpt @@ -1,5 +1,7 @@ --TEST-- Test getdate() function : usage variation - Passing high positive and negative float values to timestamp. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : array getdate([int timestamp]) @@ -20,59 +22,16 @@ $timestamp = -12.3456789000e10; var_dump( getdate($timestamp) ); ?> ===DONE=== ---EXPECTREGEX-- +--EXPECTF-- +*** Testing getdate() : usage variation *** -\*\*\* Testing getdate\(\) : usage variation \*\*\* +-- Testing getdate() function by passing float 12.3456789000e10 value to timestamp -- --- Testing getdate\(\) function by passing float 12.3456789000e10 value to timestamp -- -array\(11\) { - \["seconds"\]=> - int\((.+)\) - \["minutes"\]=> - int\((43|0)\) - \["hours"\]=> - int\((10|6)\) - \["mday"\]=> - int\((26|11)\) - \["wday"\]=> - int\((2|6)\) - \["mon"\]=> - int\(3\) - \["year"\]=> - int\((1935|5882)\) - \["yday"\]=> - int\((84|69)\) - \["weekday"\]=> - string\((7|8)\) "(Tuesday|Saturday)" - \["month"\]=> - string\(5\) "March" - \[0\]=> - int\((-1097262584|123456789000)\) -} +Warning: getdate() expects parameter 1 to be integer, float given in %s on line %d +bool(false) --- Testing getdate\(\) function by passing float -12.3456789000e10 value to timestamp -- -array\(11\) { - \["seconds"\]=> - int\((.+)\) - \["minutes"\]=> - int\((39|23)\) - \["hours"\]=> - int\((0|2|5)\) - \["mday"\]=> - int\((9|14|23)\) - \["wday"\]=> - int\((0|6)\) - \["mon"\]=> - int\((10|12)\) - \["year"\]=> - int\((2004|1901|-1943)\) - \["yday"\]=> - int\((282|347|295)\) - \["weekday"\]=> - string\((6|8)\) "(Sunday|Saturday)" - \["month"\]=> - string\((7|8)\) "(October|December)" - \[0\]=> - int\((1097262584|-2147483648|-123456789000)\) -} -===DONE=== +-- Testing getdate() function by passing float -12.3456789000e10 value to timestamp -- + +Warning: getdate() expects parameter 1 to be integer, float given in %s on line %d +bool(false) +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt index 5b62a8274d..4b58febaea 100644 --- a/ext/date/tests/gmdate_variation14.phpt +++ b/ext/date/tests/gmdate_variation14.phpt @@ -1,5 +1,7 @@ --TEST-- Test gmdate() function : usage variation - Passing high positive and negetive float values to timestamp. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : string gmdate(string format [, long timestamp]) @@ -23,12 +25,16 @@ var_dump( gmdate($format, $timestamp) ); ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing gmdate\(\) : usage variation \*\*\* +--EXPECTF-- +*** Testing gmdate() : usage variation *** --- Testing gmdate\(\) function with float 12.3456789000e10 to timestamp -- -string\((24|25)\) "(1935-03-26T04:50:16\+0000|5882-03-11T00:30:00\+0000)" +-- Testing gmdate() function with float 12.3456789000e10 to timestamp -- --- Testing gmdate\(\) function with float -12.3456789000e10 to timestamp -- -string\((24|25)\) "(2004-10-08T19:09:44\+0000|1901-12-13T20:45:52\+0000|-1943-10-22T23:30:00\+0000)" +Warning: gmdate() expects parameter 2 to be integer, float given in %s on line %d +bool(false) + +-- Testing gmdate() function with float -12.3456789000e10 to timestamp -- + +Warning: gmdate() expects parameter 2 to be integer, float given in %s on line %d +bool(false) ===DONE===
\ No newline at end of file diff --git a/ext/date/tests/gmdate_variation2.phpt b/ext/date/tests/gmdate_variation2.phpt index c52de9da75..3a2ba5e69f 100644 --- a/ext/date/tests/gmdate_variation2.phpt +++ b/ext/date/tests/gmdate_variation2.phpt @@ -126,22 +126,22 @@ string(24) "1970-01-01T00:00:00+0000" --empty array-- -Warning: gmdate() expects parameter 2 to be long, array given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmdate() expects parameter 2 to be long, array given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmdate() expects parameter 2 to be long, array given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmdate() expects parameter 2 to be long, array given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -164,42 +164,42 @@ string(24) "1970-01-01T00:00:00+0000" --empty string DQ-- -Warning: gmdate() expects parameter 2 to be long, string given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmdate() expects parameter 2 to be long, string given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmdate() expects parameter 2 to be long, string given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmdate() expects parameter 2 to be long, string given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmdate() expects parameter 2 to be long, string given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmdate() expects parameter 2 to be long, string given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmdate() expects parameter 2 to be long, object given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmdate() expects parameter 2 to be long, object given in %s on line %d +Warning: gmdate() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt index 81abb5f2b2..58777ef771 100644 --- a/ext/date/tests/gmmktime_basic.phpt +++ b/ext/date/tests/gmmktime_basic.phpt @@ -30,6 +30,6 @@ var_dump( gmmktime() ); *** Testing gmmktime() : basic functionality *** int(1218182888) -Strict Standards: gmmktime(): You should be using the time() function instead in %s on line %d +Deprecated: gmmktime(): You should be using the time() function instead in %s on line %d int(%d) ===DONE=== diff --git a/ext/date/tests/gmmktime_error.phpt b/ext/date/tests/gmmktime_error.phpt index 9f5882da94..62e62057ea 100644 --- a/ext/date/tests/gmmktime_error.phpt +++ b/ext/date/tests/gmmktime_error.phpt @@ -18,12 +18,9 @@ $sec = 8; $mon = 8; $day = 8; $year = 2008; -$extra_arg1 = 10; -$extra_arg2 = 10; +$extra_arg = 10; -var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1) ); - -var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1, $extra_arg2) ); +var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg) ); ?> ===DONE=== --EXPECTF-- @@ -31,9 +28,6 @@ var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1, $extra_arg -- Testing gmmktime() function with more than expected no. of arguments -- -Deprecated: gmmktime(): The is_dst parameter is deprecated in %s on line %d -int(1218182888) - -Warning: gmmktime() expects at most 7 parameters, 8 given in %s on line %d +Warning: gmmktime() expects at most 6 parameters, 7 given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/gmmktime_variation1.phpt b/ext/date/tests/gmmktime_variation1.phpt index f84d99b9c8..2792c1000c 100644 --- a/ext/date/tests/gmmktime_variation1.phpt +++ b/ext/date/tests/gmmktime_variation1.phpt @@ -110,22 +110,22 @@ int(1218154088) --empty array-- -Warning: gmmktime() expects parameter 1 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmmktime() expects parameter 1 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmmktime() expects parameter 1 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmmktime() expects parameter 1 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -148,42 +148,42 @@ int(1218154088) --empty string DQ-- -Warning: gmmktime() expects parameter 1 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmmktime() expects parameter 1 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmmktime() expects parameter 1 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmmktime() expects parameter 1 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmmktime() expects parameter 1 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmmktime() expects parameter 1 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmmktime() expects parameter 1 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmmktime() expects parameter 1 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 1 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmmktime_variation2.phpt b/ext/date/tests/gmmktime_variation2.phpt index 93b87f6141..b53430d46b 100644 --- a/ext/date/tests/gmmktime_variation2.phpt +++ b/ext/date/tests/gmmktime_variation2.phpt @@ -110,22 +110,22 @@ int(1218182408) --empty array-- -Warning: gmmktime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmmktime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmmktime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmmktime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -148,42 +148,42 @@ int(1218182408) --empty string DQ-- -Warning: gmmktime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmmktime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmmktime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmmktime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmmktime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmmktime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmmktime() expects parameter 2 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmmktime() expects parameter 2 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmmktime_variation3.phpt b/ext/date/tests/gmmktime_variation3.phpt index d180e829a9..5a7bdcb0bb 100644 --- a/ext/date/tests/gmmktime_variation3.phpt +++ b/ext/date/tests/gmmktime_variation3.phpt @@ -110,22 +110,22 @@ int(1218182880) --empty array-- -Warning: gmmktime() expects parameter 3 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmmktime() expects parameter 3 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmmktime() expects parameter 3 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmmktime() expects parameter 3 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -148,42 +148,42 @@ int(1218182880) --empty string DQ-- -Warning: gmmktime() expects parameter 3 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmmktime() expects parameter 3 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmmktime() expects parameter 3 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmmktime() expects parameter 3 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmmktime() expects parameter 3 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmmktime() expects parameter 3 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmmktime() expects parameter 3 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmmktime() expects parameter 3 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 3 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmmktime_variation4.phpt b/ext/date/tests/gmmktime_variation4.phpt index 9093119280..de88ab56dc 100644 --- a/ext/date/tests/gmmktime_variation4.phpt +++ b/ext/date/tests/gmmktime_variation4.phpt @@ -110,22 +110,22 @@ int(1197101288) --empty array-- -Warning: gmmktime() expects parameter 4 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmmktime() expects parameter 4 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmmktime() expects parameter 4 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmmktime() expects parameter 4 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -148,42 +148,42 @@ int(1197101288) --empty string DQ-- -Warning: gmmktime() expects parameter 4 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmmktime() expects parameter 4 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmmktime() expects parameter 4 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmmktime() expects parameter 4 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmmktime() expects parameter 4 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmmktime() expects parameter 4 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmmktime() expects parameter 4 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmmktime() expects parameter 4 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 4 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmmktime_variation5.phpt b/ext/date/tests/gmmktime_variation5.phpt index dd1ca3e9c9..5d7451a348 100644 --- a/ext/date/tests/gmmktime_variation5.phpt +++ b/ext/date/tests/gmmktime_variation5.phpt @@ -110,22 +110,22 @@ int(1217491688) --empty array-- -Warning: gmmktime() expects parameter 5 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmmktime() expects parameter 5 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmmktime() expects parameter 5 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmmktime() expects parameter 5 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -148,42 +148,42 @@ int(1217491688) --empty string DQ-- -Warning: gmmktime() expects parameter 5 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmmktime() expects parameter 5 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmmktime() expects parameter 5 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmmktime() expects parameter 5 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmmktime() expects parameter 5 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmmktime() expects parameter 5 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmmktime() expects parameter 5 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmmktime() expects parameter 5 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 5 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmmktime_variation6.phpt b/ext/date/tests/gmmktime_variation6.phpt index 4877556b7b..81b930ceb6 100644 --- a/ext/date/tests/gmmktime_variation6.phpt +++ b/ext/date/tests/gmmktime_variation6.phpt @@ -106,22 +106,22 @@ int(965722088) --empty array-- -Warning: gmmktime() expects parameter 6 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmmktime() expects parameter 6 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmmktime() expects parameter 6 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmmktime() expects parameter 6 to be long, array given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -144,42 +144,42 @@ int(965722088) --empty string DQ-- -Warning: gmmktime() expects parameter 6 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmmktime() expects parameter 6 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmmktime() expects parameter 6 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmmktime() expects parameter 6 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmmktime() expects parameter 6 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmmktime() expects parameter 6 to be long, string given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmmktime() expects parameter 6 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmmktime() expects parameter 6 to be long, object given in %s on line %d +Warning: gmmktime() expects parameter 6 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmstrftime_variation11.phpt b/ext/date/tests/gmstrftime_variation11.phpt index 482ff6d2d7..f90e51ec16 100644 --- a/ext/date/tests/gmstrftime_variation11.phpt +++ b/ext/date/tests/gmstrftime_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking month related formats which are not supported on Windows. +Test gmstrftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -32,6 +32,6 @@ var_dump( gmstrftime($format, $timestamp) ); *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Abbreviated month name format %h -- -bool(false) -bool(false) +string(%d) "%s" +string(3) "Aug" ===DONE=== diff --git a/ext/date/tests/gmstrftime_variation13.phpt b/ext/date/tests/gmstrftime_variation13.phpt index 42f33f01ea..cccfa89d42 100644 --- a/ext/date/tests/gmstrftime_variation13.phpt +++ b/ext/date/tests/gmstrftime_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking date related formats which are not supported on Windows. +Test gmstrftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -18,7 +18,7 @@ echo "*** Testing gmstrftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) $timestamp = gmmktime(8, 8, 8, 8, 8, 2008); -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); //array of values to iterate over @@ -43,18 +43,18 @@ foreach($inputs as $key =>$value) { *** Testing gmstrftime() : usage variation *** --Century number-- -bool(false) -bool(false) +string(2) "%d" +string(2) "20" --Month Date Year-- -bool(false) -bool(false) +string(%d) "%d/%d/%d" +string(8) "08/08/08" --Year with century-- -bool(false) -bool(false) +string(%d) "%d" +string(4) "2008" --Year without century-- -bool(false) -bool(false) +string(2) "%d" +string(2) "08" ===DONE=== diff --git a/ext/date/tests/gmstrftime_variation15.phpt b/ext/date/tests/gmstrftime_variation15.phpt index c0df364789..0a32b43322 100644 --- a/ext/date/tests/gmstrftime_variation15.phpt +++ b/ext/date/tests/gmstrftime_variation15.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking time related formats which are not supported on Windows. +Test gmstrftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -18,7 +18,7 @@ echo "*** Testing gmstrftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) $timestamp = gmmktime(8, 8, 8, 8, 8, 2008); -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); //array of values to iterate over @@ -42,14 +42,14 @@ foreach($inputs as $key =>$value) { *** Testing gmstrftime() : usage variation *** --Time in a.m/p.m notation-- -bool(false) -bool(false) +string(%d) "%d:%d:%d %c%c" +string(11) "08:08:08 AM" --Time in 24 hour notation-- -bool(false) -bool(false) +string(%d) "%d:%d" +string(5) "08:08" --Current time %H:%M:%S format-- -bool(false) -bool(false) +string(%d) "%d:%d:%d" +string(8) "08:08:08" ===DONE=== diff --git a/ext/date/tests/gmstrftime_variation17.phpt b/ext/date/tests/gmstrftime_variation17.phpt index e3070a5144..5fa308f645 100644 --- a/ext/date/tests/gmstrftime_variation17.phpt +++ b/ext/date/tests/gmstrftime_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking day related formats which are not supported on Windows. +Test gmstrftime() function : usage variation - Checking day related formats which was not supported on Windows before vc14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -18,7 +18,7 @@ echo "*** Testing gmstrftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) $timestamp = gmmktime(8, 8, 8, 8, 8, 2008); -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); echo "\n-- Testing gmstrftime() function with Day of the month as decimal single digit format --\n"; @@ -32,6 +32,6 @@ var_dump( gmstrftime($format, $timestamp) ); *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Day of the month as decimal single digit format -- -bool(false) -bool(false) +string(2) "%A%d" +string(2) " 8" ===DONE=== diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt index 3131e01ca1..9ba714750e 100644 --- a/ext/date/tests/gmstrftime_variation19.phpt +++ b/ext/date/tests/gmstrftime_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking newline and tab formats which are not supported on Windows. +Test gmstrftime() function : usage variation - Checking newline and tab formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -18,7 +18,7 @@ echo "*** Testing gmstrftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) $timestamp = gmmktime(8, 8, 8, 8, 8, 2008); -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); //array of values to iterate over @@ -41,10 +41,12 @@ foreach($inputs as $key =>$value) { *** Testing gmstrftime() : usage variation *** --Newline character-- -bool(false) -bool(false) +string(1) " +" +string(1) " +" --Tab character-- -bool(false) -bool(false) +string(1) " " +string(1) " " ===DONE=== diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt index c577fe1d3d..c3ff81d136 100644 --- a/ext/date/tests/gmstrftime_variation2.phpt +++ b/ext/date/tests/gmstrftime_variation2.phpt @@ -112,32 +112,36 @@ string(20) "Jan 01 1970 00:00:10" string(20) "Dec 31 1969 23:59:50" --float 12.3456789000e10-- -string(20) "Mar 26 1935 04:50:16" + +Warning: gmstrftime() expects parameter 2 to be integer, float given in %s on line %d +bool(false) --float -12.3456789000e10-- -string(20) "Oct 08 2004 19:09:44" + +Warning: gmstrftime() expects parameter 2 to be integer, float given in %s on line %d +bool(false) --float .5-- string(20) "Jan 01 1970 00:00:00" --empty array-- -Warning: gmstrftime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: gmstrftime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: gmstrftime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: gmstrftime() expects parameter 2 to be long, array given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -160,42 +164,42 @@ string(20) "Jan 01 1970 00:00:00" --empty string DQ-- -Warning: gmstrftime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: gmstrftime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: gmstrftime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: gmstrftime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: gmstrftime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: gmstrftime() expects parameter 2 to be long, string given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: gmstrftime() expects parameter 2 to be long, object given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: gmstrftime() expects parameter 2 to be long, object given in %s on line %d +Warning: gmstrftime() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/gmstrftime_variation21.phpt b/ext/date/tests/gmstrftime_variation21.phpt index 26ed157c3f..08ca2fc606 100644 --- a/ext/date/tests/gmstrftime_variation21.phpt +++ b/ext/date/tests/gmstrftime_variation21.phpt @@ -18,7 +18,7 @@ echo "*** Testing gmstrftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) $timestamp = gmmktime(8, 8, 8, 8, 8, 2008); -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); //array of values to iterate over @@ -42,8 +42,8 @@ foreach($inputs as $key =>$value) { *** Testing gmstrftime() : usage variation *** --Preferred date and time representation-- -string(%d) "%d/%d/%d %d:%d:%d" -string(17) "08/08/08 08:08:08" +string(%d) "%s %s %d %d:%d:%d %d" +string(24) "Fri Aug 8 08:08:08 2008" --Preferred date representation-- string(%d) "%d/%d/%d" diff --git a/ext/date/tests/gmstrftime_variation9.phpt b/ext/date/tests/gmstrftime_variation9.phpt index 95b6c904f9..6ba33ac394 100644 --- a/ext/date/tests/gmstrftime_variation9.phpt +++ b/ext/date/tests/gmstrftime_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking week related formats which are not supported on Windows. +Test gmstrftime() function : usage variation - Checking week related formats which was not supported on Windows before vc14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -18,7 +18,7 @@ echo "*** Testing gmstrftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) $timestamp = gmmktime(8, 8, 8, 8, 8, 2008); -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); //array of values to iterate over @@ -41,10 +41,10 @@ foreach($inputs as $key =>$value) { *** Testing gmstrftime() : usage variation *** --The ISO 8601:1988 week number-- -bool(false) -bool(false) +string(%d) "%d" +string(2) "32" --Weekday as decimal-- -bool(false) -bool(false) +string(1) "%d" +string(1) "5" ===DONE=== diff --git a/ext/date/tests/idate_variation2.phpt b/ext/date/tests/idate_variation2.phpt index 7dd761d519..cfa8076ea0 100644 --- a/ext/date/tests/idate_variation2.phpt +++ b/ext/date/tests/idate_variation2.phpt @@ -107,22 +107,22 @@ int(1970) --empty array-- -Warning: idate() expects parameter 2 to be long, array given in %s on line %d +Warning: idate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: idate() expects parameter 2 to be long, array given in %s on line %d +Warning: idate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: idate() expects parameter 2 to be long, array given in %s on line %d +Warning: idate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: idate() expects parameter 2 to be long, array given in %s on line %d +Warning: idate() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -145,42 +145,42 @@ int(1970) --empty string DQ-- -Warning: idate() expects parameter 2 to be long, string given in %s on line %d +Warning: idate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: idate() expects parameter 2 to be long, string given in %s on line %d +Warning: idate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: idate() expects parameter 2 to be long, string given in %s on line %d +Warning: idate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: idate() expects parameter 2 to be long, string given in %s on line %d +Warning: idate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: idate() expects parameter 2 to be long, string given in %s on line %d +Warning: idate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: idate() expects parameter 2 to be long, string given in %s on line %d +Warning: idate() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: idate() expects parameter 2 to be long, object given in %s on line %d +Warning: idate() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: idate() expects parameter 2 to be long, object given in %s on line %d +Warning: idate() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt index 1a2ee1ffd5..dd38a44170 100644 --- a/ext/date/tests/idate_variation3.phpt +++ b/ext/date/tests/idate_variation3.phpt @@ -1,5 +1,7 @@ --TEST-- Test idate() function : usage variation - Passing higher positive and negetive float values to timestamp. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : int idate(string format [, int timestamp]) @@ -24,12 +26,16 @@ var_dump( idate($format, $timestamp) ); ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing idate\(\) : usage variation \*\*\* +--EXPECTF-- +*** Testing idate() : usage variation *** --- Testing idate\(\) function with float 12.3456789000e10 to timestamp -- -int\((1935|5882)\) +-- Testing idate() function with float 12.3456789000e10 to timestamp -- --- Testing idate\(\) function with float -12.3456789000e10 to timestamp -- -int\((2004|1901|-1943)\) -===DONE=== +Warning: idate() expects parameter 2 to be integer, float given in %s on line %d +bool(false) + +-- Testing idate() function with float -12.3456789000e10 to timestamp -- + +Warning: idate() expects parameter 2 to be integer, float given in %s on line %d +bool(false) +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/localtime_variation1.phpt b/ext/date/tests/localtime_variation1.phpt index 472b32b60c..b19f0ed648 100644 --- a/ext/date/tests/localtime_variation1.phpt +++ b/ext/date/tests/localtime_variation1.phpt @@ -226,34 +226,34 @@ array(9) { --empty array-- -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, array given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -510,66 +510,66 @@ array(9) { --empty string DQ-- -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, string given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: localtime() expects parameter 1 to be long, object given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, object given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: localtime() expects parameter 1 to be long, object given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d bool(false) -Warning: localtime() expects parameter 1 to be long, object given in %s on line %d +Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt index a73dfffdd9..a8dd3ac35f 100644 --- a/ext/date/tests/localtime_variation3.phpt +++ b/ext/date/tests/localtime_variation3.phpt @@ -1,5 +1,7 @@ --TEST-- Test localtime() function : usage variation - Passing higher positive and negetive float values to timestamp. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : array localtime([int timestamp [, bool associative_array]]) @@ -27,90 +29,22 @@ var_dump( localtime($timestamp, $is_associative) ); ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing localtime\(\) : usage variation \*\*\* +--EXPECTF-- +*** Testing localtime() : usage variation *** --- Testing localtime\(\) function with 'float 12.3456789000e10' to timestamp -- -array\(9\) { - \[0\]=> - int\((16|0)\) - \[1\]=> - int\((50|30)\) - \[2\]=> - int\((4|0)\) - \[3\]=> - int\((26|11)\) - \[4\]=> - int\(2\) - \[5\]=> - int\((35|3982)\) - \[6\]=> - int\((2|6)\) - \[7\]=> - int\((84|69)\) - \[8\]=> - int\(0\) -} -array\(9\) { - \["tm_sec"\]=> - int\((16|0)\) - \["tm_min"\]=> - int\((50|30)\) - \["tm_hour"\]=> - int\((4|0)\) - \["tm_mday"\]=> - int\((26|11)\) - \["tm_mon"\]=> - int\(2\) - \["tm_year"\]=> - int\((35|3982)\) - \["tm_wday"\]=> - int\((2|6)\) - \["tm_yday"\]=> - int\((84|69)\) - \["tm_isdst"\]=> - int\(0\) -} +-- Testing localtime() function with 'float 12.3456789000e10' to timestamp -- --- Testing localtime\(\) function with 'float -12.3456789000e10' to timestamp -- -array\(9\) { - \[0\]=> - int\((44|52|0)\) - \[1\]=> - int\((9|45|30)\) - \[2\]=> - int\((19|20|23)\) - \[3\]=> - int\((8|13|22)\) - \[4\]=> - int\((9|11)\) - \[5\]=> - int\((104|1|-3843)\) - \[6\]=> - int\((5|6)\) - \[7\]=> - int\((281|346|294)\) - \[8\]=> - int\(0\) -} -array\(9\) { - \["tm_sec"\]=> - int\((44|52|0)\) - \["tm_min"\]=> - int\((9|45|30)\) - \["tm_hour"\]=> - int\((19|20|23)\) - \["tm_mday"\]=> - int\((8|13|22)\) - \["tm_mon"\]=> - int\((9|11)\) - \["tm_year"\]=> - int\((104|1|-3843)\) - \["tm_wday"\]=> - int\((5|6)\) - \["tm_yday"\]=> - int\((281|346|294)\) - \["tm_isdst"\]=> - int\(0\) -} +Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +-- Testing localtime() function with 'float -12.3456789000e10' to timestamp -- + +Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d +bool(false) + +Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d +bool(false) ===DONE=== diff --git a/ext/date/tests/mktime-1.phpt b/ext/date/tests/mktime-1.phpt index 87fc0df685..86723e01ac 100644 --- a/ext/date/tests/mktime-1.phpt +++ b/ext/date/tests/mktime-1.phpt @@ -1,30 +1,21 @@ --TEST-- Check for mktime with out-of-range parameters --INI-- -error_reporting=2047 +error_reporting=E_ALL --FILE-- <?php - date_default_timezone_set("Europe/Amsterdam"); - # MacOS/X libc implementation doesn't treat out-of-range values - # the same way other unices do (Bug# 10686) so some extra code - # was added to datetime.c to take care of this - echo date("Y-m-d", mktime( 12, 0, 0, 3, 0, 2000)) ."\n"; - echo date("Y-m-d", mktime( 12, 0, 0, 3, -1, 2000)) ."\n"; - echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2000)) ."\n"; - echo date("Y-m-d", mktime( 12, 0, 0, 3, 0, 2001)) ."\n"; - echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2001)) ."\n"; - echo date("Y-m-d", mktime( 12, 0, 0, 0, 0, 2000)) ."\n"; - putenv("TZ=Europe/London"); - echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,-1))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,0))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,1))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,5,-90,2000,-1))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,5,-90,2000,0))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,5,-90,2000,1))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,5,-1,2000,-1))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,5,-1,2000,0))."\n"; - echo date("Y-m-d H:i:s", mktime(12,0,0,5,-1,2000,1))."\n"; +date_default_timezone_set("Europe/Amsterdam"); +# MacOS/X libc implementation doesn't treat out-of-range values +# the same way other unices do (Bug# 10686) so some extra code +# was added to datetime.c to take care of this +echo date("Y-m-d", mktime( 12, 0, 0, 3, 0, 2000)) ."\n"; +echo date("Y-m-d", mktime( 12, 0, 0, 3, -1, 2000)) ."\n"; +echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2000)) ."\n"; +echo date("Y-m-d", mktime( 12, 0, 0, 3, 0, 2001)) ."\n"; +echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2001)) ."\n"; +echo date("Y-m-d", mktime( 12, 0, 0, 0, 0, 2000)) ."\n"; + ?> --EXPECT-- 2000-02-29 @@ -33,12 +24,3 @@ error_reporting=2047 2001-02-28 2001-03-01 1999-11-30 -2000-05-29 12:00:00 -2000-05-29 13:00:00 -2000-05-29 12:00:00 -2000-01-31 12:00:00 -2000-01-31 12:00:00 -2000-01-31 11:00:00 -2000-04-29 12:00:00 -2000-04-29 13:00:00 -2000-04-29 12:00:00 diff --git a/ext/date/tests/mktime-2.phpt b/ext/date/tests/mktime-2.phpt deleted file mode 100644 index 931f637559..0000000000 --- a/ext/date/tests/mktime-2.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -mktime() [2] ---INI-- -error_reporting=2047 ---FILE-- -<?php -$timezones = array( - 'UTC', - 'Europe/London' -); - -foreach($timezones as $timezone) -{ - date_default_timezone_set($timezone); - - /* status of daylight saving time unknown */ - var_dump(mktime(0, 0, 0, 1, 1, 2002)); - /* status of daylight saving time unknown */ - var_dump(mktime(0, 0, 0, 1, 1, 2002, -1)); - /* daylight saving time is not in effect */ - var_dump(mktime(0, 0, 0, 1, 1, 2002, 0)); - /* daylight saving time is in effect */ - var_dump(mktime(0, 0, 0, 1, 1, 2002, 1)); - - /* status of daylight saving time unknown */ - var_dump(mktime(0, 0, 0, 7, 1, 2002)); - /* status of daylight saving time unknown */ - var_dump(mktime(0, 0, 0, 7, 1, 2002, -1)); - /* daylight saving time is not in effect */ - var_dump(mktime(0, 0, 0, 7, 1, 2002, 0)); - /* daylight saving time is in effect */ - var_dump(mktime(0, 0, 0, 7, 1, 2002, 1)); -} -?> ---EXPECTF-- -int(1009843200) -int(1009843200) -int(1009843200) -int(%s) -int(1025481600) -int(1025481600) -int(1025481600) -int(%s) -int(1009843200) -int(1009843200) -int(1009843200) -int(1009839600) -int(1025478000) -int(1025478000) -int(1025481600) -int(1025478000) diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index dc17c29b78..da1f3d63bf 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -20,7 +20,6 @@ $sec = 45; $month = 7; $day = 2; $year = 1963; -$is_dst = 0; var_dump( mktime($hour) ); var_dump( mktime($hour, $minute) ); @@ -28,7 +27,6 @@ var_dump( mktime($hour, $minute, $sec) ); var_dump( mktime($hour, $minute, $sec, $month) ); var_dump( mktime($hour, $minute, $sec, $month, $day) ); var_dump( mktime($hour, $minute, $sec, $month, $day, $year) ); -var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst) ); ?> ===DONE=== @@ -40,8 +38,5 @@ int(%i) int(%i) int(%i) int(%i) - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) ===DONE=== diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt index f517dc8aa3..9e3e872cb5 100644 --- a/ext/date/tests/mktime_error.phpt +++ b/ext/date/tests/mktime_error.phpt @@ -24,9 +24,8 @@ $sec = 45; $month = 7; $day = 2; $year = 1963; -$is_dst = 0; $extra_arg = 10; -var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst, $extra_arg) ); +var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $extra_arg) ); ?> ===DONE=== @@ -35,11 +34,11 @@ var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst, $extra_arg) -- Testing mktime() function with Zero arguments -- -Strict Standards: mktime(): You should be using the time() function instead in %s on line %d +Deprecated: mktime(): You should be using the time() function instead in %s on line %d int(%d) -- Testing mktime() function with more than expected no. of arguments -- -Warning: mktime() expects at most 7 parameters, 8 given in %s on line %d +Warning: mktime() expects at most 6 parameters, 7 given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt index eec97da304..5d0f0c50e0 100644 --- a/ext/date/tests/mktime_variation1.phpt +++ b/ext/date/tests/mktime_variation1.phpt @@ -135,22 +135,22 @@ int(%i) -- empty array -- -Warning: mktime() expects parameter 1 to be long, array given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: mktime() expects parameter 1 to be long, array given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: mktime() expects parameter 1 to be long, array given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: mktime() expects parameter 1 to be long, array given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -173,42 +173,42 @@ int(%i) -- empty string DQ -- -Warning: mktime() expects parameter 1 to be long, string given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: mktime() expects parameter 1 to be long, string given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: mktime() expects parameter 1 to be long, string given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: mktime() expects parameter 1 to be long, string given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: mktime() expects parameter 1 to be long, string given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: mktime() expects parameter 1 to be long, string given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: mktime() expects parameter 1 to be long, object given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: mktime() expects parameter 1 to be long, object given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -219,6 +219,6 @@ int(%i) -- resource -- -Warning: mktime() expects parameter 1 to be long, resource given in %s on line %d +Warning: mktime() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===DONE===
\ No newline at end of file diff --git a/ext/date/tests/mktime_variation2.phpt b/ext/date/tests/mktime_variation2.phpt index a969b32b7b..f5f8ef7803 100644 --- a/ext/date/tests/mktime_variation2.phpt +++ b/ext/date/tests/mktime_variation2.phpt @@ -129,22 +129,22 @@ int(%i) -- empty array -- -Warning: mktime() expects parameter 2 to be long, array given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: mktime() expects parameter 2 to be long, array given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: mktime() expects parameter 2 to be long, array given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: mktime() expects parameter 2 to be long, array given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -167,42 +167,42 @@ int(%i) -- empty string DQ -- -Warning: mktime() expects parameter 2 to be long, string given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: mktime() expects parameter 2 to be long, string given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: mktime() expects parameter 2 to be long, string given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: mktime() expects parameter 2 to be long, string given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: mktime() expects parameter 2 to be long, string given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: mktime() expects parameter 2 to be long, string given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: mktime() expects parameter 2 to be long, object given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: mktime() expects parameter 2 to be long, object given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -213,6 +213,6 @@ int(%i) -- resource -- -Warning: mktime() expects parameter 2 to be long, resource given in %s on line %d +Warning: mktime() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation3.phpt b/ext/date/tests/mktime_variation3.phpt index 52155f8f91..8abf2a2d35 100644 --- a/ext/date/tests/mktime_variation3.phpt +++ b/ext/date/tests/mktime_variation3.phpt @@ -130,22 +130,22 @@ int(%i) -- empty array -- -Warning: mktime() expects parameter 3 to be long, array given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: mktime() expects parameter 3 to be long, array given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: mktime() expects parameter 3 to be long, array given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: mktime() expects parameter 3 to be long, array given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -168,42 +168,42 @@ int(%i) -- empty string DQ -- -Warning: mktime() expects parameter 3 to be long, string given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: mktime() expects parameter 3 to be long, string given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: mktime() expects parameter 3 to be long, string given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: mktime() expects parameter 3 to be long, string given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: mktime() expects parameter 3 to be long, string given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: mktime() expects parameter 3 to be long, string given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: mktime() expects parameter 3 to be long, object given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: mktime() expects parameter 3 to be long, object given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -214,6 +214,6 @@ int(%i) -- resource -- -Warning: mktime() expects parameter 3 to be long, resource given in %s on line %d +Warning: mktime() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation4.phpt b/ext/date/tests/mktime_variation4.phpt index 3b0e200a5e..1b64c27e85 100644 --- a/ext/date/tests/mktime_variation4.phpt +++ b/ext/date/tests/mktime_variation4.phpt @@ -131,22 +131,22 @@ int(%i) -- empty array -- -Warning: mktime() expects parameter 4 to be long, array given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: mktime() expects parameter 4 to be long, array given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: mktime() expects parameter 4 to be long, array given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: mktime() expects parameter 4 to be long, array given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -169,42 +169,42 @@ int(%i) -- empty string DQ -- -Warning: mktime() expects parameter 4 to be long, string given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: mktime() expects parameter 4 to be long, string given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: mktime() expects parameter 4 to be long, string given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: mktime() expects parameter 4 to be long, string given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: mktime() expects parameter 4 to be long, string given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: mktime() expects parameter 4 to be long, string given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: mktime() expects parameter 4 to be long, object given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: mktime() expects parameter 4 to be long, object given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -215,6 +215,6 @@ int(%i) -- resource -- -Warning: mktime() expects parameter 4 to be long, resource given in %s on line %d +Warning: mktime() expects parameter 4 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation5.phpt b/ext/date/tests/mktime_variation5.phpt index 4e3690a9b0..fc36797a0e 100644 --- a/ext/date/tests/mktime_variation5.phpt +++ b/ext/date/tests/mktime_variation5.phpt @@ -132,22 +132,22 @@ int(%i) -- empty array -- -Warning: mktime() expects parameter 5 to be long, array given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: mktime() expects parameter 5 to be long, array given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: mktime() expects parameter 5 to be long, array given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: mktime() expects parameter 5 to be long, array given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -170,42 +170,42 @@ int(%i) -- empty string DQ -- -Warning: mktime() expects parameter 5 to be long, string given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: mktime() expects parameter 5 to be long, string given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: mktime() expects parameter 5 to be long, string given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: mktime() expects parameter 5 to be long, string given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: mktime() expects parameter 5 to be long, string given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: mktime() expects parameter 5 to be long, string given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: mktime() expects parameter 5 to be long, object given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: mktime() expects parameter 5 to be long, object given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -216,6 +216,6 @@ int(%i) -- resource -- -Warning: mktime() expects parameter 5 to be long, resource given in %s on line %d +Warning: mktime() expects parameter 5 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt index d0961ff2a2..0b2a130915 100644 --- a/ext/date/tests/mktime_variation6.phpt +++ b/ext/date/tests/mktime_variation6.phpt @@ -133,22 +133,22 @@ int(%i) -- empty array -- -Warning: mktime() expects parameter 6 to be long, array given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: mktime() expects parameter 6 to be long, array given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: mktime() expects parameter 6 to be long, array given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: mktime() expects parameter 6 to be long, array given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -171,42 +171,42 @@ int(%i) -- empty string DQ -- -Warning: mktime() expects parameter 6 to be long, string given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: mktime() expects parameter 6 to be long, string given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: mktime() expects parameter 6 to be long, string given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: mktime() expects parameter 6 to be long, string given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: mktime() expects parameter 6 to be long, string given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: mktime() expects parameter 6 to be long, string given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: mktime() expects parameter 6 to be long, object given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: mktime() expects parameter 6 to be long, object given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -217,7 +217,7 @@ int(%i) -- resource -- -Warning: mktime() expects parameter 6 to be long, resource given in %s on line %d +Warning: mktime() expects parameter 6 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation7.phpt b/ext/date/tests/mktime_variation7.phpt deleted file mode 100644 index 33c36d54f9..0000000000 --- a/ext/date/tests/mktime_variation7.phpt +++ /dev/null @@ -1,251 +0,0 @@ ---TEST-- -Test mktime() function : usage variation - Passing unexpected values to seventh argument $is_dst. ---FILE-- -<?php -/* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) - * Description: Get Unix timestamp for a date - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing mktime() : usage variation - unexpected values to seventh argument \$is_dst***\n"; - -//Set the default time zone -date_default_timezone_set("Europe/London"); - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = <<<EOT -hello world -EOT; - -// add arrays -$index_array = array (1, 2, 3); -$assoc_array = array ('one' => 1, 'two' => 2); - -// resource -$file_handle = fopen(__FILE__, 'r'); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 0' => 1, - 'int 0' => -1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource - 'resource' => $file_handle -); - -$hour = 10; -$minute = 30; -$second = 45; -$month = 7; -$day = 2; -$year = 1963; - -foreach($inputs as $variation =>$is_dst) { - echo "\n-- $variation --\n"; - var_dump( mktime($hour, $minute, $second, $month, $day, $year, $is_dst) ); -}; - -// closing the resource -fclose( $file_handle ); - -?> -===DONE=== ---EXPECTF-- -*** Testing mktime() : usage variation - unexpected values to seventh argument $is_dst*** - --- int 0 -- -int(%i) - --- int 12345 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- int -12345 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- float 10.5 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(-205165755) - --- float -10.5 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- float .5 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(-205162155) - --- empty array -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- int indexed array -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- associative array -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- nested arrays -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- uppercase NULL -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- lowercase null -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- lowercase true -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- lowercase false -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- uppercase TRUE -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- uppercase FALSE -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- empty string DQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- empty string SQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- string DQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- string SQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- mixed case string -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- heredoc -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- instance of classWithToString -- - -Warning: mktime() expects parameter 7 to be long, object given in %s on line %d -bool(false) - --- instance of classWithoutToString -- - -Warning: mktime() expects parameter 7 to be long, object given in %s on line %d -bool(false) - --- undefined var -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- unset var -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- resource -- - -Warning: mktime() expects parameter 7 to be long, resource given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/strftime_variation11.phpt b/ext/date/tests/strftime_variation11.phpt index a063f0ad20..08d5634daa 100644 --- a/ext/date/tests/strftime_variation11.phpt +++ b/ext/date/tests/strftime_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strftime() function : usage variation - Checking month related formats which are not supported on Windows. +Test strftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -17,7 +17,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { echo "*** Testing strftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); $timestamp = mktime(8, 8, 8, 8, 8, 2008); @@ -32,6 +32,6 @@ var_dump( strftime($format, $timestamp) ); *** Testing strftime() : usage variation *** -- Testing strftime() function with Abbreviated month name format %h -- -bool(false) -bool(false) +string(%d) "%s" +string(3) "Aug" ===DONE=== diff --git a/ext/date/tests/strftime_variation13.phpt b/ext/date/tests/strftime_variation13.phpt index 58ad283ffd..3218558184 100644 --- a/ext/date/tests/strftime_variation13.phpt +++ b/ext/date/tests/strftime_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strftime() function : usage variation - Checking date related formats which are not supported on Windows. +Test strftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -17,7 +17,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { echo "*** Testing strftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); $timestamp = mktime(8, 8, 8, 8, 8, 2008); @@ -43,18 +43,18 @@ foreach($inputs as $key =>$value) { *** Testing strftime() : usage variation *** --Century number-- -bool(false) -bool(false) +string(2) "20" +string(2) "20" --Month Date Year-- -bool(false) -bool(false) +string(%d) "%d/%d/%d" +string(8) "08/08/08" --Year with century-- -bool(false) -bool(false) +string(4) "%d" +string(4) "2008" --Year without century-- -bool(false) -bool(false) +string(2) "%d" +string(2) "08" ===DONE=== diff --git a/ext/date/tests/strftime_variation15.phpt b/ext/date/tests/strftime_variation15.phpt index 5b2946bf5d..962afd89c5 100644 --- a/ext/date/tests/strftime_variation15.phpt +++ b/ext/date/tests/strftime_variation15.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strftime() function : usage variation - Checking time related formats which are not supported on Windows. +Test strftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -17,7 +17,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { echo "*** Testing strftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); $timestamp = mktime(8, 8, 8, 8, 8, 2008); @@ -42,14 +42,14 @@ foreach($inputs as $key =>$value) { *** Testing strftime() : usage variation *** --Time in a.m/p.m notation-- -bool(false) -bool(false) +string(%d) "%d:%d:%d %s" +string(11) "08:08:08 AM" --Time in 24 hour notation-- -bool(false) -bool(false) +string(%d) "%d:%d" +string(5) "08:08" --Current time %H:%M:%S format-- -bool(false) -bool(false) +string(%d) "%d:%d:%d" +string(8) "08:08:08" ===DONE=== diff --git a/ext/date/tests/strftime_variation17.phpt b/ext/date/tests/strftime_variation17.phpt index 90b3269e83..66527e3436 100644 --- a/ext/date/tests/strftime_variation17.phpt +++ b/ext/date/tests/strftime_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strftime() function : usage variation - Checking day related formats which are not supported on Windows. +Test strftime() function : usage variation - Checking day related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -17,7 +17,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { echo "*** Testing strftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); $timestamp = mktime(8, 8, 8, 8, 8, 2008); @@ -31,6 +31,6 @@ var_dump( strftime($format, $timestamp) ); *** Testing strftime() : usage variation *** -- Testing strftime() function with Day of the month as decimal single digit format -- -bool(false) -bool(false) +string(%d) "%A%d" +string(2) " 8" ===DONE=== diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt index b41607719c..f36d0a189e 100644 --- a/ext/date/tests/strftime_variation19.phpt +++ b/ext/date/tests/strftime_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strftime() function : usage variation - Checking newline and tab formats which are not supported on Windows. +Test strftime() function : usage variation - Checking newline and tab formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -41,10 +41,12 @@ foreach($inputs as $key =>$value) { *** Testing strftime() : usage variation *** --Newline character-- -bool(false) -bool(false) +string(1) " +" +string(1) " +" --Tab character-- -bool(false) -bool(false) +string(1) " " +string(1) " " ===DONE=== diff --git a/ext/date/tests/strftime_variation2.phpt b/ext/date/tests/strftime_variation2.phpt index b02423495b..599f5f41a5 100644 --- a/ext/date/tests/strftime_variation2.phpt +++ b/ext/date/tests/strftime_variation2.phpt @@ -107,22 +107,22 @@ string(20) "Jan 01 1970 05:30:00" --empty array-- -Warning: strftime() expects parameter 2 to be long, array given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --int indexed array-- -Warning: strftime() expects parameter 2 to be long, array given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --associative array-- -Warning: strftime() expects parameter 2 to be long, array given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --nested arrays-- -Warning: strftime() expects parameter 2 to be long, array given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d bool(false) --uppercase NULL-- @@ -145,42 +145,42 @@ string(20) "Jan 01 1970 05:30:00" --empty string DQ-- -Warning: strftime() expects parameter 2 to be long, string given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --empty string SQ-- -Warning: strftime() expects parameter 2 to be long, string given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string DQ-- -Warning: strftime() expects parameter 2 to be long, string given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --string SQ-- -Warning: strftime() expects parameter 2 to be long, string given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --mixed case string-- -Warning: strftime() expects parameter 2 to be long, string given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --heredoc-- -Warning: strftime() expects parameter 2 to be long, string given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d bool(false) --instance of classWithToString-- -Warning: strftime() expects parameter 2 to be long, object given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, object given in %s on line %d bool(false) --instance of classWithoutToString-- -Warning: strftime() expects parameter 2 to be long, object given in %s on line %d +Warning: strftime() expects parameter 2 to be integer, object given in %s on line %d bool(false) --undefined var-- diff --git a/ext/date/tests/strftime_variation21.phpt b/ext/date/tests/strftime_variation21.phpt index f6aed15eff..735659298a 100644 --- a/ext/date/tests/strftime_variation21.phpt +++ b/ext/date/tests/strftime_variation21.phpt @@ -17,7 +17,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { echo "*** Testing strftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); $timestamp = mktime(8, 8, 8, 8, 8, 2008); @@ -42,8 +42,8 @@ foreach($inputs as $key =>$value) { *** Testing strftime() : usage variation *** --Preferred date and time representation-- -string(%d) "%d/%d/%d %d:%d:%d" -string(17) "08/08/08 08:08:08" +string(%d) "%s %s %d %d:%d:%d %d" +string(24) "Fri Aug 8 08:08:08 2008" --Preferred date representation-- string(%d) "%d/%d/%d" diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt index b7cf8d788e..94034b1749 100644 --- a/ext/date/tests/strftime_variation23.phpt +++ b/ext/date/tests/strftime_variation23.phpt @@ -1,5 +1,7 @@ --TEST-- Test strftime() function : usage variation - Checking large positive and negative float values to timestamp. +--SKIPIF-- +<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) @@ -25,12 +27,16 @@ var_dump( strftime($format, $timestamp) ); ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing strftime\(\) : usage variation \*\*\* +--EXPECTF-- +*** Testing strftime() : usage variation *** --- Testing strftime\(\) function with float 12.3456789000e10 to timestamp -- -string\(\d*\)\s"Mar\s(26|11)\s(1935|5882)\s(04|00):(50|30):(16|00)" +-- Testing strftime() function with float 12.3456789000e10 to timestamp -- --- Testing strftime\(\) function with float -12.3456789000e10 to timestamp -- -string\(\d*\)\s"(Oct|Dec)\s(08|13|22)\s(2004|1901|-1943)\s(19|20|23):(09|45|30):(44|52|00)" -===DONE=== +Warning: strftime() expects parameter 2 to be integer, float given in %s on line %d +bool(false) + +-- Testing strftime() function with float -12.3456789000e10 to timestamp -- + +Warning: strftime() expects parameter 2 to be integer, float given in %s on line %d +bool(false) +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/strftime_variation9.phpt b/ext/date/tests/strftime_variation9.phpt index 23aa92d98d..eff030984f 100644 --- a/ext/date/tests/strftime_variation9.phpt +++ b/ext/date/tests/strftime_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strftime() function : usage variation - Checking week related formats which are not supported on Windows. +Test strftime() function : usage variation - Checking week related formats which was not supported on Windows before VC14. --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { @@ -17,7 +17,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { echo "*** Testing strftime() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); +setlocale(LC_ALL, "C"); date_default_timezone_set("Asia/Calcutta"); $timestamp = mktime(8, 8, 8, 8, 8, 2008); @@ -41,10 +41,10 @@ foreach($inputs as $key =>$value) { *** Testing strftime() : usage variation *** --The ISO 8601:1988 week number-- -bool(false) -bool(false) +string(2) "%d" +string(2) "32" --Weekday as decimal-- -bool(false) -bool(false) +string(1) "%d" +string(1) "5" ===DONE=== diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt index 0a587a34eb..5b4b671b81 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation2.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation2.phpt @@ -130,22 +130,22 @@ string(3) "UTC" -- empty array -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -168,42 +168,42 @@ string(3) "UTC" -- empty string DQ -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, object given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, object given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -214,6 +214,6 @@ string(3) "UTC" -- resource -- -Warning: timezone_name_from_abbr() expects parameter 2 to be long, resource given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/timezone_name_from_abbr_variation3.phpt b/ext/date/tests/timezone_name_from_abbr_variation3.phpt index 66cb210e31..803afbaf75 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation3.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation3.phpt @@ -130,22 +130,22 @@ string(3) "UTC" -- empty array -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- int indexed array -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- associative array -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- nested arrays -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d bool(false) -- uppercase NULL -- @@ -168,42 +168,42 @@ string(3) "UTC" -- empty string DQ -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- empty string SQ -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string DQ -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- string SQ -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- mixed case string -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- heredoc -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d bool(false) -- instance of classWithToString -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, object given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- instance of classWithoutToString -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, object given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, object given in %s on line %d bool(false) -- undefined var -- @@ -214,6 +214,6 @@ string(3) "UTC" -- resource -- -Warning: timezone_name_from_abbr() expects parameter 3 to be long, resource given in %s on line %d +Warning: timezone_name_from_abbr() expects parameter 3 to be integer, resource given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt index c9fa25ce97..7ce1ade30a 100644 --- a/ext/date/tests/timezone_offset_get_error.phpt +++ b/ext/date/tests/timezone_offset_get_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test timezone_offset_get() function : error conditions +Test timezone_offset_get() function : error conditions --FILE-- <?php /* Prototype : int timezone_offset_get ( DateTimeZone $object , DateTime $datetime ) @@ -7,78 +7,119 @@ Test timezone_offset_get() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getOffset */ - -//Set the default time zone + +//Set the default time zone date_default_timezone_set("GMT"); $tz = timezone_open("Europe/London"); $date = date_create("GMT"); - + +set_error_handler('err'); + +function err($errno, $errstr) { + if ($errno === E_RECOVERABLE_ERROR) { + var_dump($errstr); + } +} + echo "*** Testing timezone_offset_get() : error conditions ***\n"; echo "\n-- Testing timezone_offset_get() function with zero arguments --\n"; -var_dump( timezone_offset_get() ); +try { + var_dump( timezone_offset_get() ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} echo "\n-- Testing timezone_offset_get() function with less than expected no. of arguments --\n"; -var_dump( timezone_offset_get($tz) ); +try { + var_dump( timezone_offset_get($tz) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} echo "\n-- Testing timezone_offset_get() function with more than expected no. of arguments --\n"; $extra_arg = 99; -var_dump( timezone_offset_get($tz, $date, $extra_arg) ); +try { + var_dump( timezone_offset_get($tz, $date, $extra_arg) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} echo "\n-- Testing timezone_offset_get() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( timezone_offset_get($invalid_obj, $date) ); +try { + var_dump( timezone_offset_get($invalid_obj, $date) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} $invalid_obj = 10; -var_dump( timezone_offset_get($invalid_obj, $date) ); +try { + var_dump( timezone_offset_get($invalid_obj, $date) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} $invalid_obj = null; -var_dump( timezone_offset_get($invalid_obj, $date) ); +try { + var_dump( timezone_offset_get($invalid_obj, $date) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} echo "\n-- Testing timezone_offset_get() function with an invalid values for \$datetime argument --\n"; $invalid_obj = new stdClass(); -var_dump( timezone_offset_get($tz, $invalid_obj) ); +try { + var_dump( timezone_offset_get($tz, $invalid_obj) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} $invalid_obj = 10; -var_dump( timezone_offset_get($tz, $invalid_obj) ); +try { + var_dump( timezone_offset_get($tz, $invalid_obj) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} $invalid_obj = null; -var_dump( timezone_offset_get($tz, $invalid_obj) ); +try { + var_dump( timezone_offset_get($tz, $invalid_obj) ); +} catch (Error $ex) { + var_dump($ex->getMessage()); + echo "\n"; +} ?> ===DONE=== --EXPECTF-- *** Testing timezone_offset_get() : error conditions *** -- Testing timezone_offset_get() function with zero arguments -- - -Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on line %d bool(false) -- Testing timezone_offset_get() function with less than expected no. of arguments -- - -Warning: timezone_offset_get() expects exactly 2 parameters, 1 given in %s on line %d bool(false) -- Testing timezone_offset_get() function with more than expected no. of arguments -- - -Warning: timezone_offset_get() expects exactly 2 parameters, 3 given in %s on line %d bool(false) -- Testing timezone_offset_get() function with an invalid values for $object argument -- +string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of stdClass given" -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d -bool(false) +string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given" -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d -bool(false) +string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given" -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d -bool(false) -- Testing timezone_offset_get() function with an invalid values for $datetime argument -- +string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, instance of stdClass given" -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, object given in %s on line %d -bool(false) +string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given" -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d -bool(false) +string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given" -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d -bool(false) ===DONE=== diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt index 5fd5e8b270..edeeb7fea7 100644 --- a/ext/date/tests/timezone_offset_get_variation1.phpt +++ b/ext/date/tests/timezone_offset_get_variation1.phpt @@ -13,6 +13,14 @@ echo "*** Testing timezone_offset_get() : usage variation - unexpected values t //Set the default time zone date_default_timezone_set("Europe/London"); +set_error_handler('handler'); + +function handler($errno, $errstr) { + if ($errno === E_RECOVERABLE_ERROR) { + echo $errstr . "\n"; + } +} + //get an unset variable $unset_var = 10; unset ($unset_var); @@ -99,7 +107,11 @@ $datetime = new DateTime("2009-01-31 15:14:10"); foreach($inputs as $variation =>$object) { echo "\n-- $variation --\n"; - var_dump( timezone_offset_get($object, $datetime) ); + try { + var_dump( timezone_offset_get($object, $datetime) ); + } catch (Error $ex) { + echo $ex->getMessage()."\n"; + } }; // closing the resource @@ -111,142 +123,86 @@ fclose( $file_handle ); *** Testing timezone_offset_get() : usage variation - unexpected values to first argument $object*** -- int 0 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given -- int 1 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given -- int 12345 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given -- int -12345 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given -- float 10.5 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, float given -- float -10.5 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, float given -- float .5 -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, float given -- empty array -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, array given -- int indexed array -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, array given -- associative array -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, array given -- nested arrays -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, array given -- uppercase NULL -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given -- lowercase null -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given -- lowercase true -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given -- lowercase false -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given -- uppercase TRUE -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given -- uppercase FALSE -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given -- empty string DQ -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given -- empty string SQ -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given -- string DQ -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given -- string SQ -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given -- mixed case string -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given -- heredoc -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given -- instance of classWithToString -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of classWithToString given -- instance of classWithoutToString -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of classWithoutToString given -- undefined var -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given -- unset var -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given -- resource -- - -Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, resource given in %s on line %d -bool(false) +Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, resource given ===DONE=== diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt index c83b697498..2d007d5e70 100644 --- a/ext/date/tests/timezone_offset_get_variation2.phpt +++ b/ext/date/tests/timezone_offset_get_variation2.phpt @@ -13,6 +13,14 @@ echo "*** Testing timezone_offset_get() : usage variation - unexpected values t //Set the default time zone date_default_timezone_set("Europe/London"); +set_error_handler('handler'); + +function handler($errno, $errstr) { + if ($errno === E_RECOVERABLE_ERROR) { + echo $errstr . "\n"; + } +} + //get an unset variable $unset_var = 10; unset ($unset_var); @@ -99,7 +107,11 @@ $object = new DateTimezone("Europe/London"); foreach($inputs as $variation =>$datetime) { echo "\n-- $variation --\n"; - var_dump( timezone_offset_get($object, $datetime) ); + try { + var_dump( timezone_offset_get($object, $datetime) ); + } catch (Error $ex) { + echo $ex->getMessage()."\n"; + } }; // closing the resource @@ -111,142 +123,86 @@ fclose( $file_handle ); *** Testing timezone_offset_get() : usage variation - unexpected values to second argument $datetime*** -- int 0 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given -- int 1 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given -- int 12345 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given -- int -12345 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given -- float 10.5 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, double given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, float given -- float -10.5 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, double given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, float given -- float .5 -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, double given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, float given -- empty array -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, array given -- int indexed array -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, array given -- associative array -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, array given -- nested arrays -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, array given -- uppercase NULL -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given -- lowercase null -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given -- lowercase true -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given -- lowercase false -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given -- uppercase TRUE -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given -- uppercase FALSE -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given -- empty string DQ -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given -- empty string SQ -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given -- string DQ -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given -- string SQ -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given -- mixed case string -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given -- heredoc -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given -- instance of classWithToString -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, object given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, instance of classWithToString given -- instance of classWithoutToString -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, object given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, instance of classWithoutToString given -- undefined var -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given -- unset var -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given -- resource -- - -Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, resource given in %s on line %d -bool(false) +Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, resource given ===DONE=== diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt index 62159ddf33..9ebe2861e6 100644 --- a/ext/date/tests/timezone_transitions_get_variation1.phpt +++ b/ext/date/tests/timezone_transitions_get_variation1.phpt @@ -130,17 +130,17 @@ bool(false) -- float 10.5 -- -Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d +Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, float given in %s on line %d bool(false) -- float -10.5 -- -Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d +Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, float given in %s on line %d bool(false) -- float .5 -- -Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d +Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, float given in %s on line %d bool(false) -- empty array -- diff --git a/ext/date/tests/timezone_transitions_get_variation2.phpt b/ext/date/tests/timezone_transitions_get_variation2.phpt index bc5fa859c9..c28daeb897 100644 --- a/ext/date/tests/timezone_transitions_get_variation2.phpt +++ b/ext/date/tests/timezone_transitions_get_variation2.phpt @@ -143,25 +143,25 @@ int(8) -- empty array -- -Warning: timezone_transitions_get() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d string(7) "boolean" int(1) -- int indexed array -- -Warning: timezone_transitions_get() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d string(7) "boolean" int(1) -- associative array -- -Warning: timezone_transitions_get() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d string(7) "boolean" int(1) -- nested arrays -- -Warning: timezone_transitions_get() expects parameter 2 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d string(7) "boolean" int(1) @@ -191,49 +191,49 @@ int(8) -- empty string DQ -- -Warning: timezone_transitions_get() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- empty string SQ -- -Warning: timezone_transitions_get() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- string DQ -- -Warning: timezone_transitions_get() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- string SQ -- -Warning: timezone_transitions_get() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- mixed case string -- -Warning: timezone_transitions_get() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- heredoc -- -Warning: timezone_transitions_get() expects parameter 2 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- instance of classWithToString -- -Warning: timezone_transitions_get() expects parameter 2 to be long, object given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d string(7) "boolean" int(1) -- instance of classWithoutToString -- -Warning: timezone_transitions_get() expects parameter 2 to be long, object given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d string(7) "boolean" int(1) @@ -247,7 +247,7 @@ int(8) -- resource -- -Warning: timezone_transitions_get() expects parameter 2 to be long, resource given in %s on line %d +Warning: timezone_transitions_get() expects parameter 2 to be integer, resource given in %s on line %d string(7) "boolean" int(1) ===DONE=== diff --git a/ext/date/tests/timezone_transitions_get_variation3.phpt b/ext/date/tests/timezone_transitions_get_variation3.phpt index 0112a2f36a..108d00ed6d 100644 --- a/ext/date/tests/timezone_transitions_get_variation3.phpt +++ b/ext/date/tests/timezone_transitions_get_variation3.phpt @@ -143,25 +143,25 @@ int(1) -- empty array -- -Warning: timezone_transitions_get() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d string(7) "boolean" int(1) -- int indexed array -- -Warning: timezone_transitions_get() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d string(7) "boolean" int(1) -- associative array -- -Warning: timezone_transitions_get() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d string(7) "boolean" int(1) -- nested arrays -- -Warning: timezone_transitions_get() expects parameter 3 to be long, array given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d string(7) "boolean" int(1) @@ -191,49 +191,49 @@ int(1) -- empty string DQ -- -Warning: timezone_transitions_get() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- empty string SQ -- -Warning: timezone_transitions_get() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- string DQ -- -Warning: timezone_transitions_get() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- string SQ -- -Warning: timezone_transitions_get() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- mixed case string -- -Warning: timezone_transitions_get() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- heredoc -- -Warning: timezone_transitions_get() expects parameter 3 to be long, string given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d string(7) "boolean" int(1) -- instance of classWithToString -- -Warning: timezone_transitions_get() expects parameter 3 to be long, object given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d string(7) "boolean" int(1) -- instance of classWithoutToString -- -Warning: timezone_transitions_get() expects parameter 3 to be long, object given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d string(7) "boolean" int(1) @@ -247,7 +247,7 @@ int(1) -- resource -- -Warning: timezone_transitions_get() expects parameter 3 to be long, resource given in %s on line %d +Warning: timezone_transitions_get() expects parameter 3 to be integer, resource given in %s on line %d string(7) "boolean" int(1) ===DONE=== |