summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/tests/008.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_basic.phpt10
-rw-r--r--Zend/tests/type_declarations/scalar_null.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_return_basic.phpt10
-rw-r--r--Zend/tests/type_declarations/scalar_return_basic_64bit.phpt10
-rw-r--r--Zend/tests/type_declarations/scalar_strict.phpt40
-rw-r--r--Zend/tests/type_declarations/scalar_strict_64bit.phpt40
-rw-r--r--Zend/tests/type_declarations/scalar_strict_basic.phpt26
-rw-r--r--Zend/zend_API.c4
-rw-r--r--Zend/zend_API.h2
-rw-r--r--ext/curl/tests/curl_setopt_error.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getOffset_variation1.phpt16
-rw-r--r--ext/date/tests/DateTime_construct_variation2.phpt8
-rw-r--r--ext/date/tests/DateTime_setTimezone_variation1.phpt8
-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_format_variation1.phpt8
-rw-r--r--ext/date/tests/date_isodate_set_variation1.phpt8
-rw-r--r--ext/date/tests/date_modify_variation1.phpt8
-rw-r--r--ext/date/tests/date_offset_get_variation1.phpt8
-rw-r--r--ext/date/tests/date_time_set_variation1.phpt8
-rw-r--r--ext/date/tests/date_timezone_get_variation1.phpt8
-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/gettimeofday_variation1.phpt16
-rw-r--r--ext/date/tests/localtime_variation2.phpt12
-rw-r--r--ext/date/tests/microtime_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_variation1.phpt8
-rw-r--r--ext/fileinfo/tests/bug71527-mb.phpt2
-rw-r--r--ext/fileinfo/tests/bug71527.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_variation1.phpt8
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error2.phpt4
-rw-r--r--ext/imap/tests/imap_close_variation1.phpt8
-rw-r--r--ext/imap/tests/imap_expunge_error.phpt2
-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_fetchheader_variation1.phpt8
-rw-r--r--ext/imap/tests/imap_gc_error.phpt2
-rw-r--r--ext/imap/tests/imap_headers.phpt2
-rw-r--r--ext/imap/tests/imap_num_msg_error.phpt2
-rw-r--r--ext/imap/tests/imap_num_recent_error.phpt2
-rw-r--r--ext/imap/tests/imap_ping_error.phpt2
-rw-r--r--ext/interbase/tests/bug45373.phpt2
-rw-r--r--ext/interbase/tests/ibase_num_params_001.phpt2
-rw-r--r--ext/intl/tests/breakiter___construct_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setLenient_error.phpt4
-rw-r--r--ext/intl/tests/timezone_getDisplayName_error.phpt2
-rw-r--r--ext/libxml/tests/001.phpt2
-rw-r--r--ext/mbstring/tests/mb_stristr_variation3.phpt14
-rw-r--r--ext/mbstring/tests/mb_strrchr_variation3.phpt14
-rw-r--r--ext/mbstring/tests/mb_strrichr_variation3.phpt14
-rw-r--r--ext/mbstring/tests/mb_strstr_variation3.phpt14
-rw-r--r--ext/mysqli/tests/057.phpt2
-rw-r--r--ext/mysqli/tests/bug33491.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_free_result.phpt4
-rw-r--r--ext/mysqli/tests/mysqli_max_links.phpt20
-rw-r--r--ext/mysqli/tests/mysqli_num_rows.phpt4
-rw-r--r--ext/oci8/tests/bug51291_1.phpt4
-rw-r--r--ext/openssl/tests/openssl_pkey_new_error.phpt6
-rw-r--r--ext/openssl/tests/openssl_x509_free_basic.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt2
-rw-r--r--ext/phar/tests/open_for_write_existing_b.phpt4
-rw-r--r--ext/phar/tests/open_for_write_existing_c.phpt4
-rw-r--r--ext/phar/tests/open_for_write_newfile_b.phpt4
-rw-r--r--ext/phar/tests/open_for_write_newfile_c.phpt4
-rw-r--r--ext/phar/tests/phar_running.phpt2
-rw-r--r--ext/phar/tests/tar/open_for_write_existing_b.phpt4
-rw-r--r--ext/phar/tests/tar/open_for_write_existing_c.phpt4
-rw-r--r--ext/phar/tests/tar/open_for_write_newfile_b.phpt4
-rw-r--r--ext/phar/tests/tar/open_for_write_newfile_c.phpt4
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_b.phpt4
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_c.phpt4
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_b.phpt4
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_c.phpt4
-rw-r--r--ext/reflection/tests/ReflectionClassConstant_basic1.phpt6
-rw-r--r--ext/reflection/tests/ReflectionClass_isInstance_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt4
-rw-r--r--ext/reflection/tests/ReflectionMethod_invoke_basic.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_invoke_error1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_isInstance_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_getValue_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_setValue_error.phpt2
-rw-r--r--ext/reflection/tests/bug29986.phpt2
-rw-r--r--ext/session/tests/session_regenerate_id_error.phpt4
-rw-r--r--ext/session/tests/session_set_cookie_params_error.phpt8
-rw-r--r--ext/session/tests/session_start_error.phpt8
-rw-r--r--ext/sockets/tests/socket_create_listen_used.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt2
-rw-r--r--ext/spl/tests/SplObjectStorage_attach_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/class_implements_variation2.phpt14
-rw-r--r--ext/spl/tests/class_uses_variation2.phpt14
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_chunk_variation1.phpt24
-rw-r--r--ext/standard/tests/array/array_chunk_variation3.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_fill_keys_variation3.phpt2
-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.phpt4
-rw-r--r--ext/standard/tests/array/array_key_exists_variation2.phpt8
-rw-r--r--ext/standard/tests/array/array_pad_variation1.phpt16
-rw-r--r--ext/standard/tests/array/array_product_variation5.phpt8
-rw-r--r--ext/standard/tests/array/array_push_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_rand_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_reverse_variation1.phpt24
-rw-r--r--ext/standard/tests/array/array_reverse_variation2.phpt14
-rw-r--r--ext/standard/tests/array/array_shift_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_slice_variation11.phpt8
-rw-r--r--ext/standard/tests/array/array_slice_variation4.phpt4
-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_variation1.phpt8
-rw-r--r--ext/standard/tests/array/array_walk_closure.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/asort_variation1.phpt32
-rw-r--r--ext/standard/tests/array/current_variation1.phpt8
-rw-r--r--ext/standard/tests/array/end_variation1.phpt8
-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/ksort_variation1.phpt32
-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/shuffle_variation1.phpt8
-rw-r--r--ext/standard/tests/array/sort_variation1.phpt32
-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/class_object/class_exists_variation_002.phpt12
-rw-r--r--ext/standard/tests/class_object/get_class_variation_001.phpt8
-rw-r--r--ext/standard/tests/class_object/get_object_vars_variation_003.phpt8
-rw-r--r--ext/standard/tests/class_object/interface_exists_variation2.phpt12
-rw-r--r--ext/standard/tests/class_object/is_a_error_001.phpt2
-rw-r--r--ext/standard/tests/class_object/is_subclass_of_error_001.phpt2
-rw-r--r--ext/standard/tests/class_object/trait_exists_variation_002.phpt12
-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_variation3-win32-mb.phpt8
-rw-r--r--ext/standard/tests/dir/scandir_variation3.phpt8
-rw-r--r--ext/standard/tests/file/007_error.phpt4
-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_get_contents_variation3.phpt12
-rw-r--r--ext/standard/tests/file/file_get_contents_variation4.phpt8
-rw-r--r--ext/standard/tests/file/file_put_contents_variation3.phpt8
-rw-r--r--ext/standard/tests/file/file_variation4.phpt8
-rw-r--r--ext/standard/tests/file/fopen_variation10-win32.phpt10
-rw-r--r--ext/standard/tests/file/fopen_variation11-win32.phpt10
-rw-r--r--ext/standard/tests/file/fopen_variation3.phpt12
-rw-r--r--ext/standard/tests/file/fopen_variation4.phpt8
-rw-r--r--ext/standard/tests/file/fpassthru_error.phpt2
-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/fstat_variation2.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/mkdir_variation3.phpt12
-rw-r--r--ext/standard/tests/file/mkdir_variation4.phpt8
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation5.phpt12
-rw-r--r--ext/standard/tests/file/pclose_variation1.phpt8
-rw-r--r--ext/standard/tests/file/readfile_error.phpt2
-rw-r--r--ext/standard/tests/file/readfile_variation4.phpt8
-rw-r--r--ext/standard/tests/file/readfile_variation5.phpt12
-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/unlink_error-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/unlink_error-win32.phpt2
-rw-r--r--ext/standard/tests/file/unlink_error.phpt2
-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/image/image_type_to_extension.phpt2
-rw-r--r--ext/standard/tests/strings/sha1_variation2.phpt14
-rw-r--r--ext/standard/tests/strings/substr_compare.phpt2
-rw-r--r--ext/standard/tests/strings/wordwrap_variation4.phpt12
-rw-r--r--ext/standard/tests/url/base64_decode_variation_002.phpt14
-rw-r--r--ext/sysvshm/tests/002.phpt4
-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_set_option_variation1.phpt8
-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/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt2
-rw-r--r--ext/zlib/tests/gzopen_variation4.phpt20
-rw-r--r--sapi/cli/tests/006.phpt2
233 files changed, 882 insertions, 882 deletions
diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt
index 3e990fb768..297856ec23 100644
--- a/Zend/tests/008.phpt
+++ b/Zend/tests/008.phpt
@@ -30,7 +30,7 @@ Warning: define() expects at least 2 parameters, 1 given in %s on line %d
NULL
bool(true)
-Warning: define() expects parameter 3 to be boolean, array given in %s on line %d
+Warning: define() expects parameter 3 to be bool, array given in %s on line %d
NULL
Warning: define() expects parameter 1 to be string, array given in %s on line %d
diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt
index c2191b9e64..16e7875ff9 100644
--- a/Zend/tests/type_declarations/scalar_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_basic.phpt
@@ -257,21 +257,21 @@ bool(true)
bool(false)
*** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, null given, called in %s on line %d
*** Trying array(0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, array given, called in %s on line %d
*** Trying object(stdClass)#%s (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, object given, called in %s on line %d
*** Trying object(Stringable)#%s (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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 boolean, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, resource given, called in %s on line %d
Done
diff --git a/Zend/tests/type_declarations/scalar_null.phpt b/Zend/tests/type_declarations/scalar_null.phpt
index e3beb9feac..767e36e914 100644
--- a/Zend/tests/type_declarations/scalar_null.phpt
+++ b/Zend/tests/type_declarations/scalar_null.phpt
@@ -43,7 +43,7 @@ Testing float:
Testing string:
*** Caught Argument 1 passed to {closure}() must be of the type string, null given, called in %s on line %d
Testing bool:
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, null given, called in %s on line %d
Testing int nullable:
NULL
Testing float nullable:
diff --git a/Zend/tests/type_declarations/scalar_return_basic.phpt b/Zend/tests/type_declarations/scalar_return_basic.phpt
index cf58f91500..dd7a3daf85 100644
--- a/Zend/tests/type_declarations/scalar_return_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_return_basic.phpt
@@ -200,17 +200,17 @@ bool(true)
*** Trying bool(false)
bool(false)
*** Trying NULL
-*** Caught Return value of {closure}() must be of the type boolean, null returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, null returned in %s on line %d
*** Trying array(0) {
}
-*** Caught Return value of {closure}() must be of the type boolean, array returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, array returned in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Return value of {closure}() must be of the type boolean, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, object returned in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Return value of {closure}() must be of the type boolean, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, object returned in %s on line %d
*** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of the type boolean, resource returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, resource returned in %s on line %d
Done
diff --git a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
index 9c4217203f..bec8925676 100644
--- a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
+++ b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
@@ -200,17 +200,17 @@ bool(true)
*** Trying bool(false)
bool(false)
*** Trying NULL
-*** Caught Return value of {closure}() must be of the type boolean, null returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, null returned in %s on line %d
*** Trying array(0) {
}
-*** Caught Return value of {closure}() must be of the type boolean, array returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, array returned in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Return value of {closure}() must be of the type boolean, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, object returned in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Return value of {closure}() must be of the type boolean, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, object returned in %s on line %d
*** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of the type boolean, resource returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type bool, resource returned in %s on line %d
Done
diff --git a/Zend/tests/type_declarations/scalar_strict.phpt b/Zend/tests/type_declarations/scalar_strict.phpt
index afef18f6a3..4230558b01 100644
--- a/Zend/tests/type_declarations/scalar_strict.phpt
+++ b/Zend/tests/type_declarations/scalar_strict.phpt
@@ -94,10 +94,10 @@ int(2147483647)
*** 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 int, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, bool given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, bool given, called in %s on line %d
*** Trying NULL
*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
@@ -147,10 +147,10 @@ float(2147483647)
float(NAN)
*** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type float, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type float, bool given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type float, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type float, bool given, called in %s on line %d
*** Trying NULL
*** Caught Argument 1 passed to {closure}() must be of the type float, null given, called in %s on line %d
@@ -200,10 +200,10 @@ string(0) ""
*** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
*** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type string, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, bool given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type string, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, bool given, called in %s on line %d
*** Trying NULL
*** Caught Argument 1 passed to {closure}() must be of the type string, null given, called in %s on line %d
@@ -226,31 +226,31 @@ string(0) ""
Testing 'bool' type:
*** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying float(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying float(1.5)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying string(2) "1a"
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying int(2147483647)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying bool(true)
bool(true)
@@ -259,21 +259,21 @@ bool(true)
bool(false)
*** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, null given, called in %s on line %d
*** Trying array(0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, array given, called in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, object given, called in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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 boolean, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, resource given, called in %s on line %d
Done
diff --git a/Zend/tests/type_declarations/scalar_strict_64bit.phpt b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
index 914f0e6807..b2559afae9 100644
--- a/Zend/tests/type_declarations/scalar_strict_64bit.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
@@ -94,10 +94,10 @@ int(9223372036854775807)
*** 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 int, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, bool given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, bool given, called in %s on line %d
*** Trying NULL
*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
@@ -147,10 +147,10 @@ float(9.2233720368548E+18)
float(NAN)
*** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type float, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type float, bool given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type float, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type float, bool given, called in %s on line %d
*** Trying NULL
*** Caught Argument 1 passed to {closure}() must be of the type float, null given, called in %s on line %d
@@ -200,10 +200,10 @@ string(0) ""
*** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
*** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type string, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, bool given, called in %s on line %d
*** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type string, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, bool given, called in %s on line %d
*** Trying NULL
*** Caught Argument 1 passed to {closure}() must be of the type string, null given, called in %s on line %d
@@ -226,31 +226,31 @@ string(0) ""
Testing 'bool' type:
*** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying float(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying float(1.5)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying string(2) "1a"
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying int(9223372036854775807)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying bool(true)
bool(true)
@@ -259,21 +259,21 @@ bool(true)
bool(false)
*** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, null given, called in %s on line %d
*** Trying array(0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, array given, called in %s on line %d
*** Trying object(stdClass)#6 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, object given, called in %s on line %d
*** Trying object(Stringable)#7 (0) {
}
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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 boolean, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, resource given, called in %s on line %d
Done
diff --git a/Zend/tests/type_declarations/scalar_strict_basic.phpt b/Zend/tests/type_declarations/scalar_strict_basic.phpt
index 24dff2489d..87da5f9328 100644
--- a/Zend/tests/type_declarations/scalar_strict_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_basic.phpt
@@ -74,10 +74,10 @@ int(1)
*** 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 int, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, bool given, called in %s on line %d
*** Trying false value
-*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, bool given, called in %s on line %d
*** Trying null value
*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
@@ -103,10 +103,10 @@ float(1)
*** Caught Argument 1 passed to {closure}() must be of the type float, string given, called in %s on line %d
*** Trying true value
-*** Caught Argument 1 passed to {closure}() must be of the type float, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type float, bool given, called in %s on line %d
*** Trying false value
-*** Caught Argument 1 passed to {closure}() must be of the type float, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type float, bool given, called in %s on line %d
*** Trying null value
*** Caught Argument 1 passed to {closure}() must be of the type float, null given, called in %s on line %d
@@ -132,10 +132,10 @@ Testing 'string' type:
string(1) "1"
*** Trying true value
-*** Caught Argument 1 passed to {closure}() must be of the type string, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, bool given, called in %s on line %d
*** Trying false value
-*** Caught Argument 1 passed to {closure}() must be of the type string, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, bool given, called in %s on line %d
*** Trying null value
*** Caught Argument 1 passed to {closure}() must be of the type string, null given, called in %s on line %d
@@ -152,13 +152,13 @@ string(1) "1"
Testing 'bool' type:
*** Trying integer value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, 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
+*** Caught Argument 1 passed to {closure}() must be of the type bool, float given, called in %s on line %d
*** Trying string value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, string given, called in %s on line %d
*** Trying true value
bool(true)
@@ -167,15 +167,15 @@ bool(true)
bool(false)
*** Trying null value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, null given, called in %s on line %d
*** Trying array value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, array given, called in %s on line %d
*** Trying object value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, object given, called in %s on line %d
*** Trying resource value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type bool, resource given, called in %s on line %d
Done
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index d0ab8a31ec..a2638f6f02 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -105,7 +105,7 @@ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */
case IS_FALSE:
case IS_TRUE:
case _IS_BOOL:
- return "boolean";
+ return "bool";
case IS_LONG:
return "int";
case IS_DOUBLE:
@@ -565,7 +565,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
}
if (!zend_parse_arg_bool(arg, p, is_null, check_null)) {
- return "boolean";
+ return "bool";
}
}
break;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 31ce98a121..a3e7baa772 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -691,7 +691,7 @@ END_EXTERN_C()
#define Z_EXPECTED_TYPES(_) \
_(Z_EXPECTED_LONG, "int") \
- _(Z_EXPECTED_BOOL, "boolean") \
+ _(Z_EXPECTED_BOOL, "bool") \
_(Z_EXPECTED_STRING, "string") \
_(Z_EXPECTED_ARRAY, "array") \
_(Z_EXPECTED_FUNC, "valid callback") \
diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt
index 3d157c1ede..ab864d4b2d 100644
--- a/ext/curl/tests/curl_setopt_error.phpt
+++ b/ext/curl/tests/curl_setopt_error.phpt
@@ -38,7 +38,7 @@ Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
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 1 to be resource, bool given in %s on line %d
Warning: curl_setopt() expects parameter 2 to be int, string given in %s on line %d
diff --git a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
index 700da01fea..3270566b5a 100644
--- a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
@@ -7,10 +7,10 @@ Test DateTimeZone::getOffset() function : usage variation - Passing unexpected v
* Source code: ext/date/php_date.c
* Alias to functions: timezone_offset_get()
*/
-
+
echo "*** Testing DateTimeZone::getOffset() : usage variation - unexpected values to first argument \$datetime***\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
);
@@ -177,22 +177,22 @@ bool(false)
-- lowercase true --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt
index 887e0e0a6e..c84c3b4f23 100644
--- a/ext/date/tests/DateTime_construct_variation2.phpt
+++ b/ext/date/tests/DateTime_construct_variation2.phpt
@@ -171,16 +171,16 @@ object(DateTime)#%d (3) {
}
-- lowercase true --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, boolean given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, bool given
-- lowercase false --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, boolean given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, bool given
-- uppercase TRUE --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, boolean given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, bool given
-- uppercase FALSE --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, boolean given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, bool given
-- empty string DQ --
FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, string given
diff --git a/ext/date/tests/DateTime_setTimezone_variation1.phpt b/ext/date/tests/DateTime_setTimezone_variation1.phpt
index 8baf3e50e2..04ab4a4c55 100644
--- a/ext/date/tests/DateTime_setTimezone_variation1.phpt
+++ b/ext/date/tests/DateTime_setTimezone_variation1.phpt
@@ -177,22 +177,22 @@ bool(false)
-- lowercase true --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt
index 55b0fe1771..12b5f53568 100644
--- a/ext/date/tests/date_create_variation2.phpt
+++ b/ext/date/tests/date_create_variation2.phpt
@@ -187,22 +187,22 @@ object(DateTime)#%d (3) {
-- lowercase true --
-Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt
index 8e5432239e..c6068779d6 100644
--- a/ext/date/tests/date_date_set_variation1.phpt
+++ b/ext/date/tests/date_date_set_variation1.phpt
@@ -179,22 +179,22 @@ bool(false)
-- lowercase true --
-Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt
index 9818ce44d1..e82932e7ed 100644
--- a/ext/date/tests/date_format_variation1.phpt
+++ b/ext/date/tests/date_format_variation1.phpt
@@ -177,22 +177,22 @@ bool(false)
-- lowercase true --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_format() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt
index 6bbba71b6c..c5fb46342d 100644
--- a/ext/date/tests/date_isodate_set_variation1.phpt
+++ b/ext/date/tests/date_isodate_set_variation1.phpt
@@ -179,22 +179,22 @@ bool(false)
-- lowercase true --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt
index 9ca702b82e..8a63cb960a 100644
--- a/ext/date/tests/date_modify_variation1.phpt
+++ b/ext/date/tests/date_modify_variation1.phpt
@@ -177,22 +177,22 @@ bool(false)
-- lowercase true --
-Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt
index 3a90957e89..1c9381d3fe 100644
--- a/ext/date/tests/date_offset_get_variation1.phpt
+++ b/ext/date/tests/date_offset_get_variation1.phpt
@@ -175,22 +175,22 @@ bool(false)
-- lowercase true --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt
index 27c6903cb2..85e6c783cb 100644
--- a/ext/date/tests/date_time_set_variation1.phpt
+++ b/ext/date/tests/date_time_set_variation1.phpt
@@ -179,22 +179,22 @@ bool(false)
-- lowercase true --
-Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt
index 6c60225ce6..a5d6ed01ef 100644
--- a/ext/date/tests/date_timezone_get_variation1.phpt
+++ b/ext/date/tests/date_timezone_get_variation1.phpt
@@ -175,22 +175,22 @@ bool(false)
-- lowercase true --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt
index 399681de42..f0071328d3 100644
--- a/ext/date/tests/date_timezone_set_variation1.phpt
+++ b/ext/date/tests/date_timezone_set_variation1.phpt
@@ -178,22 +178,22 @@ bool(false)
-- lowercase true --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt
index 2c27cd9326..f32ffa3b46 100644
--- a/ext/date/tests/date_timezone_set_variation2.phpt
+++ b/ext/date/tests/date_timezone_set_variation2.phpt
@@ -177,22 +177,22 @@ bool(false)
-- lowercase true --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/date/tests/gettimeofday_variation1.phpt b/ext/date/tests/gettimeofday_variation1.phpt
index f494a25b53..c4f91aab0b 100644
--- a/ext/date/tests/gettimeofday_variation1.phpt
+++ b/ext/date/tests/gettimeofday_variation1.phpt
@@ -3,9 +3,9 @@ Test gettimeofday() function : usage variation - Passing unexpected values to ge
--FILE--
<?php
/* Prototype : array gettimeofday([bool get_as_float])
- * Description: Returns the current time as array
+ * Description: Returns the current time as array
* Source code: ext/standard/microtime.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing gettimeofday() : usage variation ***\n";
@@ -140,22 +140,22 @@ float(%f)
--empty array--
-Warning: gettimeofday() expects parameter 1 to be boolean, array given in %s on line %d
+Warning: gettimeofday() expects parameter 1 to be bool, array given in %s on line %d
NULL
--int indexed array--
-Warning: gettimeofday() expects parameter 1 to be boolean, array given in %s on line %d
+Warning: gettimeofday() expects parameter 1 to be bool, array given in %s on line %d
NULL
--associative array--
-Warning: gettimeofday() expects parameter 1 to be boolean, array given in %s on line %d
+Warning: gettimeofday() expects parameter 1 to be bool, array given in %s on line %d
NULL
--nested arrays--
-Warning: gettimeofday() expects parameter 1 to be boolean, array given in %s on line %d
+Warning: gettimeofday() expects parameter 1 to be bool, array given in %s on line %d
NULL
--uppercase NULL--
@@ -250,12 +250,12 @@ float(%f)
--instance of classWithToString--
-Warning: gettimeofday() expects parameter 1 to be boolean, object given in %s on line %d
+Warning: gettimeofday() expects parameter 1 to be bool, object given in %s on line %d
NULL
--instance of classWithoutToString--
-Warning: gettimeofday() expects parameter 1 to be boolean, object given in %s on line %d
+Warning: gettimeofday() expects parameter 1 to be bool, object given in %s on line %d
NULL
--undefined var--
diff --git a/ext/date/tests/localtime_variation2.phpt b/ext/date/tests/localtime_variation2.phpt
index a2048206af..7e2f4a5eee 100644
--- a/ext/date/tests/localtime_variation2.phpt
+++ b/ext/date/tests/localtime_variation2.phpt
@@ -305,22 +305,22 @@ array(9) {
--empty array--
-Warning: localtime() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: localtime() expects parameter 2 to be bool, array given in %s on line %d
bool(false)
--int indexed array--
-Warning: localtime() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: localtime() expects parameter 2 to be bool, array given in %s on line %d
bool(false)
--associative array--
-Warning: localtime() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: localtime() expects parameter 2 to be bool, array given in %s on line %d
bool(false)
--nested arrays--
-Warning: localtime() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: localtime() expects parameter 2 to be bool, array given in %s on line %d
bool(false)
--uppercase NULL--
@@ -589,12 +589,12 @@ array(9) {
--instance of classWithToString--
-Warning: localtime() expects parameter 2 to be boolean, object given in %s on line %d
+Warning: localtime() expects parameter 2 to be bool, object given in %s on line %d
bool(false)
--instance of classWithoutToString--
-Warning: localtime() expects parameter 2 to be boolean, object given in %s on line %d
+Warning: localtime() expects parameter 2 to be bool, object given in %s on line %d
bool(false)
--undefined var--
diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt
index 07ac90874f..c5a45e9abd 100644
--- a/ext/date/tests/microtime_error.phpt
+++ b/ext/date/tests/microtime_error.phpt
@@ -58,13 +58,13 @@ float(%s)
}
}
-Warning: microtime() expects parameter 1 to be boolean, array given in %s on line 25
+Warning: microtime() expects parameter 1 to be bool, array given in %s on line 25
NULL
--> bad arg: object(stdClass)#%d (0) {
}
-Warning: microtime() expects parameter 1 to be boolean, object given in %s on line 25
+Warning: microtime() expects parameter 1 to be bool, object given in %s on line 25
NULL
--> bad arg: int(1)
diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
index 9657fc7c6d..ad0b8fd956 100644
--- a/ext/date/tests/timezone_offset_get_variation1.phpt
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -162,16 +162,16 @@ Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone,
Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given
-- lowercase true --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, bool given
-- lowercase false --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, bool given
-- uppercase TRUE --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, bool given
-- uppercase FALSE --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, boolean given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, bool given
-- empty string DQ --
Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, string given
diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
index 76cc165658..64835500c4 100644
--- a/ext/date/tests/timezone_offset_get_variation2.phpt
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -162,16 +162,16 @@ Argument 2 passed to timezone_offset_get() must implement interface DateTimeInte
Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given
-- lowercase true --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, bool given
-- lowercase false --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, bool given
-- uppercase TRUE --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, bool given
-- uppercase FALSE --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, boolean given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, bool given
-- empty string DQ --
Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, string given
diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt
index 8ea7ab1bc3..f0f8552e61 100644
--- a/ext/date/tests/timezone_transitions_get_variation1.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation1.phpt
@@ -175,22 +175,22 @@ bool(false)
-- lowercase true --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- lowercase false --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase TRUE --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- uppercase FALSE --
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, bool given in %s on line %d
bool(false)
-- empty string DQ --
diff --git a/ext/fileinfo/tests/bug71527-mb.phpt b/ext/fileinfo/tests/bug71527-mb.phpt
index a3e5680cb3..60af049f4f 100644
--- a/ext/fileinfo/tests/bug71527-mb.phpt
+++ b/ext/fileinfo/tests/bug71527-mb.phpt
@@ -15,5 +15,5 @@ USE_ZEND_ALLOC=0
--EXPECTF--
Warning: finfo_open(): Failed to load magic database at '%sbug71527私はガラスを食べられます.magic'. in %sbug71527-mb.php on line %d
-Warning: finfo_file() expects parameter 1 to be resource, boolean given in %sbug71527-mb.php on line %d
+Warning: finfo_file() expects parameter 1 to be resource, bool given in %sbug71527-mb.php on line %d
bool(false)
diff --git a/ext/fileinfo/tests/bug71527.phpt b/ext/fileinfo/tests/bug71527.phpt
index f5b1d860e8..1feb29dd73 100644
--- a/ext/fileinfo/tests/bug71527.phpt
+++ b/ext/fileinfo/tests/bug71527.phpt
@@ -15,5 +15,5 @@ USE_ZEND_ALLOC=0
--EXPECTF--
Warning: finfo_open(): Failed to load magic database at '%sbug71527.magic'. in %sbug71527.php on line %d
-Warning: finfo_file() expects parameter 1 to be resource, boolean given in %sbug71527.php on line %d
+Warning: finfo_file() expects parameter 1 to be resource, bool given in %sbug71527.php on line %d
bool(false)
diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt
index 1e628a7b55..a9e13907aa 100644
--- a/ext/gd/tests/imagecolorallocate_variation1.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation1.phpt
@@ -192,22 +192,22 @@ NULL
-- lowercase true --
-Warning: imagecolorallocate() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- lowercase false --
-Warning: imagecolorallocate() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- uppercase TRUE --
-Warning: imagecolorallocate() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- uppercase FALSE --
-Warning: imagecolorallocate() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- empty string DQ --
diff --git a/ext/gd/tests/imagetruecolortopalette_error2.phpt b/ext/gd/tests/imagetruecolortopalette_error2.phpt
index cb7004caa8..9a38187421 100644
--- a/ext/gd/tests/imagetruecolortopalette_error2.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error2.phpt
@@ -17,6 +17,6 @@ imagetruecolortopalette($image, array(), 2);
?>
--EXPECTF--
-Warning: imagetruecolortopalette() expects parameter 2 to be boolean, resource given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 2 to be bool, resource given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 2 to be boolean, array given in %s on line %d \ No newline at end of file
+Warning: imagetruecolortopalette() expects parameter 2 to be bool, array given in %s on line %d \ No newline at end of file
diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt
index 688d310764..47035f938d 100644
--- a/ext/imap/tests/imap_close_variation1.phpt
+++ b/ext/imap/tests/imap_close_variation1.phpt
@@ -149,22 +149,22 @@ NULL
-- Iteration 12 --
-Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, bool given in %simap_close_variation1.php on line 80
NULL
-- Iteration 13 --
-Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, bool given in %simap_close_variation1.php on line 80
NULL
-- Iteration 14 --
-Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, bool given in %simap_close_variation1.php on line 80
NULL
-- Iteration 15 --
-Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, bool given in %simap_close_variation1.php on line 80
NULL
-- Iteration 16 --
diff --git a/ext/imap/tests/imap_expunge_error.phpt b/ext/imap/tests/imap_expunge_error.phpt
index dc9cf5baa2..f844cdcf11 100644
--- a/ext/imap/tests/imap_expunge_error.phpt
+++ b/ext/imap/tests/imap_expunge_error.phpt
@@ -24,4 +24,4 @@ Checking with incorrect parameter type
Warning: imap_num_recent() expects parameter 1 to be resource, string given in %s on line %d
-Warning: imap_num_recent() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_num_recent() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
index 2919219df8..bcccec6913 100644
--- a/ext/imap/tests/imap_fetch_overview_variation1.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -154,22 +154,22 @@ NULL
-- Testing with first argument value: bool(true)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Testing with first argument value: bool(false)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Testing with first argument value: bool(true)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Testing with first argument value: bool(false)
-Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Testing with first argument value: %string|unicode%(0) ""
diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt
index f5f856a477..e455265f37 100644
--- a/ext/imap/tests/imap_fetchbody_variation1.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation1.phpt
@@ -154,22 +154,22 @@ NULL
-- Iteration 12 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, bool given in %s on line 85
NULL
-- Iteration 13 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, bool given in %s on line 85
NULL
-- Iteration 14 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, bool given in %s on line 85
NULL
-- Iteration 15 --
-Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, bool given in %s on line 85
NULL
-- Iteration 16 --
diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt
index b247ae1ed5..113cde8c34 100644
--- a/ext/imap/tests/imap_fetchheader_variation1.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation1.phpt
@@ -165,22 +165,22 @@ NULL
-- Iteration 12 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
index 8738b7dd82..51dc9d58dd 100644
--- a/ext/imap/tests/imap_gc_error.phpt
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -30,6 +30,6 @@ Checking with incorrect parameter type
Warning: imap_gc() expects parameter 1 to be resource, string given in %s on line %d
-Warning: imap_gc() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_gc() expects parameter 1 to be resource, bool given in %s on line %d
Warning: imap_gc(): invalid value for the flags parameter in %s on line %d
diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt
index 84fa66f627..4a1136c07b 100644
--- a/ext/imap/tests/imap_headers.phpt
+++ b/ext/imap/tests/imap_headers.phpt
@@ -24,5 +24,5 @@ Checking with incorrect parameter type
Warning: imap_headers() expects parameter 1 to be resource, string given in %s on line %d
-Warning: imap_headers() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_headers() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt
index 5a2448a1cc..2ca498dc9a 100644
--- a/ext/imap/tests/imap_num_msg_error.phpt
+++ b/ext/imap/tests/imap_num_msg_error.phpt
@@ -24,5 +24,5 @@ Checking with incorrect parameter type
Warning: imap_num_msg() expects parameter 1 to be resource, string given in %s on line %d
-Warning: imap_num_msg() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_num_msg() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_num_recent_error.phpt b/ext/imap/tests/imap_num_recent_error.phpt
index 238b307176..8929c46297 100644
--- a/ext/imap/tests/imap_num_recent_error.phpt
+++ b/ext/imap/tests/imap_num_recent_error.phpt
@@ -24,4 +24,4 @@ Checking with incorrect parameter type
Warning: imap_expunge() expects parameter 1 to be resource, string given in %s on line %d
-Warning: imap_expunge() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_expunge() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_ping_error.phpt b/ext/imap/tests/imap_ping_error.phpt
index d3d94d19b5..4757967d02 100644
--- a/ext/imap/tests/imap_ping_error.phpt
+++ b/ext/imap/tests/imap_ping_error.phpt
@@ -24,4 +24,4 @@ Checking with incorrect parameter type
Warning: imap_ping() expects parameter 1 to be resource, string given in %s on line %d
-Warning: imap_ping() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: imap_ping() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/interbase/tests/bug45373.phpt b/ext/interbase/tests/bug45373.phpt
index 8b16ef00f2..b83bf214e2 100644
--- a/ext/interbase/tests/bug45373.phpt
+++ b/ext/interbase/tests/bug45373.phpt
@@ -43,5 +43,5 @@ array(2) {
Warning: ibase_execute(): Statement expects 2 arguments, 1 given in %s on line %d
-Warning: ibase_fetch_assoc() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: ibase_fetch_assoc() expects parameter 1 to be resource, bool given in %s on line %d
NULL
diff --git a/ext/interbase/tests/ibase_num_params_001.phpt b/ext/interbase/tests/ibase_num_params_001.phpt
index 655cae1fff..709c9b769b 100644
--- a/ext/interbase/tests/ibase_num_params_001.phpt
+++ b/ext/interbase/tests/ibase_num_params_001.phpt
@@ -28,5 +28,5 @@ NULL
Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 %s in %s on line %d
-Warning: ibase_num_params() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: ibase_num_params() expects parameter 1 to be resource, bool given in %s on line %d
NULL
diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt
index 1e865cc9d9..164c757ce6 100644
--- a/ext/intl/tests/breakiter___construct_error.phpt
+++ b/ext/intl/tests/breakiter___construct_error.phpt
@@ -45,6 +45,6 @@ Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 paramete
Exception: IntlRuleBasedBreakIterator::__construct() expects at most 2 parameters, 3 given in %s on line %d
-Exception: IntlRuleBasedBreakIterator::__construct() expects parameter 2 to be boolean, array given in %s on line %d
+Exception: IntlRuleBasedBreakIterator::__construct() expects parameter 2 to be bool, array given in %s on line %d
Exception: IntlRuleBasedBreakIterator::__construct(): rbbi_create_instance: unable to create instance from compiled rules in %s on line %d
diff --git a/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt b/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt
index 2aa8002bd1..7cc5cbd2e7 100644
--- a/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt
+++ b/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt
@@ -20,7 +20,7 @@ Warning: intlcal_get_keyword_values_for_locale() expects exactly 3 parameters, 2
Warning: intlcal_get_keyword_values_for_locale(): intlcal_get_keyword_values_for_locale: bad arguments in %s on line %d
bool(false)
-Warning: IntlCalendar::getKeywordValuesForLocale() expects parameter 3 to be boolean, array given in %s on line %d
+Warning: IntlCalendar::getKeywordValuesForLocale() expects parameter 3 to be bool, array given in %s on line %d
Warning: IntlCalendar::getKeywordValuesForLocale(): intlcal_get_keyword_values_for_locale: bad arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index dce7638169..3091d9a330 100644
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -26,7 +26,7 @@ Warning: IntlCalendar::setLenient() expects exactly 1 parameter, 0 given in %s o
Warning: IntlCalendar::setLenient(): intlcal_set_lenient: bad arguments in %s on line %d
bool(false)
-Warning: IntlCalendar::setLenient() expects parameter 1 to be boolean, array given in %s on line %d
+Warning: IntlCalendar::setLenient() expects parameter 1 to be bool, array given in %s on line %d
Warning: IntlCalendar::setLenient(): intlcal_set_lenient: bad arguments in %s on line %d
bool(false)
@@ -36,7 +36,7 @@ Warning: IntlCalendar::setLenient() expects exactly 1 parameter, 2 given in %s o
Warning: IntlCalendar::setLenient(): intlcal_set_lenient: bad arguments in %s on line %d
bool(false)
-Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: intlcal_set_lenient() expects parameter 2 to be bool, array given in %s on line %d
Warning: intlcal_set_lenient(): intlcal_set_lenient: 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 bca02c4080..61143ca490 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -19,7 +19,7 @@ var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_P
--EXPECTF--
-Warning: IntlTimeZone::getDisplayName() expects parameter 1 to be boolean, array given in %s on line %d
+Warning: IntlTimeZone::getDisplayName() expects parameter 1 to be bool, 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/libxml/tests/001.phpt b/ext/libxml/tests/001.phpt
index 6f68cb4a86..b636ab7adc 100644
--- a/ext/libxml/tests/001.phpt
+++ b/ext/libxml/tests/001.phpt
@@ -22,7 +22,7 @@ bool(false)
bool(false)
bool(true)
-Warning: libxml_use_internal_errors() expects parameter 1 to be boolean, object given in %s001.php on line 6
+Warning: libxml_use_internal_errors() expects parameter 1 to be bool, object given in %s001.php on line 6
NULL
array(0) {
}
diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt
index cc0e648320..5447ab0717 100644
--- a/ext/mbstring/tests/mb_stristr_variation3.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation3.phpt
@@ -161,19 +161,19 @@ string(12) "737472696e67"
string(12) "737472696e67"
--empty array--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--associative array--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--uppercase NULL--
@@ -213,11 +213,11 @@ string(12) "737472696e67"
string(12) "737472696e67"
--instance of classWithToString--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--undefined var--
@@ -227,6 +227,6 @@ string(8) "5f76616c"
string(8) "5f76616c"
--resource--
-Error: 2 - mb_stristr() expects parameter 3 to be boolean, resource given, %s(%d)
+Error: 2 - mb_stristr() expects parameter 3 to be bool, resource given, %s(%d)
NULL
===DONE===
diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt
index c93895c7a5..72b9c66cbe 100644
--- a/ext/mbstring/tests/mb_strrchr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt
@@ -161,19 +161,19 @@ string(12) "737472696e67"
string(12) "737472696e67"
--empty array--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--associative array--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--uppercase NULL--
@@ -213,11 +213,11 @@ string(12) "737472696e67"
string(12) "737472696e67"
--instance of classWithToString--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--undefined var--
@@ -227,6 +227,6 @@ string(8) "5f76616c"
string(8) "5f76616c"
--resource--
-Error: 2 - mb_strrchr() expects parameter 3 to be boolean, resource given, %s(%d)
+Error: 2 - mb_strrchr() expects parameter 3 to be bool, resource given, %s(%d)
NULL
===DONE===
diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt
index 3949c148d1..5f73dc4da7 100644
--- a/ext/mbstring/tests/mb_strrichr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt
@@ -161,19 +161,19 @@ string(12) "737472696e67"
string(12) "737472696e67"
--empty array--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--associative array--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--uppercase NULL--
@@ -213,11 +213,11 @@ string(12) "737472696e67"
string(12) "737472696e67"
--instance of classWithToString--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--undefined var--
@@ -227,6 +227,6 @@ string(8) "5f76616c"
string(8) "5f76616c"
--resource--
-Error: 2 - mb_strrichr() expects parameter 3 to be boolean, resource given, %s(%d)
+Error: 2 - mb_strrichr() expects parameter 3 to be bool, resource given, %s(%d)
NULL
===DONE===
diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt
index 6bb1c88729..28dc17ac53 100644
--- a/ext/mbstring/tests/mb_strstr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation3.phpt
@@ -161,19 +161,19 @@ string(12) "737472696e67"
string(12) "737472696e67"
--empty array--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--associative array--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, array given, %s(%d)
NULL
--uppercase NULL--
@@ -213,11 +213,11 @@ string(12) "737472696e67"
string(12) "737472696e67"
--instance of classWithToString--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, object given, %s(%d)
NULL
--undefined var--
@@ -227,6 +227,6 @@ string(8) "5f76616c"
string(8) "5f76616c"
--resource--
-Error: 2 - mb_strstr() expects parameter 3 to be boolean, resource given, %s(%d)
+Error: 2 - mb_strstr() expects parameter 3 to be bool, resource given, %s(%d)
NULL
===DONE===
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index ed445f22de..00bb90724c 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -103,7 +103,7 @@ bool(true)
bool(false)
string(0) ""
-Warning: mysqli_stmt_reset() expects parameter 1 to be mysqli_stmt, boolean given in %s on line %d
+Warning: mysqli_stmt_reset() expects parameter 1 to be mysqli_stmt, bool given in %s on line %d
NULL
Rows: 3
array(1) {
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index 6500241760..aa2fb62def 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -26,7 +26,7 @@ $DB->query_single('SELECT DATE()');
?>
--EXPECTF--
-Fatal error: Uncaught Error: Call to a member function fetch_row() on boolean in %sbug33491.php:%d
+Fatal error: Uncaught Error: Call to a member function fetch_row() on bool in %sbug33491.php:%d
Stack trace:
#0 %s(%d): DB->query_single('SELECT DATE()')
#1 {main}
diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt
index 28f338ac6d..0186fe4147 100644
--- a/ext/mysqli/tests/mysqli_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_free_result.phpt
@@ -66,13 +66,13 @@ bool(false)
%s(0) ""
[005]
-Warning: mysqli_free_result() expects parameter 1 to be mysqli_result, boolean given in %s on line %d
+Warning: mysqli_free_result() expects parameter 1 to be mysqli_result, bool given in %s on line %d
NULL
d
bool(false)
%s(0) ""
[007]
-Warning: mysqli_free_result() expects parameter 1 to be mysqli_result, boolean given in %s on line %d
+Warning: mysqli_free_result() expects parameter 1 to be mysqli_result, bool given in %s on line %d
NULL
done!
diff --git a/ext/mysqli/tests/mysqli_max_links.phpt b/ext/mysqli/tests/mysqli_max_links.phpt
index 7f49419401..f3469e20e6 100644
--- a/ext/mysqli/tests/mysqli_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_max_links.phpt
@@ -54,23 +54,23 @@ Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d
Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d
-Warning: mysqli_query() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_query() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_close() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_close() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_query() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_query() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_close() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_close() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_query() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_query() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_close() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_close() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_query() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_query() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_close() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_close() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_query() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_query() expects parameter 1 to be mysqli, bool given in %s on line %d
-Warning: mysqli_close() expects parameter 1 to be mysqli, boolean given in %s on line %d
+Warning: mysqli_close() expects parameter 1 to be mysqli, bool given in %s on line %d
done!
diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt
index 376ddd4e8f..d5f513ad51 100644
--- a/ext/mysqli/tests/mysqli_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_num_rows.phpt
@@ -78,9 +78,9 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECTF--
-Warning: mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given in %s on line %d
+Warning: mysqli_num_rows() expects parameter 1 to be mysqli_result, bool given in %s on line %d
-Warning: mysqli_free_result() expects parameter 1 to be mysqli_result, boolean given in %s on line %d
+Warning: mysqli_free_result() expects parameter 1 to be mysqli_result, bool given in %s on line %d
Warning: mysqli_num_rows(): Couldn't fetch mysqli_result in %s on line %d
run_tests.php don't fool me with your 'ungreedy' expression '.+?'!
diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt
index 789b94ea05..c47a19fce6 100644
--- a/ext/oci8/tests/bug51291_1.phpt
+++ b/ext/oci8/tests/bug51291_1.phpt
@@ -167,7 +167,7 @@ array(4) {
Test 2 - Parse
-Warning: oci_error() expects parameter 1 to be resource, boolean given in %sbug51291_1.php on line %d
+Warning: oci_error() expects parameter 1 to be resource, bool given in %sbug51291_1.php on line %d
bool(false)
array(4) {
["code"]=>
@@ -182,7 +182,7 @@ array(4) {
NULL
2nd call
-Warning: oci_error() expects parameter 1 to be resource, boolean given in %sbug51291_1.php on line %d
+Warning: oci_error() expects parameter 1 to be resource, bool given in %sbug51291_1.php on line %d
bool(false)
array(4) {
["code"]=>
diff --git a/ext/openssl/tests/openssl_pkey_new_error.phpt b/ext/openssl/tests/openssl_pkey_new_error.phpt
index c5993411c3..0316c5d7a1 100644
--- a/ext/openssl/tests/openssl_pkey_new_error.phpt
+++ b/ext/openssl/tests/openssl_pkey_new_error.phpt
@@ -17,9 +17,9 @@ openssl_pkey_get_details(openssl_pkey_new($dh));
?>
--EXPECTF--
-Warning: openssl_pkey_get_details() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: openssl_pkey_get_details() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: openssl_pkey_get_details() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/openssl/tests/openssl_x509_free_basic.phpt b/ext/openssl/tests/openssl_x509_free_basic.phpt
index d8b586e8b4..663adccc2c 100644
--- a/ext/openssl/tests/openssl_x509_free_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_free_basic.phpt
@@ -13,4 +13,4 @@ openssl_x509_free(false);
resource(%d) of type (OpenSSL X.509)
resource(%d) of type (Unknown)
-Warning: openssl_x509_free() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: openssl_x509_free() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
index 140359afc1..000e44b731 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
@@ -93,7 +93,7 @@ array(1) {
Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d
-Fatal error: Uncaught Error: Call to a member function execute() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function execute() on bool in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
index ad710dcc15..d56f7c6549 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
@@ -36,7 +36,7 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named
Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d
-Fatal error: Uncaught Error: Call to a member function execute() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function execute() on bool in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
index 0e27b0119c..b4c75ebee1 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -56,7 +56,7 @@ Testing native PS...
Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d
-Fatal error: Uncaught Error: Call to a member function execute() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function execute() on bool in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index 65989898fd..9eb31f524c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -99,7 +99,7 @@ Native Prepared Statements...
Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d
-Fatal error: Uncaught Error: Call to a member function errorInfo() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function errorInfo() on bool in %s:%d
Stack trace:
#0 %s(%d): mysql_stmt_multiquery_wrong_usage(Object(PDO))
#1 {main}
diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index df8bf4dca3..e253f12493 100644
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -37,8 +37,8 @@ include $pname . '/b/c.php';
Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d
This is b/c
===DONE===
diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index 3d4c508559..be56d9952a 100644
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -31,8 +31,8 @@ include $pname . '/b/c.php';
Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
This is b/c
===DONE===
diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 915d1a52a5..28c9dda906 100644
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -39,9 +39,9 @@ include $pname . '/b/new.php';
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
This is b/c
Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line 22
diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index a9a7d98a74..efa0da877f 100644
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -33,9 +33,9 @@ include $pname . '/b/new.php';
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
This is b/c
Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/phar_running.phpt b/ext/phar/tests/phar_running.phpt
index 2d132b9ac7..25acf82285 100644
--- a/ext/phar/tests/phar_running.phpt
+++ b/ext/phar/tests/phar_running.phpt
@@ -22,7 +22,7 @@ var_dump(Phar::running());
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-Warning: Phar::running() expects parameter 1 to be boolean, array given in phar://%sphar_running.phar.php/index.php on line 2
+Warning: Phar::running() expects parameter 1 to be bool, array given in phar://%sphar_running.phar.php/index.php on line 2
string(%d) "phar://%sphar_running.phar.php"
string(%d) "%sphar_running.phar.php"
string(0) ""
diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index 752192835d..a6759d8e92 100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
@@ -50,9 +50,9 @@ include $alias . '/b/c.php';
Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d
This is b/c
===DONE===
diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index 4c1c59dadb..9e778e9279 100644
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
@@ -44,9 +44,9 @@ include $alias . '/b/c.php';
Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
This is b/c
===DONE===
diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index 59afb1e301..f31878e3ef 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
@@ -51,9 +51,9 @@ include $alias . '/b/new.php';
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
This is b/c
Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index b0adfe502a..815d41c274 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
@@ -44,9 +44,9 @@ include $alias . '/b/new.php';
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
This is b/c
Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index d8efa51050..e77beaecef 100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -47,8 +47,8 @@ include $alias . '/b/c.php';
Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_b.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_b.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_b.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_b.php on line %d
This is b/c
===DONE===
diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 43d862a2f1..44c8f8bb30 100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -41,8 +41,8 @@ include $alias . '/b/c.php';
Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
This is b/c
===DONE===
diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index 6457a029d9..da2b18beb0 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -50,9 +50,9 @@ include $alias . '/b/new.php';
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
This is b/c
Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index b4a254c358..b94448b347 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -44,9 +44,9 @@ include $alias . '/b/new.php';
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
-Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
This is b/c
Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
index f85e95f26f..548d64e1bf 100644
--- a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
@@ -53,13 +53,13 @@ reflectClassConstant($instance, "BAD_CONST");
Reflecting on class constant TestClass::PUB
__toString():
-string(38) "Constant [ public boolean PUB ] { 1 }
+string(35) "Constant [ public bool PUB ] { 1 }
"
export():
-string(38) "Constant [ public boolean PUB ] { 1 }
+string(35) "Constant [ public bool PUB ] { 1 }
"
export():
-Constant [ public boolean PUB ] { 1 }
+Constant [ public bool PUB ] { 1 }
NULL
getName():
diff --git a/ext/reflection/tests/ReflectionClass_isInstance_error.phpt b/ext/reflection/tests/ReflectionClass_isInstance_error.phpt
index eb3043f25d..f4c553dec6 100644
--- a/ext/reflection/tests/ReflectionClass_isInstance_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstance_error.phpt
@@ -29,7 +29,7 @@ NULL
Warning: ReflectionClass::isInstance() expects parameter 1 to be object, float given in %s on line 10
NULL
-Warning: ReflectionClass::isInstance() expects parameter 1 to be object, boolean given in %s on line 11
+Warning: ReflectionClass::isInstance() expects parameter 1 to be object, bool given in %s on line 11
NULL
Warning: ReflectionClass::isInstance() expects parameter 1 to be object, string given in %s on line 12
diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
index 8bedbea0cb..6c81728f91 100644
--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
@@ -24,4 +24,4 @@ try {
?>
--EXPECT--
-string(92) "Argument 2 passed to ReflectionMethod::invokeArgs() must be of the type array, boolean given"
+string(89) "Argument 2 passed to ReflectionMethod::invokeArgs() must be of the type array, bool given"
diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
index 1222467a6b..0c87a66153 100644
--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
@@ -93,7 +93,7 @@ string(72) "Given object is not an instance of the class this method was declare
Non-object:
-Warning: ReflectionMethod::invokeArgs() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: ReflectionMethod::invokeArgs() expects parameter 1 to be object, bool given in %s on line %d
NULL
Static method:
@@ -104,7 +104,7 @@ NULL
Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given in %s on line %d
NULL
-Warning: ReflectionMethod::invokeArgs() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: ReflectionMethod::invokeArgs() expects parameter 1 to be object, bool given in %s on line %d
NULL
Called staticMethod()
Exception: Using $this when not in object context
diff --git a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt
index 7bfe245f82..0a2b15fb83 100644
--- a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt
@@ -98,7 +98,7 @@ Static method:
Warning: ReflectionMethod::invoke() expects at least 1 parameter, 0 given in %s on line %d
NULL
-Warning: ReflectionMethod::invoke() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: ReflectionMethod::invoke() expects parameter 1 to be object, bool given in %s on line %d
NULL
Called staticMethod()
Exception: Using $this when not in object context
diff --git a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
index ef5621e7e5..411299f0c7 100644
--- a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
@@ -60,7 +60,7 @@ try {
--EXPECTF--
invoke() on a non-object:
-Warning: ReflectionMethod::invoke() expects parameter 1 to be object, boolean given in %s%eReflectionMethod_invoke_error1.php on line %d
+Warning: ReflectionMethod::invoke() expects parameter 1 to be object, bool given in %s%eReflectionMethod_invoke_error1.php on line %d
NULL
invoke() on a non-instance:
diff --git a/ext/reflection/tests/ReflectionObject_isInstance_error.phpt b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
index f8f088057c..fa0befa504 100644
--- a/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
@@ -28,7 +28,7 @@ NULL
Warning: ReflectionClass::isInstance() expects parameter 1 to be object, float given in %s on line 9
NULL
-Warning: ReflectionClass::isInstance() expects parameter 1 to be object, boolean given in %s on line 10
+Warning: ReflectionClass::isInstance() expects parameter 1 to be object, bool given in %s on line 10
NULL
Warning: ReflectionClass::isInstance() expects parameter 1 to be object, string given in %s on line 11
diff --git a/ext/reflection/tests/ReflectionProperty_getValue_error.phpt b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
index c9bf0b0f25..4efdef9c07 100644
--- a/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
@@ -63,7 +63,7 @@ NULL
Wrong type of arg:
-Warning: ReflectionProperty::getValue() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: ReflectionProperty::getValue() expects parameter 1 to be object, bool given in %s on line %d
NULL
Instance without property:
diff --git a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
index 7161c53529..d5ecc7009f 100644
--- a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
@@ -72,7 +72,7 @@ NULL
Wrong type of arg:
-Warning: ReflectionProperty::setValue() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: ReflectionProperty::setValue() expects parameter 1 to be object, bool given in %s on line %d
NULL
Static property / too many args:
diff --git a/ext/reflection/tests/bug29986.phpt b/ext/reflection/tests/bug29986.phpt
index 7e414504aa..3d8d6ee7c5 100644
--- a/ext/reflection/tests/bug29986.phpt
+++ b/ext/reflection/tests/bug29986.phpt
@@ -20,7 +20,7 @@ Class [ <user> class just_constants ] {
@@ %s %d-%d
- Constants [5] {
- Constant [ public boolean BOOLEAN_CONSTANT ] { 1 }
+ Constant [ public bool BOOLEAN_CONSTANT ] { 1 }
Constant [ public null NULL_CONSTANT ] { }
Constant [ public string STRING_CONSTANT ] { This is a string }
Constant [ public int INTEGER_CONSTANT ] { 1000 }
diff --git a/ext/session/tests/session_regenerate_id_error.phpt b/ext/session/tests/session_regenerate_id_error.phpt
index 9c94d8564b..71ef13471e 100644
--- a/ext/session/tests/session_regenerate_id_error.phpt
+++ b/ext/session/tests/session_regenerate_id_error.phpt
@@ -197,7 +197,7 @@ bool(false)
-- Iteration 21 --
-Warning: session_regenerate_id() expects parameter 1 to be boolean, object given in %s on line %d
+Warning: session_regenerate_id() expects parameter 1 to be bool, object given in %s on line %d
NULL
-- Iteration 22 --
@@ -212,7 +212,7 @@ bool(false)
-- Iteration 24 --
-Warning: session_regenerate_id() expects parameter 1 to be boolean, resource given in %s on line %d
+Warning: session_regenerate_id() expects parameter 1 to be bool, resource given in %s on line %d
NULL
Done
diff --git a/ext/session/tests/session_set_cookie_params_error.phpt b/ext/session/tests/session_set_cookie_params_error.phpt
index 9e68ab0359..cb9d1a5eaa 100644
--- a/ext/session/tests/session_set_cookie_params_error.phpt
+++ b/ext/session/tests/session_set_cookie_params_error.phpt
@@ -268,10 +268,10 @@ bool(true)
bool(true)
bool(true)
-Warning: session_set_cookie_params() expects parameter 4 to be boolean, object given in %s on line 84
+Warning: session_set_cookie_params() expects parameter 4 to be bool, object given in %s on line 84
NULL
-Warning: session_set_cookie_params() expects parameter 5 to be boolean, object given in %s on line 85
+Warning: session_set_cookie_params() expects parameter 5 to be bool, object given in %s on line 85
NULL
bool(true)
@@ -300,10 +300,10 @@ NULL
Warning: session_set_cookie_params() expects parameter 3 to be string, resource given in %s on line 83
NULL
-Warning: session_set_cookie_params() expects parameter 4 to be boolean, resource given in %s on line 84
+Warning: session_set_cookie_params() expects parameter 4 to be bool, resource given in %s on line 84
NULL
-Warning: session_set_cookie_params() expects parameter 5 to be boolean, resource given in %s on line 85
+Warning: session_set_cookie_params() expects parameter 5 to be bool, resource given in %s on line 85
NULL
bool(true)
Done
diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt
index 02aab25f9e..61d702f5f5 100644
--- a/ext/session/tests/session_start_error.phpt
+++ b/ext/session/tests/session_start_error.phpt
@@ -186,7 +186,7 @@ bool(false)
-- Iteration 12 --
-Warning: session_start() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -194,7 +194,7 @@ bool(false)
-- Iteration 13 --
-Warning: session_start() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -202,7 +202,7 @@ bool(false)
-- Iteration 14 --
-Warning: session_start() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -210,7 +210,7 @@ bool(false)
-- Iteration 15 --
-Warning: session_start() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, bool 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/sockets/tests/socket_create_listen_used.phpt b/ext/sockets/tests/socket_create_listen_used.phpt
index 901dcc2308..b41e2caefc 100644
--- a/ext/sockets/tests/socket_create_listen_used.phpt
+++ b/ext/sockets/tests/socket_create_listen_used.phpt
@@ -27,4 +27,4 @@ resource(%i) of type (Socket)
Warning: socket_create_listen(): unable to bind to given address [%i]: %a in %s on line %d
bool(false)
-Warning: socket_close() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: socket_close() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt b/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
index 80d966997b..2f77e8a449 100644
--- a/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
+++ b/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
@@ -7,4 +7,4 @@ Philip Norton philipnorton42@gmail.com
$array = SplFixedArray::fromArray(true);
?>
--EXPECTF--
-Warning: SplFixedArray::fromArray() expects parameter 1 to be array, boolean given in %s on line %d \ No newline at end of file
+Warning: SplFixedArray::fromArray() expects parameter 1 to be array, bool given in %s on line %d \ No newline at end of file
diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index 991031b416..91f010930c 100644
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -26,7 +26,7 @@ foreach($data_provider as $input) {
Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, array given in %s on line %d
NULL
-Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
+Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, bool given in %s on line %d
NULL
Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
index d984429b09..80e5e100b4 100644
--- a/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
@@ -12,7 +12,7 @@ var_dump($s->attach(new stdClass, true, true));
?>
--EXPECTF--
-Warning: SplObjectStorage::attach() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: SplObjectStorage::attach() expects parameter 1 to be object, bool given in %s on line %d
NULL
Warning: SplObjectStorage::attach() expects at most 2 parameters, 3 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 c4e4b41b9c..90ee41b212 100644
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -26,7 +26,7 @@ foreach($data_provider as $input) {
Warning: SplObjectStorage::contains() expects parameter 1 to be object, array given in %s on line %d
NULL
-Warning: SplObjectStorage::contains() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: SplObjectStorage::contains() expects parameter 1 to be object, bool given in %s on line %d
NULL
Warning: SplObjectStorage::contains() expects parameter 1 to be object, string 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 7ea5da0f68..3122616802 100644
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -26,7 +26,7 @@ foreach($data_provider as $input) {
Warning: SplObjectStorage::detach() expects parameter 1 to be object, array given in %s on line %d
NULL
-Warning: SplObjectStorage::detach() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: SplObjectStorage::detach() expects parameter 1 to be object, bool given in %s on line %d
NULL
Warning: SplObjectStorage::detach() expects parameter 1 to be object, string 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 56daa00b58..185d31fa49 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -28,7 +28,7 @@ foreach($data_provider as $input) {
Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, array given in %s on line %d
NULL
-Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, bool given in %s on line %d
NULL
Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, string 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 28e1fe8fa0..d94f030498 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -27,7 +27,7 @@ foreach($data_provider as $input) {
Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, array given in %s on line %d
NULL
-Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, bool given in %s on line %d
NULL
Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, string 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 50150f0d51..6bd0de6330 100644
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -26,7 +26,7 @@ foreach($data_provider as $input) {
Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, array given in %s on line %d
NULL
-Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
+Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, bool given in %s on line %d
NULL
Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
diff --git a/ext/spl/tests/class_implements_variation2.phpt b/ext/spl/tests/class_implements_variation2.phpt
index f6953577f3..c65fdd1626 100644
--- a/ext/spl/tests/class_implements_variation2.phpt
+++ b/ext/spl/tests/class_implements_variation2.phpt
@@ -170,19 +170,19 @@ array(1) {
}
--empty array--
-Error: 2 - class_implements() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--int indexed array--
-Error: 2 - class_implements() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--associative array--
-Error: 2 - class_implements() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--nested arrays--
-Error: 2 - class_implements() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--uppercase NULL--
@@ -234,11 +234,11 @@ array(1) {
}
--instance of classWithToString--
-Error: 2 - class_implements() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, object given, %s(%d)
bool(false)
--instance of classWithoutToString--
-Error: 2 - class_implements() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, object given, %s(%d)
bool(false)
--undefined var--
@@ -254,6 +254,6 @@ array(1) {
}
--resource--
-Error: 2 - class_implements() expects parameter 2 to be boolean, resource given, %s(%d)
+Error: 2 - class_implements() expects parameter 2 to be bool, resource given, %s(%d)
bool(false)
===DONE===
diff --git a/ext/spl/tests/class_uses_variation2.phpt b/ext/spl/tests/class_uses_variation2.phpt
index 36c9623cb3..68e5119b88 100644
--- a/ext/spl/tests/class_uses_variation2.phpt
+++ b/ext/spl/tests/class_uses_variation2.phpt
@@ -172,19 +172,19 @@ array(1) {
}
--empty array--
-Error: 2 - class_uses() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--int indexed array--
-Error: 2 - class_uses() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--associative array--
-Error: 2 - class_uses() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--nested arrays--
-Error: 2 - class_uses() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--uppercase NULL--
@@ -236,11 +236,11 @@ array(1) {
}
--instance of classWithToString--
-Error: 2 - class_uses() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, object given, %s(%d)
bool(false)
--instance of classWithoutToString--
-Error: 2 - class_uses() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, object given, %s(%d)
bool(false)
--undefined var--
@@ -256,6 +256,6 @@ array(1) {
}
--resource--
-Error: 2 - class_uses() expects parameter 2 to be boolean, resource given, %s(%d)
+Error: 2 - class_uses() expects parameter 2 to be bool, resource given, %s(%d)
bool(false)
===DONE===
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 9da0b2cb60..ef4ce85256 100644
--- a/ext/standard/tests/array/array_change_key_case_variation1.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt
@@ -155,22 +155,22 @@ NULL
-- Iteration 12 --
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt
index 2182b0b957..8c0a2cccf5 100644
--- a/ext/standard/tests/array/array_chunk_variation1.phpt
+++ b/ext/standard/tests/array/array_chunk_variation1.phpt
@@ -204,46 +204,46 @@ NULL
-- Iteration 12 --
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt
index 452006a44d..26eefc3507 100644
--- a/ext/standard/tests/array/array_chunk_variation3.phpt
+++ b/ext/standard/tests/array/array_chunk_variation3.phpt
@@ -241,7 +241,7 @@ array(1) {
-- Iteration 16 --
-Warning: array_chunk() expects parameter 3 to be boolean, object given in %s on line %d
+Warning: array_chunk() expects parameter 3 to be bool, object given in %s on line %d
NULL
-- Iteration 17 --
diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt
index 76877ef70d..afb16971fe 100644
--- a/ext/standard/tests/array/array_combine_variation1.phpt
+++ b/ext/standard/tests/array/array_combine_variation1.phpt
@@ -145,19 +145,19 @@ Warning: array_combine() expects parameter 1 to be array, null given in %s on li
NULL
-- Iteration 12 --
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt
index 3422bd81d1..9c350c8aa3 100644
--- a/ext/standard/tests/array/array_combine_variation2.phpt
+++ b/ext/standard/tests/array/array_combine_variation2.phpt
@@ -145,19 +145,19 @@ Warning: array_combine() expects parameter 2 to be array, null given in %s on li
NULL
-- Iteration 12 --
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt
index 5c57823ba7..c6eee72175 100644
--- a/ext/standard/tests/array/array_fill_keys_variation3.phpt
+++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt
@@ -36,7 +36,7 @@ echo "Done";
-- Testing array_fill_keys() function with both wrong arguments --
-Warning: array_fill_keys() expects parameter 1 to be array, boolean given in %sarray_fill_keys_variation3.php on line %d
+Warning: array_fill_keys() expects parameter 1 to be array, bool given in %sarray_fill_keys_variation3.php on line %d
NULL
-- Testing array_fill_keys() function with unusual second arguments --
diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt
index 41bf5e4df2..bbcff3818c 100644
--- a/ext/standard/tests/array/array_filter_variation1.phpt
+++ b/ext/standard/tests/array/array_filter_variation1.phpt
@@ -146,19 +146,19 @@ Warning: array_filter() expects parameter 1 to be array, null given in %s on lin
NULL
-- Iteration 12 --
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt
index ec7937fdb2..9fbfdf0139 100644
--- a/ext/standard/tests/array/array_flip_variation1.phpt
+++ b/ext/standard/tests/array/array_flip_variation1.phpt
@@ -130,19 +130,19 @@ Warning: array_flip() expects parameter 1 to be array, null given in %s on line
NULL
-- Iteration 12 --
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index c61d0afab9..95ca367284 100644
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -264,10 +264,10 @@ NULL
Warning: array_key_exists() expects parameter 2 to be array, null given in %s on line %d
NULL
-Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d
NULL
-Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d
NULL
Warning: array_key_exists() expects parameter 2 to be array, float 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 67630fd363..30c498768e 100644
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -159,22 +159,22 @@ NULL
-- Iteration 12 --
-Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt
index 2735734eec..c4ef0f2d42 100644
--- a/ext/standard/tests/array/array_pad_variation1.phpt
+++ b/ext/standard/tests/array/array_pad_variation1.phpt
@@ -178,31 +178,31 @@ Warning: array_pad() expects parameter 1 to be array, null given in %s on line %
NULL
-- Iteration 12 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt
index f68e020d5d..687ea89c38 100644
--- a/ext/standard/tests/array/array_product_variation5.phpt
+++ b/ext/standard/tests/array/array_product_variation5.phpt
@@ -153,22 +153,22 @@ NULL
--lowercase true--
-Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d
NULL
--lowercase false--
-Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d
NULL
--uppercase TRUE--
-Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d
NULL
--uppercase FALSE--
-Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d
NULL
--empty string DQ--
diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt
index 5e41a82bd7..14125fcb87 100644
--- a/ext/standard/tests/array/array_push_variation1.phpt
+++ b/ext/standard/tests/array/array_push_variation1.phpt
@@ -157,22 +157,22 @@ NULL
-- Iteration 12 --
-Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt
index 590be63d91..1847e60dc6 100644
--- a/ext/standard/tests/array/array_rand_variation1.phpt
+++ b/ext/standard/tests/array/array_rand_variation1.phpt
@@ -156,22 +156,22 @@ NULL
-- Iteration 12 --
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt
index 2765c64190..70c5d5fa3d 100644
--- a/ext/standard/tests/array/array_reverse_variation1.phpt
+++ b/ext/standard/tests/array/array_reverse_variation1.phpt
@@ -209,43 +209,43 @@ Warning: array_reverse() expects parameter 1 to be array, null given in %s on li
NULL
-- Iteration 12 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_reverse_variation2.phpt b/ext/standard/tests/array/array_reverse_variation2.phpt
index 69e7a9f112..1cc9a3088e 100644
--- a/ext/standard/tests/array/array_reverse_variation2.phpt
+++ b/ext/standard/tests/array/array_reverse_variation2.phpt
@@ -235,23 +235,23 @@ array(6) {
}
-- Iteration 10 --
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d
NULL
-- Iteration 15 --
array(6) {
@@ -375,7 +375,7 @@ array(6) {
}
-- Iteration 23 --
-Warning: array_reverse() expects parameter 2 to be boolean, object given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, object given in %s on line %d
NULL
-- Iteration 24 --
array(6) {
@@ -409,6 +409,6 @@ array(6) {
}
-- Iteration 26 --
-Warning: array_reverse() expects parameter 2 to be boolean, resource given in %s on line %d
+Warning: array_reverse() expects parameter 2 to be bool, resource 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 ddf1e122dc..cef9af8b8a 100644
--- a/ext/standard/tests/array/array_shift_variation1.phpt
+++ b/ext/standard/tests/array/array_shift_variation1.phpt
@@ -153,22 +153,22 @@ NULL
-- Iteration 12 --
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt
index db47feb9ff..2e2bfc4fc0 100644
--- a/ext/standard/tests/array/array_slice_variation11.phpt
+++ b/ext/standard/tests/array/array_slice_variation11.phpt
@@ -158,22 +158,22 @@ NULL
-- Iteration 12 --
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt
index f093d2db89..40bfad3332 100644
--- a/ext/standard/tests/array/array_slice_variation4.phpt
+++ b/ext/standard/tests/array/array_slice_variation4.phpt
@@ -267,7 +267,7 @@ array(3) {
-- Iteration 18 --
-Warning: array_slice() expects parameter 4 to be boolean, array given in %s on line %d
+Warning: array_slice() expects parameter 4 to be bool, array given in %s on line %d
NULL
-- Iteration 19 --
@@ -302,7 +302,7 @@ array(3) {
-- Iteration 22 --
-Warning: array_slice() expects parameter 4 to be boolean, object given in %s on line %d
+Warning: array_slice() expects parameter 4 to be bool, object given in %s on line %d
NULL
-- Iteration 23 --
diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt
index fa0c244511..55b249616a 100644
--- a/ext/standard/tests/array/array_sum_variation1.phpt
+++ b/ext/standard/tests/array/array_sum_variation1.phpt
@@ -130,19 +130,19 @@ Warning: array_sum() expects parameter 1 to be array, null given in %s on line %
NULL
-- Iteration 12 --
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt
index 7219051413..de65d0cf35 100644
--- a/ext/standard/tests/array/array_unique_variation1.phpt
+++ b/ext/standard/tests/array/array_unique_variation1.phpt
@@ -142,19 +142,19 @@ Warning: array_unique() expects parameter 1 to be array, null given in %s on lin
NULL
-- Iteration 12 --
-Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt
index 440fa82648..f1301e0293 100644
--- a/ext/standard/tests/array/array_unshift_variation1.phpt
+++ b/ext/standard/tests/array/array_unshift_variation1.phpt
@@ -218,38 +218,38 @@ NULL
NULL
-- Iteration 12 --
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(true)
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(true)
-- Iteration 13 --
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(false)
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(false)
-- Iteration 14 --
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(true)
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(true)
-- Iteration 15 --
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(false)
-Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d
NULL
bool(false)
diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt
index 3ccdb5105a..ba6649695d 100644
--- a/ext/standard/tests/array/array_values_variation1.phpt
+++ b/ext/standard/tests/array/array_values_variation1.phpt
@@ -155,22 +155,22 @@ NULL
-- Iteration 12 --
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt
index 4e22bb8946..846e8a01af 100644
--- a/ext/standard/tests/array/array_walk_closure.phpt
+++ b/ext/standard/tests/array/array_walk_closure.phpt
@@ -97,7 +97,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, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
Warning: array_walk() expects parameter 1 to be array, null given 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 25f60312eb..5b8c0b1d1d 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
@@ -172,31 +172,31 @@ Warning: array_walk_recursive() expects parameter 1 to be array, null given in %
NULL
-- Iteration 12 --
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt
index ad4ea26b24..4121f1a5a1 100644
--- a/ext/standard/tests/array/array_walk_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_variation1.phpt
@@ -172,31 +172,31 @@ Warning: array_walk() expects parameter 1 to be array, null given in %s on line
NULL
-- Iteration 12 --
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index f5b3b7d10e..c32e377295 100644
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -242,55 +242,55 @@ Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variat
bool(false)
-- Iteration 12 --
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 13 --
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 14 --
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 15 --
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
bool(false)
-- Iteration 16 --
diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 149d6c9181..07fc53787b 100644
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -242,55 +242,55 @@ Warning: asort() expects parameter 1 to be array, null given in %s on line %d
bool(false)
-- Iteration 12 --
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 14 --
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 15 --
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: asort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 16 --
diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt
index c90861170e..2cc78fc624 100644
--- a/ext/standard/tests/array/current_variation1.phpt
+++ b/ext/standard/tests/array/current_variation1.phpt
@@ -154,22 +154,22 @@ NULL
-- Iteration 12 --
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: current() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: current() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: current() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: current() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt
index 5e2179c7bf..a6f5ac1d1b 100644
--- a/ext/standard/tests/array/end_variation1.phpt
+++ b/ext/standard/tests/array/end_variation1.phpt
@@ -154,22 +154,22 @@ NULL
-- Iteration 12 --
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: end() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: end() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: end() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: end() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt
index cda0f67353..9beb03e76b 100644
--- a/ext/standard/tests/array/key_variation1.phpt
+++ b/ext/standard/tests/array/key_variation1.phpt
@@ -154,22 +154,22 @@ NULL
-- Iteration 12 --
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: key() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: key() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: key() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: key() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index 81807dc5ae..86d6a3eacb 100644
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -240,55 +240,55 @@ Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
bool(false)
-- Iteration 12 --
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 14 --
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 15 --
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 16 --
diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index ab70d8e346..d11c9a5290 100644
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -240,55 +240,55 @@ Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
bool(false)
-- Iteration 12 --
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 14 --
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 15 --
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 16 --
diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt
index df84857dc1..1537550f4c 100644
--- a/ext/standard/tests/array/natcasesort_variation1.phpt
+++ b/ext/standard/tests/array/natcasesort_variation1.phpt
@@ -154,22 +154,22 @@ NULL
-- Iteration 12 --
-Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt
index d4ca4d71ce..027a521471 100644
--- a/ext/standard/tests/array/next_variation1.phpt
+++ b/ext/standard/tests/array/next_variation1.phpt
@@ -153,22 +153,22 @@ NULL
-- Iteration 12 --
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: next() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: next() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: next() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: next() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt
index b5b1bfe875..257206b410 100644
--- a/ext/standard/tests/array/prev_variation1.phpt
+++ b/ext/standard/tests/array/prev_variation1.phpt
@@ -153,22 +153,22 @@ NULL
-- Iteration 12 --
-Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: prev() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: prev() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: prev() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: prev() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt
index 73ab993424..6181bd4177 100644
--- a/ext/standard/tests/array/reset_variation1.phpt
+++ b/ext/standard/tests/array/reset_variation1.phpt
@@ -153,22 +153,22 @@ NULL
-- Iteration 12 --
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: reset() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: reset() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: reset() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: reset() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt
index c70f85786a..ab05a250c6 100644
--- a/ext/standard/tests/array/rsort_variation1.phpt
+++ b/ext/standard/tests/array/rsort_variation1.phpt
@@ -293,70 +293,70 @@ bool(false)
-- Iteration 12 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 13 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 14 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 15 --
Flag = default:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_REGULAR:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_NUMERIC:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
Flag = SORT_STRING:
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 16 --
Flag = default:
diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt
index cf316ed7bb..2f578be11b 100644
--- a/ext/standard/tests/array/shuffle_variation1.phpt
+++ b/ext/standard/tests/array/shuffle_variation1.phpt
@@ -153,22 +153,22 @@ bool(false)
-- Iteration 12 --
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 14 --
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 15 --
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 16 --
diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index f3ec8781a1..f778b81907 100644
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -241,55 +241,55 @@ Warning: sort() expects parameter 1 to be array, null given in %s on line %d
bool(false)
-- Iteration 12 --
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 13 --
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 14 --
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 15 --
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: sort() expects parameter 1 to be array, bool given in %s on line %d
bool(false)
-- Iteration 16 --
diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt
index ee7e67629e..c8475f9112 100644
--- a/ext/standard/tests/array/uasort_variation1.phpt
+++ b/ext/standard/tests/array/uasort_variation1.phpt
@@ -143,19 +143,19 @@ Warning: uasort() expects parameter 1 to be array, null given in %s on line %d
NULL
-- Iteration 12 --
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt
index 1708bf096f..b2214a5880 100644
--- a/ext/standard/tests/array/uksort_variation1.phpt
+++ b/ext/standard/tests/array/uksort_variation1.phpt
@@ -154,22 +154,22 @@ NULL
--lowercase true--
-Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d
NULL
--lowercase false--
-Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d
NULL
--uppercase TRUE--
-Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d
NULL
--uppercase FALSE--
-Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d
NULL
--empty string DQ--
diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt
index 52d7abcf52..761efbca39 100644
--- a/ext/standard/tests/array/usort_variation1.phpt
+++ b/ext/standard/tests/array/usort_variation1.phpt
@@ -168,22 +168,22 @@ NULL
-- Iteration 12 --
-Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: usort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: usort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: usort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d
+Warning: usort() expects parameter 1 to be array, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt
index ee6832cf3e..4b89921759 100644
--- a/ext/standard/tests/class_object/class_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt
@@ -128,27 +128,27 @@ bool(false)
Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Arg value
@@ -187,7 +187,7 @@ bool(false)
Error: 4096 - Object of class stdClass could not be converted to string, %s(80)
Arg value
-Error: 2 - class_exists() expects parameter 2 to be boolean, object given, %s(81)
+Error: 2 - class_exists() expects parameter 2 to be bool, object given, %s(81)
NULL
Arg value
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 ea12df562c..b142f8ace9 100644
--- a/ext/standard/tests/class_object/get_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_001.phpt
@@ -162,22 +162,22 @@ bool(false)
Arg value: 1 (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: 1 (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: (type: boolean)
-Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d
bool(false)
Arg value: (type: string)
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 98b5deca1a..7351995b6d 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
@@ -160,22 +160,22 @@ NULL
Arg value 1
-Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d
NULL
Arg value
-Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d
NULL
Arg value 1
-Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d
NULL
Arg value
-Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/standard/tests/class_object/interface_exists_variation2.phpt b/ext/standard/tests/class_object/interface_exists_variation2.phpt
index 4137d8a0f9..de13c101ce 100644
--- a/ext/standard/tests/class_object/interface_exists_variation2.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation2.phpt
@@ -132,22 +132,22 @@ bool(false)
--empty array--
-Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d
+Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d
NULL
--int indexed array--
-Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d
+Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d
NULL
--associative array--
-Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d
+Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d
NULL
--nested arrays--
-Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d
+Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d
NULL
--uppercase NULL--
@@ -188,12 +188,12 @@ bool(false)
--instance of classWithToString--
-Warning: interface_exists() expects parameter 2 to be boolean, object given in %sinterface_exists_variation2.php on line %d
+Warning: interface_exists() expects parameter 2 to be bool, object given in %sinterface_exists_variation2.php on line %d
NULL
--instance of classWithoutToString--
-Warning: interface_exists() expects parameter 2 to be boolean, object given in %sinterface_exists_variation2.php on line %d
+Warning: interface_exists() expects parameter 2 to be bool, object given in %sinterface_exists_variation2.php on line %d
NULL
--undefined var--
diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt
index 57cedaf81a..0c106ee4f4 100644
--- a/ext/standard/tests/class_object/is_a_error_001.phpt
+++ b/ext/standard/tests/class_object/is_a_error_001.phpt
@@ -42,7 +42,7 @@ NULL
-- Testing is_a() function with non-boolean in last position --
-Warning: is_a() expects parameter 3 to be boolean, object given in %s on line 21
+Warning: is_a() expects parameter 3 to be bool, object given in %s on line 21
NULL
-- Testing is_a() function with less than expected no. of arguments --
diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
index 987dcd47be..62ccf6d342 100644
--- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
@@ -48,7 +48,7 @@ bool(false)
-- Testing is_subclass_of() function with more than invalid 3rd argument --
-Warning: is_subclass_of() expects parameter 3 to be boolean, object given in %s on line 26
+Warning: is_subclass_of() expects parameter 3 to be bool, object given in %s on line 26
NULL
-- Testing is_subclass_of() function with less than expected no. of arguments --
diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
index 50f2a0256f..fdd2da2dbb 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
@@ -128,27 +128,27 @@ bool(false)
Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d)
Arg value Array
-Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81)
+Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81)
NULL
Arg value
@@ -187,7 +187,7 @@ bool(false)
Error: 4096 - Object of class stdClass could not be converted to string, %s(80)
Arg value
-Error: 2 - trait_exists() expects parameter 2 to be boolean, object given, %s(81)
+Error: 2 - trait_exists() expects parameter 2 to be bool, object given, %s(81)
NULL
Arg value
diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt
index 7885a01f54..1f917b2ab5 100644
--- a/ext/standard/tests/dir/closedir_variation1.phpt
+++ b/ext/standard/tests/dir/closedir_variation1.phpt
@@ -147,22 +147,22 @@ NULL
-- Iteration 12 --
-Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
index 7b6dbde9d8..33d692c320 100644
--- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
@@ -180,19 +180,19 @@ Warning: dir() expects parameter 2 to be resource, null given in %s on line %d
NULL
-- Iteration 17 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 18 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 19 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 20 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 21 --
diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt
index 609f0691cf..765417c62c 100644
--- a/ext/standard/tests/dir/dir_variation2.phpt
+++ b/ext/standard/tests/dir/dir_variation2.phpt
@@ -174,19 +174,19 @@ Warning: dir() expects parameter 2 to be resource, null given in %s on line %d
NULL
-- Iteration 17 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 18 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 19 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 20 --
-Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 21 --
diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
index 5e5201782a..5d43962378 100644
--- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
@@ -175,22 +175,22 @@ NULL
-- Iteration 12 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt
index 80b90d5ecb..ea9cac504d 100644
--- a/ext/standard/tests/dir/opendir_variation2.phpt
+++ b/ext/standard/tests/dir/opendir_variation2.phpt
@@ -169,22 +169,22 @@ NULL
-- Iteration 12 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt
index d2f138649e..7b282dbb9e 100644
--- a/ext/standard/tests/dir/readdir_variation1.phpt
+++ b/ext/standard/tests/dir/readdir_variation1.phpt
@@ -145,22 +145,22 @@ NULL
-- Iteration 12 --
-Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt
index e7e3d7d7b1..f99e84231d 100644
--- a/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation1.phpt
@@ -146,22 +146,22 @@ NULL
-- Iteration 12 --
-Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
index 4ad753c6b2..4a81d209e5 100644
--- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
@@ -169,22 +169,22 @@ NULL
-- Iteration 12 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt
index 74f84cd90c..a75396aecd 100644
--- a/ext/standard/tests/dir/scandir_variation3.phpt
+++ b/ext/standard/tests/dir/scandir_variation3.phpt
@@ -163,22 +163,22 @@ NULL
-- Iteration 12 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 13 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 14 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 15 --
-Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d
NULL
-- Iteration 16 --
diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index b8b8fd5cbf..2b315a5cac 100644
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -138,10 +138,10 @@ bool(false)
Warning: fopen(1): failed to open stream: No such file or directory in %s on line %d
bool(false)
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-Warning: feof() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: feof() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt
index dadbdccf5a..79a5bc1ca5 100644
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -75,7 +75,7 @@ Warning: fflush() expects parameter 1 to be resource, float given in %s on line
bool(false)
-- Iteration 4 --
-Warning: fflush() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fflush() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fgetc_error.phpt b/ext/standard/tests/file/fgetc_error.phpt
index 19615269cc..65bcda0413 100644
--- a/ext/standard/tests/file/fgetc_error.phpt
+++ b/ext/standard/tests/file/fgetc_error.phpt
@@ -60,7 +60,7 @@ Warning: fgetc() expects parameter 1 to be resource, float given in %s on line %
bool(false)
-- Iteration 4 --
-Warning: fgetc() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fgetc() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fgetcsv_error.phpt b/ext/standard/tests/file/fgetcsv_error.phpt
index ad04c72c3e..6b816bca3c 100644
--- a/ext/standard/tests/file/fgetcsv_error.phpt
+++ b/ext/standard/tests/file/fgetcsv_error.phpt
@@ -74,10 +74,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, float given in %s on line
NULL
-- Iteration 4 --
-Warning: fgetcsv() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-Warning: fgetcsv() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index c5f0aabc28..c84d562027 100644
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -88,7 +88,7 @@ Warning: fgets() expects parameter 1 to be resource, float given in %s on line %
bool(false)
-- Iteration 4 --
-Warning: fgets() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fgets() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index cf0afb2e09..1eb90589a7 100644
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -87,7 +87,7 @@ Warning: fgetss() expects parameter 1 to be resource, float given in %s on line
bool(false)
-- Iteration 4 --
-Warning: fgetss() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fgetss() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt
index f485b0ecf5..035ecd3d68 100644
--- a/ext/standard/tests/file/file_get_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation3.phpt
@@ -151,19 +151,19 @@ string(%d) "contents read"
string(%d) "contents read"
--empty array--
-Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d)
NULL
--uppercase NULL--
@@ -203,11 +203,11 @@ string(%d) "contents read"
string(%d) "contents read"
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 2 to be bool, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 2 to be bool, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt
index 6a6f5317dc..6c7f5a132c 100644
--- a/ext/standard/tests/file/file_get_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -189,19 +189,19 @@ string(%d) "contents read"
string(%d) "contents read"
--lowercase true--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--lowercase false--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--uppercase TRUE--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--uppercase FALSE--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--empty string DQ--
diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt
index fc7a021c50..4a8daad29f 100644
--- a/ext/standard/tests/file/file_put_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -188,19 +188,19 @@ int(13)
int(13)
--lowercase true--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d)
NULL
--lowercase false--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d)
NULL
--uppercase TRUE--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d)
NULL
--uppercase FALSE--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d)
NULL
--empty string DQ--
diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt
index cc9ac156d5..9c92ae699f 100644
--- a/ext/standard/tests/file/file_variation4.phpt
+++ b/ext/standard/tests/file/file_variation4.phpt
@@ -205,19 +205,19 @@ array(3) {
}
--lowercase true--
-Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--lowercase false--
-Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--uppercase TRUE--
-Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--uppercase FALSE--
-Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d)
NULL
--empty string DQ--
diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt
index c949f86fa2..5f38cbba65 100644
--- a/ext/standard/tests/file/fopen_variation10-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation10-win32.phpt
@@ -98,21 +98,21 @@ file in root
Warning: fopen(c\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--\--
Warning: fopen(\\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--/--
Warning: fopen(/\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--c:fopen10.tmpdirTwo--
file in fopen10.tmpdirTwo
@@ -122,7 +122,7 @@ file in fopen10.tmpdirTwo
Warning: fopen(c:adir\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--c:\/--
file in root
@@ -144,6 +144,6 @@ file in fopen10.tmpDir
Warning: fopen(/sortout\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
===DONE===
diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt
index 61a2f60ecf..85265063d1 100644
--- a/ext/standard/tests/file/fopen_variation11-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation11-win32.phpt
@@ -96,21 +96,21 @@ file in root
Warning: fopen(c\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--\--
Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--/--
Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--c:fopen11.tmpdirTwo--
file in fopen11.tmpdirTwo
@@ -120,7 +120,7 @@ file in fopen11.tmpdirTwo
Warning: fopen(c:adir\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
--c:\/--
file in root
@@ -142,6 +142,6 @@ file in fopen11.tmpDir
Warning: fopen(/sortout\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d
file not opened for read
-Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d
===DONE===
diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt
index 3467a3a606..b4301743d4 100644
--- a/ext/standard/tests/file/fopen_variation3.phpt
+++ b/ext/standard/tests/file/fopen_variation3.phpt
@@ -151,19 +151,19 @@ ok
ok
--empty array--
-Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d)
bool(false)
--int indexed array--
-Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d)
bool(false)
--associative array--
-Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d)
bool(false)
--nested arrays--
-Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d)
bool(false)
--uppercase NULL--
@@ -203,11 +203,11 @@ ok
ok
--instance of classWithToString--
-Error: 2 - fopen() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - fopen() expects parameter 3 to be bool, object given, %s(%d)
bool(false)
--instance of classWithoutToString--
-Error: 2 - fopen() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - fopen() expects parameter 3 to be bool, object given, %s(%d)
bool(false)
--undefined var--
diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt
index 34a2be3811..7a92a0a29f 100644
--- a/ext/standard/tests/file/fopen_variation4.phpt
+++ b/ext/standard/tests/file/fopen_variation4.phpt
@@ -188,19 +188,19 @@ ok
ok
--lowercase true--
-Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d)
bool(false)
--uppercase TRUE--
-Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d)
bool(false)
--empty string DQ--
diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt
index 958397b0e5..f761d09482 100644
--- a/ext/standard/tests/file/fpassthru_error.phpt
+++ b/ext/standard/tests/file/fpassthru_error.phpt
@@ -28,7 +28,7 @@ echo "\n*** Done ***\n";
Warning: fread() expects parameter 1 to be resource, string given in %s on line %d
-Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
Warning: fpassthru() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt
index c1a5a37b27..4458dbd124 100644
--- a/ext/standard/tests/file/fpassthru_variation1.phpt
+++ b/ext/standard/tests/file/fpassthru_variation1.phpt
@@ -168,22 +168,22 @@ bool(false)
Arg value 1
-Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
Arg value
-Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
Arg value 1
-Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
Arg value
-Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
Arg value
diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt
index c0445ec1e2..c98d49c6ce 100644
--- a/ext/standard/tests/file/fputcsv_error.phpt
+++ b/ext/standard/tests/file/fputcsv_error.phpt
@@ -77,7 +77,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, boolean given in %s on line %d
+Warning: fputcsv() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 0a694f3859..d500e6827a 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -89,7 +89,7 @@ Warning: fread() expects parameter 1 to be resource, float given in %s on line %
bool(false)
-- Iteration 4 --
-Warning: fread() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fread() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index fcecb64dca..8e01b8408b 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -80,7 +80,7 @@ Warning: fseek() expects parameter 1 to be resource, float given in %s on line %
bool(false)
-- Iteration 4 --
-Warning: fseek() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fseek() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index 6838e1b074..8835046f6c 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -76,7 +76,7 @@ Warning: ftell() expects parameter 1 to be resource, float given in %s on line %
bool(false)
-- Iteration 4 --
-Warning: ftell() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: ftell() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index ef9e349391..0b94bcffc7 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -76,7 +76,7 @@ Warning: rewind() expects parameter 1 to be resource, float given in %s on line
bool(false)
-- Iteration 4 --
-Warning: rewind() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: rewind() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fstat_variation2.phpt b/ext/standard/tests/file/fstat_variation2.phpt
index 6368c3b849..e2aa865874 100644
--- a/ext/standard/tests/file/fstat_variation2.phpt
+++ b/ext/standard/tests/file/fstat_variation2.phpt
@@ -17,15 +17,15 @@ foreach ( $variation_array as $var ) {
===DONE===
--EXPECTF--
-Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, bool 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 a44d269add..31fc60fd17 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -102,7 +102,7 @@ Warning: ftruncate() expects parameter 1 to be resource, float given in %s on li
bool(false)
-- Iteration 4 --
-Warning: ftruncate() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: ftruncate() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 9d330d4c12..1e17b5d117 100644
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -100,7 +100,7 @@ Warning: fwrite() expects parameter 1 to be resource, float given in %s on line
bool(false)
-- Iteration 4 --
-Warning: fwrite() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: fwrite() expects parameter 1 to be resource, bool given in %s on line %d
bool(false)
-- Iteration 5 --
diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt
index 7622e5f612..1c0baa09f7 100644
--- a/ext/standard/tests/file/mkdir_variation3.phpt
+++ b/ext/standard/tests/file/mkdir_variation3.phpt
@@ -147,16 +147,16 @@ Directory created
Directory created
--empty array--
-Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d)
--int indexed array--
-Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d)
--associative array--
-Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d)
--nested arrays--
-Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d)
--uppercase NULL--
Directory created
@@ -195,10 +195,10 @@ Directory created
Directory created
--instance of classWithToString--
-Error: 2 - mkdir() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 3 to be bool, object given, %s(%d)
--instance of classWithoutToString--
-Error: 2 - mkdir() expects parameter 3 to be boolean, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 3 to be bool, 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 0975c8d986..862dec8c4e 100644
--- a/ext/standard/tests/file/mkdir_variation4.phpt
+++ b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -173,16 +173,16 @@ Directory created
Directory created
--lowercase true--
-Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d)
--lowercase false--
-Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d)
--uppercase TRUE--
-Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d)
--uppercase FALSE--
-Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d)
--empty string DQ--
Error: 2 - mkdir() expects parameter 4 to be resource, string given, %s(%d)
diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt
index eea7b7decc..52b5d02764 100644
--- a/ext/standard/tests/file/parse_ini_file_variation5.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt
@@ -168,19 +168,19 @@ array(1) {
}
--empty array--
-Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--int indexed array--
-Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--associative array--
-Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--nested arrays--
-Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d)
bool(false)
--uppercase NULL--
@@ -232,11 +232,11 @@ array(1) {
}
--instance of classWithToString--
-Error: 2 - parse_ini_file() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 2 to be bool, object given, %s(%d)
bool(false)
--instance of classWithoutToString--
-Error: 2 - parse_ini_file() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 2 to be bool, object given, %s(%d)
bool(false)
--undefined var--
diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt
index b639747463..2a3251bd36 100644
--- a/ext/standard/tests/file/pclose_variation1.phpt
+++ b/ext/standard/tests/file/pclose_variation1.phpt
@@ -174,19 +174,19 @@ Error: 2 - pclose() expects parameter 1 to be resource, null given, %s(%d)
bool(false)
--lowercase true--
-Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d)
bool(false)
--uppercase TRUE--
-Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d)
bool(false)
--empty string DQ--
diff --git a/ext/standard/tests/file/readfile_error.phpt b/ext/standard/tests/file/readfile_error.phpt
index 2d5d377dea..fcaa7f3946 100644
--- a/ext/standard/tests/file/readfile_error.phpt
+++ b/ext/standard/tests/file/readfile_error.phpt
@@ -51,7 +51,7 @@ bool(false)
Warning: readfile() expects parameter 3 to be resource, string given in %s on line %d
bool(false)
-Warning: readfile() expects parameter 3 to be resource, boolean given in %s on line %d
+Warning: readfile() expects parameter 3 to be resource, bool given in %s on line %d
bool(false)
-- Testing readfile() with non-existent file --
diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
index 1a7b5830c0..798a065073 100644
--- a/ext/standard/tests/file/readfile_variation4.phpt
+++ b/ext/standard/tests/file/readfile_variation4.phpt
@@ -192,19 +192,19 @@ testing readfile
testing readfile
--lowercase true--
-Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d)
file not read
--lowercase false--
-Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d)
file not read
--uppercase TRUE--
-Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d)
file not read
--uppercase FALSE--
-Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d)
file not read
--empty string DQ--
diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt
index 21856f8135..8c95ce8486 100644
--- a/ext/standard/tests/file/readfile_variation5.phpt
+++ b/ext/standard/tests/file/readfile_variation5.phpt
@@ -154,19 +154,19 @@ testing readfile
testing readfile
--empty array--
-Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d)
File not read
--int indexed array--
-Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d)
File not read
--associative array--
-Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d)
File not read
--nested arrays--
-Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d)
File not read
--uppercase NULL--
@@ -206,11 +206,11 @@ testing readfile
testing readfile
--instance of classWithToString--
-Error: 2 - readfile() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - readfile() expects parameter 2 to be bool, object given, %s(%d)
File not read
--instance of classWithoutToString--
-Error: 2 - readfile() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - readfile() expects parameter 2 to be bool, object given, %s(%d)
File not read
--undefined var--
diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
index 17fa5192bc..f84adc890a 100644
--- a/ext/standard/tests/file/rename_variation10.phpt
+++ b/ext/standard/tests/file/rename_variation10.phpt
@@ -190,19 +190,19 @@ bool(true)
bool(true)
--lowercase true--
-Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d)
bool(false)
--uppercase TRUE--
-Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d)
bool(false)
--empty string DQ--
diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
index 7d1a5e2f24..8c5af1a351 100644
--- a/ext/standard/tests/file/rmdir_variation2.phpt
+++ b/ext/standard/tests/file/rmdir_variation2.phpt
@@ -181,19 +181,19 @@ bool(true)
bool(true)
--lowercase true--
-Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--uppercase TRUE--
-Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--empty string DQ--
diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt
index 51afc369b7..efd6ee8323 100644
--- a/ext/standard/tests/file/unlink_error-win32-mb.phpt
+++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@ -94,7 +94,7 @@ bool(false)
Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d
bool(false)
-Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: unlink() expects parameter 2 to be resource, bool given in %s on line %d
bool(false)
-- Testing unlink() on non-existent file --
diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt
index 305e989962..8dde64cff0 100644
--- a/ext/standard/tests/file/unlink_error-win32.phpt
+++ b/ext/standard/tests/file/unlink_error-win32.phpt
@@ -91,7 +91,7 @@ bool(false)
Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d
bool(false)
-Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: unlink() expects parameter 2 to be resource, bool given in %s on line %d
bool(false)
-- Testing unlink() on non-existent file --
diff --git a/ext/standard/tests/file/unlink_error.phpt b/ext/standard/tests/file/unlink_error.phpt
index b1af8fd736..f7f8f00847 100644
--- a/ext/standard/tests/file/unlink_error.phpt
+++ b/ext/standard/tests/file/unlink_error.phpt
@@ -91,7 +91,7 @@ bool(false)
Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d
bool(false)
-Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d
+Warning: unlink() expects parameter 2 to be resource, bool given in %s on line %d
bool(false)
-- Testing unlink() on non-existent file --
diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt
index d68db852fd..1860018102 100644
--- a/ext/standard/tests/file/unlink_variation7.phpt
+++ b/ext/standard/tests/file/unlink_variation7.phpt
@@ -183,19 +183,19 @@ bool(true)
bool(true)
--lowercase true--
-Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--lowercase false--
-Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--uppercase TRUE--
-Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--uppercase FALSE--
-Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d)
bool(false)
--empty string DQ--
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 df95186ec9..51a5d74ae2 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
@@ -153,19 +153,19 @@ Error: 2 - call_user_func_array() expects parameter 2 to be array, null given, %
NULL
--lowercase true--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d)
NULL
--lowercase false--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d)
NULL
--uppercase TRUE--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d)
NULL
--uppercase FALSE--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d)
NULL
--empty string DQ--
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 b0a6a80199..cd974fd5e0 100644
--- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
@@ -39,7 +39,7 @@ foreach($vars as $variation =>$object) {
-- bool --
-Warning: get_resource_type() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: get_resource_type() expects parameter 1 to be resource, bool given in %s on line %d
NULL
-- int 10 --
diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt
index 356d4e9a1e..f6551fbc23 100644
--- a/ext/standard/tests/image/image_type_to_extension.phpt
+++ b/ext/standard/tests/image/image_type_to_extension.phpt
@@ -91,7 +91,7 @@ Constant: IMAGETYPE_WEBP
With dot: .webp
Without dot: webp
-Warning: image_type_to_extension() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: image_type_to_extension() expects parameter 2 to be bool, array given in %s on line %d
bool(false)
Warning: image_type_to_extension() expects parameter 1 to be int, object given in %s on line %d
diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt
index a5bf5f868c..eb11760b76 100644
--- a/ext/standard/tests/strings/sha1_variation2.phpt
+++ b/ext/standard/tests/strings/sha1_variation2.phpt
@@ -111,23 +111,23 @@ string(40) "0a4d55a8d778e5022fab701977c5d840bbc486d0"
string(40) "0a4d55a8d778e5022fab701977c5d840bbc486d0"
-- Iteration 10 --
-Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d
string(0) ""
-- Iteration 11 --
-Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d
string(0) ""
-- Iteration 12 --
-Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d
string(0) ""
-- Iteration 13 --
-Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d
string(0) ""
-- Iteration 14 --
-Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d
string(0) ""
-- Iteration 15 --
string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430"
@@ -147,7 +147,7 @@ string(80) "30613464353561386437373865353032326661623730313937376335643834306262
string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430"
-- Iteration 23 --
-Warning: sha1() expects parameter 2 to be boolean, object given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, object given in %s on line %d
string(0) ""
-- Iteration 24 --
string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430"
@@ -155,6 +155,6 @@ string(80) "30613464353561386437373865353032326661623730313937376335643834306262
string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430"
-- Iteration 26 --
-Warning: sha1() expects parameter 2 to be boolean, resource given in %s on line %d
+Warning: sha1() expects parameter 2 to be bool, resource given in %s on line %d
string(0) ""
===DONE===
diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index 830678f199..1fdf1b144f 100644
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -33,7 +33,7 @@ bool(false)
bool(true)
int(0)
-Warning: substr_compare() expects parameter 5 to be boolean, object given in %s on line %d
+Warning: substr_compare() expects parameter 5 to be bool, object given in %s on line %d
bool(false)
Test
diff --git a/ext/standard/tests/strings/wordwrap_variation4.phpt b/ext/standard/tests/strings/wordwrap_variation4.phpt
index 7111f2d2ba..656db58b15 100644
--- a/ext/standard/tests/strings/wordwrap_variation4.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation4.phpt
@@ -107,23 +107,23 @@ string(39) "testing<br />\nwordwrap<br />\nfunction"
string(39) "testing<br />\nwordwrap<br />\nfunction"
-- Iteration 10 --
-Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d
+Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d
NULL
-- Iteration 11 --
-Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d
+Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d
NULL
-- Iteration 12 --
-Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d
+Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d
NULL
-- Iteration 13 --
-Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d
+Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d
NULL
-- Iteration 14 --
-Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d
+Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d
NULL
-- Iteration 15 --
string(39) "testing<br />\nwordwrap<br />\nfunction"
@@ -131,7 +131,7 @@ string(39) "testing<br />\nwordwrap<br />\nfunction"
string(39) "testing<br />\nwordwrap<br />\nfunction"
-- Iteration 17 --
-Warning: wordwrap() expects parameter 4 to be boolean, object given in %s on line %d
+Warning: wordwrap() expects parameter 4 to be bool, object given in %s on line %d
NULL
-- Iteration 18 --
string(39) "testing<br />\nwordwrap<br />\nfunction"
diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt
index 20bf35746b..0443eefaf8 100644
--- a/ext/standard/tests/url/base64_decode_variation_002.phpt
+++ b/ext/standard/tests/url/base64_decode_variation_002.phpt
@@ -116,23 +116,23 @@ bool(false)
bool(false)
-- Arg value array() --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d)
NULL
-- Arg value array(0) --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d)
NULL
-- Arg value array(1) --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d)
NULL
-- Arg value array(1, 2) --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d)
NULL
-- Arg value array('color' => 'red', 'item' => 'pen' --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d)
NULL
-- Arg value NULL --
@@ -160,7 +160,7 @@ string(12) "hello world!"
string(12) "hello world!"
-- Arg value stdClass object --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, object given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, object given, %s(%d)
NULL
-- Arg value undefined variable --
@@ -170,6 +170,6 @@ string(12) "hello world!"
string(12) "hello world!"
-- Arg value resource --
-Error: 2 - base64_decode() expects parameter 2 to be boolean, resource given, %s(%d)
+Error: 2 - base64_decode() expects parameter 2 to be bool, resource given, %s(%d)
NULL
===Done=== \ No newline at end of file
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index c27782a07f..b28bd0c31a 100644
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -54,12 +54,12 @@ bool(false)
Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
bool(false)
-Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: shm_remove() expects parameter 1 to be resource, bool given in %s on line %d
Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
bool(false)
-Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: shm_remove() expects parameter 1 to be resource, bool given in %s on line %d
resource(%d) of type (sysvshm)
Warning: shm_remove() expects parameter 1 to be resource, int given in %s on line %d
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 dbc9066215..9f5393bcae 100644
--- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
@@ -179,22 +179,22 @@ NULL
Arg value 1
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 37b1ee98d9..7431e10843 100644
--- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
@@ -180,22 +180,22 @@ NULL
Arg value 1
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 e7342a6c34..4c85f0a13d 100644
--- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
@@ -179,22 +179,22 @@ NULL
Arg value 1
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt
index 7f23030fb1..58247ac01e 100644
--- a/ext/xml/tests/xml_get_error_code_variation1.phpt
+++ b/ext/xml/tests/xml_get_error_code_variation1.phpt
@@ -179,22 +179,22 @@ NULL
Arg value 1
-Warning: xml_get_error_code() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_error_code() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_get_error_code() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_get_error_code() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
index cbaa0d814c..e9c41e8f24 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
@@ -180,22 +180,22 @@ NULL
Arg value 1
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt
index 182e9f6fd5..35a3810ad1 100644
--- a/ext/xml/tests/xml_parse_variation1.phpt
+++ b/ext/xml/tests/xml_parse_variation1.phpt
@@ -181,22 +181,22 @@ NULL
Arg value 1
-Warning: xml_parse() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parse() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_parse() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parse() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt
index 4f7813bf5d..b488b481b6 100644
--- a/ext/xml/tests/xml_parser_free_variation1.phpt
+++ b/ext/xml/tests/xml_parser_free_variation1.phpt
@@ -179,22 +179,22 @@ NULL
Arg value 1
-Warning: xml_parser_free() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parser_free() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_parser_free() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parser_free() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt
index c94f87f420..fd08670d9e 100644
--- a/ext/xml/tests/xml_parser_get_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt
@@ -180,22 +180,22 @@ NULL
Arg value 1
-Warning: xml_parser_get_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parser_get_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_parser_get_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parser_get_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, bool 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 f606a78670..528fcf8bde 100644
--- a/ext/xml/tests/xml_parser_set_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt
@@ -180,22 +180,22 @@ NULL
Arg value 1
-Warning: xml_parser_set_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parser_set_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_parser_set_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_parser_set_option() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, bool 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 ce060f267f..2270ded5ea 100644
--- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt
index 33183aea4e..f4d3175ced 100644
--- a/ext/xml/tests/xml_set_default_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_default_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_default_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_default_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_default_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt
index f737b5f302..4bfd18fa4b 100644
--- a/ext/xml/tests/xml_set_element_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_element_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_element_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_element_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_element_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 eb52a82c09..f8333c236b 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
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 8b9b99ba53..cd03b5b8b1 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
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 864ccddd36..10910f6530 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt
index 6f581ba343..92c3d875f0 100644
--- a/ext/xml/tests/xml_set_object_variation1.phpt
+++ b/ext/xml/tests/xml_set_object_variation1.phpt
@@ -180,22 +180,22 @@ NULL
Arg value 1
-Warning: xml_set_object() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_object() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_object() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_object() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt
index cf8b189381..739c091241 100644
--- a/ext/xml/tests/xml_set_object_variation2.phpt
+++ b/ext/xml/tests/xml_set_object_variation2.phpt
@@ -174,22 +174,22 @@ NULL
Arg value 1
-Warning: xml_set_object() expects parameter 2 to be object, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_object() expects parameter 2 to be object, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_object() expects parameter 2 to be object, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_object() expects parameter 2 to be object, boolean given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, bool given in %s on line %d
NULL
Arg value
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 5293c3c3ae..a05d0e60e7 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 949e51e90f..5139499f1d 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
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
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 5ba3534d2b..b5d822ed89 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
@@ -184,22 +184,22 @@ NULL
Arg value 1
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value 1
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, bool given in %s on line %d
NULL
Arg value
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt
index 82c72ffcb3..42aaf95878 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt
@@ -53,4 +53,4 @@ $wrong_parameter = true;
echo $proc->transformToDoc($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, boolean given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, bool given in %s on line %d \ No newline at end of file
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt
index fed6c3e8d0..07892d1171 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt
@@ -54,4 +54,4 @@ $uri = 'php://output';
echo $proc->transformToURI($wrong_parameter, $uri);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, boolean given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, bool given in %s on line %d \ No newline at end of file
diff --git a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt
index 87db6e14d6..f8a5db63f7 100644
--- a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt
@@ -52,4 +52,4 @@ $wrong_parameter = true;
echo $proc->transformToXML($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, boolean given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, bool given in %s on line %d \ No newline at end of file
diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index f829acf063..e4cdce4731 100644
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -118,37 +118,37 @@ This is a file in script dir
Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
-Warning: gzpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: gzclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
-Warning: gzpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: gzclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
-Warning: gzpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: gzclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
-Warning: gzpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: gzclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
-Warning: gzpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-Warning: gzclose() expects parameter 1 to be resource, boolean given in %s on line %d
+Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
** testing with mode=rt **
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 06a7084cc3..6a980b8c45 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -61,7 +61,7 @@ string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {
Constant [ string PCRE_VERSION ] { %s }
Constant [ int PCRE_VERSION_MAJOR ] { %d }
Constant [ int PCRE_VERSION_MINOR ] { %d }
- Constant [ boolean PCRE_JIT_SUPPORT ] { %d }
+ Constant [ bool PCRE_JIT_SUPPORT ] { %d }
}
- Functions {