summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Caruso <carusogabriel34@gmail.com>2018-02-04 11:33:49 -0200
committerNikita Popov <nikita.ppv@gmail.com>2018-02-04 19:08:23 +0100
commitce1d69a1f6dcf15d43029301059c25e5bc09a577 (patch)
tree3df785771b4bfa07a9e270b04750840ed47f1cbf
parent4861730a945908208a049b0c037ddf4a339f999a (diff)
downloadphp-git-ce1d69a1f6dcf15d43029301059c25e5bc09a577.tar.gz
Use int instead of integer in type errors
PHP requires integer typehints to be written "int" and does not allow "integer" as an alias. This changes type error messages to match the actual type name and avoids confusing messages like "must be of the type integer, integer given".
-rw-r--r--Zend/tests/bug73954.phpt2
-rw-r--r--Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt4
-rw-r--r--Zend/tests/generators/generator_with_type_check.phpt2
-rw-r--r--Zend/tests/generators/generator_with_type_check_2.phpt4
-rw-r--r--Zend/tests/object_types/return_type_in_class.phpt2
-rw-r--r--Zend/tests/object_types/return_type_in_function.phpt2
-rw-r--r--Zend/tests/object_types/return_type_inheritance_in_class.phpt2
-rw-r--r--Zend/tests/object_types/return_type_inheritance_in_interface.phpt2
-rw-r--r--Zend/tests/object_types/type_hint_in_class_method.phpt2
-rw-r--r--Zend/tests/object_types/type_hint_in_function.phpt2
-rw-r--r--Zend/tests/return_types/003.phpt2
-rw-r--r--Zend/tests/return_types/030.phpt2
-rw-r--r--Zend/tests/return_types/bug70557.phpt2
-rw-r--r--Zend/tests/return_types/rfc001.phpt2
-rw-r--r--Zend/tests/type_declarations/array_001.phpt2
-rw-r--r--Zend/tests/type_declarations/explicit_weak_include_strict.phpt2
-rw-r--r--Zend/tests/type_declarations/internal_function_strict_mode.phpt2
-rw-r--r--Zend/tests/type_declarations/iterable_001.phpt2
-rw-r--r--Zend/tests/type_declarations/iterable_003.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_basic.phpt16
-rw-r--r--Zend/tests/type_declarations/scalar_constant_defaults_error.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_null.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_return_basic.phpt16
-rw-r--r--Zend/tests/type_declarations/scalar_return_basic_64bit.phpt16
-rw-r--r--Zend/tests/type_declarations/scalar_strict.phpt36
-rw-r--r--Zend/tests/type_declarations/scalar_strict_64bit.phpt36
-rw-r--r--Zend/tests/type_declarations/scalar_strict_basic.phpt20
-rw-r--r--Zend/tests/type_declarations/strict_call_weak.phpt2
-rw-r--r--Zend/tests/type_declarations/strict_call_weak_explicit.phpt2
-rw-r--r--Zend/tests/type_declarations/weak_include_strict.phpt2
-rw-r--r--Zend/tests/typehints/or_null.phpt26
-rw-r--r--Zend/tests/variadic/typehint_error.phpt2
-rw-r--r--Zend/tests/variadic/typehint_suppressed_error.phpt2
-rw-r--r--Zend/zend_API.c4
-rw-r--r--Zend/zend_API.h2
-rw-r--r--ext/calendar/tests/jdtomonthname.phpt12
-rw-r--r--ext/curl/tests/curl_setopt_error.phpt2
-rw-r--r--ext/curl/tests/curl_version_variation1.phpt14
-rw-r--r--ext/date/tests/68062.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getOffset_variation1.phpt8
-rw-r--r--ext/date/tests/DateTime_construct_variation2.phpt8
-rw-r--r--ext/date/tests/DateTime_setDate_variation1.phpt34
-rw-r--r--ext/date/tests/DateTime_setDate_variation2.phpt34
-rw-r--r--ext/date/tests/DateTime_setDate_variation3.phpt34
-rw-r--r--ext/date/tests/DateTime_setISODate_variation1.phpt26
-rw-r--r--ext/date/tests/DateTime_setISODate_variation2.phpt26
-rw-r--r--ext/date/tests/DateTime_setISODate_variation3.phpt26
-rw-r--r--ext/date/tests/DateTime_setTime_variation1.phpt26
-rw-r--r--ext/date/tests/DateTime_setTime_variation2.phpt26
-rw-r--r--ext/date/tests/DateTime_setTime_variation3.phpt26
-rw-r--r--ext/date/tests/DateTime_setTimezone_variation1.phpt8
-rw-r--r--ext/date/tests/bug36988.phpt2
-rw-r--r--ext/date/tests/bug52062.phpt2
-rw-r--r--ext/date/tests/bug70245.phpt2
-rw-r--r--ext/date/tests/checkdate_variation1.phpt26
-rw-r--r--ext/date/tests/checkdate_variation2.phpt26
-rw-r--r--ext/date/tests/checkdate_variation3.phpt26
-rw-r--r--ext/date/tests/date_create_variation2.phpt8
-rw-r--r--ext/date/tests/date_date_set_variation1.phpt8
-rw-r--r--ext/date/tests/date_date_set_variation2.phpt26
-rw-r--r--ext/date/tests/date_date_set_variation3.phpt26
-rw-r--r--ext/date/tests/date_date_set_variation4.phpt34
-rw-r--r--ext/date/tests/date_error.phpt2
-rw-r--r--ext/date/tests/date_format_error.phpt2
-rw-r--r--ext/date/tests/date_format_variation1.phpt8
-rw-r--r--ext/date/tests/date_isodate_set_error.phpt2
-rw-r--r--ext/date/tests/date_isodate_set_variation1.phpt8
-rw-r--r--ext/date/tests/date_isodate_set_variation2.phpt26
-rw-r--r--ext/date/tests/date_isodate_set_variation3.phpt26
-rw-r--r--ext/date/tests/date_isodate_set_variation4.phpt26
-rw-r--r--ext/date/tests/date_modify_error.phpt2
-rw-r--r--ext/date/tests/date_modify_variation1.phpt8
-rw-r--r--ext/date/tests/date_offset_get_error.phpt2
-rw-r--r--ext/date/tests/date_offset_get_variation1.phpt8
-rw-r--r--ext/date/tests/date_sun_info_variation1.phpt14
-rw-r--r--ext/date/tests/date_sunrise_variation1.phpt72
-rw-r--r--ext/date/tests/date_sunrise_variation2.phpt28
-rw-r--r--ext/date/tests/date_sunrise_variation9.phpt12
-rw-r--r--ext/date/tests/date_sunset_variation1.phpt72
-rw-r--r--ext/date/tests/date_sunset_variation2.phpt28
-rw-r--r--ext/date/tests/date_sunset_variation9.phpt12
-rw-r--r--ext/date/tests/date_time_set_error.phpt2
-rw-r--r--ext/date/tests/date_time_set_variation1.phpt8
-rw-r--r--ext/date/tests/date_time_set_variation2.phpt26
-rw-r--r--ext/date/tests/date_time_set_variation3.phpt26
-rw-r--r--ext/date/tests/date_time_set_variation4.phpt26
-rw-r--r--ext/date/tests/date_timestamp_get.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_wrongparam_002.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_wrongparam_003.phpt2
-rw-r--r--ext/date/tests/date_timezone_get_error.phpt2
-rw-r--r--ext/date/tests/date_timezone_get_variation1.phpt8
-rw-r--r--ext/date/tests/date_timezone_set_error.phpt2
-rw-r--r--ext/date/tests/date_timezone_set_variation1.phpt8
-rw-r--r--ext/date/tests/date_timezone_set_variation2.phpt8
-rw-r--r--ext/date/tests/date_variation2.phpt26
-rw-r--r--ext/date/tests/getdate_variation1.phpt24
-rw-r--r--ext/date/tests/getdate_variation7.phpt4
-rw-r--r--ext/date/tests/gmdate_variation14.phpt4
-rw-r--r--ext/date/tests/gmdate_variation2.phpt24
-rw-r--r--ext/date/tests/gmmktime_variation1.phpt24
-rw-r--r--ext/date/tests/gmmktime_variation2.phpt24
-rw-r--r--ext/date/tests/gmmktime_variation3.phpt24
-rw-r--r--ext/date/tests/gmmktime_variation4.phpt24
-rw-r--r--ext/date/tests/gmmktime_variation5.phpt28
-rw-r--r--ext/date/tests/gmmktime_variation6.phpt28
-rw-r--r--ext/date/tests/gmstrftime_variation2.phpt28
-rw-r--r--ext/date/tests/idate_variation2.phpt24
-rw-r--r--ext/date/tests/idate_variation3.phpt4
-rw-r--r--ext/date/tests/localtime_variation1.phpt48
-rw-r--r--ext/date/tests/localtime_variation3.phpt8
-rw-r--r--ext/date/tests/mktime_variation1.phpt26
-rw-r--r--ext/date/tests/mktime_variation2.phpt26
-rw-r--r--ext/date/tests/mktime_variation3.phpt26
-rw-r--r--ext/date/tests/mktime_variation4.phpt26
-rw-r--r--ext/date/tests/mktime_variation5.phpt26
-rw-r--r--ext/date/tests/mktime_variation6.phpt26
-rw-r--r--ext/date/tests/strftime_variation2.phpt24
-rw-r--r--ext/date/tests/strftime_variation23.phpt4
-rw-r--r--ext/date/tests/timezone_name_from_abbr_variation2.phpt26
-rw-r--r--ext/date/tests/timezone_name_from_abbr_variation3.phpt26
-rw-r--r--ext/date/tests/timezone_name_get_error.phpt2
-rw-r--r--ext/date/tests/timezone_offset_get_error.phpt4
-rw-r--r--ext/date/tests/timezone_offset_get_variation1.phpt8
-rw-r--r--ext/date/tests/timezone_offset_get_variation2.phpt8
-rw-r--r--ext/date/tests/timezone_transitions_get_error.phpt2
-rw-r--r--ext/date/tests/timezone_transitions_get_variation1.phpt8
-rw-r--r--ext/date/tests/timezone_transitions_get_variation2.phpt26
-rw-r--r--ext/date/tests/timezone_transitions_get_variation3.phpt26
-rw-r--r--ext/exif/tests/exif_tagname_variation1-64bit.phpt18
-rw-r--r--ext/exif/tests/exif_tagname_variation1.phpt18
-rw-r--r--ext/fileinfo/tests/finfo_open_error.phpt6
-rw-r--r--ext/filter/tests/007.phpt8
-rw-r--r--ext/filter/tests/010.phpt2
-rw-r--r--ext/filter/tests/011.phpt4
-rw-r--r--ext/filter/tests/040.phpt2
-rw-r--r--ext/ftp/tests/004.phpt2
-rw-r--r--ext/ftp/tests/ftp_ssl_connect_error.phpt4
-rw-r--r--ext/gd/tests/imagechar_error3.phpt2
-rw-r--r--ext/gd/tests/imagechar_error4.phpt2
-rw-r--r--ext/gd/tests/imagechar_error5.phpt2
-rw-r--r--ext/gd/tests/imagechar_error7.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error3.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error4.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error5.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error7.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_variation1.phpt8
-rw-r--r--ext/gd/tests/imagecolorallocate_variation2.phpt26
-rw-r--r--ext/gd/tests/imagecolorallocate_variation3.phpt26
-rw-r--r--ext/gd/tests/imagecolorallocate_variation4.phpt26
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error2.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error3.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error4.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error5.phpt6
-rw-r--r--ext/gd/tests/imagecolorclosesthwb.phpt2
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error1.phpt4
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error2.phpt4
-rw-r--r--ext/gd/tests/imageellipse_error2.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error3.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error4.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error5.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error6.phpt2
-rw-r--r--ext/gd/tests/imagefilltoborder_error2.phpt2
-rw-r--r--ext/gd/tests/imagefilltoborder_error3.phpt2
-rw-r--r--ext/gd/tests/imagefilltoborder_error4.phpt2
-rw-r--r--ext/gd/tests/imagefilltoborder_error5.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error14.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error16.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error19.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error2.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error3.phpt2
-rw-r--r--ext/gd/tests/imagefontheight_error1.phpt2
-rw-r--r--ext/gd/tests/imagefontwidth_error1.phpt2
-rw-r--r--ext/gd/tests/imagelayereffect_error2.phpt2
-rw-r--r--ext/gd/tests/imagerectangle_error3.phpt2
-rw-r--r--ext/gd/tests/imagerectangle_error4.phpt2
-rw-r--r--ext/gd/tests/imagerectangle_error5.phpt2
-rw-r--r--ext/gd/tests/imagerectangle_error6.phpt2
-rw-r--r--ext/gd/tests/imagerectangle_error7.phpt2
-rw-r--r--ext/gd/tests/imagesetthickness_error2.phpt6
-rw-r--r--ext/gd/tests/imagestring_error3.phpt2
-rw-r--r--ext/gd/tests/imagestring_error4.phpt2
-rw-r--r--ext/gd/tests/imagestring_error5.phpt2
-rw-r--r--ext/gd/tests/imagestring_error7.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error3.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error4.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error5.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error7.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error3.phpt6
-rw-r--r--ext/gettext/tests/gettext_ngettext-wrongparams.phpt2
-rw-r--r--ext/gmp/tests/gmp_pow.phpt4
-rw-r--r--ext/gmp/tests/gmp_random.phpt6
-rw-r--r--ext/gmp/tests/gmp_strval.phpt8
-rw-r--r--ext/hash/tests/hash_equals.phpt6
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt16
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt16
-rw-r--r--ext/iconv/tests/iconv_mime_decode_variation2.phpt16
-rw-r--r--ext/iconv/tests/iconv_strpos_variation3.phpt16
-rw-r--r--ext/iconv/tests/iconv_strpos_variation3_64bit.phpt14
-rw-r--r--ext/imap/tests/imap_close_variation1.phpt8
-rw-r--r--ext/imap/tests/imap_close_variation2.phpt6
-rw-r--r--ext/imap/tests/imap_fetch_overview_variation1.phpt8
-rw-r--r--ext/imap/tests/imap_fetchbody_variation1.phpt8
-rw-r--r--ext/imap/tests/imap_fetchbody_variation2.phpt14
-rw-r--r--ext/imap/tests/imap_fetchheader_variation1.phpt8
-rw-r--r--ext/imap/tests/imap_fetchheader_variation2.phpt22
-rw-r--r--ext/imap/tests/imap_timeout_basic.phpt2
-rw-r--r--ext/interbase/tests/ibase_drop_db_001.phpt2
-rw-r--r--ext/interbase/tests/ibase_num_fields_001.phpt2
-rw-r--r--ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt6
-rw-r--r--ext/intl/tests/breakiter_getLocale_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_getPartsIterator_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_next_error.phpt2
-rw-r--r--ext/intl/tests/calendar_add_error.phpt2
-rw-r--r--ext/intl/tests/calendar_before_after_error.phpt4
-rw-r--r--ext/intl/tests/calendar_clear_error.phpt2
-rw-r--r--ext/intl/tests/calendar_equals_error.phpt4
-rw-r--r--ext/intl/tests/calendar_fieldDifference_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getDayOfWeekType_error.phpt4
-rw-r--r--ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getLocale_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getType_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getWeekendTransition_error.phpt2
-rw-r--r--ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt8
-rw-r--r--ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt6
-rw-r--r--ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt12
-rw-r--r--ext/intl/tests/calendar_inDaylightTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isEquivalentTo_error.phpt8
-rw-r--r--ext/intl/tests/calendar_isLenient_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isSet_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isWeekend_error.phpt2
-rw-r--r--ext/intl/tests/calendar_roll_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setLenient_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt6
-rw-r--r--ext/intl/tests/calendar_setTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_set_error.phpt2
-rw-r--r--ext/intl/tests/calendar_toDateTime_error.phpt2
-rw-r--r--ext/intl/tests/dateformat_formatObject_error.phpt2
-rw-r--r--ext/intl/tests/gregoriancalendar___construct_error.phpt2
-rw-r--r--ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt2
-rw-r--r--ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt4
-rw-r--r--ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt2
-rw-r--r--ext/intl/tests/idn_uts46_errors.phpt2
-rw-r--r--ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt4
-rw-r--r--ext/intl/tests/timezone_getDisplayName_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getEquivalentID_error.phpt2
-rw-r--r--ext/intl/tests/timezone_toDateTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/transliterator_create_from_rule_error.phpt2
-rw-r--r--ext/ldap/tests/ldap_err2str_error.phpt2
-rw-r--r--ext/libxml/tests/004.phpt2
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt14
-rw-r--r--ext/mbstring/tests/mb_split_variation3.phpt14
-rw-r--r--ext/mbstring/tests/mb_stripos_variation3.phpt14
-rw-r--r--ext/mbstring/tests/mb_strpos_variation3.phpt14
-rw-r--r--ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt14
-rw-r--r--ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_field_seek.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt2
-rw-r--r--ext/oci8/tests/lob_002.phpt4
-rw-r--r--ext/oci8/tests/lob_026.phpt2
-rw-r--r--ext/oci8/tests/privileged_connect.phpt2
-rw-r--r--ext/oci8/tests/privileged_connect1.phpt2
-rw-r--r--ext/odbc/tests/odbc_data_source_001.phpt2
-rw-r--r--ext/odbc/tests/odbc_exec_001.phpt4
-rw-r--r--ext/opcache/tests/method_call_on_literal.phpt2
-rw-r--r--ext/openssl/tests/openssl_csr_new_basic.phpt4
-rw-r--r--ext/openssl/tests/openssl_csr_sign_basic.phpt4
-rw-r--r--ext/pcre/tests/grep2.phpt2
-rw-r--r--ext/pcre/tests/preg_replace_callback3.phpt4
-rw-r--r--ext/pcre/tests/preg_replace_callback_array2.phpt10
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt2
-rw-r--r--ext/phar/tests/badparameters.phpt10
-rw-r--r--ext/phar/tests/phar_bz2.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_chmod.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_compression.phpt2
-rw-r--r--ext/posix/tests/posix_getgrgid_variation.phpt20
-rw-r--r--ext/posix/tests/posix_getpgid_variation.phpt20
-rw-r--r--ext/posix/tests/posix_getpwuid_variation.phpt20
-rw-r--r--ext/posix/tests/posix_getsid_error.phpt2
-rw-r--r--ext/posix/tests/posix_initgroups.phpt2
-rw-r--r--ext/posix/tests/posix_initgroups_basic.phpt2
-rw-r--r--ext/posix/tests/posix_kill_variation1.phpt20
-rw-r--r--ext/posix/tests/posix_kill_variation2.phpt20
-rw-r--r--ext/posix/tests/posix_seteuid_error2.phpt4
-rw-r--r--ext/posix/tests/posix_seteuid_variation1.phpt8
-rw-r--r--ext/posix/tests/posix_seteuid_variation3.phpt4
-rw-r--r--ext/posix/tests/posix_seteuid_variation4.phpt4
-rw-r--r--ext/posix/tests/posix_seteuid_variation6.phpt8
-rw-r--r--ext/posix/tests/posix_setgid_variation1.phpt8
-rw-r--r--ext/posix/tests/posix_setgid_variation3.phpt4
-rw-r--r--ext/posix/tests/posix_setgid_variation4.phpt4
-rw-r--r--ext/posix/tests/posix_setgid_variation6.phpt4
-rw-r--r--ext/posix/tests/posix_setgid_variation7.phpt8
-rw-r--r--ext/posix/tests/posix_setuid_error2.phpt4
-rw-r--r--ext/posix/tests/posix_setuid_variation1.phpt8
-rw-r--r--ext/posix/tests/posix_setuid_variation3.phpt4
-rw-r--r--ext/posix/tests/posix_setuid_variation4.phpt4
-rw-r--r--ext/posix/tests/posix_setuid_variation6.phpt8
-rw-r--r--ext/posix/tests/posix_strerror_variation1.phpt20
-rw-r--r--ext/pspell/tests/002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClassConstant_basic1.phpt6
-rw-r--r--ext/reflection/tests/ReflectionClassConstant_getValue.phpt6
-rw-r--r--ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getMethods_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperties_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_toString_001.phpt6
-rw-r--r--ext/reflection/tests/ReflectionObject_constructor_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_isInstance_error.phpt2
-rw-r--r--ext/reflection/tests/bug29986.phpt2
-rw-r--r--ext/session/tests/session_start_error.phpt8
-rw-r--r--ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt2
-rw-r--r--ext/snmp/tests/snmp-object-error.phpt8
-rw-r--r--ext/snmp/tests/snmp2_real_walk.phpt4
-rw-r--r--ext/snmp/tests/snmp2_walk.phpt4
-rw-r--r--ext/snmp/tests/snmp_get_quick_print.phpt2
-rw-r--r--ext/snmp/tests/snmp_get_valueretrieval.phpt2
-rw-r--r--ext/snmp/tests/snmprealwalk.phpt4
-rw-r--r--ext/snmp/tests/snmpwalk.phpt4
-rw-r--r--ext/sockets/tests/socket_connect_error.phpt2
-rw-r--r--ext/sockets/tests/socket_create_listen-wrongparams.phpt4
-rw-r--r--ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_create_pair-wrongparams.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-2.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-2.phpt2
-rw-r--r--ext/sodium/tests/sodium_error_001.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray__construct_param_array.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray__construct_param_string.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_setSize_param_array.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplTempFileObject_constructor_error.phpt2
-rw-r--r--ext/spl/tests/arrayObject_asort_basic1.phpt2
-rw-r--r--ext/spl/tests/arrayObject_ksort_basic1.phpt2
-rw-r--r--ext/spl/tests/fileobject_setmaxlinelen_error003.phpt2
-rw-r--r--ext/spl/tests/fixedarray_005.phpt6
-rw-r--r--ext/spl/tests/fixedarray_009.phpt2
-rw-r--r--ext/spl/tests/fixedarray_015.phpt2
-rw-r--r--ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt2
-rw-r--r--ext/spl/tests/regexIterator_setMode_error.phpt2
-rw-r--r--ext/spl/tests/spl_004.phpt2
-rw-r--r--ext/spl/tests/spl_005.phpt2
-rw-r--r--ext/spl/tests/spl_object_id.phpt2
-rw-r--r--ext/standard/tests/array/005.phpt2
-rw-r--r--ext/standard/tests/array/009.phpt8
-rw-r--r--ext/standard/tests/array/array_change_key_case_errors.phpt4
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation.phpt4
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation2.phpt12
-rw-r--r--ext/standard/tests/array/array_chunk_variation1.phpt24
-rw-r--r--ext/standard/tests/array/array_chunk_variation2.phpt72
-rw-r--r--ext/standard/tests/array/array_column_error.phpt2
-rw-r--r--ext/standard/tests/array/array_combine_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_combine_variation2.phpt8
-rw-r--r--ext/standard/tests/array/array_count_values_error.phpt2
-rw-r--r--ext/standard/tests/array/array_fill_variation1.phpt24
-rw-r--r--ext/standard/tests/array/array_fill_variation1_64bit.phpt22
-rw-r--r--ext/standard/tests/array/array_fill_variation2.phpt20
-rw-r--r--ext/standard/tests/array/array_filter_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_flip_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_key_exists.phpt2
-rw-r--r--ext/standard/tests/array/array_key_exists_variation2.phpt8
-rw-r--r--ext/standard/tests/array/array_keys_error.phpt2
-rw-r--r--ext/standard/tests/array/array_pad_variation1.phpt16
-rw-r--r--ext/standard/tests/array/array_pad_variation2.phpt20
-rw-r--r--ext/standard/tests/array/array_pop_errors.phpt2
-rw-r--r--ext/standard/tests/array/array_product_variation5.phpt8
-rw-r--r--ext/standard/tests/array/array_push.phpt2
-rw-r--r--ext/standard/tests/array/array_push_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_rand.phpt2
-rw-r--r--ext/standard/tests/array/array_rand_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_rand_variation2.phpt10
-rw-r--r--ext/standard/tests/array/array_reverse_variation1.phpt24
-rw-r--r--ext/standard/tests/array/array_search1.phpt2
-rw-r--r--ext/standard/tests/array/array_search_errors.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_slice.phpt2
-rw-r--r--ext/standard/tests/array/array_slice_variation11.phpt8
-rw-r--r--ext/standard/tests/array/array_slice_variation2.phpt14
-rw-r--r--ext/standard/tests/array/array_splice_errors.phpt2
-rw-r--r--ext/standard/tests/array/array_sum_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_unique_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_unshift_variation1.phpt16
-rw-r--r--ext/standard/tests/array/array_values_errors.phpt2
-rw-r--r--ext/standard/tests/array/array_values_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_walk.phpt2
-rw-r--r--ext/standard/tests/array/array_walk_recursive1.phpt2
-rw-r--r--ext/standard/tests/array/array_walk_recursive_variation1.phpt16
-rw-r--r--ext/standard/tests/array/array_walk_variation1.phpt16
-rw-r--r--ext/standard/tests/array/arsort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/arsort_variation2.phpt16
-rw-r--r--ext/standard/tests/array/asort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/asort_variation2.phpt16
-rw-r--r--ext/standard/tests/array/count_recursive.phpt6
-rw-r--r--ext/standard/tests/array/count_variation2.phpt14
-rw-r--r--ext/standard/tests/array/current_variation1.phpt8
-rw-r--r--ext/standard/tests/array/end.phpt2
-rw-r--r--ext/standard/tests/array/end_64bit.phpt2
-rw-r--r--ext/standard/tests/array/end_variation1.phpt8
-rw-r--r--ext/standard/tests/array/extract_error.phpt2
-rw-r--r--ext/standard/tests/array/in_array_errors.phpt2
-rw-r--r--ext/standard/tests/array/key_variation1.phpt8
-rw-r--r--ext/standard/tests/array/krsort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/krsort_variation2.phpt16
-rw-r--r--ext/standard/tests/array/ksort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/ksort_variation2.phpt16
-rw-r--r--ext/standard/tests/array/natcasesort_variation1.phpt8
-rw-r--r--ext/standard/tests/array/next_variation1.phpt8
-rw-r--r--ext/standard/tests/array/prev_variation1.phpt8
-rw-r--r--ext/standard/tests/array/reset_variation1.phpt8
-rw-r--r--ext/standard/tests/array/rsort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/rsort_variation2.phpt14
-rw-r--r--ext/standard/tests/array/shuffle_variation1.phpt8
-rw-r--r--ext/standard/tests/array/sizeof_variation5.phpt12
-rw-r--r--ext/standard/tests/array/sort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/sort_variation2.phpt16
-rw-r--r--ext/standard/tests/array/uasort_variation1.phpt8
-rw-r--r--ext/standard/tests/array/uksort_variation1.phpt8
-rw-r--r--ext/standard/tests/array/usort_variation1.phpt8
-rw-r--r--ext/standard/tests/assert/assert04.phpt2
-rw-r--r--ext/standard/tests/assert/assert_error1.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_variation_001.phpt12
-rw-r--r--ext/standard/tests/class_object/get_object_vars_variation_003.phpt8
-rw-r--r--ext/standard/tests/dir/closedir_variation1.phpt8
-rw-r--r--ext/standard/tests/dir/dir_variation2-win32-mb.phpt8
-rw-r--r--ext/standard/tests/dir/dir_variation2.phpt8
-rw-r--r--ext/standard/tests/dir/opendir_variation2-win32-mb.phpt8
-rw-r--r--ext/standard/tests/dir/opendir_variation2.phpt8
-rw-r--r--ext/standard/tests/dir/readdir_variation1.phpt8
-rw-r--r--ext/standard/tests/dir/rewinddir_variation1.phpt8
-rw-r--r--ext/standard/tests/dir/scandir_variation2-mb.phpt16
-rw-r--r--ext/standard/tests/dir/scandir_variation2.phpt16
-rw-r--r--ext/standard/tests/dir/scandir_variation3-win32-mb.phpt8
-rw-r--r--ext/standard/tests/dir/scandir_variation3.phpt8
-rw-r--r--ext/standard/tests/file/006_variation2.phpt16
-rw-r--r--ext/standard/tests/file/007_error.phpt4
-rw-r--r--ext/standard/tests/file/chmod_variation4.phpt24
-rw-r--r--ext/standard/tests/file/fflush_error.phpt2
-rw-r--r--ext/standard/tests/file/fgetc_error.phpt2
-rw-r--r--ext/standard/tests/file/fgetcsv_error.phpt4
-rw-r--r--ext/standard/tests/file/fgets_error.phpt2
-rw-r--r--ext/standard/tests/file/fgetss_error.phpt2
-rw-r--r--ext/standard/tests/file/file_error.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation4.phpt8
-rw-r--r--ext/standard/tests/file/file_get_contents_variation5_32bit.phpt28
-rw-r--r--ext/standard/tests/file/file_get_contents_variation5_64bit.phpt24
-rw-r--r--ext/standard/tests/file/file_get_contents_variation6.phpt24
-rw-r--r--ext/standard/tests/file/file_put_contents_variation3.phpt8
-rw-r--r--ext/standard/tests/file/file_variation3.phpt24
-rw-r--r--ext/standard/tests/file/file_variation4.phpt8
-rw-r--r--ext/standard/tests/file/flock_error.phpt10
-rw-r--r--ext/standard/tests/file/fopen_variation4.phpt8
-rw-r--r--ext/standard/tests/file/fpassthru_variation1.phpt8
-rw-r--r--ext/standard/tests/file/fputcsv_error.phpt2
-rw-r--r--ext/standard/tests/file/fread_error.phpt2
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_error1.phpt2
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_error2.phpt2
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_error3.phpt2
-rw-r--r--ext/standard/tests/file/fseek_variation1.phpt20
-rw-r--r--ext/standard/tests/file/fseek_variation2.phpt8
-rw-r--r--ext/standard/tests/file/fstat_variation5.phpt8
-rw-r--r--ext/standard/tests/file/ftruncate_error.phpt2
-rw-r--r--ext/standard/tests/file/fwrite_error.phpt2
-rw-r--r--ext/standard/tests/file/glob_error.phpt4
-rw-r--r--ext/standard/tests/file/mkdir_variation2.phpt24
-rw-r--r--ext/standard/tests/file/mkdir_variation4.phpt8
-rw-r--r--ext/standard/tests/file/pathinfo_variation2.phpt24
-rw-r--r--ext/standard/tests/file/pclose_variation1.phpt8
-rw-r--r--ext/standard/tests/file/popen_pclose_error-win32-debug.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error-win32.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error.phpt2
-rw-r--r--ext/standard/tests/file/readfile_variation4.phpt8
-rw-r--r--ext/standard/tests/file/rename_variation10.phpt8
-rw-r--r--ext/standard/tests/file/rmdir_variation2.phpt8
-rw-r--r--ext/standard/tests/file/touch_variation3-win32-mb.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation3-win32.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation3.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation4-win32.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation4.phpt24
-rw-r--r--ext/standard/tests/file/umask_variation3.phpt24
-rw-r--r--ext/standard/tests/file/unlink_variation7.phpt8
-rw-r--r--ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt8
-rw-r--r--ext/standard/tests/general_functions/get_resource_type_variation1.phpt2
-rw-r--r--ext/standard/tests/general_functions/getrusage.phpt2
-rw-r--r--ext/standard/tests/general_functions/getrusage_error.phpt8
-rw-r--r--ext/standard/tests/general_functions/getservbyport_variation1.phpt8
-rw-r--r--ext/standard/tests/general_functions/gettype_settype_basic.phpt22
-rw-r--r--ext/standard/tests/general_functions/intval_variation2.phpt28
-rw-r--r--ext/standard/tests/general_functions/phpcredits.phpt2
-rw-r--r--ext/standard/tests/general_functions/phpcredits2.phpt2
-rw-r--r--ext/standard/tests/general_functions/phpinfo.phpt2
-rw-r--r--ext/standard/tests/general_functions/phpinfo2.phpt2
-rw-r--r--ext/standard/tests/general_functions/proc_nice_variation1.phpt8
-rw-r--r--ext/standard/tests/general_functions/proc_nice_variation3.phpt4
-rw-r--r--ext/standard/tests/general_functions/proc_nice_variation6.phpt4
-rw-r--r--ext/standard/tests/general_functions/proc_nice_variation7.phpt8
-rw-r--r--ext/standard/tests/general_functions/rand.phpt4
-rw-r--r--ext/standard/tests/image/image_type_to_extension.phpt2
-rw-r--r--ext/standard/tests/image/image_type_to_mime_type_variation1.phpt14
-rw-r--r--ext/standard/tests/math/base_convert_variation2.phpt12
-rw-r--r--ext/standard/tests/math/base_convert_variation3.phpt12
-rw-r--r--ext/standard/tests/math/mt_rand_error.phpt4
-rw-r--r--ext/standard/tests/math/mt_rand_variation1.phpt16
-rw-r--r--ext/standard/tests/math/mt_rand_variation2.phpt18
-rw-r--r--ext/standard/tests/math/mt_srand_error.phpt2
-rw-r--r--ext/standard/tests/math/mt_srand_variation1.phpt18
-rw-r--r--ext/standard/tests/math/rand_error.phpt4
-rw-r--r--ext/standard/tests/math/rand_variation1.phpt18
-rw-r--r--ext/standard/tests/math/rand_variation2.phpt18
-rw-r--r--ext/standard/tests/math/round_variation2.phpt16
-rw-r--r--ext/standard/tests/math/srand_error.phpt2
-rw-r--r--ext/standard/tests/math/srand_variation1.phpt18
-rw-r--r--ext/standard/tests/misc/syslog_parameters.phpt4
-rw-r--r--ext/standard/tests/misc/time_nanosleep_error1.phpt2
-rw-r--r--ext/standard/tests/misc/time_nanosleep_error2.phpt2
-rw-r--r--ext/standard/tests/network/ip.phpt4
-rw-r--r--ext/standard/tests/network/ip_x86_64.phpt4
-rw-r--r--ext/standard/tests/network/long2ip_variation1.phpt26
-rw-r--r--ext/standard/tests/password/password_hash_error.phpt2
-rw-r--r--ext/standard/tests/password/password_needs_rehash_error.phpt2
-rw-r--r--ext/standard/tests/streams/stream_set_chunk_size.phpt2
-rw-r--r--ext/standard/tests/streams/stream_set_timeout_error.phpt2
-rw-r--r--ext/standard/tests/strings/bug54322.phpt2
-rw-r--r--ext/standard/tests/strings/chunk_split_variation2.phpt24
-rw-r--r--ext/standard/tests/strings/chunk_split_variation5.phptbin2287 -> 2283 bytes
-rw-r--r--ext/standard/tests/strings/chunk_split_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/count_chars_variation2.phpt10
-rw-r--r--ext/standard/tests/strings/explode_variation3.phpt10
-rw-r--r--ext/standard/tests/strings/get_html_translation_table_variation1.phpt44
-rw-r--r--ext/standard/tests/strings/get_html_translation_table_variation2.phpt22
-rw-r--r--ext/standard/tests/strings/hebrev_variation2.phpt14
-rw-r--r--ext/standard/tests/strings/hebrevc_variation2.phpt14
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt24
-rw-r--r--ext/standard/tests/strings/nl_langinfo_variation1.phpt10
-rw-r--r--ext/standard/tests/strings/str_pad_variation2.phpt10
-rw-r--r--ext/standard/tests/strings/str_pad_variation4.phpt12
-rw-r--r--ext/standard/tests/strings/str_repeat.phptbin17017 -> 16705 bytes
-rw-r--r--ext/standard/tests/strings/str_split_variation2.phpt24
-rw-r--r--ext/standard/tests/strings/str_split_variation2_64bit.phpt22
-rw-r--r--ext/standard/tests/strings/str_split_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/str_split_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/str_word_count.phpt4
-rw-r--r--ext/standard/tests/strings/strcspn_variation3.phpt44
-rw-r--r--ext/standard/tests/strings/strcspn_variation4.phpt22
-rw-r--r--ext/standard/tests/strings/stripos_variation14.phpt18
-rw-r--r--ext/standard/tests/strings/stripos_variation15.phpt6
-rw-r--r--ext/standard/tests/strings/strncasecmp_variation5.phpt18
-rw-r--r--ext/standard/tests/strings/strncmp_variation5.phpt18
-rw-r--r--ext/standard/tests/strings/strpos.phptbin10241 -> 10229 bytes
-rw-r--r--ext/standard/tests/strings/strripos_offset.phpt8
-rw-r--r--ext/standard/tests/strings/strrpos_offset.phpt8
-rw-r--r--ext/standard/tests/strings/strrpos_variation14.phpt20
-rw-r--r--ext/standard/tests/strings/strrpos_variation15.phpt8
-rw-r--r--ext/standard/tests/strings/strspn_variation3.phpt44
-rw-r--r--ext/standard/tests/strings/strspn_variation4.phpt22
-rw-r--r--ext/standard/tests/strings/substr_compare.phpt2
-rw-r--r--ext/standard/tests/strings/substr_count_error.phpt2
-rw-r--r--ext/standard/tests/strings/substr_count_variation_001.phpt6
-rw-r--r--ext/standard/tests/strings/wordwrap_variation2.phpt88
-rw-r--r--ext/standard/tests/url/get_headers_error_002.phpt6
-rw-r--r--ext/standard/tests/url/parse_url_variation_002_32bit.phpt22
-rw-r--r--ext/standard/tests/url/parse_url_variation_002_64bit.phpt20
-rw-r--r--ext/sysvshm/tests/002.phpt2
-rw-r--r--ext/sysvshm/tests/003.phpt6
-rw-r--r--ext/sysvshm/tests/004.phpt4
-rw-r--r--ext/sysvshm/tests/005.phpt4
-rw-r--r--ext/sysvshm/tests/006.phpt2
-rw-r--r--ext/sysvshm/tests/007.phpt4
-rw-r--r--ext/tokenizer/tests/001.phpt4
-rw-r--r--ext/xml/tests/xml_error_string_variation1.phpt20
-rw-r--r--ext/xml/tests/xml_get_current_byte_index_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_get_current_column_number_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_get_current_line_number_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_get_error_code_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_parse_into_struct_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_parse_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_parser_free_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_parser_get_option_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_parser_get_option_variation2.phpt22
-rw-r--r--ext/xml/tests/xml_parser_set_option_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_parser_set_option_variation2.phpt20
-rw-r--r--ext/xml/tests/xml_set_character_data_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_default_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_element_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_object_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_object_variation2.phpt8
-rw-r--r--ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt8
-rw-r--r--ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt8
-rw-r--r--ext/zlib/tests/gzdeflate_error1.phpt2
-rw-r--r--ext/zlib/tests/gzencode_error1.phpt6
-rw-r--r--ext/zlib/tests/gzfile_variation10.phpt4
-rw-r--r--ext/zlib/tests/gzfile_variation13.phpt4
-rw-r--r--ext/zlib/tests/gzfile_variation14.phpt8
-rw-r--r--ext/zlib/tests/gzfile_variation2.phpt8
-rw-r--r--ext/zlib/tests/gzfile_variation8.phpt8
-rw-r--r--ext/zlib/tests/gzinflate_error1.phpt2
-rw-r--r--ext/zlib/tests/gzopen_variation3.phpt26
-rw-r--r--ext/zlib/tests/gzuncompress_error1.phpt2
-rw-r--r--ext/zlib/tests/readgzfile_variation10.phpt4
-rw-r--r--ext/zlib/tests/readgzfile_variation13.phpt4
-rw-r--r--ext/zlib/tests/readgzfile_variation14.phpt8
-rw-r--r--ext/zlib/tests/readgzfile_variation2.phpt8
-rw-r--r--ext/zlib/tests/readgzfile_variation8.phpt8
-rw-r--r--sapi/cli/tests/006.phpt34
-rw-r--r--sapi/phpdbg/tests/info_002.phpt6
-rw-r--r--tests/classes/type_hinting_003.phpt2
-rw-r--r--tests/classes/type_hinting_004.phpt20
-rw-r--r--tests/lang/bug24658.phpt2
-rw-r--r--tests/lang/func_get_arg_variation.phpt2
-rw-r--r--tests/output/ob_implicit_flush_variation_001.phpt24
-rw-r--r--tests/output/ob_start_error_001.phpt4
627 files changed, 2941 insertions, 2941 deletions
diff --git a/Zend/tests/bug73954.phpt b/Zend/tests/bug73954.phpt
index f911dd5834..fb0a6b8f3d 100644
--- a/Zend/tests/bug73954.phpt
+++ b/Zend/tests/bug73954.phpt
@@ -16,7 +16,7 @@ takes_int(log(tan(3.14)));
float(NAN)
bool(true)
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %s on line 9 and defined in %s:6
+Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type int, float given, called in %s on line 9 and defined in %s:6
Stack trace:
#0 %s(9): takes_int(NAN)
#1 {main}
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt
index 9029dc2625..1e535ea9f9 100644
--- a/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt
+++ b/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt
@@ -49,6 +49,6 @@ Too few arguments to function bar(), 1 passed in %s and exactly 2 expected
ArgumentCountError
Too few arguments to function bat(), 1 passed in %s and exactly 2 expected
TypeError
-Argument 1 passed to bat() must be of the type integer, string given, called in %s
+Argument 1 passed to bat() must be of the type int, string given, called in %s
TypeError
-Argument 2 passed to bat() must be of the type string, integer given, called in %s \ No newline at end of file
+Argument 2 passed to bat() must be of the type string, int given, called in %s
diff --git a/Zend/tests/generators/generator_with_type_check.phpt b/Zend/tests/generators/generator_with_type_check.phpt
index 2aa16532dc..12e6d46d76 100644
--- a/Zend/tests/generators/generator_with_type_check.phpt
+++ b/Zend/tests/generators/generator_with_type_check.phpt
@@ -6,7 +6,7 @@ function gen(array $a) { yield; }
gen(42);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to gen() must be of the type array, integer given, called in %sgenerator_with_type_check.php on line 3 and defined in %sgenerator_with_type_check.php:2
+Fatal error: Uncaught TypeError: Argument 1 passed to gen() must be of the type array, int given, called in %sgenerator_with_type_check.php on line 3 and defined in %sgenerator_with_type_check.php:2
Stack trace:
#0 %sgenerator_with_type_check.php(3): gen(42)
#1 {main}
diff --git a/Zend/tests/generators/generator_with_type_check_2.phpt b/Zend/tests/generators/generator_with_type_check_2.phpt
index d8ea4fbf0d..ba1216224c 100644
--- a/Zend/tests/generators/generator_with_type_check_2.phpt
+++ b/Zend/tests/generators/generator_with_type_check_2.phpt
@@ -18,5 +18,5 @@ try {
}
?>
--EXPECTF--
-Argument 1 passed to gen() must be of the type array, integer given, called in %sgenerator_with_type_check_2.php on line 4
-Argument 1 passed to gen() must be of the type array, integer given, called in %sgenerator_with_type_check_2.php on line 10
+Argument 1 passed to gen() must be of the type array, int given, called in %sgenerator_with_type_check_2.php on line 4
+Argument 1 passed to gen() must be of the type array, int given, called in %sgenerator_with_type_check_2.php on line 10
diff --git a/Zend/tests/object_types/return_type_in_class.phpt b/Zend/tests/object_types/return_type_in_class.phpt
index 2d0f771106..bef0421f8d 100644
--- a/Zend/tests/object_types/return_type_in_class.phpt
+++ b/Zend/tests/object_types/return_type_in_class.phpt
@@ -19,7 +19,7 @@ $three = new class extends Two {
$three->a();
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, integer returned in %s:13
+Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
Stack trace:
#0 %s(16): class@anonymous->a()
#1 {main}
diff --git a/Zend/tests/object_types/return_type_in_function.phpt b/Zend/tests/object_types/return_type_in_function.phpt
index e8ae75f490..5597e27b3f 100644
--- a/Zend/tests/object_types/return_type_in_function.phpt
+++ b/Zend/tests/object_types/return_type_in_function.phpt
@@ -9,7 +9,7 @@ function a() : object {
a();
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of a() must be an object, integer returned in %s:4
+Fatal error: Uncaught TypeError: Return value of a() must be an object, int returned in %s:4
Stack trace:
#0 %s(6): a()
#1 {main}
diff --git a/Zend/tests/object_types/return_type_inheritance_in_class.phpt b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
index 826758f326..9ecf3cab1c 100644
--- a/Zend/tests/object_types/return_type_inheritance_in_class.phpt
+++ b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
@@ -19,7 +19,7 @@ $three = new class extends Two {
$three->a();
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, integer returned in %s:13
+Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
Stack trace:
#0 %s(16): class@anonymous->a()
#1 {main}
diff --git a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
index fe1f6e6c0c..eec1ba260b 100644
--- a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
+++ b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
@@ -19,7 +19,7 @@ $three = new class implements Two {
$three->a();
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, integer returned in %s:13
+Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
Stack trace:
#0 %s(16): class@anonymous->a()
#1 {main}
diff --git a/Zend/tests/object_types/type_hint_in_class_method.phpt b/Zend/tests/object_types/type_hint_in_class_method.phpt
index e41caa0e70..4ea5216c4e 100644
--- a/Zend/tests/object_types/type_hint_in_class_method.phpt
+++ b/Zend/tests/object_types/type_hint_in_class_method.phpt
@@ -12,7 +12,7 @@ $one->a(new One());
$one->a(123);
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to One::a() must be an object, integer given, called in %s:4
+Fatal error: Uncaught TypeError: Argument 1 passed to One::a() must be an object, int given, called in %s:4
Stack trace:
#0 %s(9): One->a(123)
#1 {main}
diff --git a/Zend/tests/object_types/type_hint_in_function.phpt b/Zend/tests/object_types/type_hint_in_function.phpt
index 917726ce2e..3e923983d7 100644
--- a/Zend/tests/object_types/type_hint_in_function.phpt
+++ b/Zend/tests/object_types/type_hint_in_function.phpt
@@ -10,7 +10,7 @@ a(new A());
a(123);
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to a() must be an object, integer given, called in %s.php on line 7 and defined in %s:4
+Fatal error: Uncaught TypeError: Argument 1 passed to a() must be an object, int given, called in %s.php on line 7 and defined in %s:4
Stack trace:
#0 %s(7): a(123)
#1 {main}
diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt
index e12e215de2..f70500da9f 100644
--- a/Zend/tests/return_types/003.phpt
+++ b/Zend/tests/return_types/003.phpt
@@ -9,7 +9,7 @@ function test1() : array {
test1();
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, integer returned in %s:%d
+Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, int returned in %s:%d
Stack trace:
#0 %s(%d): test1()
#1 {main}
diff --git a/Zend/tests/return_types/030.phpt b/Zend/tests/return_types/030.phpt
index 288137f05c..1bb5512c85 100644
--- a/Zend/tests/return_types/030.phpt
+++ b/Zend/tests/return_types/030.phpt
@@ -16,7 +16,7 @@ foo(0);
ok
ok
-Fatal error: Uncaught TypeError: Return value of foo() must be of the type array or null, integer returned in %s030.php:3
+Fatal error: Uncaught TypeError: Return value of foo() must be of the type array or null, int returned in %s030.php:3
Stack trace:
#0 %s030.php(10): foo(0)
#1 {main}
diff --git a/Zend/tests/return_types/bug70557.phpt b/Zend/tests/return_types/bug70557.phpt
index 8cc123a581..cb4eb498b9 100644
--- a/Zend/tests/return_types/bug70557.phpt
+++ b/Zend/tests/return_types/bug70557.phpt
@@ -16,4 +16,4 @@ try {
}
?>
--EXPECT--
-string(72) "Return value of getNumber() must be of the type integer, string returned"
+string(68) "Return value of getNumber() must be of the type int, string returned"
diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt
index 5a1d42b446..3c74acb923 100644
--- a/Zend/tests/return_types/rfc001.phpt
+++ b/Zend/tests/return_types/rfc001.phpt
@@ -11,7 +11,7 @@ function get_config(): array {
get_config();
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of get_config() must be of the type array, integer returned in %s:%d
+Fatal error: Uncaught TypeError: Return value of get_config() must be of the type array, int returned in %s:%d
Stack trace:
#0 %s(%d): get_config()
#1 {main}
diff --git a/Zend/tests/type_declarations/array_001.phpt b/Zend/tests/type_declarations/array_001.phpt
index 8fc368e288..c3315849a2 100644
--- a/Zend/tests/type_declarations/array_001.phpt
+++ b/Zend/tests/type_declarations/array_001.phpt
@@ -12,7 +12,7 @@ foo(123);
--EXPECTF--
3
-Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %s on line 7 and defined in %s:2
+Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, int given, called in %s on line 7 and defined in %s:2
Stack trace:
#0 %s(%d): foo(123)
#1 {main}
diff --git a/Zend/tests/type_declarations/explicit_weak_include_strict.phpt b/Zend/tests/type_declarations/explicit_weak_include_strict.phpt
index fb53d8ce11..9773775ae4 100644
--- a/Zend/tests/type_declarations/explicit_weak_include_strict.phpt
+++ b/Zend/tests/type_declarations/explicit_weak_include_strict.phpt
@@ -11,7 +11,7 @@ require 'weak_include_strict_2.inc';
// calls within that file should stay strict, despite being included by weak file
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type int, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
Stack trace:
#0 %s(%d): takes_int(1)
#1 %s(%d): require('%s')
diff --git a/Zend/tests/type_declarations/internal_function_strict_mode.phpt b/Zend/tests/type_declarations/internal_function_strict_mode.phpt
index 4e792fa8d1..8b70bbae1a 100644
--- a/Zend/tests/type_declarations/internal_function_strict_mode.phpt
+++ b/Zend/tests/type_declarations/internal_function_strict_mode.phpt
@@ -28,7 +28,7 @@ try {
?>
--EXPECTF--
*** Trying Ord With Integer
-*** Caught ord() expects parameter 1 to be string, integer given
+*** Caught ord() expects parameter 1 to be string, int given
*** Trying Array Map With Invalid Callback
*** Caught array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name or object
*** Trying Strlen With Float
diff --git a/Zend/tests/type_declarations/iterable_001.phpt b/Zend/tests/type_declarations/iterable_001.phpt
index f0c8bba610..b9e8119436 100644
--- a/Zend/tests/type_declarations/iterable_001.phpt
+++ b/Zend/tests/type_declarations/iterable_001.phpt
@@ -45,4 +45,4 @@ object(ArrayIterator)#1 (1) {
int(3)
}
}
-Argument 1 passed to test() must be iterable, integer given, called in %s on line %d
+Argument 1 passed to test() must be iterable, int given, called in %s on line %d
diff --git a/Zend/tests/type_declarations/iterable_003.phpt b/Zend/tests/type_declarations/iterable_003.phpt
index 8c91c993d0..e5e6af9ae8 100644
--- a/Zend/tests/type_declarations/iterable_003.phpt
+++ b/Zend/tests/type_declarations/iterable_003.phpt
@@ -29,4 +29,4 @@ array(0) {
}
object(Generator)#2 (0) {
}
-Return value of baz() must be iterable, integer returned
+Return value of baz() must be iterable, int returned
diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt
index 51c3664737..c2191b9e64 100644
--- a/Zend/tests/type_declarations/scalar_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_basic.phpt
@@ -79,16 +79,16 @@ E_NOTICE: A non well formed numeric value encountered on line %d
int(1)
*** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying int(%d)
int(%d)
*** Trying float(NAN)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying bool(true)
int(1)
@@ -97,22 +97,22 @@ int(1)
int(0)
*** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
*** Trying array(0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
*** Trying object(stdClass)#%s (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying object(Stringable)#%s (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying resource(%d) of type (stream)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
Testing 'float' type:
diff --git a/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt b/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt
index dcbb3e87f4..750edb77fa 100644
--- a/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt
+++ b/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt
@@ -13,7 +13,7 @@ var_dump(int_val());
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to int_val() must be of the type integer, string given, called in %s on line %d and defined in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to int_val() must be of the type int, string given, called in %s on line %d and defined in %s:%d
Stack trace:
#0 %s(%d): int_val()
#1 {main}
diff --git a/Zend/tests/type_declarations/scalar_null.phpt b/Zend/tests/type_declarations/scalar_null.phpt
index 6b9930f297..e3beb9feac 100644
--- a/Zend/tests/type_declarations/scalar_null.phpt
+++ b/Zend/tests/type_declarations/scalar_null.phpt
@@ -37,7 +37,7 @@ echo PHP_EOL . "Done";
?>
--EXPECTF--
Testing int:
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
Testing float:
*** Caught Argument 1 passed to {closure}() must be of the type float, null given, called in %s on line %d
Testing string:
diff --git a/Zend/tests/type_declarations/scalar_return_basic.phpt b/Zend/tests/type_declarations/scalar_return_basic.phpt
index 4e0650e7e9..cf58f91500 100644
--- a/Zend/tests/type_declarations/scalar_return_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_return_basic.phpt
@@ -76,30 +76,30 @@ int(1)
E_NOTICE: A non well formed numeric value encountered on line %d
int(1)
*** Trying string(1) "a"
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
*** Trying string(0) ""
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
*** Trying int(2147483647)
int(2147483647)
*** Trying float(NAN)
-*** Caught Return value of {closure}() must be of the type integer, float returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, float returned in %s on line %d
*** Trying bool(true)
int(1)
*** Trying bool(false)
int(0)
*** Trying NULL
-*** Caught Return value of {closure}() must be of the type integer, null returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, null returned in %s on line %d
*** Trying array(0) {
}
-*** Caught Return value of {closure}() must be of the type integer, array returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, array returned in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
*** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of the type integer, resource returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, resource returned in %s on line %d
Testing 'float' type:
*** Trying int(1)
diff --git a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
index e8f69bc699..9c4217203f 100644
--- a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
+++ b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
@@ -76,30 +76,30 @@ int(1)
E_NOTICE: A non well formed numeric value encountered on line %d
int(1)
*** Trying string(1) "a"
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
*** Trying string(0) ""
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
*** Trying int(9223372036854775807)
int(9223372036854775807)
*** Trying float(NAN)
-*** Caught Return value of {closure}() must be of the type integer, float returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, float returned in %s on line %d
*** Trying bool(true)
int(1)
*** Trying bool(false)
int(0)
*** Trying NULL
-*** Caught Return value of {closure}() must be of the type integer, null returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, null returned in %s on line %d
*** Trying array(0) {
}
-*** Caught Return value of {closure}() must be of the type integer, array returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, array returned in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
*** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of the type integer, resource returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, resource returned in %s on line %d
Testing 'float' type:
*** Trying int(1)
diff --git a/Zend/tests/type_declarations/scalar_strict.phpt b/Zend/tests/type_declarations/scalar_strict.phpt
index 40b036e1d4..afef18f6a3 100644
--- a/Zend/tests/type_declarations/scalar_strict.phpt
+++ b/Zend/tests/type_declarations/scalar_strict.phpt
@@ -70,52 +70,52 @@ Testing 'int' type:
int(1)
*** Trying string(1) "1"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying float(1)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying float(1.5)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying string(2) "1a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying int(2147483647)
int(2147483647)
*** Trying float(NAN)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
*** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
*** Trying array(0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying resource(5) of type (stream)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
Testing 'float' type:
@@ -173,7 +173,7 @@ float(NAN)
Testing 'string' type:
*** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
*** Trying string(1) "1"
string(1) "1"
@@ -194,7 +194,7 @@ string(1) "a"
string(0) ""
*** Trying int(2147483647)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
*** Trying float(NAN)
*** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
@@ -226,7 +226,7 @@ string(0) ""
Testing 'bool' type:
*** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
*** Trying string(1) "1"
*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
@@ -247,7 +247,7 @@ Testing 'bool' type:
*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
*** Trying int(2147483647)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
*** Trying float(NAN)
*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
diff --git a/Zend/tests/type_declarations/scalar_strict_64bit.phpt b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
index 3e748ede34..914f0e6807 100644
--- a/Zend/tests/type_declarations/scalar_strict_64bit.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
@@ -70,52 +70,52 @@ Testing 'int' type:
int(1)
*** Trying string(1) "1"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying float(1)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying float(1.5)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying string(2) "1a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying int(9223372036854775807)
int(9223372036854775807)
*** Trying float(NAN)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
*** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
*** Trying array(0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying resource(5) of type (stream)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
Testing 'float' type:
@@ -173,7 +173,7 @@ float(NAN)
Testing 'string' type:
*** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
*** Trying string(1) "1"
string(1) "1"
@@ -194,7 +194,7 @@ string(1) "a"
string(0) ""
*** Trying int(9223372036854775807)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
*** Trying float(NAN)
*** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
@@ -226,7 +226,7 @@ string(0) ""
Testing 'bool' type:
*** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
*** Trying string(1) "1"
*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
@@ -247,7 +247,7 @@ Testing 'bool' type:
*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
*** Trying int(9223372036854775807)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
*** Trying float(NAN)
*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
diff --git a/Zend/tests/type_declarations/scalar_strict_basic.phpt b/Zend/tests/type_declarations/scalar_strict_basic.phpt
index 3ee94a2059..24dff2489d 100644
--- a/Zend/tests/type_declarations/scalar_strict_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_basic.phpt
@@ -68,28 +68,28 @@ Testing 'int' type:
int(1)
*** Trying float value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
*** Trying string value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
*** Trying true value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
*** Trying false value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
*** Trying null value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
*** Trying array value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
*** Trying object value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
*** Trying resource value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
Testing 'float' type:
@@ -123,7 +123,7 @@ float(1)
Testing 'string' type:
*** Trying integer value
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
*** Trying float value
*** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
@@ -152,7 +152,7 @@ string(1) "1"
Testing 'bool' type:
*** Trying integer value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
*** Trying float value
*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
diff --git a/Zend/tests/type_declarations/strict_call_weak.phpt b/Zend/tests/type_declarations/strict_call_weak.phpt
index e3a606ec12..d064161480 100644
--- a/Zend/tests/type_declarations/strict_call_weak.phpt
+++ b/Zend/tests/type_declarations/strict_call_weak.phpt
@@ -13,7 +13,7 @@ require 'strict_call_weak_2.inc';
function_declared_in_weak_mode(1.0);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak.php on line 10 and defined in %sstrict_call_weak_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type int, float given, called in %sstrict_call_weak.php on line 10 and defined in %sstrict_call_weak_2.inc:5
Stack trace:
#0 %s(%d): function_declared_in_weak_mode(1)
#1 {main}
diff --git a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
index 22c5b4319c..e909ee0141 100644
--- a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
+++ b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
@@ -13,7 +13,7 @@ require 'strict_call_weak_explicit_2.inc';
function_declared_in_weak_mode(1.0);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak_explicit.php on line 10 and defined in %sstrict_call_weak_explicit_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type int, float given, called in %sstrict_call_weak_explicit.php on line 10 and defined in %sstrict_call_weak_explicit_2.inc:5
Stack trace:
#0 %s(%d): function_declared_in_weak_mode(1)
#1 {main}
diff --git a/Zend/tests/type_declarations/weak_include_strict.phpt b/Zend/tests/type_declarations/weak_include_strict.phpt
index e49485dbe5..52f5f55cdb 100644
--- a/Zend/tests/type_declarations/weak_include_strict.phpt
+++ b/Zend/tests/type_declarations/weak_include_strict.phpt
@@ -11,7 +11,7 @@ require 'weak_include_strict_2.inc';
// calls within that file should stay strict, despite being included by weak file
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type int, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
Stack trace:
#0 %s(%d): takes_int(1)
#1 %s(%d): require('%s')
diff --git a/Zend/tests/typehints/or_null.phpt b/Zend/tests/typehints/or_null.phpt
index 8c20052165..552db7d058 100644
--- a/Zend/tests/typehints/or_null.phpt
+++ b/Zend/tests/typehints/or_null.phpt
@@ -231,27 +231,27 @@ TypeError: Argument 1 passed to loadedInterface() must implement interface RealI
Stack trace:
#0 %s(26): loadedInterface(Object(stdClass))
#1 {main}
-TypeError: Argument 1 passed to unloadedClass() must be an instance of I\Dont\Exist or null, integer given, called in %s on line 32 and defined in %s:5
+TypeError: Argument 1 passed to unloadedClass() must be an instance of I\Dont\Exist or null, int given, called in %s on line 32 and defined in %s:5
Stack trace:
#0 %s(32): unloadedClass(1)
#1 {main}
-TypeError: Argument 1 passed to loadedClass() must be an instance of RealClass or null, integer given, called in %s on line 38 and defined in %s:16
+TypeError: Argument 1 passed to loadedClass() must be an instance of RealClass or null, int given, called in %s on line 38 and defined in %s:16
Stack trace:
#0 %s(38): loadedClass(1)
#1 {main}
-TypeError: Argument 1 passed to loadedInterface() must implement interface RealInterface or be null, integer given, called in %s on line 44 and defined in %s:17
+TypeError: Argument 1 passed to loadedInterface() must implement interface RealInterface or be null, int given, called in %s on line 44 and defined in %s:17
Stack trace:
#0 %s(44): loadedInterface(1)
#1 {main}
-TypeError: Argument 1 passed to callableF() must be callable or null, integer given, called in %s on line 52 and defined in %s:49
+TypeError: Argument 1 passed to callableF() must be callable or null, int given, called in %s on line 52 and defined in %s:49
Stack trace:
#0 %s(52): callableF(1)
#1 {main}
-TypeError: Argument 1 passed to iterableF() must be iterable or null, integer given, called in %s on line 60 and defined in %s:57
+TypeError: Argument 1 passed to iterableF() must be iterable or null, int given, called in %s on line 60 and defined in %s:57
Stack trace:
#0 %s(60): iterableF(1)
#1 {main}
-TypeError: Argument 1 passed to intF() must be of the type integer or null, object given, called in %s on line 68 and defined in %s:65
+TypeError: Argument 1 passed to intF() must be of the type int or null, object given, called in %s on line 68 and defined in %s:65
Stack trace:
#0 %s(68): intF(Object(stdClass))
#1 {main}
@@ -267,27 +267,27 @@ TypeError: Return value of returnLoadedInterface() must implement interface Real
Stack trace:
#0 %s(98): returnLoadedInterface()
#1 {main}
-TypeError: Return value of returnUnloadedClassScalar() must be an instance of I\Dont\Exist or null, integer returned in %s:104
+TypeError: Return value of returnUnloadedClassScalar() must be an instance of I\Dont\Exist or null, int returned in %s:104
Stack trace:
#0 %s(108): returnUnloadedClassScalar()
#1 {main}
-TypeError: Return value of returnLoadedClassScalar() must be an instance of RealClass or null, integer returned in %s:114
+TypeError: Return value of returnLoadedClassScalar() must be an instance of RealClass or null, int returned in %s:114
Stack trace:
#0 %s(118): returnLoadedClassScalar()
#1 {main}
-TypeError: Return value of returnLoadedInterfaceScalar() must implement interface RealInterface or be null, integer returned in %s:124
+TypeError: Return value of returnLoadedInterfaceScalar() must implement interface RealInterface or be null, int returned in %s:124
Stack trace:
#0 %s(128): returnLoadedInterfaceScalar()
#1 {main}
-TypeError: Return value of returnCallable() must be callable or null, integer returned in %s:134
+TypeError: Return value of returnCallable() must be callable or null, int returned in %s:134
Stack trace:
#0 %s(138): returnCallable()
#1 {main}
-TypeError: Return value of returnIterable() must be iterable or null, integer returned in %s:144
+TypeError: Return value of returnIterable() must be iterable or null, int returned in %s:144
Stack trace:
#0 %s(148): returnIterable()
#1 {main}
-TypeError: Return value of returnInt() must be of the type integer or null, object returned in %s:154
+TypeError: Return value of returnInt() must be of the type int or null, object returned in %s:154
Stack trace:
#0 %s(158): returnInt()
#1 {main}
@@ -311,7 +311,7 @@ TypeError: Return value of returnMissingIterable() must be iterable or null, non
Stack trace:
#0 %s(203): returnMissingIterable()
#1 {main}
-TypeError: Return value of returnMissingInt() must be of the type integer or null, none returned in %s:209
+TypeError: Return value of returnMissingInt() must be of the type int or null, none returned in %s:209
Stack trace:
#0 %s(212): returnMissingInt()
#1 {main}
diff --git a/Zend/tests/variadic/typehint_error.phpt b/Zend/tests/variadic/typehint_error.phpt
index 153161a09d..d9a5ea291f 100644
--- a/Zend/tests/variadic/typehint_error.phpt
+++ b/Zend/tests/variadic/typehint_error.phpt
@@ -33,7 +33,7 @@ array(3) {
}
}
-Fatal error: Uncaught TypeError: Argument 3 passed to test() must be of the type array, integer given, called in %s:%d
+Fatal error: Uncaught TypeError: Argument 3 passed to test() must be of the type array, int given, called in %s:%d
Stack trace:
#0 %s(%d): test(Array, Array, 2)
#1 {main}
diff --git a/Zend/tests/variadic/typehint_suppressed_error.phpt b/Zend/tests/variadic/typehint_suppressed_error.phpt
index ef217b2be0..ebc44c38b1 100644
--- a/Zend/tests/variadic/typehint_suppressed_error.phpt
+++ b/Zend/tests/variadic/typehint_suppressed_error.phpt
@@ -15,4 +15,4 @@ try {
?>
--EXPECTF--
-string(%d) "Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d"
+string(%d) "Argument 3 passed to test() must be of the type array, int given, called in %s on line %d"
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 79d6ab9a6c..d0ab8a31ec 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -107,7 +107,7 @@ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */
case _IS_BOOL:
return "boolean";
case IS_LONG:
- return "integer";
+ return "int";
case IS_DOUBLE:
return "float";
case IS_STRING:
@@ -497,7 +497,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
}
if (!zend_parse_arg_long(arg, p, is_null, check_null, c == 'L')) {
- return "integer";
+ return "int";
}
}
break;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 1baf50a4e8..31ce98a121 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -690,7 +690,7 @@ END_EXTERN_C()
#define FAST_ZPP 1
#define Z_EXPECTED_TYPES(_) \
- _(Z_EXPECTED_LONG, "integer") \
+ _(Z_EXPECTED_LONG, "int") \
_(Z_EXPECTED_BOOL, "boolean") \
_(Z_EXPECTED_STRING, "string") \
_(Z_EXPECTED_ARRAY, "array") \
diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt
index 6765ecf80c..b864af309c 100644
--- a/ext/calendar/tests/jdtomonthname.phpt
+++ b/ext/calendar/tests/jdtomonthname.phpt
@@ -56,22 +56,22 @@ string(0) ""
Notice: Array to string conversion in %sjdtomonthname.php on line %d
Array
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
bool(false)
=== 10000000
diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt
index b9727c8a55..3d157c1ede 100644
--- a/ext/curl/tests/curl_setopt_error.phpt
+++ b/ext/curl/tests/curl_setopt_error.phpt
@@ -40,6 +40,6 @@ Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
Warning: curl_setopt() expects parameter 1 to be resource, boolean given in %s on line %d
-Warning: curl_setopt() expects parameter 2 to be integer, string given in %s on line %d
+Warning: curl_setopt() expects parameter 2 to be int, string given in %s on line %d
Warning: curl_setopt(): Invalid curl configuration option in %scurl_setopt_error.php on line %d
diff --git a/ext/curl/tests/curl_version_variation1.phpt b/ext/curl/tests/curl_version_variation1.phpt
index 7c0106cb6a..cbf2d4cbac 100644
--- a/ext/curl/tests/curl_version_variation1.phpt
+++ b/ext/curl/tests/curl_version_variation1.phpt
@@ -110,23 +110,23 @@ bool(true)
bool(true)
-- Iteration 10 --
-Warning: curl_version() expects parameter 1 to be integer, array given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- Iteration 11 --
-Warning: curl_version() expects parameter 1 to be integer, array given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- Iteration 12 --
-Warning: curl_version() expects parameter 1 to be integer, array given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: curl_version() expects parameter 1 to be integer, string given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- Iteration 14 --
-Warning: curl_version() expects parameter 1 to be integer, string given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- Iteration 15 --
@@ -146,11 +146,11 @@ bool(true)
bool(true)
-- Iteration 22 --
-Warning: curl_version() expects parameter 1 to be integer, object given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-- Iteration 23 --
-Warning: curl_version() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, resource given in %s on line %d
bool(false)
-- Iteration 24 --
bool(true)
diff --git a/ext/date/tests/68062.phpt b/ext/date/tests/68062.phpt
index ce2105abae..6b1e16ae67 100644
--- a/ext/date/tests/68062.phpt
+++ b/ext/date/tests/68062.phpt
@@ -10,4 +10,4 @@ echo $tz->getOffset($dt);
echo $tz->getOffset(1);
--EXPECTF--
3600
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s
diff --git a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
index 2ee21a5262..700da01fea 100644
--- a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt
index e75e14d8e3..887e0e0a6e 100644
--- a/ext/date/tests/DateTime_construct_variation2.phpt
+++ b/ext/date/tests/DateTime_construct_variation2.phpt
@@ -118,16 +118,16 @@ fclose( $file_handle);
*** Testing new DateTime() : usage variation - unexpected values to second argument $timezone***
-- int 0 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
-- int 1 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
-- int 12345 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
-- int -12345 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
-- float 10.5 --
FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, float given
diff --git a/ext/date/tests/DateTime_setDate_variation1.phpt b/ext/date/tests/DateTime_setDate_variation1.phpt
index 945f7ae973..a25bdee54f 100644
--- a/ext/date/tests/DateTime_setDate_variation1.phpt
+++ b/ext/date/tests/DateTime_setDate_variation1.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
--FILE--
<?php
/* Prototype : public DateTime DateTime::setDate ( int $year , int $month , int $day )
- * Description: Resets the current date of the DateTime object to a different date.
+ * Description: Resets the current date of the DateTime object to a different date.
* Source code: ext/date/php_date.c
* Alias to functions: date_date_set
*/
echo "*** Testing DateTime::setDate() : usage variation - unexpected values to first argument \$year***\n";
-//Set the default time zone
+//Set the default time zone
date_default_timezone_set("Europe/London");
//get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
- // resource
+
+ // resource
'resource' => $file_handle
);
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
-- empty array --
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setDate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setDate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, 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 e335d21059..b3fbf46f4f 100644
--- a/ext/date/tests/DateTime_setDate_variation2.phpt
+++ b/ext/date/tests/DateTime_setDate_variation2.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
--FILE--
<?php
/* Prototype : public DateTime DateTime::setDate ( int $year , int $month , int $day )
- * Description: Resets the current date of the DateTime object to a different date.
+ * Description: Resets the current date of the DateTime object to a different date.
* Source code: ext/date/php_date.c
* Alias to functions: date_date_set
*/
echo "*** Testing DateTime::setDate() : usage variation - unexpected values to second argument \$month***\n";
-//Set the default time zone
+//Set the default time zone
date_default_timezone_set("Europe/London");
//get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
- // resource
+
+ // resource
'resource' => $file_handle
);
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
-- empty array --
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setDate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setDate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, 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 ef65e45e0e..b1f7aab961 100644
--- a/ext/date/tests/DateTime_setDate_variation3.phpt
+++ b/ext/date/tests/DateTime_setDate_variation3.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
--FILE--
<?php
/* Prototype : public DateTime DateTime::setDate ( int $year , int $month , int $day )
- * Description: Resets the current date of the DateTime object to a different date.
+ * Description: Resets the current date of the DateTime object to a different date.
* Source code: ext/date/php_date.c
* Alias to functions: date_date_set
*/
echo "*** Testing DateTime::setDate() : usage variation - unexpected values to third argument \$day***\n";
-//Set the default time zone
+//Set the default time zone
date_default_timezone_set("Europe/London");
//get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
- // resource
+
+ // resource
'resource' => $file_handle
);
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
-- empty array --
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setDate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setDate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, 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 58043e5689..74f262b536 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 integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setISODate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, 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 c40665950a..1677d042c6 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 integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setISODate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, 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 87c39264a7..63ac22c28b 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 integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setISODate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, 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 3f3c1e4c21..ea2942bff3 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 integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setTime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setTime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, 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 e2bc153b74..f3b91ced5b 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 integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setTime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setTime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, 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 59e0cefe1d..4a33fa11be 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 integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: DateTime::setTime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::setTime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, 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 b61edcb3f6..8baf3e50e2 100644
--- a/ext/date/tests/DateTime_setTimezone_variation1.phpt
+++ b/ext/date/tests/DateTime_setTimezone_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/bug36988.phpt b/ext/date/tests/bug36988.phpt
index 1223150988..ab0f3a3c8a 100644
--- a/ext/date/tests/bug36988.phpt
+++ b/ext/date/tests/bug36988.phpt
@@ -9,4 +9,4 @@ $start = microtime(true);
$a = mktime(1, 1, 1, 1, 1, 11111111111);
?>
--EXPECTF--
-Warning: mktime() expects parameter 6 to be integer, float given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, float given in %s on line %d
diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt
index d8517e6a13..bc528e21d7 100644
--- a/ext/date/tests/bug52062.phpt
+++ b/ext/date/tests/bug52062.phpt
@@ -25,7 +25,7 @@ string(32) "5138-11-16 09:46:40 100000000000"
bool(false)
string(12) "100000000000"
-Warning: DateTime::setTimestamp() expects parameter 1 to be integer, float given in %s on line %d
+Warning: DateTime::setTimestamp() expects parameter 1 to be int, 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/bug70245.phpt b/ext/date/tests/bug70245.phpt
index 4bf6256600..f754bf65a1 100644
--- a/ext/date/tests/bug70245.phpt
+++ b/ext/date/tests/bug70245.phpt
@@ -6,5 +6,5 @@ $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
+Warning: strtotime() expects parameter 2 to be int, object given in %sbug70245.php on line %d
bool(false)
diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt
index a3539dd976..5892e1d37d 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 integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: checkdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: checkdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, 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 integer, resource given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, 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 9948faf86f..d084931e5b 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 integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: checkdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: checkdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, 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 a92bc0ce8c..1fda22b35b 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 integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: checkdate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: checkdate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, 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 63a5723cd7..55b0fe1771 100644
--- a/ext/date/tests/date_create_variation2.phpt
+++ b/ext/date/tests/date_create_variation2.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle);
-- int 0 --
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt
index 59823f12b3..8e5432239e 100644
--- a/ext/date/tests/date_date_set_variation1.phpt
+++ b/ext/date/tests/date_date_set_variation1.phpt
@@ -114,22 +114,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt
index ef4e8bb868..a41ffe94b7 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 integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_date_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_date_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, 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 f304dddba2..a5510fb50f 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 integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_date_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_date_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, 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 e285afd69f..de02a2a42c 100644
--- a/ext/date/tests/date_date_set_variation4.phpt
+++ b/ext/date/tests/date_date_set_variation4.phpt
@@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to f
--FILE--
<?php
/* Prototype : DateTime date_date_set ( DateTime $object , int $year , int $month , int $day )
- * Description: Resets the current date of the DateTime object to a different date.
+ * Description: Resets the current date of the DateTime object to a different date.
* Source code: ext/date/php_date.c
* Alias to functions: DateTime::setDate
*/
echo "*** Testing date_date_set() : usage variation - unexpected values to forth argument \$day***\n";
-//Set the default time zone
+//Set the default time zone
date_default_timezone_set("Europe/London");
//get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
- // resource
+
+ // resource
'resource' => $file_handle
);
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
-- empty array --
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, 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 integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_date_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_date_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, 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 integer, resource given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, resource given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/date_error.phpt b/ext/date/tests/date_error.phpt
index ec7ff9da41..1fa25e1b0c 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 integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/date_format_error.phpt b/ext/date/tests/date_format_error.phpt
index a563d0d974..8a170b098f 100644
--- a/ext/date/tests/date_format_error.phpt
+++ b/ext/date/tests/date_format_error.phpt
@@ -59,7 +59,7 @@ bool(false)
Warning: date_format() expects parameter 1 to be DateTimeInterface, object given in %sp on line %d
bool(false)
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
Warning: date_format() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt
index af76a7ef90..9818ce44d1 100644
--- a/ext/date/tests/date_format_variation1.phpt
+++ b/ext/date/tests/date_format_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_isodate_set_error.phpt b/ext/date/tests/date_isodate_set_error.phpt
index 9accd92d93..43651ef6a0 100644
--- a/ext/date/tests/date_isodate_set_error.phpt
+++ b/ext/date/tests/date_isodate_set_error.phpt
@@ -60,7 +60,7 @@ bool(false)
Warning: date_isodate_set() expects parameter 1 to be DateTime, object given in %s on line %d
bool(false)
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d
diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt
index 900dc84475..6bbba71b6c 100644
--- a/ext/date/tests/date_isodate_set_variation1.phpt
+++ b/ext/date/tests/date_isodate_set_variation1.phpt
@@ -114,22 +114,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt
index fe667801a2..078abf0191 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 integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_isodate_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_isodate_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, 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 5a7a4a2802..a9906dc97d 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 integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_isodate_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_isodate_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, 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 074df8452f..0c94d515b0 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 integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, 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 integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_isodate_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_isodate_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, 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 integer, resource given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, resource given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/date_modify_error.phpt b/ext/date/tests/date_modify_error.phpt
index ac727f1ca1..2bfd38bbe6 100644
--- a/ext/date/tests/date_modify_error.phpt
+++ b/ext/date/tests/date_modify_error.phpt
@@ -60,7 +60,7 @@ bool(false)
Warning: date_modify() expects parameter 1 to be DateTime, object given in %s on line %d
bool(false)
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d
diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt
index afe75e2c69..9ca702b82e 100644
--- a/ext/date/tests/date_modify_variation1.phpt
+++ b/ext/date/tests/date_modify_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_offset_get_error.phpt b/ext/date/tests/date_offset_get_error.phpt
index 8531845ca7..7c1fa2a691 100644
--- a/ext/date/tests/date_offset_get_error.phpt
+++ b/ext/date/tests/date_offset_get_error.phpt
@@ -49,7 +49,7 @@ bool(false)
Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, object given in %s on line %d
bool(false)
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt
index a3d93b3f23..3a90957e89 100644
--- a/ext/date/tests/date_offset_get_variation1.phpt
+++ b/ext/date/tests/date_offset_get_variation1.phpt
@@ -110,22 +110,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_sun_info_variation1.phpt b/ext/date/tests/date_sun_info_variation1.phpt
index 1faafea1d9..caf939efc0 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 integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- Iteration 17 --
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- Iteration 18 --
-Warning: date_sun_info() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- Iteration 19 --
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- Iteration 20 --
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- Iteration 21 --
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, 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 integer, resource given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, 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 ccb0ad8325..87b2d79864 100644
--- a/ext/date/tests/date_sunrise_variation1.phpt
+++ b/ext/date/tests/date_sunrise_variation1.phpt
@@ -144,46 +144,46 @@ int(28596)
--empty array--
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--uppercase NULL--
@@ -218,90 +218,90 @@ int(28596)
--empty string DQ--
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, 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 45519798f4..0a63d42793 100644
--- a/ext/date/tests/date_sunrise_variation2.phpt
+++ b/ext/date/tests/date_sunrise_variation2.phpt
@@ -116,12 +116,12 @@ bool(false)
--float 12.3456789000e10--
-Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, float given in %s on line %d
bool(false)
--float -12.3456789000e10--
-Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, float given in %s on line %d
bool(false)
--float .5--
@@ -129,22 +129,22 @@ int(1218174468)
--empty array--
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--uppercase NULL--
@@ -167,42 +167,42 @@ int(1218174468)
--empty string DQ--
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, 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 979fa455a0..17558a7e42 100644
--- a/ext/date/tests/date_sunrise_variation9.phpt
+++ b/ext/date/tests/date_sunrise_variation9.phpt
@@ -39,23 +39,23 @@ var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $ze
-- 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
+Warning: date_sunrise() expects parameter 1 to be int, 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
+Warning: date_sunrise() expects parameter 1 to be int, 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
+Warning: date_sunrise() expects parameter 1 to be int, 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
+Warning: date_sunrise() expects parameter 1 to be int, 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
+Warning: date_sunrise() expects parameter 1 to be int, 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
+Warning: date_sunrise() expects parameter 1 to be int, 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 99b6230338..58e885b314 100644
--- a/ext/date/tests/date_sunset_variation1.phpt
+++ b/ext/date/tests/date_sunset_variation1.phpt
@@ -144,46 +144,46 @@ int(62545)
--empty array--
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--uppercase NULL--
@@ -218,90 +218,90 @@ int(62545)
--empty string DQ--
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, 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 8015995fe0..6c9eca364f 100644
--- a/ext/date/tests/date_sunset_variation2.phpt
+++ b/ext/date/tests/date_sunset_variation2.phpt
@@ -116,12 +116,12 @@ bool(false)
--float 12.3456789000e10--
-Warning: date_sunset() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, float given in %s on line %d
bool(false)
--float -12.3456789000e10--
-Warning: date_sunset() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, float given in %s on line %d
bool(false)
--float .5--
@@ -129,22 +129,22 @@ int(1218199264)
--empty array--
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--uppercase NULL--
@@ -167,42 +167,42 @@ int(1218199264)
--empty string DQ--
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: date_sunset() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: date_sunset() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, 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 c18d48e42c..56949b7e8f 100644
--- a/ext/date/tests/date_sunset_variation9.phpt
+++ b/ext/date/tests/date_sunset_variation9.phpt
@@ -39,23 +39,23 @@ var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zen
-- 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
+Warning: date_sunset() expects parameter 1 to be int, 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
+Warning: date_sunset() expects parameter 1 to be int, 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
+Warning: date_sunset() expects parameter 1 to be int, 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
+Warning: date_sunset() expects parameter 1 to be int, 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
+Warning: date_sunset() expects parameter 1 to be int, 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
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/date_time_set_error.phpt b/ext/date/tests/date_time_set_error.phpt
index 5c5ddaf4d2..e722cc7151 100644
--- a/ext/date/tests/date_time_set_error.phpt
+++ b/ext/date/tests/date_time_set_error.phpt
@@ -63,7 +63,7 @@ bool(false)
Warning: date_time_set() expects parameter 1 to be DateTime, object given in %s on line %d
bool(false)
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d
diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt
index 64e65d58b8..27c6903cb2 100644
--- a/ext/date/tests/date_time_set_variation1.phpt
+++ b/ext/date/tests/date_time_set_variation1.phpt
@@ -114,22 +114,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt
index 3e77fffada..6ab19f24ee 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 integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
bool(false)
-- int indexed array --
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
bool(false)
-- associative array --
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
bool(false)
-- nested arrays --
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, 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 integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
bool(false)
-- empty string SQ --
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
bool(false)
-- string DQ --
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
bool(false)
-- string SQ --
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
bool(false)
-- mixed case string --
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
bool(false)
-- heredoc --
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
bool(false)
-- instance of classWithToString --
-Warning: date_time_set() expects parameter 2 to be integer, object given in %s
+Warning: date_time_set() expects parameter 2 to be int, object given in %s
bool(false)
-- instance of classWithoutToString --
-Warning: date_time_set() expects parameter 2 to be integer, object given in %s
+Warning: date_time_set() expects parameter 2 to be int, 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 integer, resource given in %s
+Warning: date_time_set() expects parameter 2 to be int, 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 12a60a118c..7293580553 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 integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_time_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_time_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, 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 aa05f7dd40..8a0d5c8caa 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 integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, 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 integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date_time_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date_time_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, 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 integer, resource given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, resource given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/date_timestamp_get.phpt b/ext/date/tests/date_timestamp_get.phpt
index ec0258bdc0..acdf1e567e 100644
--- a/ext/date/tests/date_timestamp_get.phpt
+++ b/ext/date/tests/date_timestamp_get.phpt
@@ -17,4 +17,4 @@ bool(true)
-Warning: date_timestamp_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timestamp_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
index ed31cb217d..1b3a94bffd 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
@@ -12,4 +12,4 @@ $dftz021 = date_default_timezone_get(); //UTC
date_timestamp_set(987654321, 123456789);
?>
--EXPECTF--
-Warning: date_timestamp_set() expects parameter 1 to be DateTime, integer given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects parameter 1 to be DateTime, int given in %s on line %d \ No newline at end of file
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
index 387313b13b..1243240c2d 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 integer, array given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects parameter 2 to be int, array given in %s on line %d \ No newline at end of file
diff --git a/ext/date/tests/date_timezone_get_error.phpt b/ext/date/tests/date_timezone_get_error.phpt
index 01963c8224..4d8318431c 100644
--- a/ext/date/tests/date_timezone_get_error.phpt
+++ b/ext/date/tests/date_timezone_get_error.phpt
@@ -48,7 +48,7 @@ bool(false)
Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, object given in %s on line %d
bool(false)
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt
index 4bbd414895..6c60225ce6 100644
--- a/ext/date/tests/date_timezone_get_variation1.phpt
+++ b/ext/date/tests/date_timezone_get_variation1.phpt
@@ -110,22 +110,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_timezone_set_error.phpt b/ext/date/tests/date_timezone_set_error.phpt
index 8c9c00d638..3ceebf7382 100644
--- a/ext/date/tests/date_timezone_set_error.phpt
+++ b/ext/date/tests/date_timezone_set_error.phpt
@@ -56,7 +56,7 @@ bool(false)
Warning: date_timezone_set() expects parameter 1 to be DateTime, object given in %s on line %d
bool(false)
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d
diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt
index 0adaf14b94..399681de42 100644
--- a/ext/date/tests/date_timezone_set_variation1.phpt
+++ b/ext/date/tests/date_timezone_set_variation1.phpt
@@ -113,22 +113,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt
index 46ce4e5814..2c27cd9326 100644
--- a/ext/date/tests/date_timezone_set_variation2.phpt
+++ b/ext/date/tests/date_timezone_set_variation2.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt
index 597c4d83bb..5d2535c833 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 integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: date() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: date() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: date() expects parameter 2 to be int, 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 e0b8bab008..c74eb4c715 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 integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: getdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: getdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, 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 0f0165edea..dcff205f68 100644
--- a/ext/date/tests/getdate_variation7.phpt
+++ b/ext/date/tests/getdate_variation7.phpt
@@ -27,11 +27,11 @@ var_dump( getdate($timestamp) );
-- 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
+Warning: getdate() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-- 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
+Warning: getdate() expects parameter 1 to be int, 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 4b58febaea..70c6b67c47 100644
--- a/ext/date/tests/gmdate_variation14.phpt
+++ b/ext/date/tests/gmdate_variation14.phpt
@@ -30,11 +30,11 @@ var_dump( gmdate($format, $timestamp) );
-- Testing gmdate() function with float 12.3456789000e10 to timestamp --
-Warning: gmdate() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, 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
+Warning: gmdate() expects parameter 2 to be int, 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 3a2ba5e69f..f22c52fcd0 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 integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--undefined var--
diff --git a/ext/date/tests/gmmktime_variation1.phpt b/ext/date/tests/gmmktime_variation1.phpt
index 2792c1000c..d0e4da8fce 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 integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmmktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmmktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, 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 b53430d46b..5f77347a7e 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 integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmmktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmmktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, 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 5a7bdcb0bb..a3878ccd01 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 integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmmktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmmktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, 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 de88ab56dc..41ae07afa1 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 integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, 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 integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmmktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmmktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, 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 5d7451a348..1ebf1377b3 100644
--- a/ext/date/tests/gmmktime_variation5.phpt
+++ b/ext/date/tests/gmmktime_variation5.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to fifth
--FILE--
<?php
/* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date
+ * Description: Get UNIX timestamp for a GMT date
* Source code: ext/date/php_date.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing gmmktime() : usage variation ***\n";
@@ -110,22 +110,22 @@ int(1217491688)
--empty array--
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, 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 integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmmktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmmktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, 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 81b930ceb6..e5e80282cb 100644
--- a/ext/date/tests/gmmktime_variation6.phpt
+++ b/ext/date/tests/gmmktime_variation6.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to sixth
--FILE--
<?php
/* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date
+ * Description: Get UNIX timestamp for a GMT date
* Source code: ext/date/php_date.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing gmmktime() : usage variation ***\n";
@@ -106,22 +106,22 @@ int(965722088)
--empty array--
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, 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 integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmmktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmmktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, object given in %s on line %d
bool(false)
--undefined var--
diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt
index c3ff81d136..c29241b793 100644
--- a/ext/date/tests/gmstrftime_variation2.phpt
+++ b/ext/date/tests/gmstrftime_variation2.phpt
@@ -113,12 +113,12 @@ string(20) "Dec 31 1969 23:59:50"
--float 12.3456789000e10--
-Warning: gmstrftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, float given in %s on line %d
bool(false)
--float -12.3456789000e10--
-Warning: gmstrftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, float given in %s on line %d
bool(false)
--float .5--
@@ -126,22 +126,22 @@ string(20) "Jan 01 1970 00:00:00"
--empty array--
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--uppercase NULL--
@@ -164,42 +164,42 @@ string(20) "Jan 01 1970 00:00:00"
--empty string DQ--
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: gmstrftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: gmstrftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--undefined var--
diff --git a/ext/date/tests/idate_variation2.phpt b/ext/date/tests/idate_variation2.phpt
index cfa8076ea0..16730bbc4b 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 integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: idate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: idate() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: idate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: idate() expects parameter 2 to be int, 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 dd38a44170..a2fa0c1a62 100644
--- a/ext/date/tests/idate_variation3.phpt
+++ b/ext/date/tests/idate_variation3.phpt
@@ -31,11 +31,11 @@ var_dump( idate($format, $timestamp) );
-- Testing idate() function with float 12.3456789000e10 to timestamp --
-Warning: idate() expects parameter 2 to be integer, float given in %s on line %d
+Warning: idate() expects parameter 2 to be int, 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
+Warning: idate() expects parameter 2 to be int, 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 b19f0ed648..cc0b3a1138 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 integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, 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 a8dd3ac35f..c49cfbb949 100644
--- a/ext/date/tests/localtime_variation3.phpt
+++ b/ext/date/tests/localtime_variation3.phpt
@@ -34,17 +34,17 @@ var_dump( localtime($timestamp, $is_associative) );
-- Testing localtime() function with 'float 12.3456789000e10' to timestamp --
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, 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
+Warning: localtime() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, float 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 5d0f0c50e0..0ccc31da40 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 integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, 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 integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: mktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: mktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, 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 integer, resource given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, 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 f5f8ef7803..b6957ce6dc 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 integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: mktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: mktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, 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 8abf2a2d35..5ea479e801 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 integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: mktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: mktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, 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 1b64c27e85..af6bc1f29c 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 integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, 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 integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: mktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: mktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, 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 integer, resource given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, 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 fc36797a0e..9fbf70b907 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 integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, 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 integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: mktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: mktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, 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 integer, resource given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, 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 0b2a130915..6328699b68 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 integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, 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 integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: mktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: mktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, 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 integer, resource given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, resource given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/strftime_variation2.phpt b/ext/date/tests/strftime_variation2.phpt
index 599f5f41a5..ac76225eb3 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 integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--associative array--
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--empty string SQ--
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string DQ--
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--string SQ--
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--mixed case string--
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--heredoc--
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
bool(false)
--instance of classWithToString--
-Warning: strftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: strftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, object given in %s on line %d
bool(false)
--undefined var--
diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt
index 94034b1749..58b266c20f 100644
--- a/ext/date/tests/strftime_variation23.phpt
+++ b/ext/date/tests/strftime_variation23.phpt
@@ -32,11 +32,11 @@ var_dump( strftime($format, $timestamp) );
-- Testing strftime() function with float 12.3456789000e10 to timestamp --
-Warning: strftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, 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
+Warning: strftime() expects parameter 2 to be int, float given in %s on line %d
bool(false)
===DONE=== \ No newline at end of file
diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
index 5b4b671b81..a3c9a1e1e0 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 integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, 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 integer, resource given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, 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 803afbaf75..94c38a9e82 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 integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- int indexed array --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- associative array --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- nested arrays --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, 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 integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- empty string SQ --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string DQ --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- string SQ --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- mixed case string --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- heredoc --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- instance of classWithToString --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- instance of classWithoutToString --
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, 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 integer, resource given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, resource given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/date/tests/timezone_name_get_error.phpt b/ext/date/tests/timezone_name_get_error.phpt
index 3c33e33f4d..185b564052 100644
--- a/ext/date/tests/timezone_name_get_error.phpt
+++ b/ext/date/tests/timezone_name_get_error.phpt
@@ -48,7 +48,7 @@ bool(false)
Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
bool(false)
-Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt
index 7ce1ade30a..2aff20ac2d 100644
--- a/ext/date/tests/timezone_offset_get_error.phpt
+++ b/ext/date/tests/timezone_offset_get_error.phpt
@@ -110,7 +110,7 @@ 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"
-string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given"
+string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given"
string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given"
@@ -118,7 +118,7 @@ string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of Da
-- 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"
-string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given"
+string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given"
string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given"
diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
index edeeb7fea7..9657fc7c6d 100644
--- a/ext/date/tests/timezone_offset_get_variation1.phpt
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -123,16 +123,16 @@ fclose( $file_handle );
*** Testing timezone_offset_get() : usage variation - unexpected values to first argument $object***
-- int 0 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
-- int 1 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
-- int 12345 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
-- int -12345 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
-- float 10.5 --
Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, float given
diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
index 2d007d5e70..76cc165658 100644
--- a/ext/date/tests/timezone_offset_get_variation2.phpt
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -123,16 +123,16 @@ fclose( $file_handle );
*** Testing timezone_offset_get() : usage variation - unexpected values to second argument $datetime***
-- int 0 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
-- int 1 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
-- int 12345 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
-- int -12345 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
-- float 10.5 --
Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, float given
diff --git a/ext/date/tests/timezone_transitions_get_error.phpt b/ext/date/tests/timezone_transitions_get_error.phpt
index 142cfda2ff..159c883efb 100644
--- a/ext/date/tests/timezone_transitions_get_error.phpt
+++ b/ext/date/tests/timezone_transitions_get_error.phpt
@@ -50,7 +50,7 @@ bool(false)
Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
bool(false)
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt
index 9ebe2861e6..8ea7ab1bc3 100644
--- a/ext/date/tests/timezone_transitions_get_variation1.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation1.phpt
@@ -110,22 +110,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 1 --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int 12345 --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- int -12345 --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
bool(false)
-- float 10.5 --
diff --git a/ext/date/tests/timezone_transitions_get_variation2.phpt b/ext/date/tests/timezone_transitions_get_variation2.phpt
index 07a394e9f9..5c7951d502 100644
--- a/ext/date/tests/timezone_transitions_get_variation2.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation2.phpt
@@ -143,7 +143,7 @@ int(8)
-- empty array --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -151,7 +151,7 @@ int(1)
-- int indexed array --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -159,7 +159,7 @@ int(1)
-- associative array --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -167,7 +167,7 @@ int(1)
-- nested arrays --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -199,7 +199,7 @@ int(8)
-- empty string DQ --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -207,7 +207,7 @@ int(1)
-- empty string SQ --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -215,7 +215,7 @@ int(1)
-- string DQ --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -223,7 +223,7 @@ int(1)
-- string SQ --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -231,7 +231,7 @@ int(1)
-- mixed case string --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -239,7 +239,7 @@ int(1)
-- heredoc --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -247,7 +247,7 @@ int(1)
-- instance of classWithToString --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, object given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -255,7 +255,7 @@ int(1)
-- instance of classWithoutToString --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, object given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -271,7 +271,7 @@ int(8)
-- resource --
-Warning: timezone_transitions_get() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, resource given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
diff --git a/ext/date/tests/timezone_transitions_get_variation3.phpt b/ext/date/tests/timezone_transitions_get_variation3.phpt
index 0d2889c359..975e77ff34 100644
--- a/ext/date/tests/timezone_transitions_get_variation3.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation3.phpt
@@ -143,7 +143,7 @@ int(1)
-- empty array --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -151,7 +151,7 @@ int(1)
-- int indexed array --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -159,7 +159,7 @@ int(1)
-- associative array --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -167,7 +167,7 @@ int(1)
-- nested arrays --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -199,7 +199,7 @@ int(1)
-- empty string DQ --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -207,7 +207,7 @@ int(1)
-- empty string SQ --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -215,7 +215,7 @@ int(1)
-- string DQ --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -223,7 +223,7 @@ int(1)
-- string SQ --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -231,7 +231,7 @@ int(1)
-- mixed case string --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -239,7 +239,7 @@ int(1)
-- heredoc --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -247,7 +247,7 @@ int(1)
-- instance of classWithToString --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, object given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -255,7 +255,7 @@ int(1)
-- instance of classWithoutToString --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, object given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -271,7 +271,7 @@ int(1)
-- resource --
-Warning: timezone_transitions_get() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, resource given in %s on line %d
string(7) "boolean"
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
index 22298af2ae..4e61c25bb9 100644
--- a/ext/exif/tests/exif_tagname_variation1-64bit.phpt
+++ b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
@@ -126,23 +126,23 @@ bool(false)
bool(false)
-- Iteration 10 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 13 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 14 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 15 --
bool(false)
@@ -154,11 +154,11 @@ bool(false)
bool(false)
-- Iteration 19 --
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
bool(false)
@@ -166,11 +166,11 @@ bool(false)
bool(false)
-- Iteration 23 --
-Warning: exif_tagname() expects parameter 1 to be integer, object given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
-Warning: exif_tagname() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, resource given in %s on line %d
NULL
-- Iteration 25 --
bool(false)
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index 44d2568f49..207b200aac 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -120,23 +120,23 @@ bool(false)
bool(false)
-- Iteration 8 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 13 --
bool(false)
@@ -148,11 +148,11 @@ bool(false)
bool(false)
-- Iteration 17 --
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
bool(false)
@@ -160,11 +160,11 @@ bool(false)
bool(false)
-- Iteration 21 --
-Warning: exif_tagname() expects parameter 1 to be integer, object given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
-Warning: exif_tagname() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, resource given in %s on line %d
NULL
-- Iteration 23 --
bool(false)
diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index 511df600c1..c4883981ce 100644
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -38,7 +38,7 @@ Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or direct
Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line 12
bool(false)
-Warning: finfo_open() expects parameter 1 to be integer, array given in %sfinfo_open_error.php on line 13
+Warning: finfo_open() expects parameter 1 to be int, array given in %sfinfo_open_error.php on line 13
bool(false)
Warning: finfo_open() expects at most 2 parameters, 3 given in %sfinfo_open_error.php on line 14
@@ -47,7 +47,7 @@ bool(false)
Notice: finfo_open(): Warning: using regular magic file `%smagic' in %sfinfo_open_error.php on line 15
resource(6) of type (file_info)
-Warning: finfo_open() expects parameter 1 to be integer, string given in %sfinfo_open_error.php on line 16
+Warning: finfo_open() expects parameter 1 to be int, string given in %sfinfo_open_error.php on line 16
bool(false)
-finfo::finfo() expects parameter 1 to be integer, string given
+finfo::finfo() expects parameter 1 to be int, string given
===DONE===
diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt
index 0214533a10..67c0b89f5f 100644
--- a/ext/filter/tests/007.phpt
+++ b/ext/filter/tests/007.phpt
@@ -50,15 +50,15 @@ Warning: filter_has_var() expects parameter 2 to be string, array given in %s007
bool(false)
bool(false)
-Warning: filter_has_var() expects parameter 1 to be integer, string given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, string given in %s007.php on line %d
bool(false)
-Warning: filter_has_var() expects parameter 1 to be integer, array given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, array given in %s007.php on line %d
bool(false)
-Warning: filter_has_var() expects parameter 1 to be integer, array given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, array given in %s007.php on line %d
bool(false)
-Warning: filter_has_var() expects parameter 1 to be integer, string given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, string given in %s007.php on line %d
bool(false)
Done
diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt
index 40dd27bc52..38b436f58d 100644
--- a/ext/filter/tests/010.phpt
+++ b/ext/filter/tests/010.phpt
@@ -54,7 +54,7 @@ array(7) {
}
}
-Warning: filter_var() expects parameter 2 to be integer, array given in %s on line %d
+Warning: filter_var() expects parameter 2 to be int, array given in %s on line %d
NULL
string(1) "1"
string(1) "1"
diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
index 2598fd5375..b5075d1821 100644
--- a/ext/filter/tests/011.phpt
+++ b/ext/filter/tests/011.phpt
@@ -40,10 +40,10 @@ float(12345.7)
string(29) "&#60;p&#62;string&#60;/p&#62;"
bool(false)
-Warning: filter_var() expects parameter 2 to be integer, string given in %s011.php on line %d
+Warning: filter_var() expects parameter 2 to be int, string given in %s011.php on line %d
NULL
-Warning: filter_input() expects parameter 3 to be integer, string given in %s011.php on line %d
+Warning: filter_input() expects parameter 3 to be int, string given in %s011.php on line %d
NULL
Warning: filter_var() expects at most 3 parameters, 5 given in %s011.php on line %d
diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt
index 03c5091ccb..1d578a4f13 100644
--- a/ext/filter/tests/040.phpt
+++ b/ext/filter/tests/040.phpt
@@ -40,6 +40,6 @@ bool(false)
bool(false)
bool(false)
-Warning: filter_has_var() expects parameter 1 to be integer, string given in %s on line %d
+Warning: filter_has_var() expects parameter 1 to be int, string given in %s on line %d
bool(false)
Done
diff --git a/ext/ftp/tests/004.phpt b/ext/ftp/tests/004.phpt
index 21b8aabbeb..3fcf272e3b 100644
--- a/ext/ftp/tests/004.phpt
+++ b/ext/ftp/tests/004.phpt
@@ -37,7 +37,7 @@ var_dump(ftp_quit($ftp));
bool(true)
string(4) "UNIX"
-Warning: ftp_alloc() expects parameter 2 to be integer, array given in %s004.php on line 12
+Warning: ftp_alloc() expects parameter 2 to be int, array given in %s004.php on line 12
bool(false)
Warning: ftp_cdup() expects exactly 1 parameter, 2 given in %s004.php on line 13
diff --git a/ext/ftp/tests/ftp_ssl_connect_error.phpt b/ext/ftp/tests/ftp_ssl_connect_error.phpt
index 6deec03e5e..f139696c7f 100644
--- a/ext/ftp/tests/ftp_ssl_connect_error.phpt
+++ b/ext/ftp/tests/ftp_ssl_connect_error.phpt
@@ -37,9 +37,9 @@ bool(false)
Warning: ftp_ssl_connect() expects parameter 1 to be string, array given in %s on line %d
-Warning: ftp_ssl_connect() expects parameter 2 to be integer, array given in %s on line %d
+Warning: ftp_ssl_connect() expects parameter 2 to be int, array given in %s on line %d
-Warning: ftp_ssl_connect() expects parameter 3 to be integer, array given in %s on line %d
+Warning: ftp_ssl_connect() expects parameter 3 to be int, array given in %s on line %d
-- Testing ftp_ssl_connect() function with more than expected no. of arguments --
diff --git a/ext/gd/tests/imagechar_error3.phpt b/ext/gd/tests/imagechar_error3.phpt
index 31b1c2386f..5fff2013bf 100644
--- a/ext/gd/tests/imagechar_error3.phpt
+++ b/ext/gd/tests/imagechar_error3.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 'string', 5, 5, 'C', 1);
?>
--EXPECTF--
-Warning: imagechar() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagechar_error4.phpt b/ext/gd/tests/imagechar_error4.phpt
index 263da50e60..9220584ae8 100644
--- a/ext/gd/tests/imagechar_error4.phpt
+++ b/ext/gd/tests/imagechar_error4.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 'string', 5, 'C', 1);
?>
--EXPECTF--
-Warning: imagechar() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagechar_error5.phpt b/ext/gd/tests/imagechar_error5.phpt
index 8d47dc377b..7ea0e72a82 100644
--- a/ext/gd/tests/imagechar_error5.phpt
+++ b/ext/gd/tests/imagechar_error5.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 5, 'string', 'C', 1);
?>
--EXPECTF--
-Warning: imagechar() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagechar_error7.phpt b/ext/gd/tests/imagechar_error7.phpt
index 1d7819265c..3d847f3410 100644
--- a/ext/gd/tests/imagechar_error7.phpt
+++ b/ext/gd/tests/imagechar_error7.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 5, 5, 'C', 'font');
?>
--EXPECTF--
-Warning: imagechar() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error3.phpt b/ext/gd/tests/imagecharup_error3.phpt
index a44b766484..13f716b133 100644
--- a/ext/gd/tests/imagecharup_error3.phpt
+++ b/ext/gd/tests/imagecharup_error3.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 'string', 5, 5, 'C', 1);
?>
--EXPECTF--
-Warning: imagecharup() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error4.phpt b/ext/gd/tests/imagecharup_error4.phpt
index f1824f1344..b403d0eec7 100644
--- a/ext/gd/tests/imagecharup_error4.phpt
+++ b/ext/gd/tests/imagecharup_error4.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 'string', 5, 'C', 1);
?>
--EXPECTF--
-Warning: imagecharup() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error5.phpt b/ext/gd/tests/imagecharup_error5.phpt
index 73c2d075fe..a4a7c88100 100644
--- a/ext/gd/tests/imagecharup_error5.phpt
+++ b/ext/gd/tests/imagecharup_error5.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 5, 'string', 'C', 1);
?>
--EXPECTF--
-Warning: imagecharup() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error7.phpt b/ext/gd/tests/imagecharup_error7.phpt
index fe1fe073da..c10835daae 100644
--- a/ext/gd/tests/imagecharup_error7.phpt
+++ b/ext/gd/tests/imagecharup_error7.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 5, 5, 'C', 'font');
?>
--EXPECTF--
-Warning: imagecharup() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt
index 60d690bfbe..1e628a7b55 100644
--- a/ext/gd/tests/imagecolorallocate_variation1.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation1.phpt
@@ -117,22 +117,22 @@ foreach($values as $key => $value) {
-- int 0 --
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- int 1 --
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- int 12345 --
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- int -12345 --
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- float 10.5 --
diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt
index 7de60bc19f..9f631af210 100644
--- a/ext/gd/tests/imagecolorallocate_variation2.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation2.phpt
@@ -126,22 +126,22 @@ int(2570)
--empty array--
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
NULL
--int indexed array--
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
NULL
--associative array--
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
NULL
--nested arrays--
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
NULL
--uppercase NULL--
@@ -164,42 +164,42 @@ int(2570)
--empty string DQ--
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
NULL
--empty string SQ--
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
NULL
--string DQ--
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
NULL
--string SQ--
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
NULL
--mixed case string--
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
NULL
--heredoc--
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
NULL
--instance of classWithToString--
-Warning: imagecolorallocate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, object given in %s on line %d
NULL
--instance of classWithoutToString--
-Warning: imagecolorallocate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, object given in %s on line %d
NULL
--undefined var--
@@ -210,6 +210,6 @@ int(2570)
--file resource--
-Warning: imagecolorallocate() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, resource given in %s on line %d
NULL
===DONE===
diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index 3fe1f50f82..76bb4ba360 100644
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -125,22 +125,22 @@ int(655370)
--empty array--
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
NULL
--int indexed array--
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
NULL
--associative array--
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
NULL
--nested arrays--
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
NULL
--uppercase NULL--
@@ -163,42 +163,42 @@ int(655370)
--empty string DQ--
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
NULL
--empty string SQ--
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
NULL
--string DQ--
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
NULL
--string SQ--
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
NULL
--mixed case string--
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
NULL
--heredoc--
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
NULL
--instance of classWithToString--
-Warning: imagecolorallocate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, object given in %s on line %d
NULL
--instance of classWithoutToString--
-Warning: imagecolorallocate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, object given in %s on line %d
NULL
--undefined var--
@@ -209,6 +209,6 @@ int(655370)
--file resource--
-Warning: imagecolorallocate() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, resource given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt
index e4ef7c62a2..d1e1f45513 100644
--- a/ext/gd/tests/imagecolorallocate_variation4.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation4.phpt
@@ -125,22 +125,22 @@ int(657920)
--empty array--
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
NULL
--int indexed array--
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
NULL
--associative array--
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
NULL
--nested arrays--
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
NULL
--uppercase NULL--
@@ -163,42 +163,42 @@ int(657920)
--empty string DQ--
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
NULL
--empty string SQ--
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
NULL
--string DQ--
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
NULL
--string SQ--
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
NULL
--mixed case string--
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
NULL
--heredoc--
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
NULL
--instance of classWithToString--
-Warning: imagecolorallocate() expects parameter 4 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, object given in %s on line %d
NULL
--instance of classWithoutToString--
-Warning: imagecolorallocate() expects parameter 4 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, object given in %s on line %d
NULL
--undefined var--
@@ -209,6 +209,6 @@ int(657920)
--file resource--
-Warning: imagecolorallocate() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, resource given in %s on line %d
NULL
===DONE===
diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index d0df2a7d6b..f1e82b3779 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, array(), 255, 255, 50);
imagecolorallocatealpha($img, tmpfile(), 255, 255, 50);
?>
--EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, %s given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, resource given in %s on line %d \ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index ab92960c20..51018f797d 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, array(), 255, 50);
imagecolorallocatealpha($img, 255, tmpfile(), 255, 50);
?>
--EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, %s given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, resource given in %s on line %d \ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index 708e95e680..4c517e5c37 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, 255, array(), 50);
imagecolorallocatealpha($img, 255, 255, tmpfile(), 50);
?>
--EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, %s given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, resource given in %s on line %d \ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index fd43410365..f1fcc0df73 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, 255, 255, array());
imagecolorallocatealpha($img, 255, 255, 255, tmpfile());
?>
--EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, %s given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, resource given in %s on line %d \ No newline at end of file
diff --git a/ext/gd/tests/imagecolorclosesthwb.phpt b/ext/gd/tests/imagecolorclosesthwb.phpt
index 79df5a11eb..efe9c5035e 100644
--- a/ext/gd/tests/imagecolorclosesthwb.phpt
+++ b/ext/gd/tests/imagecolorclosesthwb.phpt
@@ -26,5 +26,5 @@ NULL
Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given in %s on line %d
NULL
-Warning: imagecolorclosesthwb() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorclosesthwb() expects parameter 2 to be int, string given in %s on line %d
NULL
diff --git a/ext/gd/tests/imagecreatetruecolor_error1.phpt b/ext/gd/tests/imagecreatetruecolor_error1.phpt
index 7ec75aa66f..6acce13512 100644
--- a/ext/gd/tests/imagecreatetruecolor_error1.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error1.phpt
@@ -13,6 +13,6 @@ $image = imagecreatetruecolor('s', 30);
$image = imagecreatetruecolor(30, 's');
?>
--EXPECTF--
-Warning: imagecreatetruecolor() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 1 to be int, %s given in %s on line %d
-Warning: imagecreatetruecolor() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index 62ff43a62f..7d96f8793f 100644
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -19,6 +19,6 @@ Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
-Warning: imagecreatetruecolor() expects parameter 1 to be integer, float given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 1 to be int, float given in %s on line %d
-Warning: imagecreatetruecolor() expects parameter 2 to be integer, float given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 2 to be int, float given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error2.phpt b/ext/gd/tests/imageellipse_error2.phpt
index d9062f6531..3eb3681c0d 100644
--- a/ext/gd/tests/imageellipse_error2.phpt
+++ b/ext/gd/tests/imageellipse_error2.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 'wrong param', 150, 300, 200, 16777215);
?>
--EXPECTF--
-Warning: imageellipse() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error3.phpt b/ext/gd/tests/imageellipse_error3.phpt
index fca825ff2f..692149dd16 100644
--- a/ext/gd/tests/imageellipse_error3.phpt
+++ b/ext/gd/tests/imageellipse_error3.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 'wrong param', 300, 200, 16777215);
?>
--EXPECTF--
-Warning: imageellipse() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error4.phpt b/ext/gd/tests/imageellipse_error4.phpt
index c8d6eb0fa0..e93334ba54 100644
--- a/ext/gd/tests/imageellipse_error4.phpt
+++ b/ext/gd/tests/imageellipse_error4.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 'wrong param', 200, 16777215);
?>
--EXPECTF--
-Warning: imageellipse() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error5.phpt b/ext/gd/tests/imageellipse_error5.phpt
index e4d2473225..a86e25e461 100644
--- a/ext/gd/tests/imageellipse_error5.phpt
+++ b/ext/gd/tests/imageellipse_error5.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 300, 'wrong param', 16777215);
?>
--EXPECTF--
-Warning: imageellipse() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 5 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error6.phpt b/ext/gd/tests/imageellipse_error6.phpt
index d3eebd140e..74d1ac2f1e 100644
--- a/ext/gd/tests/imageellipse_error6.phpt
+++ b/ext/gd/tests/imageellipse_error6.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 300, 200, 'wrong param');
?>
--EXPECTF--
-Warning: imageellipse() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt
index 8ad1f4004e..2c70ce9f7c 100644
--- a/ext/gd/tests/imagefilltoborder_error2.phpt
+++ b/ext/gd/tests/imagefilltoborder_error2.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 'wrong param', 50, imagecolorallocate( $image, 0, 0,
?>
--EXPECTF--
-Warning: imagefilltoborder() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt
index b0e089cfa0..74f01183a5 100644
--- a/ext/gd/tests/imagefilltoborder_error3.phpt
+++ b/ext/gd/tests/imagefilltoborder_error3.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 'wrong param', imagecolorallocate( $image, 0, 0,
?>
--EXPECTF--
-Warning: imagefilltoborder() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt
index 94a6123a96..3eaa719cd9 100644
--- a/ext/gd/tests/imagefilltoborder_error4.phpt
+++ b/ext/gd/tests/imagefilltoborder_error4.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 50, 'wrong param', imagecolorallocate( $image, 25
?>
--EXPECTF--
-Warning: imagefilltoborder() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt
index 6f4255ae3b..b9eb07982d 100644
--- a/ext/gd/tests/imagefilltoborder_error5.phpt
+++ b/ext/gd/tests/imagefilltoborder_error5.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), 'wrong
?>
--EXPECTF--
-Warning: imagefilltoborder() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 5 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt
index 50359a29d0..6da2d8385e 100644
--- a/ext/gd/tests/imagefilter_error14.phpt
+++ b/ext/gd/tests/imagefilter_error14.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imagefilter($image, IMG_FILTER_COLORIZE, 'wrong parameter', 255, 255));
?>
--EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
bool(false)
diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt
index c4ecc0b96a..d0351f9f74 100644
--- a/ext/gd/tests/imagefilter_error16.phpt
+++ b/ext/gd/tests/imagefilter_error16.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imagefilter($image, IMG_FILTER_CONTRAST, 'wrong parameter'));
?>
--EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
bool(false)
diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt
index a225d6391f..aa25994457 100644
--- a/ext/gd/tests/imagefilter_error19.phpt
+++ b/ext/gd/tests/imagefilter_error19.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imagefilter($image, IMG_FILTER_BRIGHTNESS, 'wrong parameter'));
?>
--EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
bool(false)
diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt
index a9fefd377a..d4cca5c8d7 100644
--- a/ext/gd/tests/imagefilter_error2.phpt
+++ b/ext/gd/tests/imagefilter_error2.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imagefilter($image, 'wrong parameter'));
?>
--EXPECTF--
-Warning: imagefilter() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 2 to be int, string given in %s on line %d
NULL
diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt
index 413183d4bb..844f12a824 100644
--- a/ext/gd/tests/imagefilter_error3.phpt
+++ b/ext/gd/tests/imagefilter_error3.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imagefilter($image, IMG_FILTER_PIXELATE, 'wrong parameter'));
?>
--EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
bool(false)
diff --git a/ext/gd/tests/imagefontheight_error1.phpt b/ext/gd/tests/imagefontheight_error1.phpt
index 34aa4a8903..e324772c5f 100644
--- a/ext/gd/tests/imagefontheight_error1.phpt
+++ b/ext/gd/tests/imagefontheight_error1.phpt
@@ -12,4 +12,4 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
imagefontheight('string');
?>
--EXPECTF--
-Warning: imagefontheight() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imagefontheight() expects parameter 1 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefontwidth_error1.phpt b/ext/gd/tests/imagefontwidth_error1.phpt
index c1a1463b9b..46178a22f2 100644
--- a/ext/gd/tests/imagefontwidth_error1.phpt
+++ b/ext/gd/tests/imagefontwidth_error1.phpt
@@ -12,4 +12,4 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
imagefontwidth('string');
?>
--EXPECTF--
-Warning: imagefontwidth() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imagefontwidth() expects parameter 1 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt
index bd1d5aaf1f..83210f789f 100644
--- a/ext/gd/tests/imagelayereffect_error2.phpt
+++ b/ext/gd/tests/imagelayereffect_error2.phpt
@@ -15,4 +15,4 @@ $image = imagecreatetruecolor(180, 30);
$layer = imagelayereffect($image, 'IMG_EFFECT_REPLACE');
?>
--EXPECTF--
-Warning: imagelayereffect() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagelayereffect() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt
index 350ee1bf82..93a2acb339 100644
--- a/ext/gd/tests/imagerectangle_error3.phpt
+++ b/ext/gd/tests/imagerectangle_error3.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
imagerectangle( $image, 'wrong param', 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
?>
--EXPECTF--
-Warning: imagerectangle() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt
index 4c448dc027..b9253545fc 100644
--- a/ext/gd/tests/imagerectangle_error4.phpt
+++ b/ext/gd/tests/imagerectangle_error4.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
imagerectangle( $image, 0, 'wrong param', 50, 50, imagecolorallocate($image, 255, 255, 255) );
?>
--EXPECTF--
-Warning: imagerectangle() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt
index fa9486e3de..6be6b5301d 100644
--- a/ext/gd/tests/imagerectangle_error5.phpt
+++ b/ext/gd/tests/imagerectangle_error5.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
imagerectangle( $image, 0, 0, 'wrong param', 50, imagecolorallocate($image, 255, 255, 255) );
?>
--EXPECTF--
-Warning: imagerectangle() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt
index 1523a9ec57..2b89543c31 100644
--- a/ext/gd/tests/imagerectangle_error6.phpt
+++ b/ext/gd/tests/imagerectangle_error6.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
imagerectangle( $image, 0, 0, 50, 'wrong param', imagecolorallocate($image, 255, 255, 255) );
?>
--EXPECTF--
-Warning: imagerectangle() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 5 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt
index ee6326feff..dfec56439f 100644
--- a/ext/gd/tests/imagerectangle_error7.phpt
+++ b/ext/gd/tests/imagerectangle_error7.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
imagerectangle( $image, 0, 0, 50, 50, 'wrong param' );
?>
--EXPECTF--
-Warning: imagerectangle() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index 263e18bcc3..f829cbebc5 100644
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -17,8 +17,8 @@ imagesetthickness($image, $image);
?>
--EXPECTF--
-Warning: imagesetthickness() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagesetthickness() expects parameter 2 to be int, string given in %s on line %d
-Warning: imagesetthickness() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagesetthickness() expects parameter 2 to be int, array given in %s on line %d
-Warning: imagesetthickness() expects parameter 2 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagesetthickness() expects parameter 2 to be int, resource given in %s on line %d \ No newline at end of file
diff --git a/ext/gd/tests/imagestring_error3.phpt b/ext/gd/tests/imagestring_error3.phpt
index 464e46e8d2..783e89e19a 100644
--- a/ext/gd/tests/imagestring_error3.phpt
+++ b/ext/gd/tests/imagestring_error3.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 'string', 5, 5, 'String', 1);
?>
--EXPECTF--
-Warning: imagestring() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestring_error4.phpt b/ext/gd/tests/imagestring_error4.phpt
index f782b7bda4..3db02d9723 100644
--- a/ext/gd/tests/imagestring_error4.phpt
+++ b/ext/gd/tests/imagestring_error4.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 'string', 5, 'String', 1);
?>
--EXPECTF--
-Warning: imagestring() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestring_error5.phpt b/ext/gd/tests/imagestring_error5.phpt
index d774314797..05d674e6aa 100644
--- a/ext/gd/tests/imagestring_error5.phpt
+++ b/ext/gd/tests/imagestring_error5.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 'string', 'String', 1);
?>
--EXPECTF--
-Warning: imagestring() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestring_error7.phpt b/ext/gd/tests/imagestring_error7.phpt
index 2f44682a93..8d9e017e1b 100644
--- a/ext/gd/tests/imagestring_error7.phpt
+++ b/ext/gd/tests/imagestring_error7.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 5, 'String', 'font');
?>
--EXPECTF--
-Warning: imagestring() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error3.phpt b/ext/gd/tests/imagestringup_error3.phpt
index e4cfe98c75..d436749829 100644
--- a/ext/gd/tests/imagestringup_error3.phpt
+++ b/ext/gd/tests/imagestringup_error3.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 'string', 5, 5, 'String', 1);
?>
--EXPECTF--
-Warning: imagestringup() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagestringup() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error4.phpt b/ext/gd/tests/imagestringup_error4.phpt
index 0b525cea26..7d8b2fd9ce 100644
--- a/ext/gd/tests/imagestringup_error4.phpt
+++ b/ext/gd/tests/imagestringup_error4.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 1, 'string', 5, 'String', 1);
?>
--EXPECTF--
-Warning: imagestringup() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagestringup() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error5.phpt b/ext/gd/tests/imagestringup_error5.phpt
index d774314797..05d674e6aa 100644
--- a/ext/gd/tests/imagestringup_error5.phpt
+++ b/ext/gd/tests/imagestringup_error5.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 'string', 'String', 1);
?>
--EXPECTF--
-Warning: imagestring() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error7.phpt b/ext/gd/tests/imagestringup_error7.phpt
index 4609936567..6afa7cb3a7 100644
--- a/ext/gd/tests/imagestringup_error7.phpt
+++ b/ext/gd/tests/imagestringup_error7.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 1, 5, 5, 'String', 'font');
?>
--EXPECTF--
-Warning: imagestringup() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagestringup() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 46e3f487e0..41d5978274 100644
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -19,10 +19,10 @@ imagetruecolortopalette($image, true, null);
?>
--EXPECTF--
-Warning: imagetruecolortopalette() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be int, string given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be int, resource given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be int, array given in %s on line %d
Warning: imagetruecolortopalette(): Number of colors has to be greater than zero and no more than %d in %s on line %d
diff --git a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
index f73e133026..dfff6a6dac 100644
--- a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
@@ -21,7 +21,7 @@ Warning: ngettext() expects parameter 1 to be string, array given in %s on line
Warning: ngettext() expects parameter 2 to be string, array given in %s on line 3
-Warning: ngettext() expects parameter 3 to be integer, array given in %s on line 4
+Warning: ngettext() expects parameter 3 to be int, array given in %s on line 4
Warning: ngettext() expects exactly 3 parameters, 0 given in %s on line 5
diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt
index 6140b0cebf..b1b7b7d57e 100644
--- a/ext/gmp/tests/gmp_pow.phpt
+++ b/ext/gmp/tests/gmp_pow.phpt
@@ -57,10 +57,10 @@ NULL
Warning: gmp_pow() expects exactly 2 parameters, 0 given in %s on line %d
NULL
-Warning: gmp_pow() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmp_pow() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gmp_pow() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmp_pow() expects parameter 2 to be int, array given in %s on line %d
NULL
Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt
index da4ca5c7bd..5533224b2c 100644
--- a/ext/gmp/tests/gmp_random.phpt
+++ b/ext/gmp/tests/gmp_random.phpt
@@ -40,7 +40,7 @@ string(%d) "%d"
Deprecated: Function gmp_random() is deprecated in %s on line %d
-Warning: gmp_random() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmp_random() expects parameter 1 to be int, array given in %s on line %d
NULL
Deprecated: Function gmp_random() is deprecated in %s on line %d
@@ -50,11 +50,11 @@ NULL
Deprecated: Function gmp_random() is deprecated in %s on line %d
-Warning: gmp_random() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d
NULL
Deprecated: Function gmp_random() is deprecated in %s on line %d
-Warning: gmp_random() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d
NULL
Done
diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt
index df3e596a19..4df78bdf7a 100644
--- a/ext/gmp/tests/gmp_strval.phpt
+++ b/ext/gmp/tests/gmp_strval.phpt
@@ -40,13 +40,13 @@ NULL
Warning: gmp_strval(): Unable to convert variable to GMP - string is not an integer in %s on line %d
bool(false)
-Warning: gmp_strval() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, string given in %s on line %d
NULL
Warning: gmp_strval(): Bad base for conversion: -1 (should be between 2 and %d or -2 and -%d) in %s on line %d
bool(false)
-Warning: gmp_strval() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, string given in %s on line %d
NULL
Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
@@ -68,10 +68,10 @@ Warning: gmp_strval(): Bad base for conversion: 100000 (should be between 2 and
bool(false)
string(8) "-3373333"
-Warning: gmp_strval() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gmp_strval() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, object given in %s on line %d
NULL
Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/hash/tests/hash_equals.phpt b/ext/hash/tests/hash_equals.phpt
index 25304f6b0a..8fdf22967e 100644
--- a/ext/hash/tests/hash_equals.phpt
+++ b/ext/hash/tests/hash_equals.phpt
@@ -27,13 +27,13 @@ bool(false)
bool(false)
bool(true)
-Warning: hash_equals(): Expected known_string to be a string, integer given in %s on line %d
+Warning: hash_equals(): Expected known_string to be a string, int given in %s on line %d
bool(false)
-Warning: hash_equals(): Expected user_string to be a string, integer given in %s on line %d
+Warning: hash_equals(): Expected user_string to be a string, int given in %s on line %d
bool(false)
-Warning: hash_equals(): Expected known_string to be a string, integer given in %s on line %d
+Warning: hash_equals(): Expected known_string to be a string, int given in %s on line %d
bool(false)
Warning: hash_equals(): Expected known_string to be a string, null given in %s on line %d
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
index f89658a47d..4e547c131f 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
@@ -236,7 +236,7 @@ array(5) {
-- Iteration 7 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, float given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, float given in %s on line %d
bool(false)
-- Iteration 8 --
@@ -393,32 +393,32 @@ array(5) {
-- Iteration 16 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 17 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 18 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 19 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 20 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 21 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, object given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- Iteration 22 --
@@ -461,6 +461,6 @@ array(5) {
-- Iteration 24 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
Done
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
index 4ee232e835..e17525e0fe 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
@@ -239,7 +239,7 @@ array(5) {
-- Iteration 7 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, float given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, float given in %s on line %d
bool(false)
-- Iteration 8 --
@@ -396,32 +396,32 @@ array(5) {
-- Iteration 16 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 17 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 18 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 19 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 20 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 21 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, object given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- Iteration 22 --
@@ -464,6 +464,6 @@ array(5) {
-- Iteration 24 --
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
Done
diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index f4508e9860..c4e3c4d400 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -128,7 +128,7 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67"
-- Iteration 7 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, float given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, float given in %s on line %d
string(0) ""
-- Iteration 8 --
@@ -157,32 +157,32 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67"
-- Iteration 16 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
string(0) ""
-- Iteration 17 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
string(0) ""
-- Iteration 18 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
string(0) ""
-- Iteration 19 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
string(0) ""
-- Iteration 20 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
string(0) ""
-- Iteration 21 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, object given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, object given in %s on line %d
string(0) ""
-- Iteration 22 --
@@ -193,6 +193,6 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67"
-- Iteration 24 --
-Warning: iconv_mime_decode() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, resource given in %s on line %d
string(0) ""
Done
diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt
index ea889a07bd..3983da6f84 100644
--- a/ext/iconv/tests/iconv_strpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3.phpt
@@ -139,7 +139,7 @@ bool(false)
--
float(123456789000)
-Warning: iconv_strpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
--
float(1.23456789E-9)
@@ -168,33 +168,33 @@ int(8)
--
string(0) ""
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(0) ""
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(6) "string"
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(6) "string"
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(11) "hello world"
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
object(classA)#%d (%d) {
}
-Warning: iconv_strpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, object given in %s on line %d
bool(false)
--
NULL
@@ -205,6 +205,6 @@ int(8)
--
resource(%d) of type (stream)
-Warning: iconv_strpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, resource given in %s on line %d
bool(false)
Done
diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
index c4e3e141a1..d2dd8a7495 100644
--- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
@@ -166,33 +166,33 @@ int(8)
--
string(0) ""
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(0) ""
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(6) "string"
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(6) "string"
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
string(11) "hello world"
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
--
object(classA)#%d (%d) {
}
-Warning: iconv_strpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, object given in %s on line %d
bool(false)
--
NULL
@@ -203,6 +203,6 @@ int(8)
--
resource(%d) of type (stream)
-Warning: iconv_strpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, resource given in %s on line %d
bool(false)
Done
diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt
index 4de03ddc52..688d310764 100644
--- a/ext/imap/tests/imap_close_variation1.phpt
+++ b/ext/imap/tests/imap_close_variation1.phpt
@@ -94,22 +94,22 @@ foreach($inputs as $input) {
-- Iteration 1 --
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
NULL
-- Iteration 2 --
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
NULL
-- Iteration 3 --
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
NULL
-- Iteration 4 --
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
NULL
-- Iteration 5 --
diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt
index f1d36d0abe..febf063ad4 100644
--- a/ext/imap/tests/imap_close_variation2.phpt
+++ b/ext/imap/tests/imap_close_variation2.phpt
@@ -189,19 +189,19 @@ CL_EXPUNGE was not set, 3 msgs in mailbox
-- Iteration 16 --
-Warning: imap_close() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_close() expects parameter 2 to be int, string given in %s on line %d
NULL
CL_EXPUNGE was not set, 3 msgs in mailbox
-- Iteration 17 --
-Warning: imap_close() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_close() expects parameter 2 to be int, string given in %s on line %d
NULL
CL_EXPUNGE was not set, 3 msgs in mailbox
-- Iteration 18 --
-Warning: imap_close() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_close() expects parameter 2 to be int, array given in %s on line %d
NULL
CL_EXPUNGE was not set, 3 msgs in mailbox
diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
index 437cdcfa8a..2919219df8 100644
--- a/ext/imap/tests/imap_fetch_overview_variation1.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -99,22 +99,22 @@ foreach($inputs as $input) {
-- Testing with first argument value: int(0)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Testing with first argument value: int(1)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Testing with first argument value: int(12345)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Testing with first argument value: int(-2345)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Testing with first argument value: float(10.5)
diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt
index ac9087c3a2..f5f856a477 100644
--- a/ext/imap/tests/imap_fetchbody_variation1.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation1.phpt
@@ -99,22 +99,22 @@ foreach($inputs as $input) {
-- Iteration 1 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
NULL
-- Iteration 2 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
NULL
-- Iteration 3 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
NULL
-- Iteration 4 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
NULL
-- Iteration 5 --
diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt
index 8565e233c9..7744ee8ec0 100644
--- a/ext/imap/tests/imap_fetchbody_variation2.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation2.phpt
@@ -176,37 +176,37 @@ bool(false)
-- Iteration 16 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 19 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: imap_fetchbody() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 23 --
diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt
index 22d56b1bd3..b247ae1ed5 100644
--- a/ext/imap/tests/imap_fetchheader_variation1.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation1.phpt
@@ -110,22 +110,22 @@ foreach($inputs as $input) {
-- Iteration 1 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt
index 64ed2be319..9f3e64812d 100644
--- a/ext/imap/tests/imap_fetchheader_variation2.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation2.phpt
@@ -209,52 +209,52 @@ bool(false)
-- Iteration 16 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 22 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 23 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 24 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 25 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 26 --
@@ -269,6 +269,6 @@ bool(false)
-- Iteration 28 --
-Warning: imap_fetchheader() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, resource given in %s on line %d
NULL
===DONE===
diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt
index 9e616df60e..181f042531 100644
--- a/ext/imap/tests/imap_timeout_basic.phpt
+++ b/ext/imap/tests/imap_timeout_basic.phpt
@@ -44,7 +44,7 @@ Checking with no parameters
Warning: imap_timeout() expects at least 1 parameter, 0 given in %s on line %d
Checking with incorrect parameter type
-Warning: imap_timeout() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imap_timeout() expects parameter 1 to be int, %s given in %s on line %d
GET values:
int(%d)
int(%d)
diff --git a/ext/interbase/tests/ibase_drop_db_001.phpt b/ext/interbase/tests/ibase_drop_db_001.phpt
index 7526e13144..31db4034ba 100644
--- a/ext/interbase/tests/ibase_drop_db_001.phpt
+++ b/ext/interbase/tests/ibase_drop_db_001.phpt
@@ -24,7 +24,7 @@ var_dump(ibase_drop_db(NULL));
resource(%d) of type (Firebird/InterBase link)
bool(true)
-Warning: ibase_drop_db() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ibase_drop_db() expects parameter 1 to be resource, int given in %s on line %d
NULL
Warning: ibase_drop_db() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/interbase/tests/ibase_num_fields_001.phpt b/ext/interbase/tests/ibase_num_fields_001.phpt
index f1e0e4ab4f..3c4074e244 100644
--- a/ext/interbase/tests/ibase_num_fields_001.phpt
+++ b/ext/interbase/tests/ibase_num_fields_001.phpt
@@ -18,7 +18,7 @@ var_dump(ibase_num_fields());
--EXPECTF--
int(2)
-Warning: ibase_num_fields() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ibase_num_fields() expects parameter 1 to be resource, int given in %s on line %d
NULL
Warning: ibase_num_fields() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
index c3353d5c7f..ee53c068e9 100644
--- a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
+++ b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
@@ -25,7 +25,7 @@ Warning: IntlBreakIterator::following() expects exactly 1 parameter, 2 given in
Warning: IntlBreakIterator::following(): breakiter_following: bad arguments in %s on line %d
bool(false)
-Warning: IntlBreakIterator::following() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::following() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::following(): breakiter_following: bad arguments in %s on line %d
bool(false)
@@ -35,7 +35,7 @@ Warning: IntlBreakIterator::preceding() expects exactly 1 parameter, 2 given in
Warning: IntlBreakIterator::preceding(): breakiter_preceding: bad arguments in %s on line %d
bool(false)
-Warning: IntlBreakIterator::preceding() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::preceding() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::preceding(): breakiter_preceding: bad arguments in %s on line %d
bool(false)
@@ -45,7 +45,7 @@ Warning: IntlBreakIterator::isBoundary() expects exactly 1 parameter, 2 given in
Warning: IntlBreakIterator::isBoundary(): breakiter_is_boundary: bad arguments in %s on line %d
bool(false)
-Warning: IntlBreakIterator::isBoundary() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::isBoundary() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::isBoundary(): breakiter_is_boundary: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/breakiter_getLocale_error.phpt b/ext/intl/tests/breakiter_getLocale_error.phpt
index 4ad7267837..9e37a31e61 100644
--- a/ext/intl/tests/breakiter_getLocale_error.phpt
+++ b/ext/intl/tests/breakiter_getLocale_error.phpt
@@ -22,7 +22,7 @@ Warning: IntlBreakIterator::getLocale() expects exactly 1 parameter, 2 given in
Warning: IntlBreakIterator::getLocale(): breakiter_get_locale: bad arguments in %s on line %d
bool(false)
-Warning: IntlBreakIterator::getLocale() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::getLocale() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::getLocale(): breakiter_get_locale: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
index 164b75c7e7..12a55e7e0f 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
@@ -18,7 +18,7 @@ var_dump($it->getPartsIterator(-1));
==DONE==
--EXPECTF--
-Warning: IntlBreakIterator::getPartsIterator() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::getPartsIterator() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::getPartsIterator(): breakiter_get_parts_iterator: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/breakiter_next_error.phpt b/ext/intl/tests/breakiter_next_error.phpt
index a7aea4505f..0472ed4a44 100644
--- a/ext/intl/tests/breakiter_next_error.phpt
+++ b/ext/intl/tests/breakiter_next_error.phpt
@@ -21,7 +21,7 @@ Warning: IntlBreakIterator::next() expects exactly 1 parameter, 2 given in %s on
Warning: IntlBreakIterator::next(): breakiter_next: bad arguments in %s on line %d
bool(false)
-Warning: IntlBreakIterator::next() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::next() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::next(): breakiter_next: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index fc0584c61a..ad2cbc356e 100644
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -38,7 +38,7 @@ Warning: intlcal_add() expects exactly 3 parameters, 4 given in %s on line %d
Warning: intlcal_add(): intlcal_add: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_add(1, 2, 3)
#1 {main}
diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index 7d57b93a33..279e3d816e 100644
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -67,9 +67,9 @@ bool(false)
error: 2, IntlCalendar::before() expects exactly 1 parameter, 0 given
error: 2, IntlCalendar::before(): intlcal_before/after: bad arguments
bool(false)
-error: 0, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, int given
error: 2, IntlCalendar::after() expects exactly 1 parameter, 2 given
error: 2, IntlCalendar::after(): intlcal_before/after: bad arguments
diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt
index 7ff2ff0867..bffa103eac 100644
--- a/ext/intl/tests/calendar_clear_error.phpt
+++ b/ext/intl/tests/calendar_clear_error.phpt
@@ -29,7 +29,7 @@ bool(false)
Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_clear(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index a9f164d38f..bdfe8c27cb 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -51,8 +51,8 @@ error: 2, IntlCalendar::equals(): intlcal_equals: bad arguments
bool(false)
error: 0, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, instance of stdClass given
-error: 0, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, int given
error: 0, Argument 2 passed to intlcal_equals() must be an instance of IntlCalendar, array given
-error: 0, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index f9d88d447b..d09df44452 100644
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_field_difference() expects exactly 3 parameters, 4 given in %s
Warning: intlcal_field_difference(): intlcal_field_difference: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_field_difference(1, 0, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index 9d39666f06..bb10a2642d 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -36,12 +36,12 @@ Warning: IntlCalendar::getDayOfWeekType() expects exactly 1 parameter, 0 given i
Warning: IntlCalendar::getDayOfWeekType(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
bool(false)
-Warning: intlcal_get_day_of_week_type() expects parameter 2 to be integer, string given in %s on line %d
+Warning: intlcal_get_day_of_week_type() expects parameter 2 to be int, string given in %s on line %d
Warning: intlcal_get_day_of_week_type(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_day_of_week_type(1, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index 3bae010c4a..4d623f711f 100644
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_first_day_of_week() expects exactly 1 parameter, 2 given in
Warning: intlcal_get_first_day_of_week(): intlcal_get_first_day_of_week: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_first_day_of_week(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt
index 47c62e3957..01ba795bdc 100644
--- a/ext/intl/tests/calendar_getLocale_error.phpt
+++ b/ext/intl/tests/calendar_getLocale_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_get_locale() expects exactly 2 parameters, 1 given in %s on lin
Warning: intlcal_get_locale(): intlcal_get_locale: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_locale(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index 216363bec3..b2c7e5b46c 100644
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_minimal_days_in_first_week() expects exactly 1 parameter, 2
Warning: intlcal_get_minimal_days_in_first_week(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_minimal_days_in_first_week(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index cb1ae4ea4b..270f484a36 100644
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -44,7 +44,7 @@ Warning: intlcal_get_repeated_wall_time_option() expects exactly 1 parameter, 2
Warning: intlcal_get_repeated_wall_time_option(): intlcal_get_repeated_wall_time_option: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_skipped_wall_time_option(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index 15c1a50455..5941b9ada0 100644
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_time_zone() expects exactly 1 parameter, 2 given in %s on l
Warning: intlcal_get_time_zone(): intlcal_get_time_zone: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_time_zone(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index 8c75ca5722..359b816997 100644
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -28,7 +28,7 @@ Warning: intlcal_get_time() expects exactly 1 parameter, 2 given in %s on line %
Warning: intlcal_get_time(): intlcal_get_time: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_time(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index 95499a60ac..b5f32d5768 100644
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_type() expects exactly 1 parameter, 2 given in %s on line %
Warning: intlcal_get_type(): intlcal_get_type: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_type(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index f77a60fc78..10a31a339a 100644
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_get_weekend_transition() expects exactly 2 parameters, 1 given
Warning: intlcal_get_weekend_transition(): intlcal_get_weekend_transition: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_get_weekend_transition(1, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 5d74a7d72d..999c050b9f 100644
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -98,11 +98,11 @@ bool(false)
Warning: intlcal_get_minimum(): intlcal_get_minimum: invalid field in %s on line %d
bool(false)
-error: 0, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
index 309e355623..989fb8b7cd 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
@@ -53,17 +53,17 @@ bool(false)
Warning: IntlCalendar::getActualMinimum(): intlcal_get_actual_minimum: invalid field in %s on line %d
bool(false)
-Warning: IntlCalendar::get() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlCalendar::get() expects parameter 1 to be int, string given in %s on line %d
Warning: IntlCalendar::get(): intlcal_get: bad arguments in %s on line %d
bool(false)
-Warning: IntlCalendar::getActualMaximum() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlCalendar::getActualMaximum() expects parameter 1 to be int, string given in %s on line %d
Warning: IntlCalendar::getActualMaximum(): intlcal_get_actual_maximum: bad arguments in %s on line %d
bool(false)
-Warning: IntlCalendar::getActualMinimum() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlCalendar::getActualMinimum() expects parameter 1 to be int, string given in %s on line %d
Warning: IntlCalendar::getActualMinimum(): intlcal_get_actual_minimum: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index 88b03f8cdb..f7026e0719 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -96,18 +96,18 @@ error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: invalid fiel
bool(false)
error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: invalid field
bool(false)
-error: 2, intlcal_get() expects parameter 2 to be integer, string given
+error: 2, intlcal_get() expects parameter 2 to be int, string given
error: 2, intlcal_get(): intlcal_get: bad arguments
bool(false)
-error: 2, intlcal_get_actual_maximum() expects parameter 2 to be integer, string given
+error: 2, intlcal_get_actual_maximum() expects parameter 2 to be int, string given
error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: bad arguments
bool(false)
-error: 2, intlcal_get_actual_minimum() expects parameter 2 to be integer, string given
+error: 2, intlcal_get_actual_minimum() expects parameter 2 to be int, string given
error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: bad arguments
bool(false)
-error: 0, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index 1de9e2a830..6ed1f48c3c 100644
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_in_daylight_time() expects exactly 1 parameter, 2 given in %s o
Warning: intlcal_in_daylight_time(): intlcal_in_daylight_time: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_in_daylight_time(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index 35b8fc189a..e7f8765fef 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -50,16 +50,16 @@ try {
}
--EXPECT--
-error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, int given
error: 2, IntlCalendar::isEquivalentTo() expects exactly 1 parameter, 2 given
error: 2, IntlCalendar::isEquivalentTo(): intlcal_is_equivalent_to: bad arguments
bool(false)
-error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, int given
error: 2, intlcal_is_equivalent_to() expects exactly 2 parameters, 1 given
error: 2, intlcal_is_equivalent_to(): intlcal_is_equivalent_to: bad arguments
bool(false)
-error: 0, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
+error: 0, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, int given
-error: 0, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index 8cc8e969e7..26fb95c173 100644
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_is_lenient() expects exactly 1 parameter, 2 given in %s on line
Warning: intlcal_is_lenient(): intlcal_is_lenient: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_is_lenient(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index a8efa34218..53b244879f 100644
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_is_set() expects exactly 2 parameters, 1 given in %s on line %d
Warning: intlcal_is_set(): intlcal_is_set: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_is_set(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index 417bcb4c23..a4a7ff2060 100644
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -36,7 +36,7 @@ Warning: intlcal_is_weekend() expects parameter 2 to be float, string given in %
Warning: intlcal_is_weekend(): intlcal_is_weekend: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_is_weekend(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index 2b8c303cbb..c476bfb62a 100644
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -34,7 +34,7 @@ bool(false)
Warning: intlcal_roll(): intlcal_set: too many arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_roll(1, 2, 3)
#1 {main}
diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index 466690dbee..82cc3f245d 100644
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -37,7 +37,7 @@ bool(false)
Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_first_day_of_week(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index 9619dc564c..dce7638169 100644
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in
Warning: intlcal_set_lenient(): intlcal_set_lenient: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_lenient(1, false)
#1 {main}
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index ee88f6d630..bf7584ade1 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -36,7 +36,7 @@ bool(false)
Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2)
#1 {main}
diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index 27f6215d52..24362174f2 100644
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -53,12 +53,12 @@ Warning: IntlCalendar::setRepeatedWallTimeOption() expects exactly 1 parameter,
Warning: IntlCalendar::setRepeatedWallTimeOption(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
bool(false)
-Warning: IntlCalendar::setSkippedWallTimeOption() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlCalendar::setSkippedWallTimeOption() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlCalendar::setSkippedWallTimeOption(): intlcal_set_skipped_wall_time_option: bad arguments in %s on line %d
bool(false)
-Warning: IntlCalendar::setRepeatedWallTimeOption() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlCalendar::setRepeatedWallTimeOption() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlCalendar::setRepeatedWallTimeOption(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
bool(false)
@@ -79,7 +79,7 @@ Warning: intlcal_set_repeated_wall_time_option() expects exactly 2 parameters, 1
Warning: intlcal_set_repeated_wall_time_option(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_repeated_wall_time_option(1, 1)
#1 {main}
diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index 4dee131ef7..9ed6238d34 100644
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -51,4 +51,4 @@ bool(false)
error: 2, intlcal_set_time_zone() expects exactly 2 parameters, 3 given
error: 2, intlcal_set_time_zone(): intlcal_set_time_zone: bad arguments
bool(false)
-error: 0, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt
index 00bb7eb91d..3d45933ee7 100644
--- a/ext/intl/tests/calendar_setTime_error.phpt
+++ b/ext/intl/tests/calendar_setTime_error.phpt
@@ -34,7 +34,7 @@ Warning: intlcal_set_time() expects exactly 2 parameters, 3 given in %s on line
Warning: intlcal_set_time(): intlcal_set_time: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set_time(1)
#1 {main}
diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index c232b5640a..929f7427aa 100644
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -38,7 +38,7 @@ bool(false)
Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_set(1, 2, 3)
#1 {main}
diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index 3d3ada22b9..27a74674bd 100644
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -38,7 +38,7 @@ bool(false)
Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d
string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlcal_to_date_time(3)
#1 {main}
diff --git a/ext/intl/tests/dateformat_formatObject_error.phpt b/ext/intl/tests/dateformat_formatObject_error.phpt
index 221602d135..24e21b50d8 100644
--- a/ext/intl/tests/dateformat_formatObject_error.phpt
+++ b/ext/intl/tests/dateformat_formatObject_error.phpt
@@ -36,7 +36,7 @@ var_dump(IntlDateFormatter::formatObject($cal, "YYYY", array()));
Warning: IntlDateFormatter::formatObject() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
-Warning: IntlDateFormatter::formatObject() expects parameter 1 to be object, integer given in %s on line %d
+Warning: IntlDateFormatter::formatObject() expects parameter 1 to be object, int given in %s on line %d
bool(false)
Warning: IntlDateFormatter::formatObject(): datefmt_format_object: the passed object must be an instance of either IntlCalendar or DateTime in %s on line %d
diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt
index ccc87d9703..30dedbb345 100644
--- a/ext/intl/tests/gregoriancalendar___construct_error.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt
@@ -38,4 +38,4 @@ NULL
Exception: IntlGregorianCalendar::__construct(): intlgregcal_create_instance: no variant with 4 arguments (excluding trailing NULLs) in %s on line %d
-Exception: IntlGregorianCalendar::__construct() expects parameter 6 to be integer, array given in %s on line %d
+Exception: IntlGregorianCalendar::__construct() expects parameter 6 to be int, array given in %s on line %d
diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index dd37788dd1..76c5cbc652 100644
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -27,7 +27,7 @@ Warning: intlgregcal_get_gregorian_change() expects exactly 1 parameter, 2 given
Warning: intlgregcal_get_gregorian_change(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlgregcal_get_gregorian_change(1)
#1 {main}
diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 6c4803c68c..125dc15cc1 100644
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -30,7 +30,7 @@ Warning: IntlGregorianCalendar::isLeapYear() expects exactly 1 parameter, 0 give
Warning: IntlGregorianCalendar::isLeapYear(): intlgregcal_is_leap_year: bad arguments in %s on line %d
bool(false)
-Warning: IntlGregorianCalendar::isLeapYear() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlGregorianCalendar::isLeapYear() expects parameter 1 to be int, string given in %s on line %d
Warning: IntlGregorianCalendar::isLeapYear(): intlgregcal_is_leap_year: bad arguments in %s on line %d
bool(false)
@@ -45,7 +45,7 @@ Warning: intlgregcal_is_leap_year() expects exactly 2 parameters, 1 given in %s
Warning: intlgregcal_is_leap_year(): intlgregcal_is_leap_year: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlgregcal_is_leap_year(1, 2)
#1 {main}
diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
index f45672c178..74833eb14a 100644
--- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
@@ -39,7 +39,7 @@ Warning: intlgregcal_set_gregorian_change() expects exactly 2 parameters, 1 give
Warning: intlgregcal_set_gregorian_change(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, int given in %s:%d
Stack trace:
#0 %s(%d): intlgregcal_set_gregorian_change(1, 4)
#1 {main}
diff --git a/ext/intl/tests/idn_uts46_errors.phpt b/ext/intl/tests/idn_uts46_errors.phpt
index 5de890ea67..6a99bde649 100644
--- a/ext/intl/tests/idn_uts46_errors.phpt
+++ b/ext/intl/tests/idn_uts46_errors.phpt
@@ -43,7 +43,7 @@ var_dump($foo["errors"]==IDNA_ERROR_CONTEXTJ);
=> PHP level errors
bad args:
-Warning: idn_to_ascii() expects parameter 3 to be integer, array given in %s on line %d
+Warning: idn_to_ascii() expects parameter 3 to be int, array given in %s on line %d
Warning: idn_to_ascii(): idn_to_ascii: bad arguments in %s on line %d
NULL
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
index 6dc68a7a8c..febca6f91b 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
@@ -23,7 +23,7 @@ Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects at least 1 paramete
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
bool(false)
-Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
bool(false)
@@ -36,7 +36,7 @@ Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 2 to be s
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
bool(false)
-Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 3 to be integer, string given in %s on line %d
+Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 3 to be int, string given in %s on line %d
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 4089c42e3c..bca02c4080 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -24,7 +24,7 @@ Warning: IntlTimeZone::getDisplayName() expects parameter 1 to be boolean, array
Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
bool(false)
-Warning: IntlTimeZone::getDisplayName() expects parameter 2 to be integer, array given in %s on line %d
+Warning: IntlTimeZone::getDisplayName() expects parameter 2 to be int, array given in %s on line %d
Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/timezone_getEquivalentID_error.phpt b/ext/intl/tests/timezone_getEquivalentID_error.phpt
index d1f7da0f47..f22ca4eefd 100644
--- a/ext/intl/tests/timezone_getEquivalentID_error.phpt
+++ b/ext/intl/tests/timezone_getEquivalentID_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getEquivalentID() expects exactly 2 parameters, 1 given i
Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: bad arguments in %s on line %d
bool(false)
-Warning: IntlTimeZone::getEquivalentID() expects parameter 2 to be integer, string given in %s on line %d
+Warning: IntlTimeZone::getEquivalentID() expects parameter 2 to be int, string given in %s on line %d
Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index ecc5e2bef8..f36e28494a 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -35,7 +35,7 @@ Warning: intltz_to_date_time_zone() expects exactly 1 parameter, 0 given in %s o
Warning: intltz_to_date_time_zone(): intltz_to_date_time_zone: bad arguments in %s on line %d
bool(false)
-Fatal error: Uncaught TypeError: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, int given in %s:%d
Stack trace:
#0 %s(%d): intltz_to_date_time_zone(1)
#1 {main}
diff --git a/ext/intl/tests/transliterator_create_from_rule_error.phpt b/ext/intl/tests/transliterator_create_from_rule_error.phpt
index f9125017c7..7ec6cd0a5a 100644
--- a/ext/intl/tests/transliterator_create_from_rule_error.phpt
+++ b/ext/intl/tests/transliterator_create_from_rule_error.phpt
@@ -37,7 +37,7 @@ Warning: Transliterator::createFromRules() expects at least 1 parameter, 0 given
Warning: Transliterator::createFromRules(): transliterator_create_from_rules: bad arguments in %s on line %d
transliterator_create_from_rules: bad arguments: U_ILLEGAL_ARGUMENT_ERROR
-Warning: Transliterator::createFromRules() expects parameter 2 to be integer, string given in %s on line %d
+Warning: Transliterator::createFromRules() expects parameter 2 to be int, string given in %s on line %d
Warning: Transliterator::createFromRules(): transliterator_create_from_rules: bad arguments in %s on line %d
transliterator_create_from_rules: bad arguments: U_ILLEGAL_ARGUMENT_ERROR
diff --git a/ext/ldap/tests/ldap_err2str_error.phpt b/ext/ldap/tests/ldap_err2str_error.phpt
index c60bc52185..0963ac4101 100644
--- a/ext/ldap/tests/ldap_err2str_error.phpt
+++ b/ext/ldap/tests/ldap_err2str_error.phpt
@@ -23,6 +23,6 @@ NULL
Warning: ldap_err2str() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-Warning: ldap_err2str() expects parameter 1 to be integer, string given in %s on line %d
+Warning: ldap_err2str() expects parameter 1 to be int, string given in %s on line %d
NULL
===DONE===
diff --git a/ext/libxml/tests/004.phpt b/ext/libxml/tests/004.phpt
index aa87ab7503..9d5121089d 100644
--- a/ext/libxml/tests/004.phpt
+++ b/ext/libxml/tests/004.phpt
@@ -37,7 +37,7 @@ Warning: libxml_set_streams_context() expects parameter 1 to be resource, string
NULL
bool(true)
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, integer given in %s004.php on line %d
+Warning: libxml_set_streams_context() expects parameter 1 to be resource, int given in %s004.php on line %d
NULL
bool(true)
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
index d8712e3949..66014fa8a5 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
@@ -173,32 +173,32 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
-- Iteration 16 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, object given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
@@ -211,6 +211,6 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
-- Iteration 24 --
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, resource given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt
index 3ef13513da..ccf614b8bf 100644
--- a/ext/mbstring/tests/mb_split_variation3.phpt
+++ b/ext/mbstring/tests/mb_split_variation3.phpt
@@ -285,32 +285,32 @@ array(1) {
-- Iteration 16 --
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 17 --
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 18 --
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 19 --
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 20 --
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 21 --
-Warning: mb_split() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- Iteration 22 --
@@ -327,6 +327,6 @@ array(1) {
-- Iteration 24 --
-Warning: mb_split() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, resource given in %s on line %d
bool(false)
Done
diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt
index 9907356ccd..025105ae73 100644
--- a/ext/mbstring/tests/mb_stripos_variation3.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation3.phpt
@@ -170,32 +170,32 @@ int(8)
-- Iteration 18 --
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: mb_stripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -206,6 +206,6 @@ int(8)
-- Iteration 26 --
-Warning: mb_stripos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt
index ce43080dc3..cbdeda2b38 100644
--- a/ext/mbstring/tests/mb_strpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation3.phpt
@@ -170,32 +170,32 @@ int(8)
-- Iteration 18 --
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: mb_strpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -206,6 +206,6 @@ int(8)
-- Iteration 26 --
-Warning: mb_strpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
index cc3843e102..16f92bfdfa 100644
--- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
@@ -165,32 +165,32 @@ int(8)
-- Iteration 16 --
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mb_strripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
@@ -201,7 +201,7 @@ int(8)
-- Iteration 24 --
-Warning: mb_strripos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
index 544a6a3f22..68dd834116 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
@@ -187,7 +187,7 @@ mysqli_result->unknown = ''
Constructor:
-Warning: mysqli_result::__construct() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mysqli_result::__construct() expects parameter 2 to be int, string given in %s on line %d
Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, string given in %s on line %d
done! \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt
index b30b11cd27..37b872302f 100644
--- a/ext/mysqli/tests/mysqli_field_seek.phpt
+++ b/ext/mysqli/tests/mysqli_field_seek.phpt
@@ -218,7 +218,7 @@ Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
bool(false)
bool(false)
-Warning: mysqli_field_seek() expects parameter 2 to be integer, float given in %s on line %d
+Warning: mysqli_field_seek() expects parameter 2 to be int, float given in %s on line %d
NULL
bool(true)
object(stdClass)#%d (13) {
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
index 31eb574422..826d225bae 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
@@ -118,7 +118,7 @@ if (!function_exists('mysqli_stmt_get_result'))
require_once("clean_table.inc");
?>
--EXPECTF--
-Warning: mysqli_result::data_seek() expects parameter 1 to be integer, float given in %s on line %d
+Warning: mysqli_result::data_seek() expects parameter 1 to be int, float given in %s on line %d
Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d
diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index 912c27b989..bb377a90d8 100644
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -62,13 +62,13 @@ object(OCI-Lob)#%d (1) {
}
int(0)
-Warning: OCI-Lob::write() expects parameter 2 to be integer, string given in %slob_002.php on line %d
+Warning: OCI-Lob::write() expects parameter 2 to be int, string given in %slob_002.php on line %d
NULL
int(4)
int(40000)
int(40004)
-Warning: OCI-Lob::seek() expects parameter 1 to be integer, string given in %slob_002.php on line %d
+Warning: OCI-Lob::seek() expects parameter 1 to be int, string given in %slob_002.php on line %d
NULL
bool(false)
int(40004)
diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt
index aa4c254dda..94249bef18 100644
--- a/ext/oci8/tests/lob_026.phpt
+++ b/ext/oci8/tests/lob_026.phpt
@@ -73,7 +73,7 @@ NULL
bool(true)
int(3)
-Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, integer given in %s on line %d
+Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, int given in %s on line %d
NULL
bool(true)
array(2) {
diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index 98fe3ed225..45e236178e 100644
--- a/ext/oci8/tests/privileged_connect.phpt
+++ b/ext/oci8/tests/privileged_connect.phpt
@@ -21,5 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c
Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
-Warning: oci_connect() expects parameter 5 to be integer, string given in %s on line %d
+Warning: oci_connect() expects parameter 5 to be int, string given in %s on line %d
Done
diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt
index 9581675ad2..849505b722 100644
--- a/ext/oci8/tests/privileged_connect1.phpt
+++ b/ext/oci8/tests/privileged_connect1.phpt
@@ -23,5 +23,5 @@ Warning: oci_connect(): ORA-%d: %s in %s on line %d
Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
-Warning: oci_connect() expects parameter 5 to be integer, string given in %s on line %d
+Warning: oci_connect() expects parameter 5 to be int, string given in %s on line %d
Done
diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
index 6900f13205..8f5767315a 100644
--- a/ext/odbc/tests/odbc_data_source_001.phpt
+++ b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -23,7 +23,7 @@ var_dump(odbc_data_source($conn, SQL_FETCH_FIRST));
Warning: odbc_data_source(): Invalid fetch type (0) in %s on line %d
bool(false)
-Warning: odbc_data_source() expects parameter 2 to be integer, string given in %s on line %d
+Warning: odbc_data_source() expects parameter 2 to be int, string given in %s on line %d
NULL
array(%d) {
%a
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index dfdddf88c0..cfb13876a2 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -28,11 +28,11 @@ odbc_exec($conn, NULL);
?>
--EXPECTF--
-Warning: odbc_exec() expects parameter 3 to be integer, string given in %s on line %d
+Warning: odbc_exec() expects parameter 3 to be int, string given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
-Warning: odbc_exec() expects parameter 3 to be integer, string given in %s on line %d
+Warning: odbc_exec() expects parameter 3 to be int, string given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
diff --git a/ext/opcache/tests/method_call_on_literal.phpt b/ext/opcache/tests/method_call_on_literal.phpt
index bf89caa418..1f7d9792fa 100644
--- a/ext/opcache/tests/method_call_on_literal.phpt
+++ b/ext/opcache/tests/method_call_on_literal.phpt
@@ -11,4 +11,4 @@ try {
?>
--EXPECT--
-Call to a member function foo() on integer
+Call to a member function foo() on int
diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt
index e0f52d739f..24db4a4afc 100644
--- a/ext/openssl/tests/openssl_csr_new_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_new_basic.phpt
@@ -26,10 +26,10 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions"
echo "Done\n";
?>
--EXPECTF--
-Warning: openssl_csr_new() expects parameter 1 to be array, integer given in %s on line %d
+Warning: openssl_csr_new() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: openssl_csr_new() expects parameter 1 to be array, integer given in %s on line %d
+Warning: openssl_csr_new() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: openssl_csr_new(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d
diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt
index 572bb36695..a9961c2357 100644
--- a/ext/openssl/tests/openssl_csr_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt
@@ -56,7 +56,7 @@ bool(false)
Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d
bool(false)
-Warning: openssl_csr_sign() expects parameter 4 to be integer, string given in %s on line %d
+Warning: openssl_csr_sign() expects parameter 4 to be int, string given in %s on line %d
NULL
Warning: openssl_csr_sign() expects parameter 5 to be array, string given in %s on line %d
@@ -76,7 +76,7 @@ Warning: openssl_csr_sign(): key array must be of the form array(0 => key, 1 =>
Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d
bool(false)
-Warning: openssl_csr_sign() expects parameter 4 to be integer, array given in %s on line %d
+Warning: openssl_csr_sign() expects parameter 4 to be int, array given in %s on line %d
NULL
resource(%d) of type (OpenSSL X.509)
diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt
index 4155e2bc88..a739cb60ac 100644
--- a/ext/pcre/tests/grep2.phpt
+++ b/ext/pcre/tests/grep2.phpt
@@ -24,7 +24,7 @@ var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);
Warning: preg_grep() expects at most 3 parameters, 4 given in %sgrep2.php on line 3
NULL
-Warning: preg_grep() expects parameter 2 to be array, integer given in %sgrep2.php on line 4
+Warning: preg_grep() expects parameter 2 to be array, int given in %sgrep2.php on line 4
NULL
Warning: preg_grep(): Compilation failed: quantifier does not follow a repeatable item at offset 0 in %sgrep2.php on line 5
diff --git a/ext/pcre/tests/preg_replace_callback3.phpt b/ext/pcre/tests/preg_replace_callback3.phpt
index fc3218b9e7..320fe3c77a 100644
--- a/ext/pcre/tests/preg_replace_callback3.phpt
+++ b/ext/pcre/tests/preg_replace_callback3.phpt
@@ -36,9 +36,9 @@ string(1) "3"
Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid callback in %s on line %d
string(1) "3"
-Warning: preg_replace_callback() expects parameter 4 to be integer, string given in %s on line %d
+Warning: preg_replace_callback() expects parameter 4 to be int, string given in %s on line %d
NULL
-Warning: preg_replace_callback() expects parameter 4 to be integer, array given in %s on line %d
+Warning: preg_replace_callback() expects parameter 4 to be int, array given in %s on line %d
NULL
Done
diff --git a/ext/pcre/tests/preg_replace_callback_array2.phpt b/ext/pcre/tests/preg_replace_callback_array2.phpt
index 8e70bb06e8..5908eeb278 100644
--- a/ext/pcre/tests/preg_replace_callback_array2.phpt
+++ b/ext/pcre/tests/preg_replace_callback_array2.phpt
@@ -40,19 +40,19 @@ NULL
Warning: preg_replace_callback_array() expects at least 2 parameters, 1 given in %s on line %d
NULL
-Warning: preg_replace_callback_array() expects parameter 1 to be array, integer given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: preg_replace_callback_array() expects parameter 1 to be array, integer given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: preg_replace_callback_array() expects parameter 1 to be array, integer given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: preg_replace_callback_array() expects parameter 3 to be integer, string given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: preg_replace_callback() expects parameter 4 to be integer, array given in %s on line %d
+Warning: preg_replace_callback() expects parameter 4 to be int, array given in %s on line %d
NULL
string(0) ""
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
index 72b53156a2..10ce72f8c6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -38,7 +38,7 @@ try {
if (false !== ($tmp = @$stmt->getColumnMeta(-1)))
printf("[004] Expecting false got %s\n", var_export($tmp, true));
- // Warning: PDOStatement::getColumnMeta() expects parameter 1 to be integer, array given in
+ // Warning: PDOStatement::getColumnMeta() expects parameter 1 to be int, array given in
if (false !== ($tmp = @$stmt->getColumnMeta(array())))
printf("[005] Expecting false got %s\n", var_export($tmp, true));
diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt
index 4d0887f66f..8564d4f17e 100644
--- a/ext/phar/tests/badparameters.phpt
+++ b/ext/phar/tests/badparameters.phpt
@@ -151,13 +151,13 @@ Warning: Phar::createDefaultStub() expects parameter 1 to be a valid path, array
Warning: Phar::loadPhar() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
-Warning: Phar::canCompress() expects parameter 1 to be integer, %string given in %sbadparameters.php on line %d
+Warning: Phar::canCompress() expects parameter 1 to be int, %string given in %sbadparameters.php on line %d
Exception: Phar::__construct() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
-Warning: Phar::convertToExecutable() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::convertToExecutable() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
-Warning: Phar::convertToData() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::convertToData() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
Warning: PharData::delete() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
Cannot write out phar archive, phar is read-only
@@ -177,10 +177,10 @@ Warning: Phar::setDefaultStub() expects parameter 1 to be %string, array given i
Cannot change stub: phar.readonly=1
Cannot set signature algorithm, phar is read-only
-Warning: Phar::compress() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::compress() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
Cannot compress phar archive, phar is read-only
-Warning: Phar::compressFiles() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::compressFiles() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
Phar is readonly, cannot change compression
Warning: Phar::copy() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d
diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index 7328ba510b..c269a8b34f 100644
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -59,6 +59,6 @@ string(%d) "phar://%sphar_bz2.phar/tar_004.php"
bool(true)
bool(true)
-Warning: Phar::isFileFormat() expects parameter 1 to be integer, array given in %sphar_bz2.php on line %d
+Warning: Phar::isFileFormat() expects parameter 1 to be int, array given in %sphar_bz2.php on line %d
Unknown file format specified
===DONE===
diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt
index ddc4d37393..9544a1a5e0 100644
--- a/ext/phar/tests/pharfileinfo_chmod.phpt
+++ b/ext/phar/tests/pharfileinfo_chmod.phpt
@@ -29,5 +29,5 @@ $b->chmod(0666);
--EXPECTF--
Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod
-Warning: PharFileInfo::chmod() expects parameter 1 to be integer, array given in %spharfileinfo_chmod.php on line %d
+Warning: PharFileInfo::chmod() expects parameter 1 to be int, array given in %spharfileinfo_chmod.php on line %d
===DONE=== \ No newline at end of file
diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt
index 2c3bac8863..551776194e 100644
--- a/ext/phar/tests/pharfileinfo_compression.phpt
+++ b/ext/phar/tests/pharfileinfo_compression.phpt
@@ -76,7 +76,7 @@ var_dump($b->decompress());
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
--EXPECTF--
-Warning: PharFileInfo::isCompressed() expects parameter 1 to be integer, array given in %spharfileinfo_compression.php on line 11
+Warning: PharFileInfo::isCompressed() expects parameter 1 to be int, array given in %spharfileinfo_compression.php on line 11
Unknown compression type specified
Unknown compression type specified
Cannot compress with Gzip compression, not possible with tar-based phar archives
diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt
index 7abd32b97f..235e080a6c 100644
--- a/ext/posix/tests/posix_getgrgid_variation.phpt
+++ b/ext/posix/tests/posix_getgrgid_variation.phpt
@@ -97,7 +97,7 @@ valid output
Arg value 101234567000
-Warning: posix_getgrgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, float given in %s on line %d
valid output
Arg value 1.07654321E-9
@@ -110,35 +110,35 @@ Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
Arg value Array
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
Arg value Array
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
Arg value Array
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
Arg value Array
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
Arg value Array
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Arg value
@@ -161,22 +161,22 @@ valid output
Arg value
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value string
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value string
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value
diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt
index 478164c210..bbf062d998 100644
--- a/ext/posix/tests/posix_getpgid_variation.phpt
+++ b/ext/posix/tests/posix_getpgid_variation.phpt
@@ -97,7 +97,7 @@ valid output
Arg value 101234567000
-Warning: posix_getpgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, float given in %s on line %d
valid output
Arg value 1.07654321E-9
@@ -110,35 +110,35 @@ Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
Arg value Array
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
Arg value Array
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
Arg value Array
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
Arg value Array
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
Arg value Array
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
valid output
Arg value
@@ -161,22 +161,22 @@ valid output
Arg value
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value string
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value string
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value
diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt
index fa000f5b8a..9bcddea832 100644
--- a/ext/posix/tests/posix_getpwuid_variation.phpt
+++ b/ext/posix/tests/posix_getpwuid_variation.phpt
@@ -97,7 +97,7 @@ valid output
Arg value 101234567000
-Warning: posix_getpwuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, float given in %s on line %d
valid output
Arg value 1.07654321E-9
@@ -110,35 +110,35 @@ Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
Arg value Array
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
Arg value Array
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
Arg value Array
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
Arg value Array
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
valid output
Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
Arg value Array
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
valid output
Arg value
@@ -161,22 +161,22 @@ valid output
Arg value
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value string
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value string
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
valid output
Arg value
diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt
index 9d2a259624..cb9d384153 100644
--- a/ext/posix/tests/posix_getsid_error.phpt
+++ b/ext/posix/tests/posix_getsid_error.phpt
@@ -22,7 +22,7 @@ var_dump( posix_getsid(-1) );
Warning: posix_getsid() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
-Warning: posix_getsid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getsid() expects parameter 1 to be int, array given in %s on line %d
bool(false)
bool(false)
===DONE===
diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index e7db4a6794..2fdd808f1f 100644
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -13,6 +13,6 @@ var_dump(posix_initgroups(NULL, NULL));
?>
--EXPECTF--
-Warning: posix_initgroups() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_initgroups() expects parameter 2 to be int, string given in %s on line %d
bool(false)
bool(false)
diff --git a/ext/posix/tests/posix_initgroups_basic.phpt b/ext/posix/tests/posix_initgroups_basic.phpt
index afed610335..b97f1dc167 100644
--- a/ext/posix/tests/posix_initgroups_basic.phpt
+++ b/ext/posix/tests/posix_initgroups_basic.phpt
@@ -16,7 +16,7 @@ var_dump(posix_initgroups(NULL, NULL));
--EXPECTF--
Basic test of POSIX posix_initgroups function
-Warning: posix_initgroups() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_initgroups() expects parameter 2 to be int, string given in %s on line %d
bool(false)
bool(false)
===DONE====
diff --git a/ext/posix/tests/posix_kill_variation1.phpt b/ext/posix/tests/posix_kill_variation1.phpt
index d26f11df03..1a3fa20d79 100644
--- a/ext/posix/tests/posix_kill_variation1.phpt
+++ b/ext/posix/tests/posix_kill_variation1.phpt
@@ -91,7 +91,7 @@ bool(false)
Arg value 101234567000
-Warning: posix_kill() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, float given in %s on line %d
bool(false)
Arg value 1.07654321E-9
@@ -104,35 +104,35 @@ Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
bool(false)
Arg value
@@ -155,22 +155,22 @@ bool(false)
Arg value
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
bool(false)
Arg value
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
bool(false)
Arg value string
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
bool(false)
Arg value string
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
bool(false)
Arg value
diff --git a/ext/posix/tests/posix_kill_variation2.phpt b/ext/posix/tests/posix_kill_variation2.phpt
index 399151a7ed..d3fe6e78da 100644
--- a/ext/posix/tests/posix_kill_variation2.phpt
+++ b/ext/posix/tests/posix_kill_variation2.phpt
@@ -91,7 +91,7 @@ bool(false)
Arg value 101234567000
-Warning: posix_kill() expects parameter 2 to be integer, float given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, float given in %s on line %d
bool(false)
Arg value 1.07654321E-9
@@ -104,35 +104,35 @@ Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
bool(false)
Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
Arg value Array
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
bool(false)
Arg value
@@ -155,22 +155,22 @@ bool(false)
Arg value
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
bool(false)
Arg value
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
bool(false)
Arg value string
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
bool(false)
Arg value string
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
bool(false)
Arg value
diff --git a/ext/posix/tests/posix_seteuid_error2.phpt b/ext/posix/tests/posix_seteuid_error2.phpt
index cf724c13a5..1073d8c44a 100644
--- a/ext/posix/tests/posix_seteuid_error2.phpt
+++ b/ext/posix/tests/posix_seteuid_error2.phpt
@@ -49,7 +49,7 @@ foreach ( $variation_array as $var ) {
?>
--EXPECTF--
*** Test substituting argument 1 with object values ***
-Error: 2 - posix_seteuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_seteuid() expects parameter 1 to be int, object given, %s
bool(false)
-Error: 2 - posix_seteuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_seteuid() expects parameter 1 to be int, object given, %s
bool(false)
diff --git a/ext/posix/tests/posix_seteuid_variation1.phpt b/ext/posix/tests/posix_seteuid_variation1.phpt
index 44546c47bf..d205c9917c 100644
--- a/ext/posix/tests/posix_seteuid_variation1.phpt
+++ b/ext/posix/tests/posix_seteuid_variation1.phpt
@@ -28,14 +28,14 @@ foreach ( $variation_array as $var ) {
?>
--EXPECTF--
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
diff --git a/ext/posix/tests/posix_seteuid_variation3.phpt b/ext/posix/tests/posix_seteuid_variation3.phpt
index 413c6c21bd..1d89c8b913 100644
--- a/ext/posix/tests/posix_seteuid_variation3.phpt
+++ b/ext/posix/tests/posix_seteuid_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
bool(false)
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 22
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 22
bool(false)
bool(false)
bool(false)
diff --git a/ext/posix/tests/posix_seteuid_variation4.phpt b/ext/posix/tests/posix_seteuid_variation4.phpt
index 7dc10f85c7..455c5e2533 100644
--- a/ext/posix/tests/posix_seteuid_variation4.phpt
+++ b/ext/posix/tests/posix_seteuid_variation4.phpt
@@ -38,9 +38,9 @@ foreach ( $variation_array as $var ) {
bool(false)
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_seteuid() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_seteuid() expects parameter 1 to be int, float given in %s on line %d
bool(false)
bool(false)
diff --git a/ext/posix/tests/posix_seteuid_variation6.phpt b/ext/posix/tests/posix_seteuid_variation6.phpt
index 10fd2a81b6..e514b7cd74 100644
--- a/ext/posix/tests/posix_seteuid_variation6.phpt
+++ b/ext/posix/tests/posix_seteuid_variation6.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
--EXPECTF--
*** Test substituting argument 1 with string values ***
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
diff --git a/ext/posix/tests/posix_setgid_variation1.phpt b/ext/posix/tests/posix_setgid_variation1.phpt
index 64b83ec3cd..7aadaf3657 100644
--- a/ext/posix/tests/posix_setgid_variation1.phpt
+++ b/ext/posix/tests/posix_setgid_variation1.phpt
@@ -33,15 +33,15 @@ foreach ( $variation_array as $var ) {
--EXPECTF--
*** Test substituting argument 1 with array values ***
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
bool(false)
===DONE===
diff --git a/ext/posix/tests/posix_setgid_variation3.phpt b/ext/posix/tests/posix_setgid_variation3.phpt
index 4ae575f699..92580c9373 100644
--- a/ext/posix/tests/posix_setgid_variation3.phpt
+++ b/ext/posix/tests/posix_setgid_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
bool(false)
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
bool(false)
bool(false)
bool(false)
diff --git a/ext/posix/tests/posix_setgid_variation4.phpt b/ext/posix/tests/posix_setgid_variation4.phpt
index 15d3cf56d8..4292c0dfc5 100644
--- a/ext/posix/tests/posix_setgid_variation4.phpt
+++ b/ext/posix/tests/posix_setgid_variation4.phpt
@@ -37,10 +37,10 @@ foreach ( $variation_array as $var ) {
bool(false)
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, float given in %s on line %d
bool(false)
bool(false)
===DONE===
diff --git a/ext/posix/tests/posix_setgid_variation6.phpt b/ext/posix/tests/posix_setgid_variation6.phpt
index a711d05c9a..abee8ed222 100644
--- a/ext/posix/tests/posix_setgid_variation6.phpt
+++ b/ext/posix/tests/posix_setgid_variation6.phpt
@@ -50,9 +50,9 @@ foreach ( $variation_array as $var ) {
===DONE===
--EXPECTF--
*** Test substituting argument 1 with object values ***
-Error: 2 - posix_setgid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setgid() expects parameter 1 to be int, object given, %s
bool(false)
-Error: 2 - posix_setgid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setgid() expects parameter 1 to be int, object given, %s
bool(false)
===DONE===
\ No newline at end of file
diff --git a/ext/posix/tests/posix_setgid_variation7.phpt b/ext/posix/tests/posix_setgid_variation7.phpt
index 3dc691fbb7..0c4ef502f4 100644
--- a/ext/posix/tests/posix_setgid_variation7.phpt
+++ b/ext/posix/tests/posix_setgid_variation7.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
--EXPECTF--
*** Test substituting argument 1 with string values ***
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
bool(false)
diff --git a/ext/posix/tests/posix_setuid_error2.phpt b/ext/posix/tests/posix_setuid_error2.phpt
index 5473f48897..577b9d3102 100644
--- a/ext/posix/tests/posix_setuid_error2.phpt
+++ b/ext/posix/tests/posix_setuid_error2.phpt
@@ -49,7 +49,7 @@ foreach ( $variation_array as $var ) {
?>
--EXPECTF--
*** Test substituting argument 1 with object values ***
-Error: 2 - posix_setuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setuid() expects parameter 1 to be int, object given, %s
bool(false)
-Error: 2 - posix_setuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setuid() expects parameter 1 to be int, object given, %s
bool(false)
diff --git a/ext/posix/tests/posix_setuid_variation1.phpt b/ext/posix/tests/posix_setuid_variation1.phpt
index 6748d7b9e8..44e02e0a27 100644
--- a/ext/posix/tests/posix_setuid_variation1.phpt
+++ b/ext/posix/tests/posix_setuid_variation1.phpt
@@ -28,14 +28,14 @@ foreach ( $variation_array as $var ) {
?>
--EXPECTF--
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
bool(false)
diff --git a/ext/posix/tests/posix_setuid_variation3.phpt b/ext/posix/tests/posix_setuid_variation3.phpt
index 0042b72ee3..f562002485 100644
--- a/ext/posix/tests/posix_setuid_variation3.phpt
+++ b/ext/posix/tests/posix_setuid_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
bool(false)
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 22
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 22
bool(false)
bool(false)
bool(false)
diff --git a/ext/posix/tests/posix_setuid_variation4.phpt b/ext/posix/tests/posix_setuid_variation4.phpt
index 185ef8f53c..419f675bf5 100644
--- a/ext/posix/tests/posix_setuid_variation4.phpt
+++ b/ext/posix/tests/posix_setuid_variation4.phpt
@@ -38,9 +38,9 @@ foreach ( $variation_array as $var ) {
bool(false)
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setuid() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setuid() expects parameter 1 to be int, float given in %s on line %d
bool(false)
bool(false)
diff --git a/ext/posix/tests/posix_setuid_variation6.phpt b/ext/posix/tests/posix_setuid_variation6.phpt
index 0536b8d199..e902b07ddc 100644
--- a/ext/posix/tests/posix_setuid_variation6.phpt
+++ b/ext/posix/tests/posix_setuid_variation6.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
--EXPECTF--
*** Test substituting argument 1 with string values ***
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
bool(false)
diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt
index 40fff34be8..43ef566893 100644
--- a/ext/posix/tests/posix_strerror_variation1.phpt
+++ b/ext/posix/tests/posix_strerror_variation1.phpt
@@ -90,7 +90,7 @@ string
Arg value 101234567000
-Warning: posix_strerror() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, float given in %s on line %d
boolean
Arg value 1.07654321E-9
@@ -103,35 +103,35 @@ Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
Arg value Array
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
boolean
Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
Arg value Array
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
boolean
Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
Arg value Array
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
boolean
Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
Arg value Array
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
boolean
Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
Arg value Array
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
boolean
Arg value
@@ -154,22 +154,22 @@ string
Arg value
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
boolean
Arg value
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
boolean
Arg value string
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
boolean
Arg value string
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
boolean
Arg value
diff --git a/ext/pspell/tests/002.phpt b/ext/pspell/tests/002.phpt
index 3b32b5f150..1b0dc2cdfa 100644
--- a/ext/pspell/tests/002.phpt
+++ b/ext/pspell/tests/002.phpt
@@ -36,7 +36,7 @@ bool(false)
bool(true)
bool(true)
-Warning: pspell_clear_session() expects parameter 1 to be integer, object given in %s on line %d
+Warning: pspell_clear_session() expects parameter 1 to be int, object given in %s on line %d
NULL
bool(true)
bool(false)
diff --git a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
index fd8118650f..f85e95f26f 100644
--- a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
@@ -87,13 +87,13 @@ string(21) "/** My Doc comment */"
Reflecting on class constant TestClass::PROT
__toString():
-string(42) "Constant [ protected integer PROT ] { 4 }
+string(38) "Constant [ protected int PROT ] { 4 }
"
export():
-string(42) "Constant [ protected integer PROT ] { 4 }
+string(38) "Constant [ protected int PROT ] { 4 }
"
export():
-Constant [ protected integer PROT ] { 4 }
+Constant [ protected int PROT ] { 4 }
NULL
getName():
diff --git a/ext/reflection/tests/ReflectionClassConstant_getValue.phpt b/ext/reflection/tests/ReflectionClassConstant_getValue.phpt
index e447d15357..5ff0baf6e2 100644
--- a/ext/reflection/tests/ReflectionClassConstant_getValue.phpt
+++ b/ext/reflection/tests/ReflectionClassConstant_getValue.phpt
@@ -24,13 +24,13 @@ echo new ReflectionClass('C');
?>
--EXPECTF--
int(2)
-Constant [ public integer X ] { 2 }
+Constant [ public int X ] { 2 }
Class [ <user> class C ] {
@@ %s 12-15
- Constants [2] {
- Constant [ public integer X ] { 2 }
- Constant [ public integer Y ] { 1 }
+ Constant [ public int X ] { 2 }
+ Constant [ public int Y ] { 1 }
}
- Static properties [0] {
diff --git a/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt b/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt
index 9ccc285433..30694bf536 100644
--- a/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt
@@ -13,7 +13,7 @@ Class [ <user> class A ] {
@@ %s 2-5
- Constants [2] {
- Constant [ public integer A ] { 8 }
+ Constant [ public int A ] { 8 }
Constant [ public array B ] { Array }
}
diff --git a/ext/reflection/tests/ReflectionClass_getMethods_002.phpt b/ext/reflection/tests/ReflectionClass_getMethods_002.phpt
index fae86e1642..b6a78aa318 100644
--- a/ext/reflection/tests/ReflectionClass_getMethods_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethods_002.phpt
@@ -13,6 +13,6 @@ $rc->getMethods('X', true);
?>
--EXPECTF--
Test invalid arguments:
-Warning: ReflectionClass::getMethods() expects parameter 1 to be integer, string given in %s on line 4
+Warning: ReflectionClass::getMethods() expects parameter 1 to be int, string given in %s on line 4
Warning: ReflectionClass::getMethods() expects at most 1 parameter, 2 given in %s on line 5
diff --git a/ext/reflection/tests/ReflectionClass_getProperties_002.phpt b/ext/reflection/tests/ReflectionClass_getProperties_002.phpt
index fc4d5648a4..1f7dc24d74 100644
--- a/ext/reflection/tests/ReflectionClass_getProperties_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperties_002.phpt
@@ -12,6 +12,6 @@ $rc->getProperties('X', true);
?>
--EXPECTF--
Test invalid arguments:
-Warning: ReflectionClass::getProperties() expects parameter 1 to be integer, string given in %s on line 4
+Warning: ReflectionClass::getProperties() expects parameter 1 to be int, string given in %s on line 4
Warning: ReflectionClass::getProperties() expects at most 1 parameter, 2 given in %s on line 5
diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt
index 179d63afad..fab6387e05 100644
--- a/ext/reflection/tests/ReflectionClass_toString_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -12,9 +12,9 @@ echo $rc;
Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
- Constants [3] {
- Constant [ public integer IS_IMPLICIT_ABSTRACT ] { 16 }
- Constant [ public integer IS_EXPLICIT_ABSTRACT ] { 32 }
- Constant [ public integer IS_FINAL ] { 4 }
+ Constant [ public int IS_IMPLICIT_ABSTRACT ] { 16 }
+ Constant [ public int IS_EXPLICIT_ABSTRACT ] { 32 }
+ Constant [ public int IS_FINAL ] { 4 }
}
- Static properties [0] {
diff --git a/ext/reflection/tests/ReflectionObject_constructor_error.phpt b/ext/reflection/tests/ReflectionObject_constructor_error.phpt
index baa6129edf..71a1166b13 100644
--- a/ext/reflection/tests/ReflectionObject_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_constructor_error.phpt
@@ -30,7 +30,7 @@ object(ReflectionObject)#%d (1) {
string(0) ""
}
-Warning: ReflectionObject::__construct() expects parameter 1 to be object, integer given in %s on line 7
+Warning: ReflectionObject::__construct() expects parameter 1 to be object, int given in %s on line 7
object(ReflectionObject)#%d (1) {
["name"]=>
string(0) ""
diff --git a/ext/reflection/tests/ReflectionObject_isInstance_error.phpt b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
index b0fb071e1f..f8f088057c 100644
--- a/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
@@ -22,7 +22,7 @@ NULL
Warning: ReflectionClass::isInstance() expects exactly 1 parameter, 2 given in %s on line 7
NULL
-Warning: ReflectionClass::isInstance() expects parameter 1 to be object, integer given in %s on line 8
+Warning: ReflectionClass::isInstance() expects parameter 1 to be object, int given in %s on line 8
NULL
Warning: ReflectionClass::isInstance() expects parameter 1 to be object, float given in %s on line 9
diff --git a/ext/reflection/tests/bug29986.phpt b/ext/reflection/tests/bug29986.phpt
index f5aa62a00b..7e414504aa 100644
--- a/ext/reflection/tests/bug29986.phpt
+++ b/ext/reflection/tests/bug29986.phpt
@@ -23,7 +23,7 @@ Class [ <user> class just_constants ] {
Constant [ public boolean BOOLEAN_CONSTANT ] { 1 }
Constant [ public null NULL_CONSTANT ] { }
Constant [ public string STRING_CONSTANT ] { This is a string }
- Constant [ public integer INTEGER_CONSTANT ] { 1000 }
+ Constant [ public int INTEGER_CONSTANT ] { 1000 }
Constant [ public float FLOAT_CONSTANT ] { 3.14159265 }
}
diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt
index 5a0bcefc2a..02aab25f9e 100644
--- a/ext/session/tests/session_start_error.phpt
+++ b/ext/session/tests/session_start_error.phpt
@@ -98,7 +98,7 @@ ob_end_flush();
-- Iteration 1 --
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -106,7 +106,7 @@ bool(false)
-- Iteration 2 --
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -114,7 +114,7 @@ bool(false)
-- Iteration 3 --
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -122,7 +122,7 @@ bool(false)
-- Iteration 4 --
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
index 8ed2143285..c968a33970 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
@@ -13,7 +13,7 @@ var_dump($xml->xpath("BBBB"));
--EXPECTF--
Notice: Undefined variable: x in %s on line %d
-Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d
+Warning: simplexml_load_string() expects parameter 3 to be int, float given in %s on line %d
Fatal error: Uncaught Error: Call to a member function xpath() on null in %s:%d
Stack trace:
diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt
index 2b81629d7e..31908921da 100644
--- a/ext/snmp/tests/snmp-object-error.phpt
+++ b/ext/snmp/tests/snmp-object-error.phpt
@@ -76,8 +76,8 @@ var_dump($session->max_oids);
?>
--EXPECTF--
SNMP::__construct() expects at least 3 parameters, 2 given
-SNMP::__construct() expects parameter 4 to be integer, string given
-SNMP::__construct() expects parameter 5 to be integer, string given
+SNMP::__construct() expects parameter 4 to be int, string given
+SNMP::__construct() expects parameter 5 to be int, string given
Unknown SNMP protocol version
Exception handling
@@ -100,10 +100,10 @@ Warning: SNMP::get(): Invalid or uninitialized SNMP object in %s on line %d
bool(false)
bool(true)
-Warning: SNMP::walk() expects parameter 3 to be integer, string given in %s on line %d
+Warning: SNMP::walk() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-Warning: SNMP::walk() expects parameter 4 to be integer, string given in %s on line %d
+Warning: SNMP::walk() expects parameter 4 to be int, string given in %s on line %d
bool(false)
Warning: SNMP::get() expects at least 1 parameter, 0 given in %s on line %d
diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
index a255a763f2..d9bca8a4e9 100644
--- a/ext/snmp/tests/snmp2_real_walk.phpt
+++ b/ext/snmp/tests/snmp2_real_walk.phpt
@@ -52,10 +52,10 @@ var_dump($return);
--EXPECTF--
Checking error handling
-Warning: snmp2_real_walk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmp2_real_walk() expects parameter 4 to be int, %s given in %s on line %d
bool(false)
-Warning: snmp2_real_walk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmp2_real_walk() expects parameter 5 to be int, %s given in %s on line %d
bool(false)
Checking working
Single OID
diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
index 6d03693dac..a9c1f55ba9 100644
--- a/ext/snmp/tests/snmp2_walk.phpt
+++ b/ext/snmp/tests/snmp2_walk.phpt
@@ -60,10 +60,10 @@ var_dump($return);
--EXPECTF--
Checking error handling
-Warning: snmp2_walk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmp2_walk() expects parameter 4 to be int, %s given in %s on line %d
bool(false)
-Warning: snmp2_walk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmp2_walk() expects parameter 5 to be int, %s given in %s on line %d
bool(false)
Checking working
Single OID
diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt
index 1876047d4f..f88df7d618 100644
--- a/ext/snmp/tests/snmp_get_quick_print.phpt
+++ b/ext/snmp/tests/snmp_get_quick_print.phpt
@@ -29,7 +29,7 @@ Checking error handling
Warning: snmp_get_quick_print() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-Warning: snmp_set_quick_print() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: snmp_set_quick_print() expects parameter 1 to be int, %s given in %s on line %d
bool(false)
Warning: snmp_set_quick_print() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/snmp/tests/snmp_get_valueretrieval.phpt b/ext/snmp/tests/snmp_get_valueretrieval.phpt
index 38937332b9..74202bc693 100644
--- a/ext/snmp/tests/snmp_get_valueretrieval.phpt
+++ b/ext/snmp/tests/snmp_get_valueretrieval.phpt
@@ -39,7 +39,7 @@ bool(false)
Warning: snmp_set_valueretrieval() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
-Warning: snmp_set_valueretrieval() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: snmp_set_valueretrieval() expects parameter 1 to be int, %s given in %s on line %d
bool(false)
Warning: snmp_set_valueretrieval(): Unknown SNMP value retrieval method '67' in %s on line %d
diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
index e3827ab1c7..8ded5297fd 100644
--- a/ext/snmp/tests/snmprealwalk.phpt
+++ b/ext/snmp/tests/snmprealwalk.phpt
@@ -52,10 +52,10 @@ var_dump($return);
--EXPECTF--
Checking error handling
-Warning: snmprealwalk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmprealwalk() expects parameter 4 to be int, %s given in %s on line %d
bool(false)
-Warning: snmprealwalk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmprealwalk() expects parameter 5 to be int, %s given in %s on line %d
bool(false)
Checking working
Single OID
diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
index 12544eebd6..5038e09712 100644
--- a/ext/snmp/tests/snmpwalk.phpt
+++ b/ext/snmp/tests/snmpwalk.phpt
@@ -60,10 +60,10 @@ var_dump($return);
--EXPECTF--
Checking error handling
-Warning: snmpwalk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmpwalk() expects parameter 4 to be int, %s given in %s on line %d
bool(false)
-Warning: snmpwalk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmpwalk() expects parameter 5 to be int, %s given in %s on line %d
bool(false)
Checking working
Single OID
diff --git a/ext/sockets/tests/socket_connect_error.phpt b/ext/sockets/tests/socket_connect_error.phpt
index 483763aed3..5987f502be 100644
--- a/ext/sockets/tests/socket_connect_error.phpt
+++ b/ext/sockets/tests/socket_connect_error.phpt
@@ -29,5 +29,5 @@ Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d
Warning: socket_create() expects exactly 3 parameters, 2 given in %s on line %d
-Warning: socket_create() expects parameter 1 to be integer, array given in %s on line %d
+Warning: socket_create() expects parameter 1 to be int, array given in %s on line %d
diff --git a/ext/sockets/tests/socket_create_listen-wrongparams.phpt b/ext/sockets/tests/socket_create_listen-wrongparams.phpt
index 608678aaca..4fc8ea7012 100644
--- a/ext/sockets/tests/socket_create_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_listen-wrongparams.phpt
@@ -10,9 +10,9 @@ if (!extension_loaded('sockets')) {
$sock1 = socket_create_listen(array());
$sock2 = socket_create_listen(31337, array());
--EXPECTF--
-Warning: socket_create_listen() expects parameter 1 to be integer, array given in %s on line %d
+Warning: socket_create_listen() expects parameter 1 to be int, array given in %s on line %d
-Warning: socket_create_listen() expects parameter 2 to be integer, array given in %s on line %d
+Warning: socket_create_listen() expects parameter 2 to be int, array given in %s on line %d
--CREDITS--
Till Klampaeckel, till@php.net
PHP Testfest Berlin 2009-05-09
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 70d314181b..554819ac99 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -24,7 +24,7 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
NULL
-Warning: socket_create_pair() expects parameter 1 to be integer, string given in %s on line %d
+Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
NULL
bool(true)
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 37e3338be3..856d2cdc52 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -24,7 +24,7 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
NULL
-Warning: socket_create_pair() expects parameter 1 to be integer, string given in %s on line %d
+Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
NULL
Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index 98528420fa..c33fba3cc2 100644
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -29,7 +29,7 @@ NULL
Warning: socket_export_stream() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-Warning: socket_export_stream() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: socket_export_stream() expects parameter 1 to be resource, int given in %s on line %d
NULL
Warning: socket_export_stream() expects parameter 1 to be resource, object given in %s on line %d
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index 4f06bbd719..fd4c9e8e2d 100644
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -29,7 +29,7 @@ NULL
Warning: socket_import_stream() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-Warning: socket_import_stream() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: socket_import_stream() expects parameter 1 to be resource, int given in %s on line %d
NULL
Warning: socket_import_stream() expects parameter 1 to be resource, object given in %s on line %d
diff --git a/ext/sodium/tests/sodium_error_001.phpt b/ext/sodium/tests/sodium_error_001.phpt
index 094500c495..a9801e21ce 100644
--- a/ext/sodium/tests/sodium_error_001.phpt
+++ b/ext/sodium/tests/sodium_error_001.phpt
@@ -15,7 +15,7 @@ $key = random_bytes(SODIUM_CRYPTO_SHORTHASH_KEYBYTES);
$hash = do_crypto_shorthash($m, $key);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: sodium_crypto_shorthash() expects parameter 1 to be string, integer given in %s:%d
+Fatal error: Uncaught TypeError: sodium_crypto_shorthash() expects parameter 1 to be string, int given in %s:%d
Stack trace:
#0 %s(%d): sodium_crypto_shorthash()
#1 %s(%d): do_crypto_shorthash()
diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
index f370159e3b..2446db2257 100644
--- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
@@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2);
$dll->setIteratorMode(new SplDoublyLinkedList(2));
?>
--EXPECTF--
-Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be integer, object given in %s on line %d \ No newline at end of file
+Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be int, object given in %s on line %d \ No newline at end of file
diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
index b15579edca..57832e7c30 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
@@ -13,4 +13,4 @@ try {
?>
--EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, array given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, array given
diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index 744a9cf775..c10edbddc2 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -13,4 +13,4 @@ try {
?>
--EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
index 4739d8c55d..d8daca9a33 100644
--- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
+++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
@@ -12,4 +12,4 @@ try {
?>
--EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, object given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given
diff --git a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
index 36ecf46453..3cecb8b79c 100644
--- a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
+++ b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
@@ -7,4 +7,4 @@ PHPNW Testfest 2009 - Lorna Mitchell
echo SplFixedArray::fromArray(17954);
?>
--EXPECTF--
-Warning: SplFixedArray::fromArray() expects parameter 1 to be array, integer given in %s on line %d
+Warning: SplFixedArray::fromArray() expects parameter 1 to be array, int given in %s on line %d
diff --git a/ext/spl/tests/SplFixedArray_setSize_param_array.phpt b/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
index ee155bb6da..a9e763ab83 100644
--- a/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
@@ -9,7 +9,7 @@ $fixed_array->setSize(array());
var_dump($fixed_array);
?>
--EXPECTF--
-Warning: SplFixedArray::setSize() expects parameter 1 to be integer, array given in %s on line %d
+Warning: SplFixedArray::setSize() expects parameter 1 to be int, array given in %s on line %d
object(SplFixedArray)#1 (2) {
[0]=>
NULL
diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index 25d472c30f..991031b416 100644
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
NULL
-Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, int given in %s on line %d
NULL
Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, float given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
index 9942ff3fd1..c4e4b41b9c 100644
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
Warning: SplObjectStorage::contains() expects parameter 1 to be object, string given in %s on line %d
NULL
-Warning: SplObjectStorage::contains() expects parameter 1 to be object, integer given in %s on line %d
+Warning: SplObjectStorage::contains() expects parameter 1 to be object, int given in %s on line %d
NULL
Warning: SplObjectStorage::contains() expects parameter 1 to be object, float given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
index fa75a07368..7ea5da0f68 100644
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
Warning: SplObjectStorage::detach() expects parameter 1 to be object, string given in %s on line %d
NULL
-Warning: SplObjectStorage::detach() expects parameter 1 to be object, integer given in %s on line %d
+Warning: SplObjectStorage::detach() expects parameter 1 to be object, int given in %s on line %d
NULL
Warning: SplObjectStorage::detach() expects parameter 1 to be object, float given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
index 374d3d11fd..56daa00b58 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -34,7 +34,7 @@ NULL
Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, string given in %s on line %d
NULL
-Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, integer given in %s on line %d
+Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, int given in %s on line %d
NULL
Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, float given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
index 69d35a1a22..28e1fe8fa0 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -33,7 +33,7 @@ NULL
Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
NULL
-Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, int given in %s on line %d
NULL
Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, float given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
index 2a66f1eae8..50150f0d51 100644
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
NULL
-Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, int given in %s on line %d
NULL
Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, float given in %s on line %d
diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
index fe47366987..338aa4b0b0 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
@@ -9,4 +9,4 @@ try {
}
?>
--EXPECTF--
-SplTempFileObject::__construct() expects parameter 1 to be integer, string given
+SplTempFileObject::__construct() expects parameter 1 to be int, string given
diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt
index 6a523aec66..6a2014e72b 100644
--- a/ext/spl/tests/arrayObject_asort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic1.phpt
@@ -36,7 +36,7 @@ object(ArrayObject)#%d (1) {
}
}
-Warning: asort() expects parameter 2 to be integer, string given in %sarrayObject_asort_basic1.php on line %d
+Warning: asort() expects parameter 2 to be int, string given in %sarrayObject_asort_basic1.php on line %d
bool(false)
object(ArrayObject)#%d (1) {
["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt
index 1e7aa01fe8..85e90031cf 100644
--- a/ext/spl/tests/arrayObject_ksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt
@@ -35,7 +35,7 @@ object(ArrayObject)#%d (1) {
}
}
-Warning: ksort() expects parameter 2 to be integer, string given in %sarrayObject_ksort_basic1.php on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %sarrayObject_ksort_basic1.php on line %d
bool(false)
object(ArrayObject)#2 (1) {
["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt b/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
index 06451a3677..14387998fb 100644
--- a/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
+++ b/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
@@ -9,4 +9,4 @@ $s->setMaxLineLen('string');
?>
--EXPECTF--
-Warning: SplFileObject::setMaxLineLen() expects parameter 1 to be integer, string given in %s on line %d
+Warning: SplFileObject::setMaxLineLen() expects parameter 1 to be int, string given in %s on line %d
diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt
index cc64fd01b0..7240c0abc6 100644
--- a/ext/spl/tests/fixedarray_005.phpt
+++ b/ext/spl/tests/fixedarray_005.phpt
@@ -24,7 +24,7 @@ try {
?>
===DONE===
--EXPECT--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, object given
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
===DONE===
diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt
index fe38883621..4d2624528b 100644
--- a/ext/spl/tests/fixedarray_009.phpt
+++ b/ext/spl/tests/fixedarray_009.phpt
@@ -10,4 +10,4 @@ try {
}
?>
--EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index b6f119ab1f..9468d9626c 100644
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -12,5 +12,5 @@ try {
echo "Done\n";
?>
--EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
Done
diff --git a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
index bbd283f96c..7076ad9896 100644
--- a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
@@ -26,7 +26,7 @@ $it->setPrefixPart(1, $a); // Should throw a warning as setPrefixPart expects ar
--EXPECTF--
Warning: RecursiveTreeIterator::setPrefixPart() expects exactly 2 parameters, 1 given in %s on line %d
-Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be integer, object given in %s on line %d
+Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be int, object given in %s on line %d
Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be string, object given in %s on line %d
===DONE===
diff --git a/ext/spl/tests/regexIterator_setMode_error.phpt b/ext/spl/tests/regexIterator_setMode_error.phpt
index 7062959eb1..77732b058c 100644
--- a/ext/spl/tests/regexIterator_setMode_error.phpt
+++ b/ext/spl/tests/regexIterator_setMode_error.phpt
@@ -25,4 +25,4 @@ int(0)
string(14) "Illegal mode 7"
int(0)
-Warning: RegexIterator::setMode() expects parameter 1 to be integer, string given in %s on line %d
+Warning: RegexIterator::setMode() expects parameter 1 to be int, string given in %s on line %d
diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index be0cb804c6..60de68b82a 100644
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -78,7 +78,7 @@ int(5)
int(6)
int(4)
===ERRORS===
-Error: Argument 3 passed to iterator_apply() must be of the type array or null, integer given
+Error: Argument 3 passed to iterator_apply() must be of the type array or null, int given
Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_function' not found or invalid function name
NULL
Error: iterator_apply() expects at most 3 parameters, 4 given
diff --git a/ext/spl/tests/spl_005.phpt b/ext/spl/tests/spl_005.phpt
index 219c791bbb..cb36df18cf 100644
--- a/ext/spl/tests/spl_005.phpt
+++ b/ext/spl/tests/spl_005.phpt
@@ -13,7 +13,7 @@ var_dump(spl_object_hash());
--EXPECTF--
string(32) "%s"
-Warning: spl_object_hash() expects parameter 1 to be object, integer given in %sspl_005.php on line %d
+Warning: spl_object_hash() expects parameter 1 to be object, int given in %sspl_005.php on line %d
NULL
Warning: spl_object_hash() expects exactly 1 parameter, 0 given in %sspl_005.php on line %d
diff --git a/ext/spl/tests/spl_object_id.phpt b/ext/spl/tests/spl_object_id.phpt
index fc7b74f8d9..ca13b03fee 100644
--- a/ext/spl/tests/spl_object_id.phpt
+++ b/ext/spl/tests/spl_object_id.phpt
@@ -13,7 +13,7 @@ var_dump(spl_object_id(new stdClass) === spl_object_id($a));
--EXPECTF--
int(%d)
-Warning: spl_object_id() expects parameter 1 to be object, integer given in %sspl_object_id.php on line %d
+Warning: spl_object_id() expects parameter 1 to be object, int given in %sspl_object_id.php on line %d
NULL
Warning: spl_object_id() expects exactly 1 parameter, 0 given in %sspl_object_id.php on line %d
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt
index f72493215f..667c954895 100644
--- a/ext/standard/tests/array/005.phpt
+++ b/ext/standard/tests/array/005.phpt
@@ -87,7 +87,7 @@ echo"Done";
Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index e0618ad70e..f275085de5 100644
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -501,7 +501,7 @@ NULL
Warning: next() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: key() expects parameter 1 to be array, float given in %s on line %d
@@ -510,7 +510,7 @@ NULL
Warning: key() expects parameter 1 to be array, string given in %s on line %d
NULL
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: current() expects parameter 1 to be array, float given in %s on line %d
@@ -519,7 +519,7 @@ NULL
Warning: current() expects parameter 1 to be array, string given in %s on line %d
NULL
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: next() expects parameter 1 to be array, float given in %s on line %d
@@ -528,7 +528,7 @@ NULL
Warning: next() expects parameter 1 to be array, string given in %s on line %d
NULL
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: reset() expects parameter 1 to be array, float given in %s on line %d
diff --git a/ext/standard/tests/array/array_change_key_case_errors.phpt b/ext/standard/tests/array/array_change_key_case_errors.phpt
index ec506f767d..5577b620fd 100644
--- a/ext/standard/tests/array/array_change_key_case_errors.phpt
+++ b/ext/standard/tests/array/array_change_key_case_errors.phpt
@@ -14,10 +14,10 @@ var_dump( array_change_key_case($item, $item["one"], "CASE_UPPER") ); // more th
echo "end\n";
?>
--EXPECTF--
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_change_key_case() expects at least 1 parameter, 0 given in %s on line %d
diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt
index 2a6148e251..5c2d524f9b 100644
--- a/ext/standard/tests/array/array_change_key_case_variation.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation.phpt
@@ -21,7 +21,7 @@ var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 )
echo "end\n";
?>
--EXPECTF--
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
array(4) {
["ONE"]=>
@@ -38,7 +38,7 @@ array(1) {
int(4)
}
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
array(1) {
["ONE"]=>
diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt
index cf73693965..9da0b2cb60 100644
--- a/ext/standard/tests/array/array_change_key_case_variation1.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt
index 6b2f4ef1ab..818c20e2ee 100644
--- a/ext/standard/tests/array/array_change_key_case_variation2.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt
@@ -240,32 +240,32 @@ array(3) {
-- Iteration 16 --
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_change_key_case() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt
index 0535c126ba..2182b0b957 100644
--- a/ext/standard/tests/array/array_chunk_variation1.phpt
+++ b/ext/standard/tests/array/array_chunk_variation1.phpt
@@ -83,46 +83,46 @@ echo "Done";
-- Iteration 1 --
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt
index 2a3ef6ed85..b36c194a87 100644
--- a/ext/standard/tests/array/array_chunk_variation2.phpt
+++ b/ext/standard/tests/array/array_chunk_variation2.phpt
@@ -177,57 +177,57 @@ NULL
-- Iteration 6 --
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
@@ -352,78 +352,78 @@ NULL
-- Iteration 17 --
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/array_column_error.phpt b/ext/standard/tests/array/array_column_error.phpt
index bdcbec0062..26a09aff24 100644
--- a/ext/standard/tests/array/array_column_error.phpt
+++ b/ext/standard/tests/array/array_column_error.phpt
@@ -57,7 +57,7 @@ NULL
-- Testing array_column() function with int as first parameter --
-Warning: array_column() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_column() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Testing array_column() column key parameter should be a string or an integer (testing bool) --
diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt
index f369171c7b..76877ef70d 100644
--- a/ext/standard/tests/array/array_combine_variation1.phpt
+++ b/ext/standard/tests/array/array_combine_variation1.phpt
@@ -101,19 +101,19 @@ echo "Done";
*** Testing array_combine() : Passing non-array values to $keys argument ***
-- Iteration 1 --
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt
index ed637bb438..3422bd81d1 100644
--- a/ext/standard/tests/array/array_combine_variation2.phpt
+++ b/ext/standard/tests/array/array_combine_variation2.phpt
@@ -101,19 +101,19 @@ echo "Done";
*** Testing array_combine() : Passing non-array values to $values argument ***
-- Iteration 1 --
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt
index 843e34ee59..e544c8117c 100644
--- a/ext/standard/tests/array/array_count_values_error.phpt
+++ b/ext/standard/tests/array/array_count_values_error.phpt
@@ -45,6 +45,6 @@ NULL
-- Testing array_count_values() function integer arguments --
-Warning: array_count_values() expects parameter 1 to be array, integer given in %sarray_count_values_error.php on line 26
+Warning: array_count_values() expects parameter 1 to be array, int given in %sarray_count_values_error.php on line 26
NULL
Done \ No newline at end of file
diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt
index 684949fe95..5701f79b48 100644
--- a/ext/standard/tests/array/array_fill_variation1.phpt
+++ b/ext/standard/tests/array/array_fill_variation1.phpt
@@ -125,7 +125,7 @@ array(2) {
}
-- Iteration 3 --
-Warning: array_fill() expects parameter 1 to be integer, float given in %s%eext%estandard%etests%earray%earray_fill_variation1.php on line 92
+Warning: array_fill() expects parameter 1 to be int, float given in %s%eext%estandard%etests%earray%earray_fill_variation1.php on line 92
NULL
-- Iteration 4 --
array(2) {
@@ -143,23 +143,23 @@ array(2) {
}
-- Iteration 6 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 7 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 8 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 9 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 10 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 11 --
array(2) {
@@ -205,23 +205,23 @@ array(2) {
}
-- Iteration 17 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 18 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 19 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 20 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 21 --
-Warning: array_fill() expects parameter 1 to be integer, object given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, object given in %sarray_fill_variation1.php on line %d
NULL
-- Iteration 22 --
array(2) {
@@ -239,6 +239,6 @@ array(2) {
}
-- Iteration 24 --
-Warning: array_fill() expects parameter 1 to be integer, resource given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, resource given in %sarray_fill_variation1.php on line %d
NULL
Done
diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
index 6cbec86f60..699e98b1b3 100644
--- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt
+++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
@@ -146,23 +146,23 @@ array(2) {
}
-- Iteration 6 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
array(2) {
@@ -208,23 +208,23 @@ array(2) {
}
-- Iteration 17 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: array_fill() expects parameter 1 to be integer, object given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
array(2) {
@@ -242,6 +242,6 @@ array(2) {
}
-- Iteration 24 --
-Warning: array_fill() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt
index 953615edf5..d3955fdaaa 100644
--- a/ext/standard/tests/array/array_fill_variation2.phpt
+++ b/ext/standard/tests/array/array_fill_variation2.phpt
@@ -129,23 +129,23 @@ array(0) {
}
-- Iteration 6 --
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
array(0) {
@@ -171,23 +171,23 @@ array(0) {
}
-- Iteration 17 --
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: array_fill() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
array(0) {
diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt
index c96e876e5d..41bf5e4df2 100644
--- a/ext/standard/tests/array/array_filter_variation1.phpt
+++ b/ext/standard/tests/array/array_filter_variation1.phpt
@@ -102,19 +102,19 @@ echo "Done"
*** Testing array_filter() : usage variations - unexpected values for 'input'***
-- Iteration 1 --
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt
index f03c377422..ec7937fdb2 100644
--- a/ext/standard/tests/array/array_flip_variation1.phpt
+++ b/ext/standard/tests/array/array_flip_variation1.phpt
@@ -86,19 +86,19 @@ echo "Done"
*** Testing array_flip() : usage variations - unexpected values for 'input' ***
-- Iteration 1 --
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index ef40f846ad..c61d0afab9 100644
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -258,7 +258,7 @@ bool(false)
Warning: array_key_exists() expects parameter 2 to be array, string given in %s on line %d
NULL
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
NULL
Warning: array_key_exists() expects parameter 2 to be array, null given in %s on line %d
diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt
index b58ca445c9..67630fd363 100644
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -104,22 +104,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_keys_error.phpt b/ext/standard/tests/array/array_keys_error.phpt
index 685547f0ec..46a989b839 100644
--- a/ext/standard/tests/array/array_keys_error.phpt
+++ b/ext/standard/tests/array/array_keys_error.phpt
@@ -15,7 +15,7 @@ echo "Done\n";
?>
--EXPECTF--
*** Testing error conditions ***
-Warning: array_keys() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_keys() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_keys() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt
index 8038579186..2735734eec 100644
--- a/ext/standard/tests/array/array_pad_variation1.phpt
+++ b/ext/standard/tests/array/array_pad_variation1.phpt
@@ -101,31 +101,31 @@ echo "Done";
*** Testing array_pad() : passing non array values to $input argument ***
-- Iteration 1 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt
index 130255caa9..69de77ee97 100644
--- a/ext/standard/tests/array/array_pad_variation2.phpt
+++ b/ext/standard/tests/array/array_pad_variation2.phpt
@@ -161,23 +161,23 @@ array(2) {
}
-- Iteration 7 --
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
array(2) {
@@ -223,23 +223,23 @@ array(2) {
}
-- Iteration 18 --
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: array_pad() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 23 --
array(2) {
diff --git a/ext/standard/tests/array/array_pop_errors.phpt b/ext/standard/tests/array/array_pop_errors.phpt
index d6c86c3794..fd6147731c 100644
--- a/ext/standard/tests/array/array_pop_errors.phpt
+++ b/ext/standard/tests/array/array_pop_errors.phpt
@@ -51,7 +51,7 @@ echo"\nDone";
Warning: array_pop() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-Warning: array_pop() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pop() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_pop() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt
index 5031000192..f68e020d5d 100644
--- a/ext/standard/tests/array/array_product_variation5.phpt
+++ b/ext/standard/tests/array/array_product_variation5.phpt
@@ -98,22 +98,22 @@ foreach($inputs as $key =>$value) {
--int 0--
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
NULL
--int 1--
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
NULL
--int 12345--
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
NULL
--int -12345--
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
NULL
--float 10.5--
diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
index cea77f4c3c..4d8a55e329 100644
--- a/ext/standard/tests/array/array_push.phpt
+++ b/ext/standard/tests/array/array_push.phpt
@@ -75,7 +75,7 @@ echo"\nDone";
Warning: array_push() expects at least 2 parameters, 0 given in %s on line %d
NULL
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_push() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt
index 94b9ec8811..5e41a82bd7 100644
--- a/ext/standard/tests/array/array_push_variation1.phpt
+++ b/ext/standard/tests/array/array_push_variation1.phpt
@@ -102,22 +102,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt
index c158b0f74b..678892b6e0 100644
--- a/ext/standard/tests/array/array_rand.phpt
+++ b/ext/standard/tests/array/array_rand.phpt
@@ -25,7 +25,7 @@ NULL
Warning: array_rand(): Array is empty in %s on line %d
NULL
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt
index 636c489402..590be63d91 100644
--- a/ext/standard/tests/array/array_rand_variation1.phpt
+++ b/ext/standard/tests/array/array_rand_variation1.phpt
@@ -101,22 +101,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt
index 96abce5b51..44967ffd8c 100644
--- a/ext/standard/tests/array/array_rand_variation2.phpt
+++ b/ext/standard/tests/array/array_rand_variation2.phpt
@@ -181,27 +181,27 @@ NULL
-- Iteration 16 --
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 21 --
diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt
index c528387603..2765c64190 100644
--- a/ext/standard/tests/array/array_reverse_variation1.phpt
+++ b/ext/standard/tests/array/array_reverse_variation1.phpt
@@ -99,43 +99,43 @@ echo "Done";
*** Testing array_reverse() : usage variations - unexpected values for 'array' argument ***
-- Iteration 1 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt
index 26377d218f..81dd55db62 100644
--- a/ext/standard/tests/array/array_search1.phpt
+++ b/ext/standard/tests/array/array_search1.phpt
@@ -22,7 +22,7 @@ echo "Done\n";
Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
NULL
-Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_search() expects parameter 2 to be array, int given in %s on line %d
NULL
int(1)
bool(false)
diff --git a/ext/standard/tests/array/array_search_errors.phpt b/ext/standard/tests/array/array_search_errors.phpt
index 0127f62cbc..90502b2f53 100644
--- a/ext/standard/tests/array/array_search_errors.phpt
+++ b/ext/standard/tests/array/array_search_errors.phpt
@@ -39,6 +39,6 @@ NULL
Warning: array_search() expects parameter 2 to be array, string given in %s on line %d
NULL
-Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_search() expects parameter 2 to be array, int given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt
index 4c60a45fdf..ddf1e122dc 100644
--- a/ext/standard/tests/array/array_shift_variation1.phpt
+++ b/ext/standard/tests/array/array_shift_variation1.phpt
@@ -98,22 +98,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt
index b17fbce66f..59d804350b 100644
--- a/ext/standard/tests/array/array_slice.phpt
+++ b/ext/standard/tests/array/array_slice.phpt
@@ -103,7 +103,7 @@ Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d
*** Output for scalar Argument ***
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
*** Output for string Argument ***
diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt
index de6ebe1d45..db47feb9ff 100644
--- a/ext/standard/tests/array/array_slice_variation11.phpt
+++ b/ext/standard/tests/array/array_slice_variation11.phpt
@@ -103,22 +103,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt
index 792a1d732c..1d3be8127d 100644
--- a/ext/standard/tests/array/array_slice_variation2.phpt
+++ b/ext/standard/tests/array/array_slice_variation2.phpt
@@ -153,7 +153,7 @@ array(4) {
-- Iteration 7 --
-Warning: array_slice() expects parameter 2 to be integer, float given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 8 --
@@ -250,32 +250,32 @@ array(4) {
-- Iteration 16 --
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: array_slice() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 19 --
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt
index 0d4e8da421..bdcd9913cf 100644
--- a/ext/standard/tests/array/array_splice_errors.phpt
+++ b/ext/standard/tests/array/array_splice_errors.phpt
@@ -33,7 +33,7 @@ NULL
Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
NULL
-Warning: array_splice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_splice() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_splice() expects parameter 1 to be array, object given in %s on line %d
diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt
index afe24a92e9..fa0c244511 100644
--- a/ext/standard/tests/array/array_sum_variation1.phpt
+++ b/ext/standard/tests/array/array_sum_variation1.phpt
@@ -86,19 +86,19 @@ echo "Done"
*** Testing array_sum() : unexpected values for 'input' ***
-- Iteration 1 --
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt
index bac29276cc..7219051413 100644
--- a/ext/standard/tests/array/array_unique_variation1.phpt
+++ b/ext/standard/tests/array/array_unique_variation1.phpt
@@ -98,19 +98,19 @@ echo "Done";
*** Testing array_unique() : Passing non array values to $input argument ***
-- Iteration 1 --
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt
index 67e572df60..440fa82648 100644
--- a/ext/standard/tests/array/array_unshift_variation1.phpt
+++ b/ext/standard/tests/array/array_unshift_variation1.phpt
@@ -119,38 +119,38 @@ echo "Done";
*** Testing array_unshift() : unexpected values for $array argument ***
-- Iteration 1 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(0)
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(0)
-- Iteration 2 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(1)
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(1)
-- Iteration 3 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(12345)
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(12345)
-- Iteration 4 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(-2345)
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
NULL
int(-2345)
diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt
index c8133dde35..82e5e04956 100644
--- a/ext/standard/tests/array/array_values_errors.phpt
+++ b/ext/standard/tests/array/array_values_errors.phpt
@@ -28,7 +28,7 @@ NULL
Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
NULL
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_values() expects parameter 1 to be array, object given in %s on line %d
diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt
index 516beec6f6..3ccdb5105a 100644
--- a/ext/standard/tests/array/array_values_variation1.phpt
+++ b/ext/standard/tests/array/array_values_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
-- Iteration 1 --
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 35ef02e15e..d3ef3750b0 100644
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -34,7 +34,7 @@ echo "Done\n";
Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index 65939d5eec..07f09c5263 100644
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -34,7 +34,7 @@ echo "Done\n";
Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
index 9ed6792598..25f60312eb 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
@@ -95,31 +95,31 @@ echo "Done"
*** Testing array_walk_recursive() : unexpected values for 'input' argument ***
-- Iteration 1 --
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt
index a45ce4da03..ad4ea26b24 100644
--- a/ext/standard/tests/array/array_walk_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_variation1.phpt
@@ -95,31 +95,31 @@ echo "Done"
*** Testing array_walk() : unexpected values for 'input' argument ***
-- Iteration 1 --
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index acf39e75e6..f5b3b7d10e 100644
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -99,55 +99,55 @@ echo "Done";
-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
-- Iteration 1 --
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 2 --
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 3 --
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 4 --
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index 1db1efe25d..b716b65793 100644
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -211,7 +211,7 @@ array(3) {
}
-- Iteration 13 --
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -223,7 +223,7 @@ array(3) {
}
-- Iteration 14 --
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -235,7 +235,7 @@ array(3) {
}
-- Iteration 15 --
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -247,7 +247,7 @@ array(3) {
}
-- Iteration 16 --
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -259,7 +259,7 @@ array(3) {
}
-- Iteration 17 --
-Warning: arsort() expects parameter 2 to be integer, object given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, object given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -271,7 +271,7 @@ array(3) {
}
-- Iteration 18 --
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -283,7 +283,7 @@ array(3) {
}
-- Iteration 19 --
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
@@ -295,7 +295,7 @@ array(3) {
}
-- Iteration 20 --
-Warning: arsort() expects parameter 2 to be integer, resource given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, resource given in %sarsort_variation2.php on line %d
bool(false)
array(3) {
[1]=>
diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 1713f12919..149d6c9181 100644
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -99,55 +99,55 @@ echo "Done";
-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
-- Iteration 1 --
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index ce2247f894..f58663cdaa 100644
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -211,7 +211,7 @@ array(3) {
}
-- Iteration 13 --
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -223,7 +223,7 @@ array(3) {
}
-- Iteration 14 --
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -235,7 +235,7 @@ array(3) {
}
-- Iteration 15 --
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -247,7 +247,7 @@ array(3) {
}
-- Iteration 16 --
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -259,7 +259,7 @@ array(3) {
}
-- Iteration 17 --
-Warning: asort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: asort() expects parameter 2 to be int, object given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -271,7 +271,7 @@ array(3) {
}
-- Iteration 18 --
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -283,7 +283,7 @@ array(3) {
}
-- Iteration 19 --
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[1]=>
@@ -295,7 +295,7 @@ array(3) {
}
-- Iteration 20 --
-Warning: asort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: asort() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
array(3) {
[1]=>
diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index dcef3bd47b..edec9fbe3f 100644
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -239,13 +239,13 @@ NULL
Warning: Use of undefined constant ABCD - assumed 'ABCD' (this will throw an Error in a future version of PHP) in %s on line %d
-Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: count() expects parameter 2 to be int, %s given in %s on line %d
NULL
-Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: count() expects parameter 2 to be int, %s given in %s on line %d
NULL
-Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: count() expects parameter 2 to be int, %s given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt
index b3d583866c..86a2b0108f 100644
--- a/ext/standard/tests/array/count_variation2.phpt
+++ b/ext/standard/tests/array/count_variation2.phpt
@@ -148,32 +148,32 @@ int(3)
-- Iteration 16 --
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: count() expects parameter 2 to be integer, object given in %s on line %d
+Warning: count() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
@@ -184,6 +184,6 @@ int(3)
-- Iteration 24 --
-Warning: count() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: count() expects parameter 2 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt
index 580f6dddc0..c90861170e 100644
--- a/ext/standard/tests/array/current_variation1.phpt
+++ b/ext/standard/tests/array/current_variation1.phpt
@@ -99,22 +99,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt
index a99f90beb8..3dfe1e821e 100644
--- a/ext/standard/tests/array/end.phpt
+++ b/ext/standard/tests/array/end.phpt
@@ -228,7 +228,7 @@ NULL
Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: end() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt
index 23d410ee1b..fbda85ea01 100644
--- a/ext/standard/tests/array/end_64bit.phpt
+++ b/ext/standard/tests/array/end_64bit.phpt
@@ -229,7 +229,7 @@ NULL
Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: end() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt
index c5704faaf5..5e2179c7bf 100644
--- a/ext/standard/tests/array/end_variation1.phpt
+++ b/ext/standard/tests/array/end_variation1.phpt
@@ -99,22 +99,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt
index 96cad9d262..d7e5fd7ac5 100644
--- a/ext/standard/tests/array/extract_error.phpt
+++ b/ext/standard/tests/array/extract_error.phpt
@@ -45,7 +45,7 @@ NULL
Warning: extract(): Invalid extract type in %s on line %d
NULL
-Warning: extract() expects parameter 1 to be array, integer given in %s on line %d
+Warning: extract() expects parameter 1 to be array, int given in %s on line %d
NULL
Warning: extract() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/standard/tests/array/in_array_errors.phpt b/ext/standard/tests/array/in_array_errors.phpt
index 13a6cdb4cc..193b976e94 100644
--- a/ext/standard/tests/array/in_array_errors.phpt
+++ b/ext/standard/tests/array/in_array_errors.phpt
@@ -40,6 +40,6 @@ NULL
Warning: in_array() expects parameter 2 to be array, string given in %s on line %d
NULL
-Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d
+Warning: in_array() expects parameter 2 to be array, int given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt
index 42565ba8e4..cda0f67353 100644
--- a/ext/standard/tests/array/key_variation1.phpt
+++ b/ext/standard/tests/array/key_variation1.phpt
@@ -99,22 +99,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index 7275a22c8b..81807dc5ae 100644
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -97,55 +97,55 @@ echo "Done";
-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
-- Iteration 1 --
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 1f0b331ce8..fc113ff30a 100644
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -210,7 +210,7 @@ array(3) {
}
-- Iteration 13 --
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -222,7 +222,7 @@ array(3) {
}
-- Iteration 14 --
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -234,7 +234,7 @@ array(3) {
}
-- Iteration 15 --
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -246,7 +246,7 @@ array(3) {
}
-- Iteration 16 --
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -258,7 +258,7 @@ array(3) {
}
-- Iteration 17 --
-Warning: krsort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, object given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -270,7 +270,7 @@ array(3) {
}
-- Iteration 18 --
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -282,7 +282,7 @@ array(3) {
}
-- Iteration 19 --
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -294,7 +294,7 @@ array(3) {
}
-- Iteration 20 --
-Warning: krsort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
array(3) {
[10]=>
diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index a22954db78..ab70d8e346 100644
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -97,55 +97,55 @@ echo "Done";
-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
-- Iteration 1 --
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index 830181d993..fb1371a985 100644
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -210,7 +210,7 @@ array(3) {
}
-- Iteration 13 --
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -222,7 +222,7 @@ array(3) {
}
-- Iteration 14 --
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -234,7 +234,7 @@ array(3) {
}
-- Iteration 15 --
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -246,7 +246,7 @@ array(3) {
}
-- Iteration 16 --
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -258,7 +258,7 @@ array(3) {
}
-- Iteration 17 --
-Warning: ksort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, object given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -270,7 +270,7 @@ array(3) {
}
-- Iteration 18 --
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -282,7 +282,7 @@ array(3) {
}
-- Iteration 19 --
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[10]=>
@@ -294,7 +294,7 @@ array(3) {
}
-- Iteration 20 --
-Warning: ksort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
array(3) {
[10]=>
diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt
index cd4938b695..df84857dc1 100644
--- a/ext/standard/tests/array/natcasesort_variation1.phpt
+++ b/ext/standard/tests/array/natcasesort_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
-- Iteration 1 --
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt
index e8a2530e42..d4ca4d71ce 100644
--- a/ext/standard/tests/array/next_variation1.phpt
+++ b/ext/standard/tests/array/next_variation1.phpt
@@ -98,22 +98,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt
index aacb57d9c6..b5b1bfe875 100644
--- a/ext/standard/tests/array/prev_variation1.phpt
+++ b/ext/standard/tests/array/prev_variation1.phpt
@@ -98,22 +98,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt
index d4b3212ef2..73ab993424 100644
--- a/ext/standard/tests/array/reset_variation1.phpt
+++ b/ext/standard/tests/array/reset_variation1.phpt
@@ -98,22 +98,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt
index 86d1481860..c70f85786a 100644
--- a/ext/standard/tests/array/rsort_variation1.phpt
+++ b/ext/standard/tests/array/rsort_variation1.phpt
@@ -106,70 +106,70 @@ echo "Done";
-- Iteration 1 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 2 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 3 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 4 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 5 --
Flag = default:
diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt
index d91b09c1ca..8b4a5074e4 100644
--- a/ext/standard/tests/array/rsort_variation2.phpt
+++ b/ext/standard/tests/array/rsort_variation2.phpt
@@ -337,7 +337,7 @@ array(5) {
-- Iteration 16 --
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(5) {
[0]=>
@@ -354,7 +354,7 @@ array(5) {
-- Iteration 17 --
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(5) {
[0]=>
@@ -371,7 +371,7 @@ array(5) {
-- Iteration 18 --
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(5) {
[0]=>
@@ -388,7 +388,7 @@ array(5) {
-- Iteration 19 --
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(5) {
[0]=>
@@ -405,7 +405,7 @@ array(5) {
-- Iteration 20 --
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(5) {
[0]=>
@@ -422,7 +422,7 @@ array(5) {
-- Iteration 21 --
-Warning: rsort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, object given in %s on line %d
bool(false)
array(5) {
[0]=>
@@ -469,7 +469,7 @@ array(5) {
-- Iteration 24 --
-Warning: rsort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
array(5) {
[0]=>
diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt
index 6ecbd387fe..cf316ed7bb 100644
--- a/ext/standard/tests/array/shuffle_variation1.phpt
+++ b/ext/standard/tests/array/shuffle_variation1.phpt
@@ -98,22 +98,22 @@ echo "Done";
-- Iteration 1 --
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt
index 675017fd1f..d608dbbe1b 100644
--- a/ext/standard/tests/array/sizeof_variation5.phpt
+++ b/ext/standard/tests/array/sizeof_variation5.phpt
@@ -105,28 +105,28 @@ int(6)
int(6)
-- Iteration 16 --
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
int(6)
-- Iteration 21 --
-Warning: sizeof() expects parameter 2 to be integer, object given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 22 --
-Warning: sizeof() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index c9d0958da3..f3ec8781a1 100644
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -98,55 +98,55 @@ echo "Done";
-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
-- Iteration 1 --
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 48ffa1975a..3ee1784edc 100644
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -214,7 +214,7 @@ array(3) {
}
-- Iteration 13 --
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -226,7 +226,7 @@ array(3) {
}
-- Iteration 14 --
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -238,7 +238,7 @@ array(3) {
}
-- Iteration 15 --
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -250,7 +250,7 @@ array(3) {
}
-- Iteration 16 --
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -262,7 +262,7 @@ array(3) {
}
-- Iteration 17 --
-Warning: sort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: sort() expects parameter 2 to be int, object given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -274,7 +274,7 @@ array(3) {
}
-- Iteration 18 --
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -286,7 +286,7 @@ array(3) {
}
-- Iteration 19 --
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
bool(false)
array(3) {
[0]=>
@@ -298,7 +298,7 @@ array(3) {
}
-- Iteration 20 --
-Warning: sort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: sort() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
array(3) {
[0]=>
diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt
index ce20666c96..ee7e67629e 100644
--- a/ext/standard/tests/array/uasort_variation1.phpt
+++ b/ext/standard/tests/array/uasort_variation1.phpt
@@ -99,19 +99,19 @@ echo "Done"
*** Testing uasort() : unexpected values for 'array_arg' ***
-- Iteration 1 --
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt
index fdb85c2efb..1708bf096f 100644
--- a/ext/standard/tests/array/uksort_variation1.phpt
+++ b/ext/standard/tests/array/uksort_variation1.phpt
@@ -99,22 +99,22 @@ foreach($inputs as $key =>$value) {
--int 0--
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
NULL
--int 1--
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
NULL
--int 12345--
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
NULL
--int -12345--
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
NULL
--float 10.5--
diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt
index d793089410..52d7abcf52 100644
--- a/ext/standard/tests/array/usort_variation1.phpt
+++ b/ext/standard/tests/array/usort_variation1.phpt
@@ -113,22 +113,22 @@ fclose($fp);
-- Iteration 1 --
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 9364a3e0a5..a057ee4380 100644
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -40,7 +40,7 @@ Warning: assert() expects at most 2 parameters, 3 given in %s on line %d
Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
-Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d
+Warning: assert_options() expects parameter 1 to be int, string given in %s on line %d
Warning: assert(): assert(0) failed in %s on line %d
diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt
index 6d7248c8ec..ae59afb40b 100644
--- a/ext/standard/tests/assert/assert_error1.phpt
+++ b/ext/standard/tests/assert/assert_error1.phpt
@@ -37,7 +37,7 @@ var_dump($rc = assert('aa=sd+as+safsafasfaçsafçsafç'));
Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
NULL
-Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d
+Warning: assert_options() expects parameter 1 to be int, string given in %s on line %d
NULL
Warning: assert() expects at most 2 parameters, 3 given in %s on line %d
diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt
index 3987968e90..ea12df562c 100644
--- a/ext/standard/tests/class_object/get_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_001.phpt
@@ -3,9 +3,9 @@ Test get_class() function : usage variations - passing unexpected types.
--FILE--
<?php
/* Prototype : proto string get_class([object object])
- * Description: Retrieves the class name
+ * Description: Retrieves the class name
* Source code: Zend/zend_builtin_functions.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing get_class() : usage variations ***\n";
@@ -82,22 +82,22 @@ Notice: Undefined variable: unset_var in %sget_class_variation_001.php on line 6
Arg value: 0 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: 1 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: 12345 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: -2345 (type: integer)
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: 10.5 (type: double)
diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
index 6121d0d979..98b5deca1a 100644
--- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
@@ -80,22 +80,22 @@ Notice: Undefined variable: unset_var in %s on line 59
Arg value 0
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
NULL
Arg value 1
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
NULL
Arg value 12345
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
NULL
Arg value -2345
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt
index bf8dbbff9c..7885a01f54 100644
--- a/ext/standard/tests/dir/closedir_variation1.phpt
+++ b/ext/standard/tests/dir/closedir_variation1.phpt
@@ -92,22 +92,22 @@ foreach($inputs as $input) {
-- Iteration 1 --
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
index a2d482f43e..7b6dbde9d8 100644
--- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
@@ -116,19 +116,19 @@ rmdir($directory);
*** Testing dir() : unexpected values for $context argument ***
-- Iteration 1 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt
index 24f429f187..609f0691cf 100644
--- a/ext/standard/tests/dir/dir_variation2.phpt
+++ b/ext/standard/tests/dir/dir_variation2.phpt
@@ -110,19 +110,19 @@ rmdir($directory);
*** Testing dir() : unexpected values for $context argument ***
-- Iteration 1 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
index 3d54638e0d..5e5201782a 100644
--- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
@@ -120,22 +120,22 @@ rmdir($path);
-- Iteration 1 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt
index 7728aa3757..80b90d5ecb 100644
--- a/ext/standard/tests/dir/opendir_variation2.phpt
+++ b/ext/standard/tests/dir/opendir_variation2.phpt
@@ -114,22 +114,22 @@ rmdir($path);
-- Iteration 1 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt
index 2815e8d26f..d2f138649e 100644
--- a/ext/standard/tests/dir/readdir_variation1.phpt
+++ b/ext/standard/tests/dir/readdir_variation1.phpt
@@ -90,22 +90,22 @@ foreach($inputs as $input) {
-- Iteration 1 --
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt
index b4f52bbab1..e7e3d7d7b1 100644
--- a/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation1.phpt
@@ -91,22 +91,22 @@ foreach($inputs as $input) {
-- Iteration 1 --
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt
index 9e9df97802..7ee58ad450 100644
--- a/ext/standard/tests/dir/scandir_variation2-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt
@@ -229,37 +229,37 @@ array(2) {
-- Iteration 16 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 19 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 23 --
@@ -280,6 +280,6 @@ array(2) {
-- Iteration 25 --
-Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d
NULL
===DONE===
diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt
index bed9512e77..a3ee88a3be 100644
--- a/ext/standard/tests/dir/scandir_variation2.phpt
+++ b/ext/standard/tests/dir/scandir_variation2.phpt
@@ -229,37 +229,37 @@ array(2) {
-- Iteration 16 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 19 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 23 --
@@ -280,6 +280,6 @@ array(2) {
-- Iteration 25 --
-Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d
NULL
===DONE===
diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
index c2b2ed5a17..4ad753c6b2 100644
--- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
@@ -114,22 +114,22 @@ rmdir($dir);
-- Iteration 1 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt
index 5be4466bfc..74f84cd90c 100644
--- a/ext/standard/tests/dir/scandir_variation3.phpt
+++ b/ext/standard/tests/dir/scandir_variation3.phpt
@@ -108,22 +108,22 @@ rmdir($dir);
-- Iteration 1 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 2 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 4 --
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt
index 7c5d2c838b..f40932645b 100644
--- a/ext/standard/tests/file/006_variation2.phpt
+++ b/ext/standard/tests/file/006_variation2.phpt
@@ -149,38 +149,38 @@ bool(true)
43567
-- Iteration 12 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
-- Iteration 13 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
-- Iteration 14 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
-- Iteration 15 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
*** Done ***
diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index 80cc657d5d..b8b8fd5cbf 100644
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -118,10 +118,10 @@ bool(false)
Warning: fopen(10): failed to open stream: No such file or directory in %s on line %d
bool(false)
-Warning: fclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: feof() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: feof() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt
index 1fa5ad53ff..d5a691fa37 100644
--- a/ext/standard/tests/file/chmod_variation4.phpt
+++ b/ext/standard/tests/file/chmod_variation4.phpt
@@ -129,19 +129,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -163,35 +163,35 @@ bool(true)
bool(true)
--empty string DQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt
index a334d8fea1..dadbdccf5a 100644
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -67,7 +67,7 @@ Warning: fflush() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fflush() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fflush() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgetc_error.phpt b/ext/standard/tests/file/fgetc_error.phpt
index 6b2f49e38c..19615269cc 100644
--- a/ext/standard/tests/file/fgetc_error.phpt
+++ b/ext/standard/tests/file/fgetc_error.phpt
@@ -52,7 +52,7 @@ Warning: fgetc() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fgetc() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetc() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgetcsv_error.phpt b/ext/standard/tests/file/fgetcsv_error.phpt
index daaa733c9d..ad04c72c3e 100644
--- a/ext/standard/tests/file/fgetcsv_error.phpt
+++ b/ext/standard/tests/file/fgetcsv_error.phpt
@@ -60,10 +60,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, string given in %s on lin
NULL
-- Iteration 2 --
-Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d
NULL
-Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index 5a62252b78..c5f0aabc28 100644
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -80,7 +80,7 @@ Warning: fgets() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fgets() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgets() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index 2640d27900..cf0afb2e09 100644
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -79,7 +79,7 @@ Warning: fgetss() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fgetss() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetss() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt
index 31189672d3..1e7d51237a 100644
--- a/ext/standard/tests/file/file_error.phpt
+++ b/ext/standard/tests/file/file_error.phpt
@@ -36,7 +36,7 @@ NULL
Warning: file() expects at most 3 parameters, 4 given in %s on line %d
NULL
-Warning: file() expects parameter 2 to be integer, string given in %s on line %d
+Warning: file() expects parameter 2 to be int, string given in %s on line %d
NULL
array(0) {
}
diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt
index ecceb28093..6a6f5317dc 100644
--- a/ext/standard/tests/file/file_get_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -131,19 +131,19 @@ fclose($fileRes);
*** Testing file_get_contents() : usage variation ***
--int 0--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 1--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
index 26ba22a47e..e4d610c035 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
@@ -152,30 +152,30 @@ Error: 2 - file_get_contents(): Failed to seek to position -22 in the stream, %s
bool(false)
--float 12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d)
NULL
--float -12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d)
NULL
--float .5--
string(%d) "contents read"
--empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -197,35 +197,35 @@ string(12) "ontents read"
string(%d) "contents read"
--empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
index 66f51895a9..8e23c65791 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -162,19 +162,19 @@ bool(false)
string(%d) "contents read"
--empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -196,35 +196,35 @@ string(12) "ontents read"
string(%d) "contents read"
--empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt
index 25a122e1bc..f253957709 100644
--- a/ext/standard/tests/file/file_get_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation6.phpt
@@ -142,19 +142,19 @@ bool(false)
string(%d) ""
--empty array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -176,35 +176,35 @@ string(%d) "c"
string(%d) ""
--empty string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt
index bf454ca08c..fc7a021c50 100644
--- a/ext/standard/tests/file/file_put_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -130,19 +130,19 @@ fclose($fileRes);
*** Testing file_put_contents() : usage variation ***
--int 0--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--int 1--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt
index f61c3c257e..250621ef73 100644
--- a/ext/standard/tests/file/file_variation3.phpt
+++ b/ext/standard/tests/file/file_variation3.phpt
@@ -151,19 +151,19 @@ array(3) {
}
--empty array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -239,35 +239,35 @@ array(3) {
}
--empty string DQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt
index 04ddc91600..cc9ac156d5 100644
--- a/ext/standard/tests/file/file_variation4.phpt
+++ b/ext/standard/tests/file/file_variation4.phpt
@@ -129,19 +129,19 @@ unlink($filename);
*** Testing file() : usage variation ***
--int 0--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 1--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 81e42f3fe6..216e70c246 100644
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -75,23 +75,23 @@ Warning: flock(): Illegal operation argument in %s on line %d
bool(false)
--- Iteration 4 ---
-Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
+Warning: flock() expects parameter 2 to be int, array given in %s on line %d
NULL
--- Iteration 5 ---
-Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
+Warning: flock() expects parameter 2 to be int, array given in %s on line %d
NULL
--- Iteration 6 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
NULL
--- Iteration 7 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
NULL
--- Iteration 8 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
NULL
Warning: flock(): supplied resource is not a valid stream resource in %s on line %d
diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt
index 4bd5b2a446..34a2be3811 100644
--- a/ext/standard/tests/file/fopen_variation4.phpt
+++ b/ext/standard/tests/file/fopen_variation4.phpt
@@ -130,19 +130,19 @@ fclose($fileresource);
*** Testing fopen() : usage variation ***
--int 0--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt
index f952cdbc8c..c1a5a37b27 100644
--- a/ext/standard/tests/file/fpassthru_variation1.phpt
+++ b/ext/standard/tests/file/fpassthru_variation1.phpt
@@ -88,22 +88,22 @@ echo "Done";
Arg value 0
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value 1
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value 12345
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value -2345
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value 10.5
diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt
index 1e6ba94edd..c0445ec1e2 100644
--- a/ext/standard/tests/file/fputcsv_error.phpt
+++ b/ext/standard/tests/file/fputcsv_error.phpt
@@ -63,7 +63,7 @@ NULL
Warning: fputcsv() expects at least 2 parameters, 1 given in %s on line %d
NULL
-Warning: fputcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fputcsv() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 4917d2ef47..0a694f3859 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -81,7 +81,7 @@ Warning: fread() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fread() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fread() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index 9a3a2d5154..fcecb64dca 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -72,7 +72,7 @@ Warning: fseek() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fseek() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fseek() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index e83c398f4b..6838e1b074 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -68,7 +68,7 @@ Warning: ftell() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: ftell() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ftell() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index 6f2511d49c..ef9e349391 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -68,7 +68,7 @@ Warning: rewind() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: rewind() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewind() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt
index 914c6d0e42..dda12bc704 100644
--- a/ext/standard/tests/file/fseek_variation1.phpt
+++ b/ext/standard/tests/file/fseek_variation1.phpt
@@ -105,31 +105,31 @@ int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
@@ -159,31 +159,31 @@ int(0)
Arg value
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value string
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value string
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value testClass
-Warning: fseek() expects parameter 2 to be integer, object given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, object given in %s on line %d
bool(false)
int(0)
diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt
index cb88c03525..48fe1802a8 100644
--- a/ext/standard/tests/file/fseek_variation2.phpt
+++ b/ext/standard/tests/file/fseek_variation2.phpt
@@ -128,25 +128,25 @@ int(3)
Arg value
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
Arg value
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
Arg value string
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
Arg value string
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt
index 6f98da81e7..6478b39377 100644
--- a/ext/standard/tests/file/fstat_variation5.phpt
+++ b/ext/standard/tests/file/fstat_variation5.phpt
@@ -17,15 +17,15 @@ foreach ( $variation_array as $var ) {
===DONE===
--EXPECTF--
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
===DONE=== \ No newline at end of file
diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index 3ccd32a2d4..a44d269add 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -94,7 +94,7 @@ Warning: ftruncate() expects parameter 1 to be resource, string given in %s on l
bool(false)
-- Iteration 2 --
-Warning: ftruncate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ftruncate() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 119302a13a..9d330d4c12 100644
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -92,7 +92,7 @@ Warning: fwrite() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fwrite() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fwrite() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/glob_error.phpt b/ext/standard/tests/file/glob_error.phpt
index b65c5fe528..527b70e069 100644
--- a/ext/standard/tests/file/glob_error.phpt
+++ b/ext/standard/tests/file/glob_error.phpt
@@ -45,9 +45,9 @@ NULL
-- Testing glob() with invalid arguments --
-Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
+Warning: glob() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
+Warning: glob() expects parameter 2 to be int, string given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt
index 67316f2c14..0b461d2635 100644
--- a/ext/standard/tests/file/mkdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_variation2.phpt
@@ -130,16 +130,16 @@ Directory created
Directory created
--empty array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--int indexed array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--associative array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--nested arrays--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--uppercase NULL--
Directory created
@@ -160,28 +160,28 @@ Directory created
Directory created
--empty string DQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--empty string SQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--string DQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--string SQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--mixed case string--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--heredoc--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--instance of classWithToString--
-Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d)
--instance of classWithoutToString--
-Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d)
--undefined var--
Directory created
diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt
index a866f8d16f..0975c8d986 100644
--- a/ext/standard/tests/file/mkdir_variation4.phpt
+++ b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -128,16 +128,16 @@ fclose($fileRes);
*** Testing mkdir() : usage variation ***
--int 0--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--int 1--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--int 12345--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--int -12345--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--float 10.5--
Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
index ea7c2d77a8..84c8243369 100644
--- a/ext/standard/tests/file/pathinfo_variation2.phpt
+++ b/ext/standard/tests/file/pathinfo_variation2.phpt
@@ -126,19 +126,19 @@ string(%d) %s
string(%d) %s
--empty array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ string(17) "/usr/include/arpa"
string(0) ""
--empty string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt
index a6ffd0630f..b639747463 100644
--- a/ext/standard/tests/file/pclose_variation1.phpt
+++ b/ext/standard/tests/file/pclose_variation1.phpt
@@ -114,19 +114,19 @@ foreach($inputs as $key =>$value) {
*** Testing pclose() : usage variation ***
--int 0--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
index e41d6b113e..3c4439e5cb 100644
--- a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
+++ b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
@@ -56,7 +56,7 @@ bool(false)
Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
--- Done ---'abc.txt' is not recognized as an internal or external command,
diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt
index 9f9593c64b..1d059828d0 100644
--- a/ext/standard/tests/file/popen_pclose_error-win32.phpt
+++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt
@@ -51,7 +51,7 @@ bool(false)
Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt
index 72ce73411c..8b851f13bb 100644
--- a/ext/standard/tests/file/popen_pclose_error.phpt
+++ b/ext/standard/tests/file/popen_pclose_error.phpt
@@ -50,7 +50,7 @@ bool(false)
Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
--- Done ---
diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
index 9ee5a2f3c7..1a7b5830c0 100644
--- a/ext/standard/tests/file/readfile_variation4.phpt
+++ b/ext/standard/tests/file/readfile_variation4.phpt
@@ -134,19 +134,19 @@ fclose($fileRes);
*** Testing readfile() : usage variation ***
--int 0--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--int 1--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--int 12345--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--int -12345--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--float 10.5--
diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
index 5c81757ed8..17fa5192bc 100644
--- a/ext/standard/tests/file/rename_variation10.phpt
+++ b/ext/standard/tests/file/rename_variation10.phpt
@@ -132,19 +132,19 @@ fclose($fileRes);
*** Testing rename() : usage variation ***
--int 0--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
index 6053018f42..7d1a5e2f24 100644
--- a/ext/standard/tests/file/rmdir_variation2.phpt
+++ b/ext/standard/tests/file/rmdir_variation2.phpt
@@ -123,19 +123,19 @@ fclose($fileres);
*** Testing rmdir() : usage variation ***
--int 0--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
index 445ef3fb1c..b3f8817656 100644
--- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
@@ -126,19 +126,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
bool(true)
--empty string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt
index d6760f92b7..8c7db0905b 100644
--- a/ext/standard/tests/file/touch_variation3-win32.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32.phpt
@@ -126,19 +126,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
bool(true)
--empty string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt
index 1ba1fc44cb..00203c8f36 100644
--- a/ext/standard/tests/file/touch_variation3.phpt
+++ b/ext/standard/tests/file/touch_variation3.phpt
@@ -126,19 +126,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
bool(true)
--empty string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt
index 0b12173cc1..2f1eda71c6 100644
--- a/ext/standard/tests/file/touch_variation4-win32.phpt
+++ b/ext/standard/tests/file/touch_variation4-win32.phpt
@@ -126,19 +126,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
bool(true)
--empty string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt
index 0bbb4a7a3b..6467f5dcdf 100644
--- a/ext/standard/tests/file/touch_variation4.phpt
+++ b/ext/standard/tests/file/touch_variation4.phpt
@@ -126,19 +126,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
bool(true)
--empty string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt
index 4ce074f81d..843dbe0dc4 100644
--- a/ext/standard/tests/file/umask_variation3.phpt
+++ b/ext/standard/tests/file/umask_variation3.phpt
@@ -144,22 +144,22 @@ int(0)
int(0)
--empty array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
--int indexed array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
--associative array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
--nested arrays--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
@@ -188,42 +188,42 @@ int(0)
int(0)
--empty string DQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--empty string SQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--string DQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--string SQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--mixed case string--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--heredoc--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--instance of classWithToString--
-Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d)
bool(false)
int(63)
--instance of classWithoutToString--
-Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d)
bool(false)
int(63)
diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt
index f165e4e9c2..d68db852fd 100644
--- a/ext/standard/tests/file/unlink_variation7.phpt
+++ b/ext/standard/tests/file/unlink_variation7.phpt
@@ -125,19 +125,19 @@ fclose($fileRes);
*** Testing unlink() : usage variation different types for context ***
--int 0--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
index 5ab5e461bf..df95186ec9 100644
--- a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
+++ b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
@@ -109,19 +109,19 @@ foreach($inputs as $key =>$value) {
*** Testing call_user_func_array() : usage variation ***
--int 0--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
NULL
--int 1--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
index 635bd89816..b0a6a80199 100644
--- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
@@ -44,7 +44,7 @@ NULL
-- int 10 --
-Warning: get_resource_type() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: get_resource_type() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- float 10.5 --
diff --git a/ext/standard/tests/general_functions/getrusage.phpt b/ext/standard/tests/general_functions/getrusage.phpt
index e89f9e68a7..e9fc8c6f6e 100644
--- a/ext/standard/tests/general_functions/getrusage.phpt
+++ b/ext/standard/tests/general_functions/getrusage.phpt
@@ -18,6 +18,6 @@ string(5) "array"
string(5) "array"
string(5) "array"
-Warning: getrusage() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, array given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt
index 7ac99655b8..a40a43449a 100644
--- a/ext/standard/tests/general_functions/getrusage_error.phpt
+++ b/ext/standard/tests/general_functions/getrusage_error.phpt
@@ -54,17 +54,17 @@ Warning: getrusage() expects at most 1 parameter, 2 given in %s on line %d
-- Testing getrusage() function with invalid argument - non-numeric STRING--
-Warning: getrusage() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, string given in %s on line %d
-- Testing getrusage() function with invalid argument - ARRAY--
-Warning: getrusage() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, array given in %s on line %d
-- Testing getrusage() function with invalid argument - OBJECT --
-Warning: getrusage() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, object given in %s on line %d
-- Testing getrusage() function with invalid argument - RESOURCE --
-Warning: getrusage() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, resource given in %s on line %d
===DONE===
diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
index add7b52deb..3073f66430 100644
--- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
@@ -25,16 +25,16 @@ bool(false)
bool(false)
bool(false)
-Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d
NULL
bool(false)
string(%d) "%s"
-Warning: getservbyport() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, object given in %s on line %d
NULL
diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
index b082fbf5f5..59252b5e2c 100644
--- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
@@ -8,11 +8,11 @@ precision=14
Description: Returns the type of the PHP variable var
Prototype: bool settype ( mixed &$var, string $type );
- Description: Set the type of variable var to type
+ Description: Set the type of variable var to type
*/
/* Test the basic functionalities of settype() & gettype() functions.
- Use the gettype() to get the type of regular data and use settype()
+ Use the gettype() to get the type of regular data and use settype()
to change its type to other types */
/* function to handle catchable errors */
@@ -22,8 +22,8 @@ function foo($errno, $errstr, $errfile, $errline) {
echo "$errno: $errstr\n";
}
//set the error handler, this is required as
-// settype() would fail with catachable fatal error
-set_error_handler("foo");
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
echo "**** Testing gettype() and settype() functions ****\n";
@@ -89,24 +89,24 @@ foreach ($values as $value) {
echo "\n*** Testing settype(): basic operations ***\n";
foreach ($types as $type) {
- echo "\n-- Setting type of data to $type --\n";
+ echo "\n-- Setting type of data to $type --\n";
$loop_count = 1;
foreach ($values as $var) {
echo "-- Iteration $loop_count --\n"; $loop_count ++;
// set to new type
var_dump( settype($var, $type) );
-
- // dump the var
+
+ // dump the var
var_dump( $var );
-
- // check the new type
- var_dump( gettype($var) );
+
+ // check the new type
+ var_dump( gettype($var) );
}
}
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
**** Testing gettype() and settype() functions ****
*** Testing gettype(): basic operations ***
diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt
index f601c4b895..b27ace4063 100644
--- a/ext/standard/tests/general_functions/intval_variation2.phpt
+++ b/ext/standard/tests/general_functions/intval_variation2.phpt
@@ -115,30 +115,30 @@ int(1)
int(1)
--float 12.3456789000e10--
-Error: 2 - intval() expects parameter 2 to be integer, float given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, float given, %s(%d)
NULL
--float -12.3456789000e10--
-Error: 2 - intval() expects parameter 2 to be integer, float given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, float given, %s(%d)
NULL
--float .5--
int(1)
--empty array--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ int(1)
int(1)
--empty string DQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - intval() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - intval() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/general_functions/phpcredits.phpt b/ext/standard/tests/general_functions/phpcredits.phpt
index 01dd160033..044232570e 100644
--- a/ext/standard/tests/general_functions/phpcredits.phpt
+++ b/ext/standard/tests/general_functions/phpcredits.phpt
@@ -41,7 +41,7 @@ PHP Quality Assurance Team
%a
bool(true)
-Warning: phpcredits() expects parameter 1 to be integer, array given in %sphpcredits.php on line 4
+Warning: phpcredits() expects parameter 1 to be int, array given in %sphpcredits.php on line 4
NULL
--
PHP Credits
diff --git a/ext/standard/tests/general_functions/phpcredits2.phpt b/ext/standard/tests/general_functions/phpcredits2.phpt
index d32784b4e9..9966f23a96 100644
--- a/ext/standard/tests/general_functions/phpcredits2.phpt
+++ b/ext/standard/tests/general_functions/phpcredits2.phpt
@@ -19,7 +19,7 @@ var_dump(phpcredits(CREDITS_GROUP));
<!DOCTYPE %a>%s</html>
bool(true)
-Warning: phpcredits() expects parameter 1 to be integer, array given in %sphpcredits2.php on line 4
+Warning: phpcredits() expects parameter 1 to be int, array given in %sphpcredits2.php on line 4
NULL
--
<h1>PHP Credits</h1>
diff --git a/ext/standard/tests/general_functions/phpinfo.phpt b/ext/standard/tests/general_functions/phpinfo.phpt
index aeb7ee4bd1..a805876aab 100644
--- a/ext/standard/tests/general_functions/phpinfo.phpt
+++ b/ext/standard/tests/general_functions/phpinfo.phpt
@@ -63,7 +63,7 @@ PHP License
bool(true)
--
-Warning: phpinfo() expects parameter 1 to be integer, array given in %sphpinfo.php on line 5
+Warning: phpinfo() expects parameter 1 to be int, array given in %sphpinfo.php on line 5
NULL
--
phpinfo()
diff --git a/ext/standard/tests/general_functions/phpinfo2.phpt b/ext/standard/tests/general_functions/phpinfo2.phpt
index 50353d5e80..f422f923d9 100644
--- a/ext/standard/tests/general_functions/phpinfo2.phpt
+++ b/ext/standard/tests/general_functions/phpinfo2.phpt
@@ -21,7 +21,7 @@ var_dump(phpinfo(INFO_LICENSE));
%a</html>bool(true)
--
-Warning: phpinfo() expects parameter 1 to be integer, array given in %sphpinfo2.php on line 5
+Warning: phpinfo() expects parameter 1 to be int, array given in %sphpinfo2.php on line 5
NULL
--
<!DOCTYPE %s>
diff --git a/ext/standard/tests/general_functions/proc_nice_variation1.phpt b/ext/standard/tests/general_functions/proc_nice_variation1.phpt
index 5ab2e89339..4aa4b47801 100644
--- a/ext/standard/tests/general_functions/proc_nice_variation1.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation1.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
--EXPECTF--
*** Test substituting argument 1 with array values ***
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
bool(false)
diff --git a/ext/standard/tests/general_functions/proc_nice_variation3.phpt b/ext/standard/tests/general_functions/proc_nice_variation3.phpt
index 5ac7e366df..c5626dd50f 100644
--- a/ext/standard/tests/general_functions/proc_nice_variation3.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
bool(true)
bool(true)
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
bool(false)
bool(true)
bool(true)
diff --git a/ext/standard/tests/general_functions/proc_nice_variation6.phpt b/ext/standard/tests/general_functions/proc_nice_variation6.phpt
index 593cf10b4d..a3aff167ed 100644
--- a/ext/standard/tests/general_functions/proc_nice_variation6.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation6.phpt
@@ -50,7 +50,7 @@ foreach ( $variation_array as $var ) {
?>
--EXPECTF--
*** Test substituting argument 1 with object values ***
-Error: 2 - proc_nice() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - proc_nice() expects parameter 1 to be int, object given, %s(%d)
bool(false)
-Error: 2 - proc_nice() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - proc_nice() expects parameter 1 to be int, object given, %s(%d)
bool(false)
diff --git a/ext/standard/tests/general_functions/proc_nice_variation7.phpt b/ext/standard/tests/general_functions/proc_nice_variation7.phpt
index b6c7096519..368d2b1079 100644
--- a/ext/standard/tests/general_functions/proc_nice_variation7.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation7.phpt
@@ -36,14 +36,14 @@ foreach ( $variation_array as $var ) {
--EXPECTF--
*** Test substituting argument 1 with string values ***
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
bool(false)
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
bool(false)
diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt
index f314200e65..93faf3ac16 100644
--- a/ext/standard/tests/general_functions/rand.phpt
+++ b/ext/standard/tests/general_functions/rand.phpt
@@ -45,12 +45,12 @@ int(%d)
NULL
NULL
-Warning: srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: srand() expects parameter 1 to be int, array given in %s on line %d
NULL
NULL
NULL
-Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d
NULL
int(%d)
diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt
index 91666af42d..356d4e9a1e 100644
--- a/ext/standard/tests/image/image_type_to_extension.phpt
+++ b/ext/standard/tests/image/image_type_to_extension.phpt
@@ -94,7 +94,7 @@ Constant: IMAGETYPE_WEBP
Warning: image_type_to_extension() expects parameter 2 to be boolean, array given in %s on line %d
bool(false)
-Warning: image_type_to_extension() expects parameter 1 to be integer, object given in %s on line %d
+Warning: image_type_to_extension() expects parameter 1 to be int, object given in %s on line %d
bool(false)
bool(false)
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
index ccff8645e6..2c67338e41 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
@@ -95,12 +95,12 @@ string(24) "application/octet-stream"
-- Iteration 6 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, array given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, array given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
@@ -123,27 +123,27 @@ string(24) "application/octet-stream"
-- Iteration 14 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 15 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 16 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, object given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 19 --
diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt
index 96bc596747..14593ffe76 100644
--- a/ext/standard/tests/math/base_convert_variation2.phpt
+++ b/ext/standard/tests/math/base_convert_variation2.phpt
@@ -153,32 +153,32 @@ bool(false)
-- Iteration 17 --
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: base_convert() expects parameter 2 to be integer, array given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt
index c5cf390f19..bd4f052ca6 100644
--- a/ext/standard/tests/math/base_convert_variation3.phpt
+++ b/ext/standard/tests/math/base_convert_variation3.phpt
@@ -153,32 +153,32 @@ bool(false)
-- Iteration 17 --
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: base_convert() expects parameter 3 to be integer, array given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
diff --git a/ext/standard/tests/math/mt_rand_error.phpt b/ext/standard/tests/math/mt_rand_error.phpt
index 888e7d2bc5..87f5c3641d 100644
--- a/ext/standard/tests/math/mt_rand_error.phpt
+++ b/ext/standard/tests/math/mt_rand_error.phpt
@@ -14,6 +14,6 @@ Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line 2
Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line 3
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line 4
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line 4
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line 5
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line 5
diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt
index f2adb6d39d..38df739baf 100644
--- a/ext/standard/tests/math/mt_rand_variation1.phpt
+++ b/ext/standard/tests/math/mt_rand_variation1.phpt
@@ -138,37 +138,37 @@ int(%i)
-- Iteration 17 --
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mt_rand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: mt_rand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -179,6 +179,6 @@ int(%i)
-- Iteration 26 --
-Warning: mt_rand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, resource given in %s on line %d
NULL
===Done===
diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt
index 3c4be806d6..f49d1293f7 100644
--- a/ext/standard/tests/math/mt_rand_variation2.phpt
+++ b/ext/standard/tests/math/mt_rand_variation2.phpt
@@ -113,7 +113,7 @@ int(%i)
-- Iteration 8 --
-Warning: mt_rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
-- Iteration 17 --
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mt_rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: mt_rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
-- Iteration 26 --
-Warning: mt_rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, resource given in %s on line %d
NULL
===Done===
diff --git a/ext/standard/tests/math/mt_srand_error.phpt b/ext/standard/tests/math/mt_srand_error.phpt
index aa2fc75b74..0858a99e83 100644
--- a/ext/standard/tests/math/mt_srand_error.phpt
+++ b/ext/standard/tests/math/mt_srand_error.phpt
@@ -10,7 +10,7 @@ var_dump(mt_srand("500ABC"));
Warning: mt_srand() expects at most 2 parameters, 3 given in %s on line 2
NULL
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line 3
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line 3
NULL
Notice: A non well formed numeric value encountered in %s on line 4
diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt
index 7409767f91..891152b8a8 100644
--- a/ext/standard/tests/math/mt_srand_variation1.phpt
+++ b/ext/standard/tests/math/mt_srand_variation1.phpt
@@ -113,7 +113,7 @@ NULL
-- Iteration 8 --
-Warning: mt_srand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, float given in %s on line %d
NULL
-- Iteration 9 --
@@ -142,37 +142,37 @@ NULL
-- Iteration 17 --
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: mt_srand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -183,6 +183,6 @@ NULL
-- Iteration 26 --
-Warning: mt_srand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, resource given in %s on line %d
NULL
===Done===
diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt
index f4a868959a..876f79b029 100644
--- a/ext/standard/tests/math/rand_error.phpt
+++ b/ext/standard/tests/math/rand_error.phpt
@@ -13,6 +13,6 @@ Warning: rand() expects exactly 2 parameters, 1 given in %s on line 2
Warning: rand() expects exactly 2 parameters, 3 given in %s on line 3
-Warning: rand() expects parameter 1 to be integer, string given in %s on line 4
+Warning: rand() expects parameter 1 to be int, string given in %s on line 4
-Warning: rand() expects parameter 2 to be integer, string given in %s on line 5
+Warning: rand() expects parameter 2 to be int, string given in %s on line 5
diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt
index f14ada87f5..d688524b6e 100644
--- a/ext/standard/tests/math/rand_variation1.phpt
+++ b/ext/standard/tests/math/rand_variation1.phpt
@@ -113,7 +113,7 @@ int(%i)
-- Iteration 8 --
-Warning: rand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 1 to be int, float given in %s on line %d
NULL
-- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
-- Iteration 17 --
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: rand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: rand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
-- Iteration 26 --
-Warning: rand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 1 to be int, resource given in %s on line %d
NULL
===Done===
diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt
index 824b47b0cb..ed9c9a61c3 100644
--- a/ext/standard/tests/math/rand_variation2.phpt
+++ b/ext/standard/tests/math/rand_variation2.phpt
@@ -113,7 +113,7 @@ int(%i)
-- Iteration 8 --
-Warning: rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
-- Iteration 17 --
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
-- Iteration 26 --
-Warning: rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 2 to be int, resource given in %s on line %d
NULL
===Done===
diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt
index f199ff7eb6..aec4c7f27b 100644
--- a/ext/standard/tests/math/round_variation2.phpt
+++ b/ext/standard/tests/math/round_variation2.phpt
@@ -141,37 +141,37 @@ float(123)
-- Iteration 17 --
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: round() expects parameter 2 to be integer, array given in %s on line %d
+Warning: round() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: round() expects parameter 2 to be integer, object given in %s on line %d
+Warning: round() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -182,6 +182,6 @@ float(123)
-- Iteration 26 --
-Warning: round() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: round() expects parameter 2 to be int, resource given in %s on line %d
NULL
===Done=== \ No newline at end of file
diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt
index ca9e4b939c..92140af82a 100644
--- a/ext/standard/tests/math/srand_error.phpt
+++ b/ext/standard/tests/math/srand_error.phpt
@@ -24,7 +24,7 @@ var_dump(srand("500ABC"));
Warning: srand() expects at most 2 parameters, 3 given in %s on line %d
NULL
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
NULL
Notice: A non well formed numeric value encountered in %s on line %d
diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt
index 522a8f5536..3a681e647a 100644
--- a/ext/standard/tests/math/srand_variation1.phpt
+++ b/ext/standard/tests/math/srand_variation1.phpt
@@ -113,7 +113,7 @@ NULL
-- Iteration 8 --
-Warning: srand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: srand() expects parameter 1 to be int, float given in %s on line %d
NULL
-- Iteration 9 --
@@ -142,37 +142,37 @@ NULL
-- Iteration 17 --
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: srand() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 20 --
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 23 --
-Warning: srand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: srand() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 24 --
@@ -183,6 +183,6 @@ NULL
-- Iteration 26 --
-Warning: srand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: srand() expects parameter 1 to be int, resource given in %s on line %d
NULL
===Done===
diff --git a/ext/standard/tests/misc/syslog_parameters.phpt b/ext/standard/tests/misc/syslog_parameters.phpt
index b925df1891..f3551c044e 100644
--- a/ext/standard/tests/misc/syslog_parameters.phpt
+++ b/ext/standard/tests/misc/syslog_parameters.phpt
@@ -13,10 +13,10 @@ closelog('Doesnt take any parameters');
--EXPECTF--
Warning: openlog() expects exactly 3 parameters, 0 given in %s on line %d
-Warning: openlog() expects parameter 2 to be integer, string given in %s on line %d
+Warning: openlog() expects parameter 2 to be int, string given in %s on line %d
Warning: syslog() expects exactly 2 parameters, 0 given in %s on line %d
-Warning: syslog() expects parameter 1 to be integer, string given in %s on line %d
+Warning: syslog() expects parameter 1 to be int, string given in %s on line %d
Warning: closelog() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/standard/tests/misc/time_nanosleep_error1.phpt b/ext/standard/tests/misc/time_nanosleep_error1.phpt
index 3bbd330e2c..58a71e9e4c 100644
--- a/ext/standard/tests/misc/time_nanosleep_error1.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error1.phpt
@@ -11,4 +11,4 @@ $nano = time_nanosleep('A', 100000);
?>
--EXPECTF--
-Warning: time_nanosleep() expects parameter 1 to be integer, string given in %s.php on line %d
+Warning: time_nanosleep() expects parameter 1 to be int, string given in %s.php on line %d
diff --git a/ext/standard/tests/misc/time_nanosleep_error2.phpt b/ext/standard/tests/misc/time_nanosleep_error2.phpt
index 72d84c42b6..db1e13f641 100644
--- a/ext/standard/tests/misc/time_nanosleep_error2.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error2.phpt
@@ -11,4 +11,4 @@ $nano = time_nanosleep(2, 'B');
?>
--EXPECTF--
-Warning: time_nanosleep() expects parameter 2 to be integer, string given in %s.php on line %d
+Warning: time_nanosleep() expects parameter 2 to be int, string given in %s.php on line %d
diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt
index abe50e7192..6c00824410 100644
--- a/ext/standard/tests/network/ip.phpt
+++ b/ext/standard/tests/network/ip.phpt
@@ -61,9 +61,9 @@ Warning: long2ip() expects exactly 1 parameter, 0 given in %sip.php on line %d
NULL
string(13) "255.254.82.80"
-Warning: long2ip() expects parameter 1 to be integer, string given in %sip.php on line %d
+Warning: long2ip() expects parameter 1 to be int, string given in %sip.php on line %d
NULL
-Warning: long2ip() expects parameter 1 to be integer, array given in %sip.php on line %d
+Warning: long2ip() expects parameter 1 to be int, array given in %sip.php on line %d
NULL
Done
diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt
index 45a48ca9df..7dc726e8c2 100644
--- a/ext/standard/tests/network/ip_x86_64.phpt
+++ b/ext/standard/tests/network/ip_x86_64.phpt
@@ -61,9 +61,9 @@ Warning: long2ip() expects exactly 1 parameter, 0 given in %sip_x86_64.php on li
NULL
string(13) "255.254.82.80"
-Warning: long2ip() expects parameter 1 to be integer, string given in %sip_x86_64.php on line %d
+Warning: long2ip() expects parameter 1 to be int, string given in %sip_x86_64.php on line %d
NULL
-Warning: long2ip() expects parameter 1 to be integer, array given in %sip_x86_64.php on line %d
+Warning: long2ip() expects parameter 1 to be int, array given in %sip_x86_64.php on line %d
NULL
Done
diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt
index e7336712be..6fc4f57ee4 100644
--- a/ext/standard/tests/network/long2ip_variation1.phpt
+++ b/ext/standard/tests/network/long2ip_variation1.phpt
@@ -126,19 +126,19 @@ string(15) "255.255.255.246"
string(7) "0.0.0.0"
--empty array--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
NULL
--int indexed array--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
NULL
--associative array--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
NULL
--nested arrays--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
NULL
--uppercase NULL--
@@ -160,35 +160,35 @@ string(7) "0.0.0.1"
string(7) "0.0.0.0"
--empty string DQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
NULL
--empty string SQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
NULL
--string DQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
NULL
--string SQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
NULL
--mixed case string--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
NULL
--heredoc--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
NULL
--instance of classWithToString--
-Error: 2 - long2ip() expects parameter 1 to be integer, object given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, object given, %slong2ip_variation1.php(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - long2ip() expects parameter 1 to be integer, object given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, object given, %slong2ip_variation1.php(%d)
NULL
--undefined var--
@@ -198,6 +198,6 @@ string(7) "0.0.0.0"
string(7) "0.0.0.0"
--resource--
-Error: 2 - long2ip() expects parameter 1 to be integer, resource given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, resource given, %slong2ip_variation1.php(%d)
NULL
===DONE===
diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt
index 8dc954649d..5f576c3122 100644
--- a/ext/standard/tests/password/password_hash_error.phpt
+++ b/ext/standard/tests/password/password_hash_error.phpt
@@ -29,7 +29,7 @@ NULL
Warning: password_hash() expects at least 2 parameters, 1 given in %s on line %d
NULL
-Warning: password_hash() expects parameter 2 to be integer, array given in %s on line %d
+Warning: password_hash() expects parameter 2 to be int, array given in %s on line %d
NULL
Warning: password_hash(): Unknown password hashing algorithm: 19 in %s on line %d
diff --git a/ext/standard/tests/password/password_needs_rehash_error.phpt b/ext/standard/tests/password/password_needs_rehash_error.phpt
index b5d8691775..65766cb3fe 100644
--- a/ext/standard/tests/password/password_needs_rehash_error.phpt
+++ b/ext/standard/tests/password/password_needs_rehash_error.phpt
@@ -22,7 +22,7 @@ NULL
Warning: password_needs_rehash() expects at least 2 parameters, 1 given in %s on line %d
NULL
-Warning: password_needs_rehash() expects parameter 2 to be integer, string given in %s on line %d
+Warning: password_needs_rehash() expects parameter 2 to be int, string given in %s on line %d
NULL
Warning: password_needs_rehash() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt
index ce272519c4..cd0ad07234 100644
--- a/ext/standard/tests/streams/stream_set_chunk_size.phpt
+++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt
@@ -89,5 +89,5 @@ bool(false)
Warning: stream_set_chunk_size(): The chunk size must be a positive integer, given -1 in %s on line %d
bool(false)
-Warning: stream_set_chunk_size() expects parameter 2 to be integer, array given in %s on line %d
+Warning: stream_set_chunk_size() expects parameter 2 to be int, array given in %s on line %d
bool(false)
diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt
index d62e44a56e..63c9a8df42 100644
--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt
+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt
@@ -72,7 +72,7 @@ bool(false)
-- Testing stream_set_timeout() function with an invalid stream --
-Warning: stream_set_timeout() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: stream_set_timeout() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Testing stream_set_timeout() function with a stream that does not support timeouts --
diff --git a/ext/standard/tests/strings/bug54322.phpt b/ext/standard/tests/strings/bug54322.phpt
index 4623a9a2ad..6b8d10daa7 100644
--- a/ext/standard/tests/strings/bug54322.phpt
+++ b/ext/standard/tests/strings/bug54322.phpt
@@ -6,5 +6,5 @@ var_dump(
get_html_translation_table(NAN, 0, "UTF-8") > 0
);
--EXPECTF--
-Warning: get_html_translation_table() expects parameter 1 to be integer, float given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, float given in %s on line %d
bool(false)
diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt
index 9240ed3ea0..195e2d2605 100644
--- a/ext/standard/tests/strings/chunk_split_variation2.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation2.phpt
@@ -100,7 +100,7 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
bool(false)
-- Iteration 3 --
-Warning: chunk_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 4 --
@@ -112,23 +112,23 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
bool(false)
-- Iteration 6 --
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 7 --
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 8 --
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 9 --
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 10 --
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 11 --
@@ -152,23 +152,23 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
bool(false)
-- Iteration 17 --
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 18 --
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 19 --
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 20 --
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 21 --
-Warning: chunk_split() expects parameter 2 to be integer, object given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, object given in %schunk_split_variation2.php on line %d
NULL
-- Iteration 22 --
@@ -180,6 +180,6 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
bool(false)
-- Iteration 24 --
-Warning: chunk_split() expects parameter 2 to be integer, resource given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, resource given in %schunk_split_variation2.php on line %d
NULL
===DONE===
diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt
index e53b1e3240..332aecdb96 100644
--- a/ext/standard/tests/strings/chunk_split_variation5.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation5.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 3dfa33a2eb..e97b1e9036 100644
--- a/ext/standard/tests/strings/chunk_split_variation8.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation8.phpt
@@ -83,7 +83,7 @@ It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test
chunk_split():::"
-- Iteration 7 --
-Warning: chunk_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 8 --
diff --git a/ext/standard/tests/strings/count_chars_variation2.phpt b/ext/standard/tests/strings/count_chars_variation2.phpt
index 7896ff1d73..fb3305bbbd 100644
--- a/ext/standard/tests/strings/count_chars_variation2.phpt
+++ b/ext/standard/tests/strings/count_chars_variation2.phpt
@@ -117,11 +117,11 @@ Warning: count_chars(): Unknown mode in %s on line %d
bool(false)
-- Iteration 11 --
-Warning: count_chars() expects parameter 2 to be integer, array given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- Iteration 12 --
-Warning: count_chars() expects parameter 2 to be integer, array given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, array given in %s on line %d
bool(false)
-- Iteration 13 --
bool(true)
@@ -137,11 +137,11 @@ bool(true)
bool(true)
-- Iteration 19 --
-Warning: count_chars() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 20 --
-Warning: count_chars() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, string given in %s on line %d
bool(false)
-- Iteration 21 --
@@ -155,7 +155,7 @@ Warning: count_chars(): Unknown mode in %s on line %d
bool(false)
-- Iteration 23 --
-Warning: count_chars() expects parameter 2 to be integer, object given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, object given in %s on line %d
bool(false)
-- Iteration 24 --
bool(true)
diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt
index 37574e11a4..b139058844 100644
--- a/ext/standard/tests/strings/explode_variation3.phpt
+++ b/ext/standard/tests/strings/explode_variation3.phpt
@@ -177,15 +177,15 @@ array(6) {
}
-- Iteration 10 --
-Warning: explode() expects parameter 3 to be integer, array given in %s on line %d
+Warning: explode() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: explode() expects parameter 3 to be integer, array given in %s on line %d
+Warning: explode() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: explode() expects parameter 3 to be integer, array given in %s on line %d
+Warning: explode() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 13 --
array(1) {
@@ -219,11 +219,11 @@ array(1) {
}
-- Iteration 19 --
-Warning: explode() expects parameter 3 to be integer, object given in %s on line %d
+Warning: explode() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration 20 --
-Warning: explode() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: explode() expects parameter 3 to be int, resource given in %s on line %d
NULL
-- Iteration 21 --
array(1) {
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
index add962a3ad..a20d10c654 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
@@ -106,38 +106,38 @@ echo "Done\n";
--- Testing get_html_translation_table() by supplying different values for 'table' argument ---
-- Iteration 1 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 2 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 3 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 4 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 5 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 6 --
int(252)
@@ -189,38 +189,38 @@ array(4) {
}
-- Iteration 10 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 11 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 12 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, object given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, object given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, object given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 13 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 14 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
NULL
-- Iteration 15 --
array(4) {
@@ -266,10 +266,10 @@ array(4) {
}
-- Iteration 17 --
-Warning: get_html_translation_table() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, resource given in %s on line %d
NULL
-Warning: get_html_translation_table() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, resource given in %s on line %d
NULL
-- Iteration 18 --
array(4) {
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
index f3aee5fc0f..907eda35ae 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
@@ -88,23 +88,23 @@ echo "Done\n";
--- Testing get_html_translation_table() by supplying different values for 'quote_style' argument ---
-- Iteration 1 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 2 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 3 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 4 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 5 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 6 --
array(4) {
@@ -148,23 +148,23 @@ array(3) {
}
-- Iteration 10 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 11 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 12 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, object given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 13 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 14 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 15 --
array(3) {
@@ -186,7 +186,7 @@ array(3) {
}
-- Iteration 17 --
-Warning: get_html_translation_table() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, resource given in %s on line %d
NULL
-- Iteration 18 --
array(3) {
diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt
index 5698cde793..a577d1ee89 100644
--- a/ext/standard/tests/strings/hebrev_variation2.phpt
+++ b/ext/standard/tests/strings/hebrev_variation2.phpt
@@ -180,15 +180,15 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text
"
-- Iteration 10 --
-Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 13 --
string(109) "xttel uaisv
@@ -230,11 +230,11 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text
"
-- Iteration 19 --
-Warning: hebrev() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: hebrev() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
@@ -266,11 +266,11 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text
"
-- Iteration 24 --
-Warning: hebrev() expects parameter 2 to be integer, object given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 25 --
-Warning: hebrev() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, resource given in %s on line %d
NULL
-- Iteration 26 --
string(109) ".The hebrev function converts logical Hebrew text to visual text
diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt
index e6a6013931..75ebc30cd8 100644
--- a/ext/standard/tests/strings/hebrevc_variation2.phpt
+++ b/ext/standard/tests/strings/hebrevc_variation2.phpt
@@ -254,15 +254,15 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text<
"
-- Iteration 10 --
-Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 13 --
string(331) "xttel uaisv<br />
@@ -338,11 +338,11 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text<
"
-- Iteration 19 --
-Warning: hebrevc() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: hebrevc() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
@@ -391,11 +391,11 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text<
"
-- Iteration 24 --
-Warning: hebrevc() expects parameter 2 to be integer, object given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 25 --
-Warning: hebrevc() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, resource given in %s on line %d
NULL
-- Iteration 26 --
string(241) ".The hebrevcc function converts logical Hebrew text to visual text<br />
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
index 837583c224..0046236259 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
@@ -103,7 +103,7 @@ string(104) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
-- Iteration 3 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, float given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 4 --
@@ -114,27 +114,27 @@ string(114) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
-- Iteration 6 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 7 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 8 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 9 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 10 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 11 --
@@ -157,27 +157,27 @@ string(114) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
-- Iteration 17 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 18 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 19 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 20 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 21 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, object given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, object given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 22 --
@@ -188,6 +188,6 @@ string(114) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
-- Iteration 24 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, resource given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, resource given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
Done
diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt
index 2d65d0ef07..c8c92855fc 100644
--- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt
+++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt
@@ -83,22 +83,22 @@ Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 5 --
-Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 6 --
-Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: nl_langinfo() expects parameter 1 to be integer, object given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, object given in %s on line %d
NULL
-- Iteration 8 --
-Warning: nl_langinfo() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, resource given in %s on line %d
NULL
===DONE===
diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt
index 73094640d4..2f082ea7a5 100644
--- a/ext/standard/tests/strings/str_pad_variation2.phpt
+++ b/ext/standard/tests/strings/str_pad_variation2.phpt
@@ -102,15 +102,15 @@ string(11) "Test string"
string(1012) "Test string "
-- Iteration 8 --
-Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
string(11) "Test string"
@@ -126,11 +126,11 @@ string(11) "Test string"
string(11) "Test string"
-- Iteration 17 --
-Warning: str_pad() expects parameter 2 to be integer, object given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 18 --
-Warning: str_pad() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, resource given in %s on line %d
NULL
-- Iteration 19 --
string(11) "Test string"
diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt
index 6bf94084bb..e5084b7e9b 100644
--- a/ext/standard/tests/strings/str_pad_variation4.phpt
+++ b/ext/standard/tests/strings/str_pad_variation4.phpt
@@ -123,11 +123,11 @@ Warning: str_pad(): Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_P
NULL
-- Iteration 10 --
-Warning: str_pad() expects parameter 4 to be integer, string given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration 11 --
-Warning: str_pad() expects parameter 4 to be integer, string given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration 12 --
string(20) "****Test string*****"
@@ -139,15 +139,15 @@ string(20) "*********Test string"
string(20) "****Test string*****"
-- Iteration 15 --
-Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration 16 --
-Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration 17 --
-Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration 18 --
string(20) "Test string*********"
@@ -163,7 +163,7 @@ string(20) "*********Test string"
string(20) "*********Test string"
-- Iteration 24 --
-Warning: str_pad() expects parameter 4 to be integer, object given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, object given in %s on line %d
NULL
-- Iteration 25 --
string(20) "*********Test string"
diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt
index bbcc489990..beb5e805f8 100644
--- a/ext/standard/tests/strings/str_repeat.phpt
+++ b/ext/standard/tests/strings/str_repeat.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt
index 42a5d5ab38..ef2ea94a9e 100644
--- a/ext/standard/tests/strings/str_split_variation2.phpt
+++ b/ext/standard/tests/strings/str_split_variation2.phpt
@@ -111,7 +111,7 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 3 --
-Warning: str_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, float given in %s on line %d
NULL
--Iteration 4 --
@@ -123,23 +123,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 6 --
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
NULL
--Iteration 7 --
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
NULL
--Iteration 8 --
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
NULL
--Iteration 9 --
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
NULL
--Iteration 10 --
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
NULL
--Iteration 11 --
@@ -257,23 +257,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 17 --
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
NULL
--Iteration 18 --
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
NULL
--Iteration 19 --
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
NULL
--Iteration 20 --
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
NULL
--Iteration 21 --
-Warning: str_split() expects parameter 2 to be integer, object given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, object given in %sstr_split_variation2.php on line %d
NULL
--Iteration 22 --
@@ -285,6 +285,6 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 24 --
-Warning: str_split() expects parameter 2 to be integer, resource given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, resource given in %sstr_split_variation2.php on line %d
NULL
Done
diff --git a/ext/standard/tests/strings/str_split_variation2_64bit.phpt b/ext/standard/tests/strings/str_split_variation2_64bit.phpt
index b80a3b42cc..d465e355d6 100644
--- a/ext/standard/tests/strings/str_split_variation2_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation2_64bit.phpt
@@ -124,23 +124,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 6 --
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
NULL
--Iteration 7 --
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
NULL
--Iteration 8 --
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
NULL
--Iteration 9 --
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
NULL
--Iteration 10 --
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
NULL
--Iteration 11 --
@@ -258,23 +258,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 17 --
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
NULL
--Iteration 18 --
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
NULL
--Iteration 19 --
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
NULL
--Iteration 20 --
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
NULL
--Iteration 21 --
-Warning: str_split() expects parameter 2 to be integer, object given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, object given in %s on line %d
NULL
--Iteration 22 --
@@ -286,6 +286,6 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 24 --
-Warning: str_split() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt
index 53385a76de..95afb24e59 100644
--- a/ext/standard/tests/strings/str_split_variation6.phpt
+++ b/ext/standard/tests/strings/str_split_variation6.phpt
@@ -157,7 +157,7 @@ array(1) {
}
-- Iteration 7 --
-Warning: str_split() expects parameter 2 to be integer, float given in %s line %d
+Warning: str_split() expects parameter 2 to be int, float given in %s line %d
NULL
-- Iteration 8 --
diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt
index 963e2aa14c..0d34317245 100644
--- a/ext/standard/tests/strings/str_split_variation7.phpt
+++ b/ext/standard/tests/strings/str_split_variation7.phpt
@@ -135,7 +135,7 @@ array(1) {
}
-- Iteration 7 --
-Warning: str_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, float given in %s on line %d
NULL
-- Iteration 8 --
diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt
index 00e71f781f..a0496cc2cf 100644
--- a/ext/standard/tests/strings/str_word_count.phpt
+++ b/ext/standard/tests/strings/str_word_count.phpt
@@ -87,10 +87,10 @@ bool(false)
Warning: str_word_count(): Invalid format value 999999999 in %s on line %d
bool(false)
-Warning: str_word_count() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_word_count() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: str_word_count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_word_count() expects parameter 2 to be int, string given in %s on line %d
NULL
string(55) "Hello friend, you're
looking good today!"
diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt
index 4940b8cfc9..ad09fdbbec 100644
--- a/ext/standard/tests/strings/strcspn_variation3.phpt
+++ b/ext/standard/tests/strings/strcspn_variation3.phpt
@@ -123,42 +123,42 @@ int(0)
-- Iteration with start value as "Array" --
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "" --
@@ -187,42 +187,42 @@ int(0)
-- Iteration with start value as "" --
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "" --
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "string" --
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "string" --
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "object" --
-Warning: strcspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, object given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration with start value as "" --
@@ -235,9 +235,9 @@ int(0)
-- Iteration with start value as "Resource id #%d" --
-Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d
NULL
-Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d
NULL
Done \ No newline at end of file
diff --git a/ext/standard/tests/strings/strcspn_variation4.phpt b/ext/standard/tests/strings/strcspn_variation4.phpt
index d7132a64ce..d7c6750233 100644
--- a/ext/standard/tests/strings/strcspn_variation4.phpt
+++ b/ext/standard/tests/strings/strcspn_variation4.phpt
@@ -119,27 +119,27 @@ int(0)
-- Iteration with len value as "Array" --
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "" --
@@ -162,27 +162,27 @@ int(0)
-- Iteration with len value as "" --
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "" --
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "string" --
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "string" --
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "object" --
-Warning: strcspn() expects parameter 4 to be integer, object given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, object given in %s on line %d
NULL
-- Iteration with len value as "" --
@@ -193,6 +193,6 @@ int(0)
-- Iteration with len value as "Resource id #%d" --
-Warning: strcspn() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, resource given in %s on line %d
NULL
Done
diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt
index 89f70ddef0..ecf9d47502 100644
--- a/ext/standard/tests/strings/stripos_variation14.phpt
+++ b/ext/standard/tests/strings/stripos_variation14.phpt
@@ -100,23 +100,23 @@ int(6)
int(6)
-- Iteration 6 --
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
int(6)
@@ -128,15 +128,15 @@ int(6)
int(6)
-- Iteration 15 --
-Warning: stripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration 16 --
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 17 --
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 18 --
int(6)
@@ -144,7 +144,7 @@ int(6)
int(6)
-- Iteration 20 --
-Warning: stripos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, resource given in %s on line %d
NULL
-- Iteration 21 --
int(6)
diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt
index ba10999fac..51583edeb4 100644
--- a/ext/standard/tests/strings/stripos_variation15.phpt
+++ b/ext/standard/tests/strings/stripos_variation15.phpt
@@ -148,15 +148,15 @@ bool(false)
bool(false)
-- Iteration 19 --
-Warning: stripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration 20 --
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 22 --
bool(false)
diff --git a/ext/standard/tests/strings/strncasecmp_variation5.phpt b/ext/standard/tests/strings/strncasecmp_variation5.phpt
index e88be79a9c..44a58f78e1 100644
--- a/ext/standard/tests/strings/strncasecmp_variation5.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation5.phpt
@@ -112,23 +112,23 @@ int(0)
int(0)
-- Iteration 8 --
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 10 --
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration 13 --
int(0)
@@ -144,11 +144,11 @@ int(0)
int(0)
-- Iteration 19 --
-Warning: strncasecmp() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: strncasecmp() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration 21 --
int(0)
@@ -156,10 +156,10 @@ int(0)
int(0)
-- Iteration 23 --
-Warning: strncasecmp() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, resource given in %s on line %d
NULL
-- Iteration 24 --
-Warning: strncasecmp() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, object given in %s on line %d
NULL
*** Done ***
diff --git a/ext/standard/tests/strings/strncmp_variation5.phpt b/ext/standard/tests/strings/strncmp_variation5.phpt
index 22aaa439e8..85e50f5929 100644
--- a/ext/standard/tests/strings/strncmp_variation5.phpt
+++ b/ext/standard/tests/strings/strncmp_variation5.phpt
@@ -126,23 +126,23 @@ int(0)
int(0)
-- Iteration 11 --
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
NULL
-- Iteration 12 --
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
NULL
-- Iteration 13 --
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
NULL
-- Iteration 14 --
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
NULL
-- Iteration 15 --
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
NULL
-- Iteration 16 --
int(0)
@@ -158,11 +158,11 @@ int(0)
int(0)
-- Iteration 22 --
-Warning: strncmp() expects parameter 3 to be integer, string given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, string given in%s on line %d
NULL
-- Iteration 23 --
-Warning: strncmp() expects parameter 3 to be integer, string given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, string given in%s on line %d
NULL
-- Iteration 24 --
int(0)
@@ -170,10 +170,10 @@ int(0)
int(0)
-- Iteration 26 --
-Warning: strncmp() expects parameter 3 to be integer, resource given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, resource given in%s on line %d
NULL
-- Iteration 27 --
-Warning: strncmp() expects parameter 3 to be integer, object given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, object given in%s on line %d
NULL
*** Done ***
diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index a2237fe005..0dd901a19d 100644
--- a/ext/standard/tests/strings/strpos.phpt
+++ b/ext/standard/tests/strings/strpos.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 47a672cc7e..6a33956326 100644
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -18,16 +18,16 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1));
echo "Done\n";
?>
--EXPECTF--
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
Warning: strripos() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt
index 4f20895b15..239fdb31f4 100644
--- a/ext/standard/tests/strings/strrpos_offset.phpt
+++ b/ext/standard/tests/strings/strrpos_offset.phpt
@@ -17,16 +17,16 @@ var_dump(strrpos(1024, "te", -PHP_INT_MAX-1));
echo "Done\n";
?>
--EXPECTF--
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d
diff --git a/ext/standard/tests/strings/strrpos_variation14.phpt b/ext/standard/tests/strings/strrpos_variation14.phpt
index 0ce98242a3..a0586db20f 100644
--- a/ext/standard/tests/strings/strrpos_variation14.phpt
+++ b/ext/standard/tests/strings/strrpos_variation14.phpt
@@ -94,7 +94,7 @@ int(6)
int(6)
-- Iteration 3 --
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-- Iteration 4 --
int(6)
@@ -102,23 +102,23 @@ int(6)
int(6)
-- Iteration 6 --
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- Iteration 7 --
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- Iteration 8 --
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- Iteration 9 --
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- Iteration 10 --
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
bool(false)
-- Iteration 11 --
int(6)
@@ -130,15 +130,15 @@ int(6)
int(6)
-- Iteration 15 --
-Warning: strrpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- Iteration 16 --
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 17 --
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 18 --
int(6)
@@ -146,7 +146,7 @@ int(6)
int(6)
-- Iteration 20 --
-Warning: strrpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, resource given in %s on line %d
bool(false)
-- Iteration 21 --
int(6)
diff --git a/ext/standard/tests/strings/strrpos_variation15.phpt b/ext/standard/tests/strings/strrpos_variation15.phpt
index 3f96d4a915..d9a40e02b0 100644
--- a/ext/standard/tests/strings/strrpos_variation15.phpt
+++ b/ext/standard/tests/strings/strrpos_variation15.phpt
@@ -112,7 +112,7 @@ Warning: strrpos(): Offset is greater than the length of haystack string in %s o
bool(false)
-- Iteration 7 --
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
bool(false)
-- Iteration 8 --
bool(false)
@@ -148,15 +148,15 @@ bool(false)
bool(false)
-- Iteration 19 --
-Warning: strrpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, object given in %s on line %d
bool(false)
-- Iteration 20 --
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 21 --
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
bool(false)
-- Iteration 22 --
bool(false)
diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt
index 13eb327f72..db1a51abf4 100644
--- a/ext/standard/tests/strings/strspn_variation3.phpt
+++ b/ext/standard/tests/strings/strspn_variation3.phpt
@@ -123,42 +123,42 @@ int(2)
-- Iteration with start value as "Array" --
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "Array" --
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
NULL
-- Iteration with start value as "" --
@@ -187,42 +187,42 @@ int(2)
-- Iteration with start value as "" --
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "" --
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "string" --
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "string" --
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
NULL
-- Iteration with start value as "object" --
-Warning: strspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, object given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, object given in %s on line %d
NULL
-- Iteration with start value as "" --
@@ -235,9 +235,9 @@ int(2)
-- Iteration with start value as "Resource id #%d" --
-Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d
NULL
-Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d
NULL
Done \ No newline at end of file
diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt
index c723328482..74c7db421b 100644
--- a/ext/standard/tests/strings/strspn_variation4.phpt
+++ b/ext/standard/tests/strings/strspn_variation4.phpt
@@ -117,27 +117,27 @@ int(0)
-- Iteration with len value as "Array" --
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "Array" --
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
NULL
-- Iteration with len value as "" --
@@ -160,27 +160,27 @@ int(0)
-- Iteration with len value as "" --
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "" --
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "string" --
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "string" --
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
NULL
-- Iteration with len value as "object" --
-Warning: strspn() expects parameter 4 to be integer, object given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, object given in %s on line %d
NULL
-- Iteration with len value as "" --
@@ -191,6 +191,6 @@ int(0)
-- Iteration with len value as "Resource id #%d" --
-Warning: strspn() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, resource given in %s on line %d
NULL
Done \ No newline at end of file
diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index 4f69ee57c5..830678f199 100644
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -41,6 +41,6 @@ Warning: substr_compare(): The length must be greater than or equal to zero in %
bool(false)
bool(true)
-Warning: substr_compare() expects parameter 4 to be integer, string given in %s on line %d
+Warning: substr_compare() expects parameter 4 to be int, string given in %s on line %d
bool(false)
Done
diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt
index 881da391e6..c086582caa 100644
--- a/ext/standard/tests/strings/substr_count_error.phpt
+++ b/ext/standard/tests/strings/substr_count_error.phpt
@@ -49,7 +49,7 @@ bool(false)
Warning: substr_count(): Invalid length value in %s on line %d
bool(false)
-Warning: substr_count() expects parameter 3 to be integer, string given in %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given in %s on line %d
NULL
Warning: substr_count(): Invalid length value in %s on line %d
diff --git a/ext/standard/tests/strings/substr_count_variation_001.phpt b/ext/standard/tests/strings/substr_count_variation_001.phpt
index a9d538d17a..c2644ce89b 100644
--- a/ext/standard/tests/strings/substr_count_variation_001.phpt
+++ b/ext/standard/tests/strings/substr_count_variation_001.phpt
@@ -68,13 +68,13 @@ int(2)
-- 3rd or 4th arg as NULL --
-Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given %s on line %d
NULL
-Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given %s on line %d
NULL
-Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given %s on line %d
NULL
int(0)
int(2)
diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt
index 5f51da81f8..61d2bbfc8b 100644
--- a/ext/standard/tests/strings/wordwrap_variation2.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation2.phpt
@@ -128,68 +128,68 @@ string(39) "testing<br />\nwordwrap<br />\nfunction"
string(223) "<br />\nt<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br />\ng<br />\n<br />\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br />\np<br />\n<br />\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br />\nn"
-- Iteration 4 --
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 5 --
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 6 --
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 7 --
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 8 --
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
NULL
-- Iteration 9 --
string(25) "testing
@@ -225,42 +225,42 @@ Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 14 --
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 15 --
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
NULL
-- Iteration 16 --
string(25) "testing
@@ -282,42 +282,42 @@ Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
bool(false)
-- Iteration 18 --
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 19 --
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
NULL
-- Iteration 20 --
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
NULL
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
NULL
-- Iteration 21 --
string(25) "testing
diff --git a/ext/standard/tests/url/get_headers_error_002.phpt b/ext/standard/tests/url/get_headers_error_002.phpt
index 4a335c8a75..a1bcdba99b 100644
--- a/ext/standard/tests/url/get_headers_error_002.phpt
+++ b/ext/standard/tests/url/get_headers_error_002.phpt
@@ -39,17 +39,17 @@ echo "Done"
-- Testing get_headers() function with format argument as type string --
-Warning: get_headers() expects parameter 2 to be integer, string given in %s on line 13
+Warning: get_headers() expects parameter 2 to be int, string given in %s on line 13
NULL
-- Testing get_headers() function with format argument as type array --
-Warning: get_headers() expects parameter 2 to be integer, array given in %s on line 17
+Warning: get_headers() expects parameter 2 to be int, array given in %s on line 17
NULL
-- Testing get_headers() function with format argument as type object --
-Warning: get_headers() expects parameter 2 to be integer, object given in %s on line 26
+Warning: get_headers() expects parameter 2 to be int, object given in %s on line 26
NULL
Done
diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
index b03393ea8e..fe4ca7bd09 100644
--- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
+++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
@@ -108,7 +108,7 @@ array(8) {
}
Arg value 101234567000
-Error: 2 - parse_url() expects parameter 2 to be integer, float given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, float given, %s(%d)
NULL
Arg value 1.07654321E-9
@@ -119,27 +119,27 @@ string(4) "http"
Error: 8 - Array to string conversion, %s(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
NULL
Error: 8 - Array to string conversion, %s(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
NULL
Error: 8 - Array to string conversion, %s(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
NULL
Error: 8 - Array to string conversion, %s(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
NULL
Error: 8 - Array to string conversion, %s(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
NULL
Arg value
@@ -161,24 +161,24 @@ Arg value
string(4) "http"
Arg value
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
NULL
Arg value
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
NULL
Arg value string
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
NULL
Arg value string
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
NULL
Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
Arg value
-Error: 2 - parse_url() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, object given, %s(%d)
NULL
Arg value
diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
index 1c24e1f727..adf9c03058 100644
--- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
+++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
@@ -119,27 +119,27 @@ string(4) "http"
Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
NULL
Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
NULL
Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
NULL
Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
NULL
Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
Arg value Array
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
NULL
Arg value
@@ -161,24 +161,24 @@ Arg value
string(4) "http"
Arg value
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
NULL
Arg value
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
NULL
Arg value string
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
NULL
Arg value string
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
NULL
Error: 4096 - Object of class stdClass could not be converted to string, %s(70)
Arg value
-Error: 2 - parse_url() expects parameter 2 to be integer, object given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, object given, %s(71)
NULL
Arg value
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index cf83b8228b..c27782a07f 100644
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -62,7 +62,7 @@ bool(false)
Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d
resource(%d) of type (sysvshm)
-Warning: shm_remove() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: shm_remove() expects parameter 1 to be resource, int given in %s on line %d
resource(%d) of type (sysvshm)
resource(%d) of type (sysvshm)
resource(%d) of type (sysvshm)
diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt
index 9b5ed4ddba..565c7c454e 100644
--- a/ext/sysvshm/tests/003.phpt
+++ b/ext/sysvshm/tests/003.phpt
@@ -46,12 +46,12 @@ bool(false)
Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s003.php on line %d
-Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d
+Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
NULL
-Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d
+Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
NULL
-Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d
+Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
NULL
Done
diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt
index 877f9f4a6d..ea931cbca2 100644
--- a/ext/sysvshm/tests/004.phpt
+++ b/ext/sysvshm/tests/004.phpt
@@ -29,10 +29,10 @@ echo "Done\n";
Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on line %d
NULL
-Warning: shm_put_var() expects parameter 1 to be resource, integer given in %s004.php on line %d
+Warning: shm_put_var() expects parameter 1 to be resource, int given in %s004.php on line %d
NULL
-Warning: shm_put_var() expects parameter 1 to be resource, integer given in %s004.php on line %d
+Warning: shm_put_var() expects parameter 1 to be resource, int given in %s004.php on line %d
NULL
bool(true)
bool(true)
diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
index 15200c6dd8..6608aba2c7 100644
--- a/ext/sysvshm/tests/005.phpt
+++ b/ext/sysvshm/tests/005.phpt
@@ -45,7 +45,7 @@ echo "Done\n";
Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d
NULL
-Warning: shm_get_var() expects parameter 1 to be resource, integer given in %s005.php on line %d
+Warning: shm_get_var() expects parameter 1 to be resource, int given in %s005.php on line %d
NULL
Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d
@@ -54,7 +54,7 @@ bool(false)
Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line %d
bool(false)
-Warning: shm_get_var() expects parameter 2 to be integer, array given in %s005.php on line %d
+Warning: shm_get_var() expects parameter 2 to be int, array given in %s005.php on line %d
NULL
string(11) "test string"
object(stdClass)#%d (0) {
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
index 1e4ec1c357..a8f5064b4b 100644
--- a/ext/sysvshm/tests/006.phpt
+++ b/ext/sysvshm/tests/006.phpt
@@ -33,7 +33,7 @@ echo "Done\n";
Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d
NULL
-Warning: shm_remove_var() expects parameter 1 to be resource, integer given in %s006.php on line %d
+Warning: shm_remove_var() expects parameter 1 to be resource, int given in %s006.php on line %d
NULL
Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index 584f13ac7a..89e32e6c4f 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -28,10 +28,10 @@ echo "Done\n";
Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d
NULL
-Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d
+Warning: shm_remove() expects parameter 1 to be resource, int given in %s007.php on line %d
NULL
-Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d
+Warning: shm_remove() expects parameter 1 to be resource, int given in %s007.php on line %d
NULL
Warning: shm_remove() expects parameter 1 to be resource, string given in %s007.php on line %d
diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
index 2f0fb6fc2d..a09e5ef19c 100644
--- a/ext/tokenizer/tests/001.phpt
+++ b/ext/tokenizer/tests/001.phpt
@@ -252,9 +252,9 @@ T_HALT_COMPILER
UNKNOWN
UNKNOWN
-Warning: token_name() expects parameter 1 to be integer, string given in %s on line %d
+Warning: token_name() expects parameter 1 to be int, string given in %s on line %d
-Warning: token_name() expects parameter 1 to be integer, array given in %s on line %d
+Warning: token_name() expects parameter 1 to be int, array given in %s on line %d
Done
diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt
index c97d995cf5..ff152f8238 100644
--- a/ext/xml/tests/xml_error_string_variation1.phpt
+++ b/ext/xml/tests/xml_error_string_variation1.phpt
@@ -103,27 +103,27 @@ string(8) "No error"
Arg value Array
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
NULL
Arg value
@@ -146,27 +146,27 @@ string(8) "No error"
Arg value
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
NULL
Arg value
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
NULL
Arg value string
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
NULL
Arg value string
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
NULL
Arg value Some Ascii Data
-Warning: xml_error_string() expects parameter 1 to be integer, object given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, object given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
index 2214c86ffa..dbc9066215 100644
--- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
Arg value 0
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
index afcac48c4b..37b1ee98d9 100644
--- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
Arg value 0
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
index 1b92c2784d..e7342a6c34 100644
--- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
Arg value 0
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt
index 62e9ac9fb3..7f23030fb1 100644
--- a/ext/xml/tests/xml_get_error_code_variation1.phpt
+++ b/ext/xml/tests/xml_get_error_code_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
Arg value 0
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
index 39ce62a5da..cbaa0d814c 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
Arg value 0
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt
index 34afcd87b5..182e9f6fd5 100644
--- a/ext/xml/tests/xml_parse_variation1.phpt
+++ b/ext/xml/tests/xml_parse_variation1.phpt
@@ -101,22 +101,22 @@ echo "Done";
Arg value 0
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt
index 7c6468a827..4f7813bf5d 100644
--- a/ext/xml/tests/xml_parser_free_variation1.phpt
+++ b/ext/xml/tests/xml_parser_free_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
Arg value 0
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt
index 002bff6cd8..c94f87f420 100644
--- a/ext/xml/tests/xml_parser_get_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
Arg value 0
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt
index e741b9fa65..367128727c 100644
--- a/ext/xml/tests/xml_parser_get_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt
@@ -134,27 +134,27 @@ bool(false)
Arg value Array
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value
@@ -185,32 +185,32 @@ bool(false)
Arg value
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value string
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value string
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value Some Ascii Data
-Warning: xml_parser_get_option() expects parameter 2 to be integer, object given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, object given in %s on line %d
NULL
Arg value Resource id %s
-Warning: xml_parser_get_option() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, resource given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt
index 14452dbe21..f606a78670 100644
--- a/ext/xml/tests/xml_parser_set_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
Arg value 0
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt
index a367ede171..3432e11d73 100644
--- a/ext/xml/tests/xml_parser_set_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt
@@ -129,27 +129,27 @@ bool(false)
Arg value Array
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value Array
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
NULL
Arg value
@@ -180,27 +180,27 @@ bool(false)
Arg value
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value string
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value string
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
NULL
Arg value Some Ascii Data
-Warning: xml_parser_set_option() expects parameter 2 to be integer, object given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, object given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
index 3e9f79768a..ce060f267f 100644
--- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt
index afd0b6ed98..33183aea4e 100644
--- a/ext/xml/tests/xml_set_default_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt
index 336237ab84..f737b5f302 100644
--- a/ext/xml/tests/xml_set_element_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
index eb90d99404..eb52a82c09 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
index 890374ea24..8b9b99ba53 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
index 97172658f9..864ccddd36 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt
index fe06f9a248..6f581ba343 100644
--- a/ext/xml/tests/xml_set_object_variation1.phpt
+++ b/ext/xml/tests/xml_set_object_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt
index bca3472a07..cf8b189381 100644
--- a/ext/xml/tests/xml_set_object_variation2.phpt
+++ b/ext/xml/tests/xml_set_object_variation2.phpt
@@ -94,22 +94,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
index 957458275b..5293c3c3ae 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
index 0a80b21a76..949e51e90f 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
index ec1061e59b..5ba3534d2b 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
Arg value 0
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 12345
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value -2345
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
NULL
Arg value 10.5
diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index 740054269f..39c4714033 100644
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -81,6 +81,6 @@ bool(false)
Warning: gzdeflate() expects parameter 1 to be string, object given in %s on line %d
NULL
-Warning: gzdeflate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gzdeflate() expects parameter 2 to be int, object given in %s on line %d
NULL
===Done===
diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index 5a16ffbc5f..967f4c4e05 100644
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -84,15 +84,15 @@ bool(false)
Warning: gzencode() expects parameter 1 to be string, object given in %s on line %d
NULL
-Warning: gzencode() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gzencode() expects parameter 2 to be int, object given in %s on line %d
NULL
Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
bool(false)
-Warning: gzencode() expects parameter 3 to be integer, object given in %s on line %d
+Warning: gzencode() expects parameter 3 to be int, object given in %s on line %d
NULL
-Warning: gzencode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzencode() expects parameter 2 to be int, string given in %s on line %d
NULL
===Done===
diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt
index 145e4c53ca..81f844402b 100644
--- a/ext/zlib/tests/gzfile_variation10.phpt
+++ b/ext/zlib/tests/gzfile_variation10.phpt
@@ -71,10 +71,10 @@ array(6) {
"
}
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
array(6) {
[0]=>
diff --git a/ext/zlib/tests/gzfile_variation13.phpt b/ext/zlib/tests/gzfile_variation13.phpt
index 24f3c84451..f090ac38b8 100644
--- a/ext/zlib/tests/gzfile_variation13.phpt
+++ b/ext/zlib/tests/gzfile_variation13.phpt
@@ -44,8 +44,8 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-Error: 2 - gzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - gzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
-Error: 2 - gzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - gzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/gzfile_variation14.phpt b/ext/zlib/tests/gzfile_variation14.phpt
index 92547adb7c..1d7ec54433 100644
--- a/ext/zlib/tests/gzfile_variation14.phpt
+++ b/ext/zlib/tests/gzfile_variation14.phpt
@@ -30,15 +30,15 @@ foreach ( $variation_array as $var ) {
===DONE===
--EXPECTF--
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index 36d1d4c71b..ed7ece218c 100644
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -26,15 +26,15 @@ foreach ( $variation as $var ) {
===DONE===
--EXPECTF--
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/gzfile_variation8.phpt b/ext/zlib/tests/gzfile_variation8.phpt
index 070fa30e40..9c9a29d485 100644
--- a/ext/zlib/tests/gzfile_variation8.phpt
+++ b/ext/zlib/tests/gzfile_variation8.phpt
@@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
===DONE===
--EXPECTF--
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index 822d9b8129..1921afc859 100644
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -70,6 +70,6 @@ bool(false)
Warning: gzinflate() expects parameter 1 to be string, object given in %s on line %d
NULL
-Warning: gzinflate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gzinflate() expects parameter 2 to be int, object given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/gzopen_variation3.phpt b/ext/zlib/tests/gzopen_variation3.phpt
index 4ba607420d..e0e60f8c7a 100644
--- a/ext/zlib/tests/gzopen_variation3.phpt
+++ b/ext/zlib/tests/gzopen_variation3.phpt
@@ -142,19 +142,19 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
--empty array--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -176,35 +176,35 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
--empty string DQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - gzopen() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - gzopen() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, object given, %s(%d)
NULL
--undefined var--
@@ -214,6 +214,6 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
--resource--
-Error: 2 - gzopen() expects parameter 3 to be integer, resource given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, resource given, %s(%d)
NULL
===DONE===
diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt
index baf2527c14..71c60552ec 100644
--- a/ext/zlib/tests/gzuncompress_error1.phpt
+++ b/ext/zlib/tests/gzuncompress_error1.phpt
@@ -75,6 +75,6 @@ bool(false)
Warning: gzuncompress() expects parameter 1 to be string, object given in %s on line %d
NULL
-Warning: gzuncompress() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzuncompress() expects parameter 2 to be int, string given in %s on line %d
NULL
===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
index 0f24c5efb2..323dca16ce 100644
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ b/ext/zlib/tests/readgzfile_variation10.phpt
@@ -45,10 +45,10 @@ as it turns around
and I know that it descends down on me
int(176)
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
When you're taught through feelings
Destiny flying high above
diff --git a/ext/zlib/tests/readgzfile_variation13.phpt b/ext/zlib/tests/readgzfile_variation13.phpt
index d6c1fb4042..e7fe83ccc2 100644
--- a/ext/zlib/tests/readgzfile_variation13.phpt
+++ b/ext/zlib/tests/readgzfile_variation13.phpt
@@ -44,8 +44,8 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-Error: 2 - readgzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - readgzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
-Error: 2 - readgzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - readgzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt
index 08f62935bc..23ba1dcf0c 100644
--- a/ext/zlib/tests/readgzfile_variation14.phpt
+++ b/ext/zlib/tests/readgzfile_variation14.phpt
@@ -30,15 +30,15 @@ foreach ( $variation_array as $var ) {
===DONE===
--EXPECTF--
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 80cb728e93..88a82f0182 100644
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -26,15 +26,15 @@ foreach ( $variation as $var ) {
===DONE===
--EXPECTF--
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/ext/zlib/tests/readgzfile_variation8.phpt b/ext/zlib/tests/readgzfile_variation8.phpt
index 7242f19b22..bd2a58382b 100644
--- a/ext/zlib/tests/readgzfile_variation8.phpt
+++ b/ext/zlib/tests/readgzfile_variation8.phpt
@@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
===DONE===
--EXPECTF--
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
===DONE=== \ No newline at end of file
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index fc3032602f..06a7084cc3 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -43,24 +43,24 @@ string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {
}
- Constants [19] {
- Constant [ integer PREG_PATTERN_ORDER ] { 1 }
- Constant [ integer PREG_SET_ORDER ] { 2 }
- Constant [ integer PREG_OFFSET_CAPTURE ] { 256 }
- Constant [ integer PREG_UNMATCHED_AS_NULL ] { 512 }
- Constant [ integer PREG_SPLIT_NO_EMPTY ] { 1 }
- Constant [ integer PREG_SPLIT_DELIM_CAPTURE ] { 2 }
- Constant [ integer PREG_SPLIT_OFFSET_CAPTURE ] { 4 }
- Constant [ integer PREG_GREP_INVERT ] { 1 }
- Constant [ integer PREG_NO_ERROR ] { 0 }
- Constant [ integer PREG_INTERNAL_ERROR ] { 1 }
- Constant [ integer PREG_BACKTRACK_LIMIT_ERROR ] { 2 }
- Constant [ integer PREG_RECURSION_LIMIT_ERROR ] { 3 }
- Constant [ integer PREG_BAD_UTF8_ERROR ] { 4 }
- Constant [ integer PREG_BAD_UTF8_OFFSET_ERROR ] { 5 }
- Constant [ integer PREG_JIT_STACKLIMIT_ERROR ] { 6 }
+ Constant [ int PREG_PATTERN_ORDER ] { 1 }
+ Constant [ int PREG_SET_ORDER ] { 2 }
+ Constant [ int PREG_OFFSET_CAPTURE ] { 256 }
+ Constant [ int PREG_UNMATCHED_AS_NULL ] { 512 }
+ Constant [ int PREG_SPLIT_NO_EMPTY ] { 1 }
+ Constant [ int PREG_SPLIT_DELIM_CAPTURE ] { 2 }
+ Constant [ int PREG_SPLIT_OFFSET_CAPTURE ] { 4 }
+ Constant [ int PREG_GREP_INVERT ] { 1 }
+ Constant [ int PREG_NO_ERROR ] { 0 }
+ Constant [ int PREG_INTERNAL_ERROR ] { 1 }
+ Constant [ int PREG_BACKTRACK_LIMIT_ERROR ] { 2 }
+ Constant [ int PREG_RECURSION_LIMIT_ERROR ] { 3 }
+ Constant [ int PREG_BAD_UTF8_ERROR ] { 4 }
+ Constant [ int PREG_BAD_UTF8_OFFSET_ERROR ] { 5 }
+ Constant [ int PREG_JIT_STACKLIMIT_ERROR ] { 6 }
Constant [ string PCRE_VERSION ] { %s }
- Constant [ integer PCRE_VERSION_MAJOR ] { %d }
- Constant [ integer PCRE_VERSION_MINOR ] { %d }
+ Constant [ int PCRE_VERSION_MAJOR ] { %d }
+ Constant [ int PCRE_VERSION_MINOR ] { %d }
Constant [ boolean PCRE_JIT_SUPPORT ] { %d }
}
diff --git a/sapi/phpdbg/tests/info_002.phpt b/sapi/phpdbg/tests/info_002.phpt
index faeca0e430..8b1aa0930c 100644
--- a/sapi/phpdbg/tests/info_002.phpt
+++ b/sapi/phpdbg/tests/info_002.phpt
@@ -13,11 +13,11 @@ prompt> [Breakpoint #0 at %s:10, hits: 1]
00011:
prompt> [User-defined constants (2)]
Address Refs Type Constant
-%s 1 integer A
+%s 1 int A
int (10)
-%s 1 integer B
+%s 1 int B
int (100)
-prompt>
+prompt>
--FILE--
<?php
diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt
index 50de31e44b..fb788e3d9c 100644
--- a/tests/classes/type_hinting_003.phpt
+++ b/tests/classes/type_hinting_003.phpt
@@ -57,7 +57,7 @@ array(1) {
int(25)
}
-Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, int given, called in %s on line %d and defined in %s:%d
Stack trace:
#0 %s(%d): Test::f1(1)
#1 {main}
diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt
index 95df6264dd..174664c02f 100644
--- a/tests/classes/type_hinting_004.phpt
+++ b/tests/classes/type_hinting_004.phpt
@@ -7,7 +7,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
echo "$errno: $errstr - $errfile($errline)\n";
return true;
}
-
+
echo "---> Type hints with callback function:\n";
class A { }
function f1(A $a) {
@@ -46,7 +46,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
} catch (Error $ex) {
echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
}
-
+
echo "\n\n---> Type hints with callback static method:\n";
class C {
static function f1(A $a) {
@@ -95,7 +95,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
} catch (Error $ex) {
echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
}
-
+
echo "\n\n---> Type hints with callback instance method:\n";
class D {
function f1(A $a) {
@@ -145,14 +145,14 @@ Ensure type hints are enforced for functions invoked as callbacks.
} catch (Error $ex) {
echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
}
-
+
?>
--EXPECTF--
---> Type hints with callback function:
-0: Argument 1 passed to f1() must be an instance of A, integer given%s(%d)
+0: Argument 1 passed to f1() must be an instance of A, int given%s(%d)
in f1;
-0: Argument 1 passed to f2() must be an instance of A or null, integer given%s(%d)
+0: Argument 1 passed to f2() must be an instance of A or null, int given%s(%d)
in f2;
in f2;
@@ -160,10 +160,10 @@ in f2;
---> Type hints with callback static method:
-0: Argument 1 passed to C::f1() must be an instance of A, integer given%s(%d)
+0: Argument 1 passed to C::f1() must be an instance of A, int given%s(%d)
in C::f1 (static);
-0: Argument 1 passed to C::f2() must be an instance of A or null, integer given%s(%d)
+0: Argument 1 passed to C::f2() must be an instance of A or null, int given%s(%d)
in C::f2 (static);
in C::f2 (static);
@@ -171,10 +171,10 @@ in C::f2 (static);
---> Type hints with callback instance method:
-0: Argument 1 passed to D::f1() must be an instance of A, integer given%s(%d)
+0: Argument 1 passed to D::f1() must be an instance of A, int given%s(%d)
in C::f1 (instance);
-0: Argument 1 passed to D::f2() must be an instance of A or null, integer given%s(%d)
+0: Argument 1 passed to D::f2() must be an instance of A or null, int given%s(%d)
in C::f2 (instance);
in C::f2 (instance);
diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt
index b089569d91..a53457d5d9 100644
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -53,7 +53,7 @@ int(2)
object(foo)#%d (0) {
}
-Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, int given in %s:%d
Stack trace:
#0 [internal function]: typehint(1, 1)
#1 %s(%d): array_walk(Array, 'typehint')
diff --git a/tests/lang/func_get_arg_variation.phpt b/tests/lang/func_get_arg_variation.phpt
index 3dab69f246..83b20848fe 100644
--- a/tests/lang/func_get_arg_variation.phpt
+++ b/tests/lang/func_get_arg_variation.phpt
@@ -20,7 +20,7 @@ Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d
Warning: func_get_arg() expects exactly 1 parameter, 2 given in %s on line %d
-Warning: func_get_arg() expects parameter 1 to be integer, string given in %s on line %d
+Warning: func_get_arg() expects parameter 1 to be int, string given in %s on line %d
Warning: func_get_arg(): The argument number should be >= 0 in %s on line %d
diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt
index 64c911d447..8f2442f8f8 100644
--- a/tests/output/ob_implicit_flush_variation_001.phpt
+++ b/tests/output/ob_implicit_flush_variation_001.phpt
@@ -122,19 +122,19 @@ NULL
NULL
--empty array--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
NULL
--int indexed array--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
NULL
--associative array--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
NULL
--nested arrays--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
NULL
--uppercase NULL--
@@ -156,35 +156,35 @@ NULL
NULL
--empty string DQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
NULL
--empty string SQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
NULL
--string DQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
NULL
--string SQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
NULL
--mixed case string--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
NULL
--heredoc--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
NULL
--instance of classWithToString--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, object given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97)
NULL
--instance of classWithoutToString--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, object given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97)
NULL
--undefined var--
diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt
index 34aa13d802..92372c7747 100644
--- a/tests/output/ob_start_error_001.phpt
+++ b/tests/output/ob_start_error_001.phpt
@@ -44,10 +44,10 @@ bool(false)
- Arg 2 wrong type
-Warning: ob_start() expects parameter 2 to be integer, string given in %s on line 23
+Warning: ob_start() expects parameter 2 to be int, string given in %s on line 23
NULL
- Arg 3 wrong type
-Warning: ob_start() expects parameter 3 to be integer, string given in %s on line 26
+Warning: ob_start() expects parameter 3 to be int, string given in %s on line 26
NULL