From 17ccbeec3242b80f84fbf6b3acd58421ef003b02 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Oct 2018 17:23:43 +0200 Subject: Trim trailing whitespace in *.phpt --- ext/standard/tests/array/005.phpt | 6 +-- ext/standard/tests/array/009.phpt | 16 +++---- .../tests/array/array_change_key_case.phpt | 8 ++-- .../array/array_change_key_case_variation.phpt | 12 +++--- .../array/array_change_key_case_variation1.phpt | 6 +-- .../array/array_change_key_case_variation2.phpt | 4 +- .../array/array_change_key_case_variation3.phpt | 8 ++-- .../array/array_change_key_case_variation4.phpt | 2 +- .../array/array_change_key_case_variation5.phpt | 2 +- .../array/array_change_key_case_variation6.phpt | 2 +- .../array/array_change_key_case_variation7.phpt | 2 +- .../array/array_change_key_case_variation8.phpt | 2 +- ext/standard/tests/array/array_chunk2.phpt | 6 +-- ext/standard/tests/array/array_chunk_basic1.phpt | 10 ++--- ext/standard/tests/array/array_chunk_basic2.phpt | 10 ++--- ext/standard/tests/array/array_chunk_error.phpt | 4 +- .../tests/array/array_chunk_variation1.phpt | 8 ++-- .../tests/array/array_chunk_variation2.phpt | 6 +-- .../tests/array/array_chunk_variation3.phpt | 6 +-- .../tests/array/array_chunk_variation4.phpt | 14 +++---- .../tests/array/array_chunk_variation5.phpt | 2 +- .../tests/array/array_chunk_variation6.phpt | 8 ++-- .../tests/array/array_chunk_variation7.phpt | 10 ++--- ext/standard/tests/array/array_combine_basic.phpt | 6 +-- ext/standard/tests/array/array_combine_error1.phpt | 6 +-- ext/standard/tests/array/array_combine_error2.phpt | 4 +- .../tests/array/array_combine_variation1.phpt | 6 +-- .../tests/array/array_combine_variation2.phpt | 4 +- .../tests/array/array_combine_variation3.phpt | 2 +- .../tests/array/array_combine_variation4.phpt | 4 +- .../tests/array/array_combine_variation5.phpt | 4 +- .../tests/array/array_combine_variation6.phpt | 6 +-- ext/standard/tests/array/array_count_values2.phpt | 24 +++++------ .../tests/array/array_count_values_error.phpt | 6 +-- .../tests/array/array_count_values_variation.phpt | 6 +-- ext/standard/tests/array/array_diff_assoc.phpt | 2 +- .../tests/array/array_diff_assoc_basic.phpt | 4 +- .../tests/array/array_diff_assoc_error.phpt | 4 +- .../tests/array/array_diff_assoc_variation1.phpt | 16 +++---- .../tests/array/array_diff_assoc_variation10.phpt | 16 +++---- .../tests/array/array_diff_assoc_variation2.phpt | 14 +++---- .../tests/array/array_diff_assoc_variation3.phpt | 20 ++++----- .../tests/array/array_diff_assoc_variation4.phpt | 16 +++---- .../tests/array/array_diff_assoc_variation5.phpt | 4 +- .../tests/array/array_diff_assoc_variation6.phpt | 46 ++++++++++----------- .../tests/array/array_diff_assoc_variation7.phpt | 4 +- .../tests/array/array_diff_assoc_variation8.phpt | 10 ++--- .../tests/array/array_diff_assoc_variation9.phpt | 10 ++--- ext/standard/tests/array/array_diff_basic.phpt | 4 +- ext/standard/tests/array/array_diff_error.phpt | 6 +-- ext/standard/tests/array/array_diff_key_basic.phpt | 2 +- ext/standard/tests/array/array_diff_key_error.phpt | 4 +- .../tests/array/array_diff_key_variation1.phpt | 2 +- .../tests/array/array_diff_key_variation2.phpt | 2 +- .../tests/array/array_diff_key_variation3.phpt | 2 +- .../tests/array/array_diff_key_variation4.phpt | 4 +- .../tests/array/array_diff_key_variation5.phpt | 6 +-- .../tests/array/array_diff_key_variation6.phpt | 4 +- .../tests/array/array_diff_key_variation7.phpt | 6 +-- .../tests/array/array_diff_key_variation8.phpt | 14 +++---- .../tests/array/array_diff_uassoc_basic.phpt | 2 +- .../tests/array/array_diff_uassoc_error.phpt | 4 +- .../tests/array/array_diff_uassoc_variation1.phpt | 2 +- .../tests/array/array_diff_uassoc_variation10.phpt | 8 ++-- .../tests/array/array_diff_uassoc_variation11.phpt | 6 +-- .../tests/array/array_diff_uassoc_variation12.phpt | 8 ++-- .../tests/array/array_diff_uassoc_variation13.phpt | 2 +- .../tests/array/array_diff_uassoc_variation14.phpt | 2 +- .../tests/array/array_diff_uassoc_variation2.phpt | 2 +- .../tests/array/array_diff_uassoc_variation3.phpt | 2 +- .../tests/array/array_diff_uassoc_variation4.phpt | 2 +- .../tests/array/array_diff_uassoc_variation5.phpt | 2 +- .../tests/array/array_diff_uassoc_variation6.phpt | 2 +- .../tests/array/array_diff_uassoc_variation7.phpt | 2 +- .../tests/array/array_diff_uassoc_variation8.phpt | 2 +- .../tests/array/array_diff_uassoc_variation9.phpt | 8 ++-- .../tests/array/array_diff_ukey_basic.phpt | 2 +- .../tests/array/array_diff_ukey_error.phpt | 6 +-- .../tests/array/array_diff_ukey_variation1.phpt | 2 +- .../tests/array/array_diff_ukey_variation10.phpt | 2 +- .../tests/array/array_diff_ukey_variation11.phpt | 2 +- .../tests/array/array_diff_ukey_variation2.phpt | 2 +- .../tests/array/array_diff_ukey_variation3.phpt | 2 +- .../tests/array/array_diff_ukey_variation4.phpt | 2 +- .../tests/array/array_diff_ukey_variation5.phpt | 12 +++--- .../tests/array/array_diff_ukey_variation6.phpt | 4 +- .../tests/array/array_diff_ukey_variation7.phpt | 6 +-- .../tests/array/array_diff_ukey_variation8.phpt | 4 +- .../tests/array/array_diff_ukey_variation9.phpt | 6 +-- .../tests/array/array_diff_variation1.phpt | 10 ++--- .../tests/array/array_diff_variation10.phpt | 14 +++---- .../tests/array/array_diff_variation2.phpt | 8 ++-- .../tests/array/array_diff_variation3.phpt | 18 ++++---- .../tests/array/array_diff_variation4.phpt | 18 ++++---- .../tests/array/array_diff_variation5.phpt | 8 ++-- .../tests/array/array_diff_variation6.phpt | 8 ++-- .../tests/array/array_diff_variation7.phpt | 4 +- .../tests/array/array_diff_variation8.phpt | 2 +- .../tests/array/array_diff_variation9.phpt | 4 +- ext/standard/tests/array/array_fill_basic.phpt | 8 ++-- ext/standard/tests/array/array_fill_error.phpt | 4 +- .../tests/array/array_fill_keys_error.phpt | 6 +-- .../tests/array/array_fill_keys_variation1.phpt | 6 +-- .../tests/array/array_fill_keys_variation2.phpt | 6 +-- .../tests/array/array_fill_keys_variation3.phpt | 6 +-- .../tests/array/array_fill_keys_variation4.phpt | 6 +-- ext/standard/tests/array/array_fill_object.phpt | 20 ++++----- .../tests/array/array_fill_variation1.phpt | 16 +++---- .../tests/array/array_fill_variation1_64bit.phpt | 16 +++---- .../tests/array/array_fill_variation2.phpt | 10 ++--- .../tests/array/array_fill_variation3.phpt | 18 ++++---- .../tests/array/array_fill_variation4.phpt | 14 +++---- .../tests/array/array_fill_variation5.phpt | 14 +++---- ext/standard/tests/array/array_filter.phpt | 2 +- ext/standard/tests/array/array_filter_basic.phpt | 4 +- ext/standard/tests/array/array_filter_error.phpt | 4 +- ext/standard/tests/array/array_filter_object.phpt | 12 +++--- .../tests/array/array_filter_variation1.phpt | 4 +- .../tests/array/array_filter_variation10.phpt | 2 +- .../tests/array/array_filter_variation2.phpt | 2 +- .../tests/array/array_filter_variation3.phpt | 2 +- .../tests/array/array_filter_variation4.phpt | 4 +- .../tests/array/array_filter_variation5.phpt | 10 ++--- .../tests/array/array_filter_variation6.phpt | 8 ++-- .../tests/array/array_filter_variation7.phpt | 4 +- .../tests/array/array_filter_variation8.phpt | 4 +- .../tests/array/array_filter_variation9.phpt | 6 +-- ext/standard/tests/array/array_flip.phpt | 18 ++++---- ext/standard/tests/array/array_flip_basic.phpt | 8 ++-- ext/standard/tests/array/array_flip_error.phpt | 4 +- .../tests/array/array_flip_variation1.phpt | 4 +- .../tests/array/array_flip_variation2.phpt | Bin 2179 -> 2165 bytes .../tests/array/array_flip_variation3.phpt | Bin 2823 -> 2818 bytes .../tests/array/array_flip_variation4.phpt | 6 +-- .../tests/array/array_flip_variation5.phpt | 2 +- .../tests/array/array_intersect_assoc_basic.phpt | 6 +-- .../tests/array/array_intersect_assoc_error.phpt | 4 +- .../array/array_intersect_assoc_variation1.phpt | 6 +-- .../array/array_intersect_assoc_variation10.phpt | 6 +-- .../array/array_intersect_assoc_variation2.phpt | 4 +- .../array/array_intersect_assoc_variation3.phpt | 2 +- .../array/array_intersect_assoc_variation4.phpt | 4 +- .../array/array_intersect_assoc_variation5.phpt | 2 +- .../array/array_intersect_assoc_variation6.phpt | 2 +- .../array/array_intersect_assoc_variation7.phpt | 10 ++--- .../array/array_intersect_assoc_variation8.phpt | 4 +- .../array/array_intersect_assoc_variation9.phpt | 8 ++-- .../tests/array/array_intersect_basic.phpt | 4 +- .../tests/array/array_intersect_error.phpt | 4 +- .../tests/array/array_intersect_key_basic.phpt | 2 +- .../tests/array/array_intersect_key_error.phpt | 4 +- .../array/array_intersect_key_variation1.phpt | 2 +- .../array/array_intersect_key_variation2.phpt | 2 +- .../array/array_intersect_key_variation3.phpt | 2 +- .../array/array_intersect_key_variation4.phpt | 4 +- .../array/array_intersect_key_variation5.phpt | 6 +-- .../array/array_intersect_key_variation6.phpt | 4 +- .../array/array_intersect_key_variation7.phpt | 6 +-- .../array/array_intersect_key_variation8.phpt | 14 +++---- .../tests/array/array_intersect_uassoc_error.phpt | 4 +- .../array/array_intersect_uassoc_variation1.phpt | 2 +- .../array/array_intersect_uassoc_variation10.phpt | 4 +- .../array/array_intersect_uassoc_variation11.phpt | 2 +- .../array/array_intersect_uassoc_variation2.phpt | 2 +- .../array/array_intersect_uassoc_variation3.phpt | 2 +- .../array/array_intersect_uassoc_variation4.phpt | 2 +- .../tests/array/array_intersect_ukey_basic.phpt | 2 +- .../tests/array/array_intersect_ukey_error.phpt | 6 +-- .../array/array_intersect_ukey_variation1.phpt | 4 +- .../array/array_intersect_ukey_variation10.phpt | 2 +- .../array/array_intersect_ukey_variation2.phpt | 4 +- .../array/array_intersect_ukey_variation3.phpt | 2 +- .../array/array_intersect_ukey_variation4.phpt | 4 +- .../array/array_intersect_ukey_variation5.phpt | 4 +- .../array/array_intersect_ukey_variation6.phpt | 4 +- .../array/array_intersect_ukey_variation7.phpt | 4 +- .../array/array_intersect_ukey_variation8.phpt | 2 +- .../array/array_intersect_ukey_variation9.phpt | 6 +-- .../tests/array/array_intersect_variation1.phpt | 8 ++-- .../tests/array/array_intersect_variation10.phpt | 8 ++-- .../tests/array/array_intersect_variation2.phpt | 6 +-- .../tests/array/array_intersect_variation3.phpt | 4 +- .../tests/array/array_intersect_variation4.phpt | 6 +-- .../tests/array/array_intersect_variation5.phpt | 2 +- .../tests/array/array_intersect_variation6.phpt | 4 +- .../tests/array/array_intersect_variation7.phpt | 8 ++-- .../tests/array/array_intersect_variation8.phpt | 8 ++-- .../tests/array/array_intersect_variation9.phpt | 8 ++-- ext/standard/tests/array/array_key_exists.phpt | 38 ++++++++--------- .../tests/array/array_key_exists_basic.phpt | 4 +- .../tests/array/array_key_exists_error.phpt | 2 +- .../tests/array/array_key_exists_object1.phpt | 4 +- .../tests/array/array_key_exists_object2.phpt | 4 +- .../tests/array/array_key_exists_variation1.phpt | 6 +-- .../tests/array/array_key_exists_variation2.phpt | 6 +-- .../tests/array/array_key_exists_variation3.phpt | 2 +- .../tests/array/array_key_exists_variation4.phpt | 2 +- .../tests/array/array_key_exists_variation5.phpt | 6 +-- .../tests/array/array_key_exists_variation6.phpt | 14 +++---- .../tests/array/array_key_exists_variation7.phpt | 2 +- .../tests/array/array_key_exists_variation8.phpt | 8 ++-- .../tests/array/array_keys_variation_001.phpt | 12 +++--- .../tests/array/array_keys_variation_002.phpt | 2 +- .../array/array_keys_variation_002_64bit.phpt | 2 +- .../tests/array/array_keys_variation_003.phpt | 4 +- .../tests/array/array_keys_variation_004.phpt | 2 +- .../tests/array/array_keys_variation_005.phpt | 4 +- ext/standard/tests/array/array_map_001.phpt | 12 +++--- ext/standard/tests/array/array_map_object2.phpt | 2 +- ext/standard/tests/array/array_map_object3.phpt | 2 +- .../tests/array/array_map_variation10.phpt | 2 +- .../tests/array/array_map_variation11.phpt | 2 +- .../tests/array/array_map_variation12.phpt | 2 +- .../tests/array/array_map_variation13.phpt | 2 +- .../tests/array/array_map_variation17.phpt | 4 +- .../tests/array/array_map_variation18.phpt | 4 +- ext/standard/tests/array/array_map_variation4.phpt | 4 +- ext/standard/tests/array/array_map_variation5.phpt | 4 +- ext/standard/tests/array/array_map_variation6.phpt | 4 +- ext/standard/tests/array/array_map_variation7.phpt | 2 +- ext/standard/tests/array/array_merge.phpt | 22 +++++----- ext/standard/tests/array/array_merge_basic.phpt | 4 +- ext/standard/tests/array/array_merge_error.phpt | 2 +- .../tests/array/array_merge_recursive_basic1.phpt | 4 +- .../tests/array/array_merge_recursive_basic2.phpt | 4 +- .../tests/array/array_merge_recursive_error.phpt | 4 +- .../array/array_merge_recursive_variation1.phpt | 10 ++--- .../array/array_merge_recursive_variation10.phpt | 6 +-- .../array/array_merge_recursive_variation2.phpt | 2 +- .../array/array_merge_recursive_variation3.phpt | 2 +- .../array/array_merge_recursive_variation4.phpt | 4 +- .../array/array_merge_recursive_variation5.phpt | 4 +- .../array/array_merge_recursive_variation6.phpt | 2 +- .../array/array_merge_recursive_variation7.phpt | 2 +- .../array/array_merge_recursive_variation8.phpt | 2 +- .../array/array_merge_recursive_variation9.phpt | 2 +- .../tests/array/array_merge_variation1.phpt | 6 +-- .../tests/array/array_merge_variation10.phpt | 4 +- .../tests/array/array_merge_variation2.phpt | 6 +-- .../tests/array/array_merge_variation3.phpt | 8 ++-- .../tests/array/array_merge_variation4.phpt | 16 +++---- .../tests/array/array_merge_variation5.phpt | 2 +- .../tests/array/array_merge_variation6.phpt | 2 +- .../tests/array/array_merge_variation7.phpt | 2 +- .../tests/array/array_merge_variation8.phpt | 2 +- .../tests/array/array_merge_variation9.phpt | 2 +- .../tests/array/array_multisort_basic1.phpt | 6 +-- .../tests/array/array_multisort_basic2.phpt | 6 +-- ext/standard/tests/array/array_multisort_case.phpt | 4 +- .../tests/array/array_multisort_error.phpt | 6 +-- .../tests/array/array_multisort_incase.phpt | 4 +- .../tests/array/array_multisort_natural.phpt | 4 +- .../tests/array/array_multisort_natural_case.phpt | 4 +- .../array/array_multisort_natural_incase.phpt | 4 +- .../tests/array/array_multisort_variation1.phpt | 6 +-- .../tests/array/array_multisort_variation10.phpt | 6 +-- .../tests/array/array_multisort_variation2.phpt | 6 +-- .../tests/array/array_multisort_variation3.phpt | 6 +-- .../tests/array/array_multisort_variation4.phpt | 6 +-- .../tests/array/array_multisort_variation5.phpt | 6 +-- .../tests/array/array_multisort_variation6.phpt | 6 +-- .../tests/array/array_multisort_variation7.phpt | 4 +- .../tests/array/array_multisort_variation8.phpt | 4 +- .../tests/array/array_multisort_variation9.phpt | 4 +- ext/standard/tests/array/array_pad.phpt | 2 +- ext/standard/tests/array/array_pad_error.phpt | 4 +- ext/standard/tests/array/array_pad_variation1.phpt | 4 +- ext/standard/tests/array/array_pad_variation2.phpt | 4 +- ext/standard/tests/array/array_pad_variation3.phpt | 6 +-- ext/standard/tests/array/array_pop.phpt | 4 +- ext/standard/tests/array/array_product_error.phpt | 6 +-- .../tests/array/array_product_variation1.phpt | 8 ++-- .../tests/array/array_product_variation2.phpt | 4 +- .../tests/array/array_product_variation3.phpt | 4 +- .../tests/array/array_product_variation4.phpt | 4 +- .../tests/array/array_product_variation5.phpt | 6 +-- ext/standard/tests/array/array_push.phpt | 4 +- ext/standard/tests/array/array_push_basic.phpt | 4 +- ext/standard/tests/array/array_push_error1.phpt | 2 +- ext/standard/tests/array/array_push_error2.phpt | 2 +- .../tests/array/array_push_variation1.phpt | 6 +-- .../tests/array/array_push_variation2.phpt | 6 +-- .../tests/array/array_push_variation3.phpt | 2 +- .../tests/array/array_push_variation5.phpt | 2 +- .../tests/array/array_push_variation6.phpt | 8 ++-- ext/standard/tests/array/array_rand.phpt | 2 +- ext/standard/tests/array/array_rand_basic1.phpt | 4 +- ext/standard/tests/array/array_rand_basic2.phpt | 6 +-- ext/standard/tests/array/array_rand_error.phpt | 4 +- .../tests/array/array_rand_variation1.phpt | 12 +++--- .../tests/array/array_rand_variation2.phpt | 4 +- .../tests/array/array_rand_variation3.phpt | 16 +++---- .../tests/array/array_rand_variation4.phpt | 16 +++---- .../tests/array/array_rand_variation5.phpt | 12 +++--- .../tests/array/array_rand_variation6.phpt | 2 +- ext/standard/tests/array/array_reduce.phpt | 2 +- ext/standard/tests/array/array_reduce_error.phpt | 6 +-- .../tests/array/array_reduce_variation1.phpt | 6 +-- .../tests/array/array_reduce_variation2.phpt | 6 +-- .../tests/array/array_reduce_variation3.phpt | 6 +-- ext/standard/tests/array/array_reverse_basic1.phpt | 4 +- ext/standard/tests/array/array_reverse_basic2.phpt | 2 +- ext/standard/tests/array/array_reverse_error.phpt | 4 +- .../tests/array/array_reverse_variation1.phpt | 4 +- .../tests/array/array_reverse_variation4.phpt | 6 +-- .../tests/array/array_reverse_variation5.phpt | 8 ++-- .../tests/array/array_reverse_variation6.phpt | 4 +- ext/standard/tests/array/array_search1.phpt | 2 +- .../tests/array/array_search_variation1.phpt | 10 ++--- .../tests/array/array_search_variation2.phpt | 10 ++--- .../tests/array/array_search_variation3.phpt | 10 ++--- .../tests/array/array_search_variation4.phpt | 34 +++++++-------- ext/standard/tests/array/array_shift_basic.phpt | 4 +- ext/standard/tests/array/array_shift_error.phpt | 4 +- .../tests/array/array_shift_variation1.phpt | 6 +-- .../tests/array/array_shift_variation2.phpt | 8 ++-- .../tests/array/array_shift_variation3.phpt | 14 +++---- .../tests/array/array_shift_variation4.phpt | 2 +- .../tests/array/array_shift_variation5.phpt | 6 +-- .../tests/array/array_shift_variation6.phpt | 2 +- .../tests/array/array_shift_variation7.phpt | 2 +- .../tests/array/array_shift_variation8.phpt | 8 ++-- ext/standard/tests/array/array_shuffle_basic.phpt | 2 +- ext/standard/tests/array/array_slice_basic.phpt | 4 +- ext/standard/tests/array/array_slice_error.phpt | 2 +- .../tests/array/array_slice_variation10.phpt | 2 +- .../tests/array/array_slice_variation11.phpt | 6 +-- .../tests/array/array_slice_variation2.phpt | 4 +- .../tests/array/array_slice_variation3.phpt | 4 +- .../tests/array/array_slice_variation4.phpt | 6 +-- .../tests/array/array_slice_variation5.phpt | 2 +- .../tests/array/array_slice_variation6.phpt | 2 +- .../tests/array/array_slice_variation7.phpt | 14 +++---- .../tests/array/array_slice_variation8.phpt | 4 +- .../tests/array/array_slice_variation9.phpt | 2 +- ext/standard/tests/array/array_splice_basic.phpt | 4 +- ext/standard/tests/array/array_splice_errors.phpt | 4 +- .../tests/array/array_splice_variation1.phpt | 4 +- .../tests/array/array_splice_variation2.phpt | 4 +- .../tests/array/array_splice_variation3.phpt | 4 +- .../tests/array/array_splice_variation4.phpt | 4 +- ext/standard/tests/array/array_sum_basic.phpt | 4 +- ext/standard/tests/array/array_sum_error.phpt | 4 +- ext/standard/tests/array/array_sum_variation1.phpt | 4 +- ext/standard/tests/array/array_sum_variation2.phpt | 2 +- ext/standard/tests/array/array_sum_variation3.phpt | 6 +-- ext/standard/tests/array/array_sum_variation4.phpt | 4 +- ext/standard/tests/array/array_sum_variation5.phpt | 2 +- ext/standard/tests/array/array_sum_variation6.phpt | 6 +-- ext/standard/tests/array/array_sum_variation7.phpt | 2 +- .../tests/array/array_udiff_assoc_basic.phpt | 2 +- .../tests/array/array_udiff_assoc_error.phpt | 6 +-- .../tests/array/array_udiff_assoc_variation.phpt | 6 +-- .../tests/array/array_udiff_assoc_variation1.phpt | 6 +-- .../tests/array/array_udiff_assoc_variation2.phpt | 6 +-- .../tests/array/array_udiff_assoc_variation3.phpt | 6 +-- .../tests/array/array_udiff_assoc_variation4.phpt | 6 +-- .../tests/array/array_udiff_assoc_variation5.phpt | 6 +-- ext/standard/tests/array/array_udiff_basic.phpt | 2 +- ext/standard/tests/array/array_udiff_error.phpt | 6 +-- .../tests/array/array_udiff_uassoc_basic.phpt | 2 +- .../tests/array/array_udiff_uassoc_error.phpt | 6 +-- .../tests/array/array_udiff_uassoc_variation1.phpt | 6 +-- .../tests/array/array_udiff_uassoc_variation2.phpt | 6 +-- .../tests/array/array_udiff_uassoc_variation3.phpt | 6 +-- .../tests/array/array_udiff_uassoc_variation4.phpt | 6 +-- .../tests/array/array_udiff_uassoc_variation5.phpt | 6 +-- .../tests/array/array_udiff_uassoc_variation6.phpt | 6 +-- .../tests/array/array_udiff_variation1.phpt | 6 +-- .../tests/array/array_udiff_variation2.phpt | 6 +-- .../tests/array/array_udiff_variation3.phpt | 6 +-- .../tests/array/array_udiff_variation4.phpt | 6 +-- .../tests/array/array_udiff_variation5.phpt | 6 +-- .../tests/array/array_uintersect_assoc_basic.phpt | 2 +- .../tests/array/array_uintersect_assoc_basic2.phpt | 2 +- .../tests/array/array_uintersect_assoc_error.phpt | 4 +- .../array/array_uintersect_assoc_variation1.phpt | 4 +- .../array/array_uintersect_assoc_variation2.phpt | 4 +- .../array/array_uintersect_assoc_variation3.phpt | 4 +- .../array/array_uintersect_assoc_variation4.phpt | 4 +- .../array/array_uintersect_assoc_variation5.phpt | 6 +-- .../tests/array/array_uintersect_basic.phpt | 2 +- .../tests/array/array_uintersect_error.phpt | 6 +-- .../tests/array/array_uintersect_uassoc_basic.phpt | 2 +- .../tests/array/array_uintersect_uassoc_error.phpt | 6 +-- .../array/array_uintersect_uassoc_variation1.phpt | 6 +-- .../array/array_uintersect_uassoc_variation2.phpt | 6 +-- .../array/array_uintersect_uassoc_variation3.phpt | 6 +-- .../array/array_uintersect_uassoc_variation4.phpt | 6 +-- .../array/array_uintersect_uassoc_variation5.phpt | 6 +-- .../array/array_uintersect_uassoc_variation6.phpt | 6 +-- .../tests/array/array_uintersect_variation1.phpt | 6 +-- .../tests/array/array_uintersect_variation2.phpt | 6 +-- .../tests/array/array_uintersect_variation3.phpt | 6 +-- .../tests/array/array_uintersect_variation4.phpt | 6 +-- .../tests/array/array_uintersect_variation5.phpt | 6 +-- ext/standard/tests/array/array_unique_basic.phpt | 4 +- ext/standard/tests/array/array_unique_error.phpt | 4 +- .../tests/array/array_unique_variation1.phpt | 4 +- .../tests/array/array_unique_variation2.phpt | 4 +- .../tests/array/array_unique_variation3.phpt | 4 +- .../tests/array/array_unique_variation4.phpt | 4 +- .../tests/array/array_unique_variation5.phpt | 4 +- .../tests/array/array_unique_variation6.phpt | 4 +- .../tests/array/array_unique_variation7.phpt | 2 +- .../tests/array/array_unique_variation8.phpt | 6 +-- ext/standard/tests/array/array_unshift.phpt | 2 +- ext/standard/tests/array/array_unshift_basic1.phpt | 4 +- ext/standard/tests/array/array_unshift_basic2.phpt | 4 +- ext/standard/tests/array/array_unshift_error.phpt | 4 +- ext/standard/tests/array/array_unshift_object.phpt | 2 +- .../tests/array/array_unshift_variation1.phpt | 4 +- .../tests/array/array_unshift_variation2.phpt | 14 +++---- .../tests/array/array_unshift_variation3.phpt | 2 +- .../tests/array/array_unshift_variation4.phpt | 6 +-- .../tests/array/array_unshift_variation5.phpt | 10 ++--- .../tests/array/array_unshift_variation6.phpt | 6 +-- .../tests/array/array_unshift_variation7.phpt | 6 +-- .../tests/array/array_unshift_variation8.phpt | 6 +-- .../tests/array/array_unshift_variation9.phpt | 10 ++--- ext/standard/tests/array/array_values.phpt | Bin 3060 -> 3051 bytes ext/standard/tests/array/array_values_basic.phpt | 4 +- ext/standard/tests/array/array_values_error.phpt | 2 +- ext/standard/tests/array/array_values_errors.phpt | 2 +- .../tests/array/array_values_variation.phpt | 6 +-- .../tests/array/array_values_variation1.phpt | 6 +-- .../tests/array/array_values_variation2.phpt | 8 ++-- .../tests/array/array_values_variation3.phpt | 14 +++---- .../tests/array/array_values_variation4.phpt | 2 +- .../tests/array/array_values_variation5.phpt | 2 +- .../tests/array/array_values_variation6.phpt | 2 +- .../tests/array/array_values_variation7.phpt | 2 +- .../tests/array/array_values_variation_64bit.phpt | 6 +-- ext/standard/tests/array/array_walk.phpt | 2 +- ext/standard/tests/array/array_walk_basic1.phpt | 12 +++--- ext/standard/tests/array/array_walk_basic2.phpt | 10 ++--- ext/standard/tests/array/array_walk_closure.phpt | 2 +- ext/standard/tests/array/array_walk_error1.phpt | 2 +- ext/standard/tests/array/array_walk_error2.phpt | 6 +-- ext/standard/tests/array/array_walk_object1.phpt | 8 ++-- ext/standard/tests/array/array_walk_object2.phpt | 8 ++-- ext/standard/tests/array/array_walk_objects.phpt | 6 +-- .../tests/array/array_walk_rec_objects.phpt | 6 +-- .../tests/array/array_walk_recursive1.phpt | 2 +- .../tests/array/array_walk_recursive_basic1.phpt | 12 +++--- .../tests/array/array_walk_recursive_basic2.phpt | 10 ++--- .../tests/array/array_walk_recursive_error1.phpt | 2 +- .../tests/array/array_walk_recursive_error2.phpt | 6 +-- .../tests/array/array_walk_recursive_object1.phpt | 8 ++-- .../tests/array/array_walk_recursive_object2.phpt | 8 ++-- .../array/array_walk_recursive_variation1.phpt | 6 +-- .../array/array_walk_recursive_variation2.phpt | 2 +- .../array/array_walk_recursive_variation3.phpt | 10 ++--- .../array/array_walk_recursive_variation4.phpt | 4 +- .../array/array_walk_recursive_variation5.phpt | 2 +- .../array/array_walk_recursive_variation6.phpt | 12 +++--- .../array/array_walk_recursive_variation7.phpt | 4 +- .../array/array_walk_recursive_variation8.phpt | 2 +- .../array/array_walk_recursive_variation9.phpt | 4 +- .../tests/array/array_walk_variation1.phpt | 6 +-- .../tests/array/array_walk_variation2.phpt | 2 +- .../tests/array/array_walk_variation3.phpt | 10 ++--- .../tests/array/array_walk_variation4.phpt | 4 +- .../tests/array/array_walk_variation5.phpt | 2 +- .../tests/array/array_walk_variation6.phpt | 12 +++--- .../tests/array/array_walk_variation7.phpt | 4 +- .../tests/array/array_walk_variation8.phpt | 2 +- .../tests/array/array_walk_variation9.phpt | 4 +- ext/standard/tests/array/arsort_basic.phpt | 10 ++--- ext/standard/tests/array/arsort_error.phpt | 6 +-- ext/standard/tests/array/arsort_object1.phpt | 10 ++--- ext/standard/tests/array/arsort_object2.phpt | 14 +++---- ext/standard/tests/array/arsort_variation1.phpt | 4 +- ext/standard/tests/array/arsort_variation10.phpt | 8 ++-- ext/standard/tests/array/arsort_variation11.phpt | Bin 3385 -> 3380 bytes ext/standard/tests/array/arsort_variation2.phpt | 2 +- ext/standard/tests/array/arsort_variation3.phpt | 14 +++---- ext/standard/tests/array/arsort_variation4.phpt | 6 +-- ext/standard/tests/array/arsort_variation5.phpt | 12 +++--- ext/standard/tests/array/arsort_variation6.phpt | 6 +-- ext/standard/tests/array/arsort_variation7.phpt | 4 +- ext/standard/tests/array/arsort_variation8.phpt | 10 ++--- ext/standard/tests/array/arsort_variation9.phpt | 8 ++-- ext/standard/tests/array/asort_basic.phpt | 10 ++--- ext/standard/tests/array/asort_error.phpt | 6 +-- ext/standard/tests/array/asort_object1.phpt | 10 ++--- ext/standard/tests/array/asort_object2.phpt | 14 +++---- ext/standard/tests/array/asort_variation1.phpt | 4 +- ext/standard/tests/array/asort_variation10.phpt | 8 ++-- ext/standard/tests/array/asort_variation11.phpt | Bin 3374 -> 3369 bytes ext/standard/tests/array/asort_variation2.phpt | 2 +- ext/standard/tests/array/asort_variation3.phpt | 14 +++---- ext/standard/tests/array/asort_variation4.phpt | 6 +-- ext/standard/tests/array/asort_variation5.phpt | 12 +++--- ext/standard/tests/array/asort_variation6.phpt | 6 +-- ext/standard/tests/array/asort_variation7.phpt | 4 +- ext/standard/tests/array/asort_variation8.phpt | 10 ++--- ext/standard/tests/array/asort_variation9.phpt | 8 ++-- ext/standard/tests/array/bug21998.phpt | 6 +-- ext/standard/tests/array/bug22463.phpt | 2 +- ext/standard/tests/array/bug24198.phpt | 4 +- ext/standard/tests/array/bug24980.phpt | 4 +- ext/standard/tests/array/bug30074.phpt | 2 +- ext/standard/tests/array/bug30833.phpt | 2 +- ext/standard/tests/array/bug33382.phpt | 2 +- ext/standard/tests/array/bug34066.phpt | 2 +- ext/standard/tests/array/bug34066_1.phpt | 2 +- ext/standard/tests/array/bug35014.phpt | 2 +- ext/standard/tests/array/bug35014_64bit.phpt | 2 +- ext/standard/tests/array/bug35022.phpt | 2 +- ext/standard/tests/array/bug35821.phpt | 2 +- ext/standard/tests/array/bug36975.phpt | 12 +++--- ext/standard/tests/array/bug38464.phpt | 2 +- ext/standard/tests/array/bug39576.phpt | 2 +- ext/standard/tests/array/bug40191.phpt | 2 +- ext/standard/tests/array/bug40709.phpt | 2 +- ext/standard/tests/array/bug41121.phpt | 6 +-- ext/standard/tests/array/bug41686.phpt | 10 ++--- ext/standard/tests/array/bug42850.phpt | 4 +- ext/standard/tests/array/bug43495.phpt | 2 +- ext/standard/tests/array/bug48484.phpt | 2 +- ext/standard/tests/array/bug50006_1.phpt | 2 +- ext/standard/tests/array/bug50006_2.phpt | 2 +- ext/standard/tests/array/bug61058.phpt | 2 +- ext/standard/tests/array/bug65304.phpt | 2 +- ext/standard/tests/array/bug68553.phpt | 2 +- ext/standard/tests/array/bug70713.phpt | 4 +- ext/standard/tests/array/bug71220.phpt | 2 +- ext/standard/tests/array/compact_basic.phpt | 6 +-- ext/standard/tests/array/compact_error.phpt | 6 +-- ext/standard/tests/array/count_basic.phpt | 4 +- ext/standard/tests/array/count_error.phpt | 2 +- ext/standard/tests/array/count_recursive.phpt | 14 +++---- ext/standard/tests/array/count_variation1.phpt | 6 +-- ext/standard/tests/array/count_variation2.phpt | 6 +-- ext/standard/tests/array/count_variation3.phpt | 2 +- ext/standard/tests/array/current_basic.phpt | 4 +- ext/standard/tests/array/current_variation1.phpt | 4 +- ext/standard/tests/array/current_variation2.phpt | 6 +-- ext/standard/tests/array/each.phpt | Bin 9688 -> 9680 bytes ext/standard/tests/array/each_basic.phpt | 8 ++-- ext/standard/tests/array/each_error.phpt | 4 +- ext/standard/tests/array/each_variation1.phpt | 6 +-- ext/standard/tests/array/each_variation2.phpt | 8 ++-- ext/standard/tests/array/each_variation3.phpt | 14 +++---- ext/standard/tests/array/each_variation4.phpt | 2 +- ext/standard/tests/array/each_variation5.phpt | 2 +- ext/standard/tests/array/each_variation6.phpt | 2 +- ext/standard/tests/array/end.phpt | 10 ++--- ext/standard/tests/array/end_64bit.phpt | 10 ++--- ext/standard/tests/array/end_basic.phpt | 4 +- ext/standard/tests/array/end_error.phpt | 2 +- ext/standard/tests/array/end_variation1.phpt | 6 +-- ext/standard/tests/array/end_variation2.phpt | 2 +- ext/standard/tests/array/end_variation3.phpt | 2 +- ext/standard/tests/array/extract_error.phpt | 2 +- ext/standard/tests/array/extract_variation1.phpt | 2 +- ext/standard/tests/array/extract_variation10.phpt | 2 +- ext/standard/tests/array/extract_variation11.phpt | 2 +- ext/standard/tests/array/extract_variation2.phpt | 4 +- ext/standard/tests/array/extract_variation3.phpt | 4 +- ext/standard/tests/array/extract_variation4.phpt | 4 +- ext/standard/tests/array/extract_variation5.phpt | 4 +- ext/standard/tests/array/extract_variation6.phpt | 2 +- ext/standard/tests/array/extract_variation7.phpt | 2 +- ext/standard/tests/array/extract_variation8.phpt | 2 +- ext/standard/tests/array/extract_variation9.phpt | 2 +- ext/standard/tests/array/in_array_errors.phpt | 2 +- ext/standard/tests/array/in_array_variation1.phpt | 12 +++--- ext/standard/tests/array/in_array_variation2.phpt | 12 +++--- ext/standard/tests/array/in_array_variation3.phpt | 12 +++--- ext/standard/tests/array/in_array_variation4.phpt | 36 ++++++++-------- ext/standard/tests/array/key_basic.phpt | 2 +- ext/standard/tests/array/key_exists_basic.phpt | 2 +- ext/standard/tests/array/key_exists_error.phpt | 2 +- .../tests/array/key_exists_variation1.phpt | 2 +- .../tests/array/key_exists_variation2.phpt | 18 ++++---- ext/standard/tests/array/key_variation1.phpt | 6 +-- ext/standard/tests/array/key_variation2.phpt | 14 +++---- ext/standard/tests/array/key_variation3.phpt | 2 +- ext/standard/tests/array/key_variation4.phpt | 2 +- ext/standard/tests/array/krsort_basic.phpt | 12 +++--- ext/standard/tests/array/krsort_error.phpt | 8 ++-- ext/standard/tests/array/krsort_object.phpt | 6 +-- ext/standard/tests/array/krsort_variation1.phpt | 2 +- ext/standard/tests/array/krsort_variation10.phpt | 4 +- ext/standard/tests/array/krsort_variation2.phpt | 4 +- ext/standard/tests/array/krsort_variation3.phpt | 16 +++---- ext/standard/tests/array/krsort_variation4.phpt | 4 +- ext/standard/tests/array/krsort_variation5.phpt | 6 +-- ext/standard/tests/array/krsort_variation6.phpt | 6 +-- ext/standard/tests/array/krsort_variation7.phpt | 14 +++---- ext/standard/tests/array/krsort_variation8.phpt | Bin 3328 -> 3321 bytes ext/standard/tests/array/krsort_variation9.phpt | 4 +- ext/standard/tests/array/ksort_basic.phpt | 8 ++-- ext/standard/tests/array/ksort_error.phpt | 4 +- ext/standard/tests/array/ksort_object.phpt | 10 ++--- ext/standard/tests/array/ksort_variation1.phpt | 2 +- ext/standard/tests/array/ksort_variation10.phpt | 8 ++-- ext/standard/tests/array/ksort_variation11.phpt | 6 +-- ext/standard/tests/array/ksort_variation2.phpt | 4 +- ext/standard/tests/array/ksort_variation3.phpt | 16 +++---- ext/standard/tests/array/ksort_variation5.phpt | 6 +-- ext/standard/tests/array/ksort_variation6.phpt | 8 ++-- ext/standard/tests/array/ksort_variation7.phpt | 14 +++---- ext/standard/tests/array/ksort_variation8.phpt | Bin 3295 -> 3289 bytes ext/standard/tests/array/ksort_variation9.phpt | 6 +-- ext/standard/tests/array/max.phpt | 2 +- ext/standard/tests/array/max_basic.phpt | 4 +- ext/standard/tests/array/max_basiclong_64bit.phpt | 6 +-- ext/standard/tests/array/max_error.phpt | 4 +- ext/standard/tests/array/max_variation1.phpt | 4 +- ext/standard/tests/array/max_variation2.phpt | 4 +- ext/standard/tests/array/min.phpt | 2 +- ext/standard/tests/array/min_basic.phpt | 4 +- ext/standard/tests/array/min_basiclong_64bit.phpt | 6 +-- ext/standard/tests/array/min_error.phpt | 4 +- ext/standard/tests/array/min_variation1.phpt | 4 +- ext/standard/tests/array/min_variation2.phpt | 4 +- ext/standard/tests/array/natcasesort_basic.phpt | 2 +- ext/standard/tests/array/natcasesort_object1.phpt | 2 +- .../tests/array/natcasesort_variation1.phpt | 4 +- .../tests/array/natcasesort_variation11.phpt | 16 +++---- .../tests/array/natcasesort_variation2.phpt | 6 +-- .../tests/array/natcasesort_variation3.phpt | 2 +- .../tests/array/natcasesort_variation9.phpt | Bin 1777 -> 1771 bytes ext/standard/tests/array/next_basic.phpt | 4 +- ext/standard/tests/array/next_error.phpt | 2 +- ext/standard/tests/array/next_variation1.phpt | 6 +-- ext/standard/tests/array/next_variation2.phpt | 2 +- ext/standard/tests/array/prev_basic.phpt | 4 +- ext/standard/tests/array/prev_error1.phpt | 2 +- ext/standard/tests/array/prev_error2.phpt | 2 +- ext/standard/tests/array/prev_error3.phpt | 2 +- ext/standard/tests/array/prev_variation1.phpt | 6 +-- ext/standard/tests/array/prev_variation2.phpt | 2 +- ext/standard/tests/array/range.phpt | 10 ++--- ext/standard/tests/array/range_errors.phpt | 6 +-- ext/standard/tests/array/reset_basic.phpt | 2 +- ext/standard/tests/array/reset_error.phpt | 2 +- ext/standard/tests/array/reset_variation1.phpt | 6 +-- ext/standard/tests/array/reset_variation2.phpt | 2 +- ext/standard/tests/array/reset_variation3.phpt | 4 +- ext/standard/tests/array/rsort_basic.phpt | 8 ++-- ext/standard/tests/array/rsort_error.phpt | 2 +- ext/standard/tests/array/rsort_object1.phpt | 6 +-- ext/standard/tests/array/rsort_object2.phpt | 8 ++-- ext/standard/tests/array/rsort_variation1.phpt | 6 +-- ext/standard/tests/array/rsort_variation10.phpt | 2 +- ext/standard/tests/array/rsort_variation11.phpt | Bin 2696 -> 2690 bytes ext/standard/tests/array/rsort_variation2.phpt | 12 +++--- ext/standard/tests/array/rsort_variation3.phpt | 12 +++--- ext/standard/tests/array/rsort_variation4.phpt | 6 +-- ext/standard/tests/array/rsort_variation5.phpt | 4 +- ext/standard/tests/array/rsort_variation6.phpt | 4 +- ext/standard/tests/array/rsort_variation7.phpt | 2 +- ext/standard/tests/array/rsort_variation8.phpt | 10 ++--- ext/standard/tests/array/rsort_variation9.phpt | 6 +-- ext/standard/tests/array/shuffle_basic1.phpt | 2 +- ext/standard/tests/array/shuffle_basic2.phpt | 4 +- ext/standard/tests/array/shuffle_error.phpt | 8 ++-- ext/standard/tests/array/shuffle_variation1.phpt | 2 +- ext/standard/tests/array/shuffle_variation2.phpt | 10 ++--- ext/standard/tests/array/shuffle_variation3.phpt | 6 +-- ext/standard/tests/array/shuffle_variation4.phpt | 8 ++-- ext/standard/tests/array/shuffle_variation5.phpt | 14 +++---- ext/standard/tests/array/sizeof_basic1.phpt | 8 ++-- ext/standard/tests/array/sizeof_basic2.phpt | 6 +-- ext/standard/tests/array/sizeof_error.phpt | 4 +- ext/standard/tests/array/sizeof_object1.phpt | 8 ++-- ext/standard/tests/array/sizeof_object2.phpt | 12 +++--- ext/standard/tests/array/sizeof_variation1.phpt | 18 ++++---- ext/standard/tests/array/sizeof_variation2.phpt | 14 +++---- ext/standard/tests/array/sizeof_variation3.phpt | 2 +- ext/standard/tests/array/sizeof_variation4.phpt | 14 +++---- ext/standard/tests/array/sizeof_variation5.phpt | 8 ++-- ext/standard/tests/array/sort_basic.phpt | 10 ++--- ext/standard/tests/array/sort_error.phpt | 8 ++-- ext/standard/tests/array/sort_object1.phpt | 6 +-- ext/standard/tests/array/sort_object2.phpt | 12 +++--- ext/standard/tests/array/sort_variation1.phpt | 6 +-- ext/standard/tests/array/sort_variation10.phpt | 4 +- ext/standard/tests/array/sort_variation11.phpt | Bin 3144 -> 3142 bytes ext/standard/tests/array/sort_variation2.phpt | 6 +-- ext/standard/tests/array/sort_variation3.phpt | 14 +++---- ext/standard/tests/array/sort_variation4.phpt | 4 +- ext/standard/tests/array/sort_variation5.phpt | 6 +-- ext/standard/tests/array/sort_variation6.phpt | 4 +- ext/standard/tests/array/sort_variation7.phpt | 2 +- ext/standard/tests/array/sort_variation8.phpt | 8 ++-- ext/standard/tests/array/sort_variation9.phpt | 6 +-- ext/standard/tests/array/uasort_basic1.phpt | 4 +- ext/standard/tests/array/uasort_basic2.phpt | 2 +- ext/standard/tests/array/uasort_error.phpt | 8 ++-- ext/standard/tests/array/uasort_object1.phpt | 8 ++-- ext/standard/tests/array/uasort_object2.phpt | 12 +++--- ext/standard/tests/array/uasort_variation1.phpt | 6 +-- ext/standard/tests/array/uasort_variation10.phpt | 4 +- ext/standard/tests/array/uasort_variation11.phpt | 4 +- ext/standard/tests/array/uasort_variation2.phpt | 2 +- ext/standard/tests/array/uasort_variation3.phpt | Bin 2584 -> 2569 bytes ext/standard/tests/array/uasort_variation4.phpt | 2 +- ext/standard/tests/array/uasort_variation5.phpt | 8 ++-- ext/standard/tests/array/uasort_variation6.phpt | 4 +- ext/standard/tests/array/uasort_variation7.phpt | 2 +- ext/standard/tests/array/uasort_variation8.phpt | 6 +-- ext/standard/tests/array/uasort_variation9.phpt | 6 +-- ext/standard/tests/array/uksort_error.phpt | 6 +-- ext/standard/tests/array/uksort_variation1.phpt | 6 +-- ext/standard/tests/array/uksort_variation2.phpt | 6 +-- .../tests/array/unexpected_array_mod_bug.phpt | 2 +- ext/standard/tests/array/usort_basic.phpt | 4 +- ext/standard/tests/array/usort_error1.phpt | 2 +- ext/standard/tests/array/usort_error2.phpt | 4 +- ext/standard/tests/array/usort_object1.phpt | 2 +- ext/standard/tests/array/usort_object2.phpt | 4 +- ext/standard/tests/array/usort_variation1.phpt | 6 +-- ext/standard/tests/array/usort_variation10.phpt | 6 +-- ext/standard/tests/array/usort_variation2.phpt | 2 +- ext/standard/tests/array/usort_variation3.phpt | 18 ++++---- ext/standard/tests/array/usort_variation4.phpt | 18 ++++---- ext/standard/tests/array/usort_variation5.phpt | 12 +++--- ext/standard/tests/array/usort_variation6.phpt | 2 +- ext/standard/tests/array/usort_variation7.phpt | 2 +- ext/standard/tests/array/usort_variation8.phpt | 6 +-- ext/standard/tests/array/usort_variation9.phpt | 4 +- ext/standard/tests/assert/assert.phpt | 4 +- ext/standard/tests/assert/assert03.phpt | 16 +++---- ext/standard/tests/assert/assert04.phpt | 20 ++++----- ext/standard/tests/assert/assert_basic.phpt | 4 +- ext/standard/tests/assert/assert_basic1.phpt | 4 +- ext/standard/tests/assert/assert_basic2.phpt | 8 ++-- ext/standard/tests/assert/assert_basic3.phpt | 2 +- ext/standard/tests/assert/assert_basic4.phpt | 2 +- ext/standard/tests/assert/assert_basic5.phpt | 2 +- ext/standard/tests/assert/assert_basic6.phpt | 2 +- ext/standard/tests/assert/assert_error.phpt | 2 +- ext/standard/tests/assert/assert_error1.phpt | 2 +- ext/standard/tests/assert/assert_error2.phpt | 2 +- ext/standard/tests/assert/assert_variation.phpt | 8 ++-- ext/standard/tests/bug64370_var1.phpt | 2 +- ext/standard/tests/bug75220.phpt | 2 +- .../tests/class_object/class_exists_basic_001.phpt | 6 +-- .../tests/class_object/class_exists_error_001.phpt | 4 +- .../class_object/class_exists_variation_001.phpt | 4 +- .../class_object/class_exists_variation_002.phpt | 4 +- .../class_object/class_exists_variation_003.phpt | 4 +- .../tests/class_object/get_class_error_001.phpt | 4 +- .../class_object/get_class_methods_basic_001.phpt | 8 ++-- .../class_object/get_class_methods_basic_002.phpt | 10 ++--- .../class_object/get_class_methods_basic_003.phpt | 10 ++--- .../class_object/get_class_methods_error_001.phpt | 6 +-- .../get_class_methods_variation_001.phpt | 4 +- .../get_class_methods_variation_002.phpt | 4 +- .../class_object/get_class_variation_001.phpt | 4 +- .../class_object/get_class_variation_002.phpt | 4 +- .../class_object/get_class_vars_variation1.phpt | 6 +-- .../class_object/get_class_vars_variation2.phpt | 16 +++---- .../get_declared_classes_basic_001.phpt | 8 ++-- .../get_declared_classes_error_001.phpt | 6 +-- .../get_declared_classes_variation1.phpt | 6 +-- .../get_declared_interfaces_basic_001.phpt | 8 ++-- .../get_declared_interfaces_error_001.phpt | 6 +-- .../get_declared_interfaces_variation1.phpt | 4 +- .../get_declared_traits_basic_001.phpt | 8 ++-- .../get_declared_traits_error_001.phpt | 6 +-- .../get_declared_traits_variation1.phpt | 4 +- .../class_object/get_object_vars_basic_001.phpt | 22 +++++----- .../class_object/get_object_vars_basic_002.phpt | 14 +++---- .../class_object/get_object_vars_error_001.phpt | 4 +- .../get_object_vars_variation_001.phpt | 4 +- .../get_object_vars_variation_002.phpt | 4 +- .../get_object_vars_variation_003.phpt | 4 +- .../class_object/get_parent_class_error_001.phpt | 4 +- .../get_parent_class_variation_001.phpt | 4 +- .../get_parent_class_variation_002.phpt | 4 +- .../tests/class_object/interface_exists_error.phpt | 6 +-- .../class_object/interface_exists_variation1.phpt | 6 +-- .../class_object/interface_exists_variation2.phpt | 6 +-- .../class_object/interface_exists_variation3.phpt | 6 +-- .../class_object/interface_exists_variation4.phpt | 6 +-- ext/standard/tests/class_object/is_a.phpt | 14 +++---- .../tests/class_object/is_a_error_001.phpt | 4 +- .../tests/class_object/is_a_variation_001.phpt | 10 ++--- .../tests/class_object/is_a_variation_002.phpt | 6 +-- .../tests/class_object/is_a_variation_003.phpt | 4 +- .../class_object/is_subclass_of_error_001.phpt | 6 +-- .../class_object/is_subclass_of_variation_001.phpt | 4 +- .../class_object/is_subclass_of_variation_002.phpt | 4 +- .../class_object/is_subclass_of_variation_003.phpt | 4 +- .../class_object/is_subclass_of_variation_004.phpt | 4 +- .../class_object/method_exists_basic_001.phpt | 6 +-- .../class_object/method_exists_basic_002.phpt | 4 +- .../class_object/method_exists_basic_003.phpt | 6 +-- .../class_object/method_exists_error_001.phpt | 4 +- .../class_object/method_exists_variation_001.phpt | 4 +- .../class_object/method_exists_variation_002.phpt | 4 +- .../class_object/method_exists_variation_003.phpt | 4 +- .../tests/class_object/property_exists_error.phpt | 6 +-- .../class_object/property_exists_variation1.phpt | 6 +-- .../trait_class_exists_variation_003.phpt | 4 +- .../tests/class_object/trait_exists_basic_001.phpt | 6 +-- .../tests/class_object/trait_exists_error_001.phpt | 4 +- .../class_object/trait_exists_variation_001.phpt | 4 +- .../class_object/trait_exists_variation_002.phpt | 4 +- ext/standard/tests/dir/chdir_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/chdir_basic.phpt | 4 +- ext/standard/tests/dir/chdir_error1.phpt | 2 +- ext/standard/tests/dir/chdir_error2-win32-mb.phpt | 2 +- ext/standard/tests/dir/chdir_error2.phpt | 2 +- .../tests/dir/chdir_variation1-win32-mb.phpt | 10 ++--- ext/standard/tests/dir/chdir_variation1.phpt | 10 ++--- .../tests/dir/chdir_variation2-win32-mb.phpt | 2 +- ext/standard/tests/dir/chdir_variation2.phpt | 2 +- .../tests/dir/closedir_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/closedir_basic.phpt | 4 +- .../tests/dir/closedir_error-win32-mb.phpt | 2 +- ext/standard/tests/dir/closedir_error.phpt | 2 +- ext/standard/tests/dir/closedir_variation1.phpt | 6 +-- .../tests/dir/closedir_variation2-win32-mb.phpt | 2 +- ext/standard/tests/dir/closedir_variation2.phpt | 2 +- ext/standard/tests/dir/closedir_variation3.phpt | 2 +- ext/standard/tests/dir/dir_basic-win32-mb.phpt | 2 +- ext/standard/tests/dir/dir_basic.phpt | 2 +- ext/standard/tests/dir/dir_error.phpt | 4 +- .../tests/dir/dir_variation2-win32-mb.phpt | 2 +- ext/standard/tests/dir/dir_variation2.phpt | 2 +- ext/standard/tests/dir/dir_variation3.phpt | 6 +-- .../tests/dir/dir_variation4-win32-mb.phpt | 2 +- ext/standard/tests/dir/dir_variation4.phpt | 2 +- ext/standard/tests/dir/dir_variation5.phpt | 4 +- ext/standard/tests/dir/dir_variation6.phpt | 2 +- ext/standard/tests/dir/dir_variation7.phpt | 4 +- ext/standard/tests/dir/dir_variation8.phpt | 8 ++-- ext/standard/tests/dir/dir_variation9.phpt | 4 +- ext/standard/tests/dir/getcwd_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/getcwd_basic.phpt | 4 +- ext/standard/tests/dir/getcwd_error.phpt | 2 +- ext/standard/tests/dir/opendir_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/opendir_basic.phpt | 4 +- .../tests/dir/opendir_error1-win32-mb.phpt | 2 +- ext/standard/tests/dir/opendir_error1.phpt | 2 +- ext/standard/tests/dir/opendir_error2.phpt | 2 +- .../tests/dir/opendir_variation2-win32-mb.phpt | 8 ++-- ext/standard/tests/dir/opendir_variation2.phpt | 8 ++-- .../tests/dir/opendir_variation3-win32-mb.phpt | 2 +- ext/standard/tests/dir/opendir_variation3.phpt | 2 +- .../tests/dir/opendir_variation4-win32-mb.phpt | 2 +- ext/standard/tests/dir/opendir_variation4.phpt | 2 +- ext/standard/tests/dir/opendir_variation5.phpt | 2 +- .../tests/dir/opendir_variation6-win32-mb.phpt | 4 +- .../tests/dir/opendir_variation6-win32.phpt | 4 +- ext/standard/tests/dir/opendir_variation6.phpt | 4 +- ext/standard/tests/dir/opendir_variation7.phpt | 4 +- ext/standard/tests/dir/readdir_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/readdir_basic.phpt | 4 +- ext/standard/tests/dir/readdir_error-win32-mb.phpt | 4 +- ext/standard/tests/dir/readdir_error.phpt | 4 +- ext/standard/tests/dir/readdir_variation1.phpt | 6 +-- .../tests/dir/readdir_variation2-win32-mb.phpt | 2 +- ext/standard/tests/dir/readdir_variation2.phpt | 2 +- .../tests/dir/readdir_variation3-win32-mb.phpt | 6 +-- ext/standard/tests/dir/readdir_variation3.phpt | 6 +-- .../tests/dir/readdir_variation4-win32-mb.phpt | 10 ++--- ext/standard/tests/dir/readdir_variation4.phpt | 10 ++--- ext/standard/tests/dir/readdir_variation5.phpt | 4 +- .../tests/dir/readdir_variation6-win32-mb.phpt | 2 +- ext/standard/tests/dir/readdir_variation6.phpt | 2 +- ext/standard/tests/dir/readdir_variation7.phpt | 2 +- .../tests/dir/rewinddir_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/rewinddir_basic.phpt | 4 +- .../tests/dir/rewinddir_error-win32-mb.phpt | 2 +- ext/standard/tests/dir/rewinddir_error.phpt | 2 +- ext/standard/tests/dir/rewinddir_variation1.phpt | 6 +-- .../tests/dir/rewinddir_variation2-win32-mb.phpt | 2 +- ext/standard/tests/dir/rewinddir_variation2.phpt | 2 +- ext/standard/tests/dir/rewinddir_variation3.phpt | 2 +- ext/standard/tests/dir/scandir_basic-win32-mb.phpt | 4 +- ext/standard/tests/dir/scandir_basic.phpt | 4 +- .../tests/dir/scandir_error1-win32-mb.phpt | 2 +- ext/standard/tests/dir/scandir_error1.phpt | 2 +- ext/standard/tests/dir/scandir_error2.phpt | 2 +- ext/standard/tests/dir/scandir_variation1.phpt | 6 +-- .../tests/dir/scandir_variation10-win32-mb.phpt | 2 +- ext/standard/tests/dir/scandir_variation10.phpt | 2 +- ext/standard/tests/dir/scandir_variation2-mb.phpt | 6 +-- ext/standard/tests/dir/scandir_variation2.phpt | 6 +-- .../tests/dir/scandir_variation3-win32-mb.phpt | 6 +-- ext/standard/tests/dir/scandir_variation3.phpt | 6 +-- .../tests/dir/scandir_variation4-win32-mb.phpt | 2 +- ext/standard/tests/dir/scandir_variation4.phpt | 2 +- ext/standard/tests/dir/scandir_variation5.phpt | 4 +- ext/standard/tests/dir/scandir_variation6.phpt | 4 +- ext/standard/tests/dir/scandir_variation7.phpt | 6 +-- .../tests/dir/scandir_variation8-win32-mb.phpt | 4 +- ext/standard/tests/dir/scandir_variation8.phpt | 4 +- .../tests/dir/scandir_variation9-win32-mb.phpt | 2 +- ext/standard/tests/dir/scandir_variation9.phpt | 2 +- .../tests/directory/DirectoryClass_basic_001.phpt | 2 +- ext/standard/tests/directory/bug74589_utf8.phpt | 2 +- ext/standard/tests/file/004.phpt | 6 +-- ext/standard/tests/file/005_basic.phpt | 2 +- ext/standard/tests/file/005_error.phpt | 4 +- ext/standard/tests/file/005_variation-win32.phpt | 20 ++++----- ext/standard/tests/file/005_variation.phpt | 20 ++++----- ext/standard/tests/file/005_variation2-win32.phpt | 14 +++---- ext/standard/tests/file/005_variation2.phpt | 14 +++---- ext/standard/tests/file/006_basic.phpt | 2 +- ext/standard/tests/file/006_error.phpt | 2 +- ext/standard/tests/file/006_variation1.phpt | 8 ++-- ext/standard/tests/file/006_variation2.phpt | 8 ++-- ext/standard/tests/file/007_basic.phpt | 4 +- ext/standard/tests/file/007_error.phpt | 6 +-- ext/standard/tests/file/007_variation1.phpt | 4 +- ext/standard/tests/file/007_variation10.phpt | 4 +- .../tests/file/007_variation11-win32-mb.phpt | 4 +- ext/standard/tests/file/007_variation11-win32.phpt | 4 +- ext/standard/tests/file/007_variation11.phpt | 4 +- ext/standard/tests/file/007_variation12-win32.phpt | 4 +- ext/standard/tests/file/007_variation12.phpt | 4 +- ext/standard/tests/file/007_variation13-win32.phpt | 4 +- ext/standard/tests/file/007_variation13.phpt | 4 +- ext/standard/tests/file/007_variation14.phpt | 4 +- ext/standard/tests/file/007_variation15.phpt | 8 ++-- ext/standard/tests/file/007_variation16.phpt | 6 +-- ext/standard/tests/file/007_variation17.phpt | 4 +- ext/standard/tests/file/007_variation18.phpt | 4 +- ext/standard/tests/file/007_variation19.phpt | 4 +- ext/standard/tests/file/007_variation2.phpt | 4 +- ext/standard/tests/file/007_variation20.phpt | 4 +- ext/standard/tests/file/007_variation21.phpt | 4 +- ext/standard/tests/file/007_variation22.phpt | 4 +- ext/standard/tests/file/007_variation23.phpt | 8 ++-- ext/standard/tests/file/007_variation24.phpt | 6 +-- ext/standard/tests/file/007_variation3.phpt | 4 +- ext/standard/tests/file/007_variation4.phpt | 4 +- ext/standard/tests/file/007_variation5.phpt | 4 +- ext/standard/tests/file/007_variation6.phpt | 4 +- ext/standard/tests/file/007_variation7.phpt | 8 ++-- ext/standard/tests/file/007_variation8.phpt | 6 +-- ext/standard/tests/file/007_variation9.phpt | 4 +- ext/standard/tests/file/basename-win32.phpt | 20 ++++----- ext/standard/tests/file/basename.phpt | Bin 8229 -> 8212 bytes ext/standard/tests/file/basename_basic-win32.phpt | 2 +- ext/standard/tests/file/basename_basic.phpt | 2 +- ext/standard/tests/file/basename_error.phpt | 6 +-- .../tests/file/basename_variation1-win32.phpt | 4 +- ext/standard/tests/file/basename_variation1.phpt | 4 +- .../tests/file/basename_variation2-win32.phpt | 6 +-- ext/standard/tests/file/basename_variation2.phpt | 6 +-- ext/standard/tests/file/basename_variation3.phpt | 6 +-- ext/standard/tests/file/basename_variation4.phpt | 4 +- ext/standard/tests/file/bug22414.phpt | 6 +-- ext/standard/tests/file/bug24482.phpt | 8 ++-- ext/standard/tests/file/bug26938.phpt | 4 +- ext/standard/tests/file/bug27508.phpt | 14 +++---- ext/standard/tests/file/bug30362.phpt | 2 +- ext/standard/tests/file/bug35740.phpt | 2 +- ext/standard/tests/file/bug35781.phpt | 4 +- ext/standard/tests/file/bug37158.phpt | 6 +-- ext/standard/tests/file/bug38086.phpt | 2 +- ext/standard/tests/file/bug38450.phpt | 2 +- ext/standard/tests/file/bug38450_1.phpt | 2 +- ext/standard/tests/file/bug38450_2.phpt | 2 +- ext/standard/tests/file/bug38450_3.phpt | 2 +- ext/standard/tests/file/bug39551.phpt | 2 +- ext/standard/tests/file/bug39673.phpt | 2 +- ext/standard/tests/file/bug40374.phpt | 4 +- ext/standard/tests/file/bug41693.phpt | 4 +- ext/standard/tests/file/bug41815.phpt | 2 +- ext/standard/tests/file/bug66509.phpt | 4 +- ext/standard/tests/file/bug72035.phpt | 2 +- ext/standard/tests/file/chmod_error.phpt | 6 +-- .../tests/file/chmod_variation2-win32-mb.phpt | 2 +- .../tests/file/chmod_variation2-win32.phpt | 2 +- ext/standard/tests/file/chmod_variation2.phpt | 2 +- ext/standard/tests/file/chmod_variation3.phpt | 6 +-- ext/standard/tests/file/chmod_variation4.phpt | 6 +-- ext/standard/tests/file/copy_basic.phpt | 2 +- ext/standard/tests/file/copy_error.phpt | 2 +- ext/standard/tests/file/copy_variation1.phpt | 2 +- ext/standard/tests/file/copy_variation10.phpt | 6 +-- ext/standard/tests/file/copy_variation11.phpt | 2 +- ext/standard/tests/file/copy_variation14.phpt | 2 +- ext/standard/tests/file/copy_variation15.phpt | 2 +- .../tests/file/copy_variation16-win32.phpt | 2 +- ext/standard/tests/file/copy_variation16.phpt | 2 +- ext/standard/tests/file/copy_variation17.phpt | 4 +- ext/standard/tests/file/copy_variation18.phpt | 6 +-- .../tests/file/copy_variation2-win32-mb.phpt | 4 +- ext/standard/tests/file/copy_variation2-win32.phpt | 4 +- ext/standard/tests/file/copy_variation2.phpt | 4 +- ext/standard/tests/file/copy_variation3-win32.phpt | 6 +-- ext/standard/tests/file/copy_variation3.phpt | 6 +-- ext/standard/tests/file/copy_variation4.phpt | Bin 4965 -> 4961 bytes ext/standard/tests/file/copy_variation5-win32.phpt | 4 +- ext/standard/tests/file/copy_variation5.phpt | 2 +- ext/standard/tests/file/copy_variation6-win32.phpt | 2 +- ext/standard/tests/file/copy_variation6.phpt | 2 +- ext/standard/tests/file/copy_variation8.phpt | 2 +- ext/standard/tests/file/copy_variation9.phpt | 2 +- .../tests/file/directory_wrapper_fstat_basic.phpt | 2 +- ext/standard/tests/file/dirname_basic-win32.phpt | 8 ++-- ext/standard/tests/file/dirname_basic.phpt | 8 ++-- ext/standard/tests/file/dirname_error.phpt | 6 +-- .../file/dirname_no_path_normalization-win32.phpt | 2 +- ext/standard/tests/file/dirname_variation1.phpt | 6 +-- ext/standard/tests/file/disk.phpt | 2 +- ext/standard/tests/file/disk_free_space_basic.phpt | 18 ++++---- .../tests/file/disk_free_space_error-win32.phpt | 2 +- ext/standard/tests/file/disk_free_space_error.phpt | 4 +- .../tests/file/disk_free_space_variation.phpt | 8 ++-- .../tests/file/disk_total_space_basic.phpt | 2 +- .../tests/file/disk_total_space_error-win32.phpt | 2 +- .../tests/file/disk_total_space_error.phpt | 4 +- .../tests/file/disk_total_space_variation.phpt | 10 ++--- ext/standard/tests/file/feof_basic.phpt | 6 +-- ext/standard/tests/file/fflush_error.phpt | 2 +- .../tests/file/fflush_variation1-win32-mb.phpt | 20 ++++----- .../tests/file/fflush_variation1-win32.phpt | 20 ++++----- ext/standard/tests/file/fflush_variation1.phpt | 18 ++++---- ext/standard/tests/file/fflush_variation2.phpt | 14 +++---- ext/standard/tests/file/fflush_variation3.phpt | 16 +++---- ext/standard/tests/file/fflush_variation4.phpt | 10 ++--- ext/standard/tests/file/fgetc_basic.phpt | 18 ++++---- ext/standard/tests/file/fgetc_variation1.phpt | 12 +++--- ext/standard/tests/file/fgetc_variation2.phpt | 4 +- ext/standard/tests/file/fgetc_variation3.phpt | 8 ++-- ext/standard/tests/file/fgetc_variation4.phpt | 12 +++--- ext/standard/tests/file/fgetcsv_variation1.phpt | 24 +++++------ ext/standard/tests/file/fgetcsv_variation10.phpt | 28 ++++++------- ext/standard/tests/file/fgetcsv_variation11.phpt | 18 ++++---- ext/standard/tests/file/fgetcsv_variation12.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation13.phpt | 14 +++---- ext/standard/tests/file/fgetcsv_variation14.phpt | 14 +++---- ext/standard/tests/file/fgetcsv_variation15.phpt | 16 +++---- ext/standard/tests/file/fgetcsv_variation16.phpt | 24 +++++------ ext/standard/tests/file/fgetcsv_variation17.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation18.phpt | 24 +++++------ ext/standard/tests/file/fgetcsv_variation19.phpt | 26 ++++++------ ext/standard/tests/file/fgetcsv_variation2.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation20.phpt | 20 ++++----- ext/standard/tests/file/fgetcsv_variation21.phpt | 16 +++---- ext/standard/tests/file/fgetcsv_variation22.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation23.phpt | 4 +- ext/standard/tests/file/fgetcsv_variation24.phpt | 20 ++++----- ext/standard/tests/file/fgetcsv_variation25.phpt | 30 +++++++------- ext/standard/tests/file/fgetcsv_variation26.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation27.phpt | 30 +++++++------- ext/standard/tests/file/fgetcsv_variation28.phpt | 30 +++++++------- ext/standard/tests/file/fgetcsv_variation29.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation3.phpt | 18 ++++---- ext/standard/tests/file/fgetcsv_variation30.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation31.phpt | 26 ++++++------ ext/standard/tests/file/fgetcsv_variation4.phpt | 18 ++++---- ext/standard/tests/file/fgetcsv_variation5.phpt | 18 ++++---- ext/standard/tests/file/fgetcsv_variation6.phpt | 20 ++++----- ext/standard/tests/file/fgetcsv_variation7.phpt | 18 ++++---- ext/standard/tests/file/fgetcsv_variation8.phpt | 22 +++++----- ext/standard/tests/file/fgetcsv_variation9.phpt | 20 ++++----- ext/standard/tests/file/fgets_basic.phpt | 2 +- ext/standard/tests/file/fgets_error.phpt | 6 +-- ext/standard/tests/file/fgets_variation1.phpt | 8 ++-- ext/standard/tests/file/fgets_variation2.phpt | 4 +- ext/standard/tests/file/fgets_variation3.phpt | 6 +-- .../tests/file/fgets_variation4-win32-mb.phpt | 2 +- .../tests/file/fgets_variation4-win32.phpt | 2 +- ext/standard/tests/file/fgets_variation4.phpt | 2 +- ext/standard/tests/file/fgets_variation5.phpt | 2 +- .../tests/file/fgets_variation6-win32.phpt | 2 +- ext/standard/tests/file/fgets_variation6.phpt | 2 +- ext/standard/tests/file/fgetss.phpt | 2 +- ext/standard/tests/file/fgetss1.phpt | 2 +- ext/standard/tests/file/fgetss_basic1.phpt | 22 +++++----- .../tests/file/fgetss_basic2-win32-mb.phpt | 12 +++--- ext/standard/tests/file/fgetss_basic2-win32.phpt | 12 +++--- ext/standard/tests/file/fgetss_basic2.phpt | 12 +++--- ext/standard/tests/file/fgetss_error.phpt | 6 +-- .../tests/file/fgetss_variation1-win32.phpt | 14 +++---- ext/standard/tests/file/fgetss_variation1.phpt | 14 +++---- ext/standard/tests/file/fgetss_variation2.phpt | 16 +++---- .../tests/file/fgetss_variation3-win32.phpt | 14 +++---- ext/standard/tests/file/fgetss_variation3.phpt | 14 +++---- ext/standard/tests/file/fgetss_variation4.phpt | 16 +++---- .../tests/file/fgetss_variation5-win32.phpt | 12 +++--- ext/standard/tests/file/fgetss_variation5.phpt | 12 +++--- ext/standard/tests/file/file_basic.phpt | 2 +- ext/standard/tests/file/file_error.phpt | 4 +- ext/standard/tests/file/file_exists_error.phpt | 6 +-- .../tests/file/file_exists_variation1.phpt | 4 +- .../tests/file/file_get_contents_error.phpt | 4 +- .../file_get_contents_file_put_contents_error.phpt | 4 +- ..._get_contents_file_put_contents_variation1.phpt | 4 +- ..._get_contents_file_put_contents_variation2.phpt | 2 +- .../tests/file/file_get_contents_variation1.phpt | 6 +-- .../tests/file/file_get_contents_variation2.phpt | 6 +-- .../tests/file/file_get_contents_variation3.phpt | 4 +- .../tests/file/file_get_contents_variation4.phpt | 8 ++-- .../file/file_get_contents_variation5_32bit.phpt | 6 +-- .../file/file_get_contents_variation5_64bit.phpt | 6 +-- .../tests/file/file_get_contents_variation6.phpt | 6 +-- .../file_get_contents_variation7-win32-mb.phpt | 14 +++---- .../file/file_get_contents_variation7-win32.phpt | 14 +++---- .../tests/file/file_get_contents_variation7.phpt | 14 +++---- .../file/file_get_contents_variation8-win32.phpt | 10 ++--- .../tests/file/file_get_contents_variation8.phpt | 10 ++--- .../tests/file/file_get_contents_variation9.phpt | 4 +- ext/standard/tests/file/file_put_contents.phpt | 2 +- .../tests/file/file_put_contents_variation1.phpt | 6 +-- .../tests/file/file_put_contents_variation2.phpt | 6 +-- .../tests/file/file_put_contents_variation3.phpt | 8 ++-- .../tests/file/file_put_contents_variation4.phpt | 8 ++-- .../tests/file/file_put_contents_variation5.phpt | 6 +-- .../tests/file/file_put_contents_variation6.phpt | 10 ++--- .../file/file_put_contents_variation7-win32.phpt | 16 +++---- .../tests/file/file_put_contents_variation7.phpt | 16 +++---- .../file/file_put_contents_variation8-win32.phpt | 12 +++--- .../tests/file/file_put_contents_variation8.phpt | Bin 2388 -> 2384 bytes .../tests/file/file_put_contents_variation9.phpt | 6 +-- ext/standard/tests/file/file_variation.phpt | 6 +-- ext/standard/tests/file/file_variation2.phpt | 6 +-- ext/standard/tests/file/file_variation3.phpt | 6 +-- ext/standard/tests/file/file_variation4.phpt | 8 ++-- ext/standard/tests/file/file_variation5.phpt | 2 +- ext/standard/tests/file/file_variation8-win32.phpt | 14 +++---- ext/standard/tests/file/file_variation8.phpt | 14 +++---- ext/standard/tests/file/file_variation9.phpt | 6 +-- ext/standard/tests/file/filegroup_basic.phpt | 2 +- ext/standard/tests/file/filegroup_variation1.phpt | 2 +- ext/standard/tests/file/filegroup_variation2.phpt | 4 +- ext/standard/tests/file/filegroup_variation3.phpt | 2 +- ext/standard/tests/file/fileinode_basic.phpt | 2 +- ext/standard/tests/file/fileinode_error.phpt | 2 +- ext/standard/tests/file/fileinode_variation.phpt | 2 +- ext/standard/tests/file/fileinode_variation1.phpt | 4 +- ext/standard/tests/file/fileinode_variation2.phpt | 6 +-- ext/standard/tests/file/fileinode_variation3.phpt | 4 +- ext/standard/tests/file/fileowner_basic.phpt | 2 +- ext/standard/tests/file/fileowner_variation1.phpt | 2 +- ext/standard/tests/file/fileowner_variation2.phpt | 4 +- ext/standard/tests/file/fileowner_variation3.phpt | 2 +- ext/standard/tests/file/fileperms_variation1.phpt | 2 +- ext/standard/tests/file/fileperms_variation2.phpt | 4 +- ext/standard/tests/file/fileperms_variation3.phpt | 2 +- ext/standard/tests/file/filesize_basic.phpt | 8 ++-- ext/standard/tests/file/filesize_error.phpt | 6 +-- .../tests/file/filesize_variation1-win32-mb.phpt | 6 +-- .../tests/file/filesize_variation1-win32.phpt | 6 +-- ext/standard/tests/file/filesize_variation1.phpt | 6 +-- .../tests/file/filesize_variation2-win32.phpt | 8 ++-- ext/standard/tests/file/filesize_variation2.phpt | 8 ++-- .../tests/file/filesize_variation3-win32.phpt | 6 +-- ext/standard/tests/file/filesize_variation3.phpt | 6 +-- .../tests/file/filesize_variation4-win32.phpt | 6 +-- ext/standard/tests/file/filesize_variation4.phpt | 6 +-- ext/standard/tests/file/filesize_variation5.phpt | 8 ++-- ext/standard/tests/file/filestat.phpt | 2 +- ext/standard/tests/file/filetype_basic.phpt | 2 +- ext/standard/tests/file/filetype_error.phpt | 2 +- ext/standard/tests/file/filetype_variation.phpt | 2 +- ext/standard/tests/file/filetype_variation2.phpt | 4 +- ext/standard/tests/file/filetype_variation3.phpt | 2 +- ext/standard/tests/file/flock.phpt | 2 +- ext/standard/tests/file/flock_basic.phpt | 8 ++-- ext/standard/tests/file/flock_error.phpt | 8 ++-- ext/standard/tests/file/flock_variation.phpt | 8 ++-- ext/standard/tests/file/fnmatch_error.phpt | 4 +- ext/standard/tests/file/fnmatch_variation.phpt | 6 +-- .../tests/file/fopen_variation10-win32.phpt | 24 +++++------ .../tests/file/fopen_variation11-win32.phpt | 24 +++++------ ext/standard/tests/file/fopen_variation12.phpt | 16 +++---- ext/standard/tests/file/fopen_variation13.phpt | 12 +++--- .../tests/file/fopen_variation14-win32.phpt | 16 +++---- ext/standard/tests/file/fopen_variation14.phpt | 16 +++---- .../tests/file/fopen_variation15-win32.phpt | 16 +++---- ext/standard/tests/file/fopen_variation15.phpt | 16 +++---- ext/standard/tests/file/fopen_variation16.phpt | 18 ++++---- ext/standard/tests/file/fopen_variation17.phpt | 20 ++++----- ext/standard/tests/file/fopen_variation19.phpt | 4 +- ext/standard/tests/file/fopen_variation3.phpt | 4 +- ext/standard/tests/file/fopen_variation4.phpt | 6 +-- ext/standard/tests/file/fopen_variation5.phpt | 24 +++++------ ext/standard/tests/file/fopen_variation6.phpt | 6 +-- ext/standard/tests/file/fopen_variation7.phpt | 12 +++--- ext/standard/tests/file/fopen_variation8.phpt | 24 +++++------ ext/standard/tests/file/fopen_variation9.phpt | 12 +++--- ext/standard/tests/file/fopencookie.phpt | 4 +- ext/standard/tests/file/fpassthru_basic.phpt | 2 +- ext/standard/tests/file/fpassthru_error.phpt | 2 +- ext/standard/tests/file/fpassthru_variation.phpt | 16 +++---- ext/standard/tests/file/fpassthru_variation1.phpt | 2 +- ext/standard/tests/file/fputcsv_error.phpt | 2 +- ext/standard/tests/file/fputcsv_variation1.phpt | 22 +++++----- ext/standard/tests/file/fputcsv_variation10.phpt | 26 ++++++------ ext/standard/tests/file/fputcsv_variation11.phpt | 24 +++++------ ext/standard/tests/file/fputcsv_variation12.phpt | 24 +++++------ ext/standard/tests/file/fputcsv_variation13.phpt | 24 +++++------ ext/standard/tests/file/fputcsv_variation14.phpt | 20 ++++----- ext/standard/tests/file/fputcsv_variation2.phpt | 22 +++++----- ext/standard/tests/file/fputcsv_variation3.phpt | 22 +++++----- ext/standard/tests/file/fputcsv_variation4.phpt | 22 +++++----- ext/standard/tests/file/fputcsv_variation5.phpt | 22 +++++----- ext/standard/tests/file/fputcsv_variation6.phpt | 24 +++++------ ext/standard/tests/file/fputcsv_variation7.phpt | 24 +++++------ ext/standard/tests/file/fputcsv_variation8.phpt | 24 +++++------ ext/standard/tests/file/fputcsv_variation9.phpt | 24 +++++------ ext/standard/tests/file/fread_basic.phpt | 36 ++++++++-------- ext/standard/tests/file/fread_error.phpt | 12 +++--- ext/standard/tests/file/fread_fwrite_basic.phpt | 12 +++--- ext/standard/tests/file/fread_variation1.phpt | 14 +++---- ext/standard/tests/file/fread_variation2.phpt | 14 +++---- .../tests/file/fread_variation3-win32-mb.phpt | 16 +++---- .../tests/file/fread_variation3-win32.phpt | 16 +++---- ext/standard/tests/file/fread_variation3.phpt | 16 +++---- .../tests/file/fread_variation4-win32.phpt | 16 +++---- ext/standard/tests/file/fread_variation4.phpt | 16 +++---- ext/standard/tests/file/fscanf.phpt | 2 +- ext/standard/tests/file/fscanf_error.phpt | 10 ++--- ext/standard/tests/file/fscanf_variation1.phpt | 4 +- ext/standard/tests/file/fscanf_variation10.phpt | 8 ++-- ext/standard/tests/file/fscanf_variation11.phpt | 4 +- ext/standard/tests/file/fscanf_variation12.phpt | 2 +- ext/standard/tests/file/fscanf_variation13.phpt | 4 +- ext/standard/tests/file/fscanf_variation14.phpt | 6 +-- ext/standard/tests/file/fscanf_variation15.phpt | 6 +-- ext/standard/tests/file/fscanf_variation16.phpt | 6 +-- ext/standard/tests/file/fscanf_variation17.phpt | 6 +-- ext/standard/tests/file/fscanf_variation18.phpt | 2 +- ext/standard/tests/file/fscanf_variation19.phpt | 4 +- ext/standard/tests/file/fscanf_variation2.phpt | 4 +- ext/standard/tests/file/fscanf_variation20.phpt | 4 +- ext/standard/tests/file/fscanf_variation21.phpt | 6 +-- ext/standard/tests/file/fscanf_variation22.phpt | 8 ++-- ext/standard/tests/file/fscanf_variation23.phpt | 6 +-- ext/standard/tests/file/fscanf_variation24.phpt | 6 +-- ext/standard/tests/file/fscanf_variation25.phpt | 6 +-- ext/standard/tests/file/fscanf_variation26.phpt | 4 +- ext/standard/tests/file/fscanf_variation27.phpt | 4 +- ext/standard/tests/file/fscanf_variation28.phpt | 8 ++-- ext/standard/tests/file/fscanf_variation29.phpt | 8 ++-- ext/standard/tests/file/fscanf_variation3.phpt | 6 +-- ext/standard/tests/file/fscanf_variation30.phpt | 4 +- ext/standard/tests/file/fscanf_variation31.phpt | 2 +- ext/standard/tests/file/fscanf_variation32.phpt | 4 +- ext/standard/tests/file/fscanf_variation33.phpt | 4 +- ext/standard/tests/file/fscanf_variation34.phpt | 6 +-- ext/standard/tests/file/fscanf_variation35.phpt | 6 +-- ext/standard/tests/file/fscanf_variation36.phpt | 4 +- ext/standard/tests/file/fscanf_variation37.phpt | 2 +- ext/standard/tests/file/fscanf_variation38.phpt | 4 +- ext/standard/tests/file/fscanf_variation39.phpt | 4 +- ext/standard/tests/file/fscanf_variation4.phpt | 6 +-- ext/standard/tests/file/fscanf_variation40.phpt | 6 +-- ext/standard/tests/file/fscanf_variation41.phpt | 6 +-- ext/standard/tests/file/fscanf_variation42.phpt | 4 +- ext/standard/tests/file/fscanf_variation43.phpt | 2 +- ext/standard/tests/file/fscanf_variation44.phpt | 4 +- ext/standard/tests/file/fscanf_variation45.phpt | 4 +- ext/standard/tests/file/fscanf_variation46.phpt | 6 +-- ext/standard/tests/file/fscanf_variation47.phpt | 6 +-- ext/standard/tests/file/fscanf_variation48.phpt | 4 +- ext/standard/tests/file/fscanf_variation49.phpt | 2 +- ext/standard/tests/file/fscanf_variation5.phpt | 4 +- ext/standard/tests/file/fscanf_variation50.phpt | 4 +- ext/standard/tests/file/fscanf_variation51.phpt | 6 +-- ext/standard/tests/file/fscanf_variation52.phpt | 6 +-- ext/standard/tests/file/fscanf_variation53.phpt | 18 ++++---- ext/standard/tests/file/fscanf_variation54.phpt | 4 +- ext/standard/tests/file/fscanf_variation55.phpt | 18 ++++---- ext/standard/tests/file/fscanf_variation6.phpt | 2 +- ext/standard/tests/file/fscanf_variation7.phpt | 4 +- ext/standard/tests/file/fscanf_variation8.phpt | 6 +-- ext/standard/tests/file/fscanf_variation9.phpt | 2 +- .../tests/file/fseek_ftell_rewind_basic1.phpt | 2 +- .../file/fseek_ftell_rewind_basic2-win32-mb.phpt | 4 +- .../file/fseek_ftell_rewind_basic2-win32.phpt | 4 +- .../tests/file/fseek_ftell_rewind_basic2.phpt | 4 +- .../tests/file/fseek_ftell_rewind_error1.phpt | 2 +- .../tests/file/fseek_ftell_rewind_variation1.phpt | 6 +-- .../file/fseek_ftell_rewind_variation2-win32.phpt | 8 ++-- .../tests/file/fseek_ftell_rewind_variation2.phpt | 8 ++-- .../tests/file/fseek_ftell_rewind_variation3.phpt | 4 +- .../file/fseek_ftell_rewind_variation4-win32.phpt | 6 +-- .../tests/file/fseek_ftell_rewind_variation4.phpt | 6 +-- .../tests/file/fseek_ftell_rewind_variation5.phpt | 6 +-- .../file/fseek_ftell_rewind_variation6-win32.phpt | 4 +- .../tests/file/fseek_ftell_rewind_variation6.phpt | 4 +- .../tests/file/fseek_ftell_rewind_variation7.phpt | 6 +-- .../file/fseek_ftell_rewind_variation8-win32.phpt | 8 ++-- .../tests/file/fseek_ftell_rewind_variation8.phpt | 8 ++-- ext/standard/tests/file/fseek_variation1.phpt | 6 +-- ext/standard/tests/file/fseek_variation2.phpt | 2 +- ext/standard/tests/file/fseek_variation3.phpt | 4 +- ext/standard/tests/file/fstat.phpt | 2 +- ext/standard/tests/file/fstat_error.phpt | 2 +- ext/standard/tests/file/ftruncate.phpt | Bin 1148 -> 1147 bytes ext/standard/tests/file/ftruncate_error.phpt | 14 +++---- .../tests/file/ftruncate_variation1-win32-mb.phpt | 6 +-- .../tests/file/ftruncate_variation1-win32.phpt | 6 +-- ext/standard/tests/file/ftruncate_variation1.phpt | 6 +-- .../tests/file/ftruncate_variation2-win32.phpt | 6 +-- ext/standard/tests/file/ftruncate_variation2.phpt | 6 +-- .../tests/file/ftruncate_variation3-win32.phpt | 6 +-- ext/standard/tests/file/ftruncate_variation3.phpt | 6 +-- .../tests/file/ftruncate_variation4-win32.phpt | 6 +-- ext/standard/tests/file/ftruncate_variation4.phpt | 6 +-- .../tests/file/ftruncate_variation5-win32.phpt | 8 ++-- ext/standard/tests/file/ftruncate_variation5.phpt | 8 ++-- .../tests/file/ftruncate_variation6-win32.phpt | 12 +++--- ext/standard/tests/file/ftruncate_variation6.phpt | 12 +++--- .../tests/file/ftruncate_variation7-win32.phpt | 14 +++---- ext/standard/tests/file/ftruncate_variation7.phpt | 14 +++---- ext/standard/tests/file/fwrite.phpt | 2 +- ext/standard/tests/file/fwrite_basic-win32-mb.phpt | 10 ++--- ext/standard/tests/file/fwrite_basic-win32.phpt | 10 ++--- ext/standard/tests/file/fwrite_basic.phpt | 10 ++--- ext/standard/tests/file/fwrite_error.phpt | 8 ++-- .../tests/file/fwrite_variation1-win32-mb.phpt | 2 +- .../tests/file/fwrite_variation1-win32.phpt | 2 +- ext/standard/tests/file/fwrite_variation1.phpt | 10 ++--- .../tests/file/fwrite_variation2-win32.phpt | 2 +- ext/standard/tests/file/fwrite_variation2.phpt | 6 +-- .../tests/file/fwrite_variation3-win32.phpt | 2 +- ext/standard/tests/file/fwrite_variation3.phpt | 6 +-- .../tests/file/fwrite_variation4-win32.phpt | 2 +- ext/standard/tests/file/fwrite_variation4.phpt | 2 +- ext/standard/tests/file/fwrite_variation5.phpt | 4 +- ext/standard/tests/file/get_current_user.phpt | 2 +- ext/standard/tests/file/include_streams.phpt | 8 ++-- .../tests/file/include_userstream_001.phpt | 2 +- .../tests/file/include_userstream_002.phpt | 2 +- .../tests/file/include_userstream_003.phpt | 2 +- ext/standard/tests/file/is_dir_variation2.phpt | 8 ++-- ext/standard/tests/file/is_dir_variation3.phpt | 2 +- ext/standard/tests/file/is_executable_basic.phpt | 2 +- .../tests/file/is_executable_variation1.phpt | 6 +-- .../tests/file/is_executable_variation2.phpt | 2 +- .../tests/file/is_executable_variation3.phpt | 2 +- ext/standard/tests/file/is_file_variation1.phpt | 2 +- ext/standard/tests/file/is_file_variation2.phpt | 2 +- ext/standard/tests/file/is_file_variation3.phpt | 4 +- ext/standard/tests/file/is_file_variation4.phpt | 2 +- .../tests/file/is_readable_variation1.phpt | 6 +-- .../tests/file/is_readable_variation3.phpt | 2 +- .../tests/file/is_writable_variation1.phpt | 6 +-- .../tests/file/is_writable_variation3.phpt | 2 +- ext/standard/tests/file/lchown_basic.phpt | 4 +- ext/standard/tests/file/lchown_error.phpt | 4 +- ext/standard/tests/file/lstat_stat_basic.phpt | 6 +-- ext/standard/tests/file/lstat_stat_error.phpt | 2 +- ext/standard/tests/file/lstat_stat_variation1.phpt | 4 +- .../tests/file/lstat_stat_variation12.phpt | 2 +- .../tests/file/lstat_stat_variation13.phpt | 2 +- .../tests/file/lstat_stat_variation14.phpt | 4 +- .../tests/file/lstat_stat_variation18.phpt | 6 +-- .../tests/file/lstat_stat_variation19.phpt | 2 +- ext/standard/tests/file/lstat_stat_variation2.phpt | 2 +- .../tests/file/lstat_stat_variation20.phpt | 6 +-- ext/standard/tests/file/lstat_stat_variation3.phpt | 2 +- ext/standard/tests/file/lstat_stat_variation5.phpt | 2 +- ext/standard/tests/file/lstat_stat_variation6.phpt | 2 +- ext/standard/tests/file/lstat_stat_variation8.phpt | 2 +- ext/standard/tests/file/lstat_stat_variation9.phpt | 2 +- ext/standard/tests/file/mkdir-001.phpt | 2 +- ext/standard/tests/file/mkdir-002.phpt | 2 +- ext/standard/tests/file/mkdir-003.phpt | 2 +- ext/standard/tests/file/mkdir-004.phpt | 2 +- ext/standard/tests/file/mkdir-005.phpt | 2 +- .../tests/file/mkdir_variation1-win32.phpt | 6 +-- ext/standard/tests/file/mkdir_variation1.phpt | 8 ++-- ext/standard/tests/file/mkdir_variation2.phpt | 4 +- ext/standard/tests/file/mkdir_variation3.phpt | 4 +- ext/standard/tests/file/mkdir_variation4.phpt | 6 +-- .../tests/file/mkdir_variation5-win32.phpt | 24 +++++------ ext/standard/tests/file/mkdir_variation5.phpt | 24 +++++------ ext/standard/tests/file/parse_ini_file.phpt | 2 +- ext/standard/tests/file/parse_ini_file_error.phpt | 8 ++-- .../tests/file/parse_ini_file_variation1.phpt | 4 +- .../tests/file/parse_ini_file_variation2.phpt | 4 +- .../tests/file/parse_ini_file_variation3.phpt | 6 +-- .../tests/file/parse_ini_file_variation4.phpt | 6 +-- .../tests/file/parse_ini_file_variation5.phpt | 6 +-- .../file/parse_ini_file_variation6-win32-mb.phpt | 14 +++---- .../file/parse_ini_file_variation6-win32.phpt | 14 +++---- .../tests/file/parse_ini_file_variation6.phpt | 14 +++---- ext/standard/tests/file/pathinfo_basic.phpt | 2 +- ext/standard/tests/file/pathinfo_basic1-win32.phpt | 4 +- ext/standard/tests/file/pathinfo_basic1.phpt | 4 +- ext/standard/tests/file/pathinfo_basic2-win32.phpt | 2 +- ext/standard/tests/file/pathinfo_basic2.phpt | 2 +- ext/standard/tests/file/pathinfo_variation1.phpt | 6 +-- ext/standard/tests/file/pathinfo_variation2.phpt | 6 +-- ext/standard/tests/file/pathinfo_variation3.phpt | 6 +-- ext/standard/tests/file/pathinfo_variaton.phpt | 2 +- ext/standard/tests/file/pclose_variation1.phpt | 6 +-- ext/standard/tests/file/php_fd_wrapper_04.phpt | 2 +- .../tests/file/popen_pclose_basic-win32-mb.phpt | 4 +- .../tests/file/popen_pclose_basic-win32.phpt | 4 +- ext/standard/tests/file/popen_pclose_basic.phpt | 2 +- ext/standard/tests/file/proc_open01.phpt | 6 +-- .../tests/file/readfile_variation10-win32.phpt | 10 ++--- ext/standard/tests/file/readfile_variation10.phpt | Bin 1869 -> 1862 bytes ext/standard/tests/file/readfile_variation3.phpt | 2 +- ext/standard/tests/file/readfile_variation4.phpt | 8 ++-- ext/standard/tests/file/readfile_variation5.phpt | 6 +-- ext/standard/tests/file/readfile_variation6.phpt | 6 +-- ext/standard/tests/file/readfile_variation7.phpt | 8 ++-- .../tests/file/readfile_variation8-win32-mb.phpt | 16 +++---- .../tests/file/readfile_variation8-win32.phpt | 16 +++---- ext/standard/tests/file/readfile_variation9.phpt | 14 +++---- .../tests/file/readlink_realpath_basic1.phpt | 4 +- .../tests/file/readlink_realpath_variation1.phpt | 18 ++++---- .../tests/file/readlink_realpath_variation2.phpt | 22 +++++----- .../tests/file/readlink_realpath_variation3.phpt | 6 +-- ext/standard/tests/file/readlink_variation1.phpt | 4 +- ext/standard/tests/file/realpath_cache.phpt | 2 +- ext/standard/tests/file/realpath_cache_win32.phpt | 2 +- .../tests/file/realpath_variation-win32-mb.phpt | 4 +- .../tests/file/realpath_variation-win32.phpt | 4 +- ext/standard/tests/file/realpath_variation2.phpt | 22 +++++----- ext/standard/tests/file/rename_basic.phpt | 2 +- ext/standard/tests/file/rename_error.phpt | 4 +- .../tests/file/rename_variation-win32.phpt | 8 ++-- ext/standard/tests/file/rename_variation.phpt | 8 ++-- .../tests/file/rename_variation1-win32.phpt | 2 +- ext/standard/tests/file/rename_variation1.phpt | 2 +- ext/standard/tests/file/rename_variation10.phpt | 6 +-- .../tests/file/rename_variation11-win32.phpt | 14 +++---- .../tests/file/rename_variation12-win32.phpt | 14 +++---- ext/standard/tests/file/rename_variation12.phpt | 14 +++---- .../tests/file/rename_variation13-win32.phpt | Bin 5058 -> 5051 bytes ext/standard/tests/file/rename_variation13.phpt | 10 ++--- ext/standard/tests/file/rename_variation2.phpt | 4 +- .../tests/file/rename_variation3-win32.phpt | 4 +- ext/standard/tests/file/rename_variation5.phpt | 6 +-- .../tests/file/rename_variation6-win32.phpt | 2 +- ext/standard/tests/file/rename_variation6.phpt | 2 +- .../tests/file/rename_variation7-win32.phpt | 2 +- ext/standard/tests/file/rename_variation7.phpt | 2 +- .../tests/file/rename_variation8-win32.phpt | 2 +- ext/standard/tests/file/rename_variation8.phpt | 2 +- .../tests/file/rmdir_variation1-win32.phpt | 6 +-- ext/standard/tests/file/rmdir_variation1.phpt | 6 +-- ext/standard/tests/file/rmdir_variation2.phpt | 6 +-- .../tests/file/rmdir_variation3-win32.phpt | 26 ++++++------ ext/standard/tests/file/rmdir_variation3.phpt | 22 +++++----- ext/standard/tests/file/stat_basic-win32-mb.phpt | 8 ++-- ext/standard/tests/file/stat_basic-win32.phpt | 8 ++-- ext/standard/tests/file/stat_error-win32.phpt | 2 +- .../tests/file/stat_variation1-win32-mb.phpt | 4 +- ext/standard/tests/file/stat_variation1-win32.phpt | 4 +- ext/standard/tests/file/statpage.phpt | 2 +- ext/standard/tests/file/stream_001.phpt | 2 +- ext/standard/tests/file/stream_002.phpt | 2 +- ext/standard/tests/file/stream_copy_to_stream.phpt | 2 +- ext/standard/tests/file/stream_rfc2397_007.phpt | 2 +- ext/standard/tests/file/stream_supports_lock.phpt | 2 +- ext/standard/tests/file/symlink.phpt | 2 +- .../file/symlink_link_linkinfo_is_link_basic1.phpt | 2 +- .../symlink_link_linkinfo_is_link_variation1.phpt | 6 +-- .../symlink_link_linkinfo_is_link_variation3.phpt | 2 +- .../symlink_link_linkinfo_is_link_variation4.phpt | 8 ++-- .../symlink_link_linkinfo_is_link_variation6.phpt | 2 +- .../symlink_link_linkinfo_is_link_variation7.phpt | 2 +- .../symlink_link_linkinfo_is_link_variation9.phpt | 4 +- .../tests/file/tempnam_variation1-win32-mb.phpt | 14 +++---- .../tests/file/tempnam_variation1-win32.phpt | 14 +++---- ext/standard/tests/file/tempnam_variation1.phpt | 14 +++---- .../tests/file/tempnam_variation2-win32.phpt | 22 +++++----- ext/standard/tests/file/tempnam_variation2.phpt | 20 ++++----- ext/standard/tests/file/tempnam_variation4-0.phpt | 6 +-- ext/standard/tests/file/tempnam_variation4-1.phpt | 6 +-- .../tests/file/tempnam_variation5-win32.phpt | 2 +- ext/standard/tests/file/tempnam_variation5.phpt | 2 +- .../tests/file/tempnam_variation6-win32.phpt | 8 ++-- ext/standard/tests/file/tempnam_variation6.phpt | 8 ++-- .../tests/file/tempnam_variation7-win32.phpt | 10 ++--- ext/standard/tests/file/tempnam_variation7.phpt | 20 ++++----- .../tests/file/tempnam_variation8-win32.phpt | 22 +++++----- ext/standard/tests/file/touch.phpt | 2 +- ext/standard/tests/file/touch_basic-win32-mb.phpt | 6 +-- ext/standard/tests/file/touch_basic-win32.phpt | 6 +-- ext/standard/tests/file/touch_basic.phpt | 6 +-- ext/standard/tests/file/touch_error.phpt | 2 +- ext/standard/tests/file/touch_variation1.phpt | 2 +- ext/standard/tests/file/touch_variation2.phpt | 2 +- .../tests/file/touch_variation3-win32-mb.phpt | 4 +- .../tests/file/touch_variation3-win32.phpt | 4 +- ext/standard/tests/file/touch_variation3.phpt | 4 +- .../tests/file/touch_variation4-win32.phpt | 4 +- ext/standard/tests/file/touch_variation4.phpt | 4 +- .../tests/file/touch_variation5-win32.phpt | 36 ++++++++-------- ext/standard/tests/file/touch_variation5.phpt | 36 ++++++++-------- .../tests/file/touch_variation6-win32.phpt | 40 +++++++++--------- ext/standard/tests/file/umask_variation1.phpt | 2 +- ext/standard/tests/file/umask_variation2.phpt | 2 +- ext/standard/tests/file/unlink_variation10.phpt | 20 ++++----- ext/standard/tests/file/unlink_variation6.phpt | 8 ++-- ext/standard/tests/file/unlink_variation7.phpt | 6 +-- .../tests/file/unlink_variation8-win32.phpt | 22 +++++----- ext/standard/tests/file/unlink_variation8.phpt | 30 +++++++------- .../tests/file/unlink_variation9-win32.phpt | 26 ++++++------ ext/standard/tests/file/userfilters.phpt | 2 +- ext/standard/tests/file/userstreams.phpt | 10 ++--- ext/standard/tests/file/windows_acls/bug44859.phpt | 2 +- .../tests/file/windows_acls/bug44859_2.phpt | 2 +- .../tests/file/windows_acls/bug44859_3.phpt | 2 +- .../tests/file/windows_acls/bug44859_4.phpt | 2 +- .../tests/file/windows_mb_path/bug54977.phpt | 2 +- .../tests/file/windows_mb_path/bug64506.phpt | 2 +- .../tests/file/windows_mb_path/bug71509.phpt | 2 +- .../tests/file/windows_mb_path/test_big5_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_big5_1.phpt | 4 +- .../tests/file/windows_mb_path/test_big5_2.phpt | 4 +- .../file/windows_mb_path/test_big5_to_utf8_0.phpt | 6 +-- .../file/windows_mb_path/test_big5_to_utf8_1.phpt | 4 +- .../file/windows_mb_path/test_big5_to_utf8_2.phpt | 4 +- .../windows_mb_path/test_cp1250_to_utf8_0.phpt | 4 +- .../windows_mb_path/test_cp1250_to_utf8_1.phpt | 2 +- .../windows_mb_path/test_cp1250_to_utf8_2.phpt | 2 +- .../windows_mb_path/test_cp1250_to_utf8_3.phpt | 4 +- .../windows_mb_path/test_cp1250_to_utf8_4.phpt | 2 +- .../windows_mb_path/test_cp1250_to_utf8_5.phpt | 2 +- .../tests/file/windows_mb_path/test_cp1251_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp1251_1.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1251_2.phpt | 4 +- .../windows_mb_path/test_cp1251_to_utf8_0.phpt | 6 +-- .../windows_mb_path/test_cp1251_to_utf8_1.phpt | 4 +- .../windows_mb_path/test_cp1251_to_utf8_2.phpt | 4 +- .../test_cp1251_zend_multibyte_0.phpt | 4 +- .../test_cp1251_zend_multibyte_1.phpt | 2 +- .../test_cp1251_zend_multibyte_2.phpt | 2 +- .../tests/file/windows_mb_path/test_cp1252_0.phpt | 6 +-- .../windows_mb_path/test_cp1252_to_utf8_0.phpt | 6 +-- .../windows_mb_path/test_cp1252_to_utf8_1.phpt | 4 +- .../windows_mb_path/test_cp1252_to_utf8_2.phpt | 4 +- .../windows_mb_path/test_cp1252_to_utf8_3.phpt | 6 +-- .../windows_mb_path/test_cp1252_to_utf8_4.phpt | 4 +- .../windows_mb_path/test_cp1252_to_utf8_5.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1253_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp1253_1.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1253_2.phpt | 2 +- .../windows_mb_path/test_cp1253_to_utf8_0.phpt | 6 +-- .../windows_mb_path/test_cp1253_to_utf8_1.phpt | 4 +- .../windows_mb_path/test_cp1253_to_utf8_2.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1254_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp1254_1.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1254_2.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1254_3.phpt | 4 +- .../windows_mb_path/test_cp1254_to_utf8_0.phpt | 6 +-- .../windows_mb_path/test_cp1254_to_utf8_1.phpt | 4 +- .../windows_mb_path/test_cp1254_to_utf8_2.phpt | 4 +- .../windows_mb_path/test_cp1254_to_utf8_3.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1255_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp1255_1.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1255_2.phpt | 4 +- .../windows_mb_path/test_cp1255_to_utf8_0.phpt | 6 +-- .../windows_mb_path/test_cp1255_to_utf8_1.phpt | 4 +- .../windows_mb_path/test_cp1255_to_utf8_2.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1256_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp1256_1.phpt | 4 +- .../tests/file/windows_mb_path/test_cp1256_2.phpt | 4 +- .../windows_mb_path/test_cp1256_to_utf8_0.phpt | 6 +-- .../windows_mb_path/test_cp1256_to_utf8_1.phpt | 4 +- .../windows_mb_path/test_cp1256_to_utf8_2.phpt | 4 +- .../tests/file/windows_mb_path/test_cp874_0.phpt | 2 +- .../tests/file/windows_mb_path/test_cp874_1.phpt | 6 +-- .../file/windows_mb_path/test_cp874_to_utf8_0.phpt | 2 +- .../file/windows_mb_path/test_cp874_to_utf8_1.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp932_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp932_1.phpt | 2 +- .../tests/file/windows_mb_path/test_cp932_2.phpt | 2 +- .../tests/file/windows_mb_path/test_cp932_3.phpt | 4 +- .../file/windows_mb_path/test_cp932_to_utf8_0.phpt | 6 +-- .../file/windows_mb_path/test_cp932_to_utf8_1.phpt | 4 +- .../file/windows_mb_path/test_cp932_to_utf8_2.phpt | 4 +- .../tests/file/windows_mb_path/test_cp936_0.phpt | 6 +-- .../tests/file/windows_mb_path/test_cp936_1.phpt | 4 +- .../tests/file/windows_mb_path/test_cp936_2.phpt | 4 +- .../file/windows_mb_path/test_cp936_to_utf8_0.phpt | 6 +-- .../file/windows_mb_path/test_cp936_to_utf8_1.phpt | 4 +- .../file/windows_mb_path/test_cp936_to_utf8_2.phpt | 4 +- .../file/windows_mb_path/test_eucjp_to_utf8_0.phpt | 6 +-- .../file/windows_mb_path/test_eucjp_to_utf8_1.phpt | 4 +- .../file/windows_mb_path/test_eucjp_to_utf8_2.phpt | 4 +- .../file/windows_mb_path/test_kartuli_utf8_0.phpt | 6 +-- .../file/windows_mb_path/test_kartuli_utf8_1.phpt | 4 +- .../file/windows_mb_path/test_kartuli_utf8_2.phpt | 4 +- .../file/windows_mb_path/test_kartuli_utf8_3.phpt | 6 +-- .../file/windows_mb_path/test_long_path_0.phpt | 4 +- .../file/windows_mb_path/test_long_path_1.phpt | 4 +- .../file/windows_mb_path/test_long_path_2.phpt | 4 +- .../file/windows_mb_path/test_long_path_mkdir.phpt | 6 +-- ext/standard/tests/filters/001.phpt | 2 +- .../tests/filters/stream_filter_remove_basic.phpt | 6 +-- .../tests/filters/stream_filter_remove_error.phpt | 6 +-- ext/standard/tests/general_functions/001.phpt | 2 +- ext/standard/tests/general_functions/003.phpt | 8 ++-- ext/standard/tests/general_functions/004.phpt | 2 +- ext/standard/tests/general_functions/007.phpt | 2 +- ext/standard/tests/general_functions/009.phpt | 2 +- ext/standard/tests/general_functions/bug27678.phpt | 2 +- ext/standard/tests/general_functions/bug31190.phpt | 2 +- ext/standard/tests/general_functions/bug36011.phpt | 6 +-- ext/standard/tests/general_functions/bug40752.phpt | 2 +- ext/standard/tests/general_functions/bug41037.phpt | 2 +- ext/standard/tests/general_functions/bug41445.phpt | 2 +- .../tests/general_functions/bug41445_1.phpt | 4 +- .../tests/general_functions/bug43293_1.phpt | 2 +- ext/standard/tests/general_functions/bug44667.phpt | 12 +++--- ext/standard/tests/general_functions/bug66094.phpt | 2 +- .../call_user_func_array_variation_002.phpt | 6 +-- .../call_user_func_array_variation_003.phpt | 6 +-- .../tests/general_functions/closures_001.phpt | 2 +- .../tests/general_functions/closures_002.phpt | 2 +- .../tests/general_functions/debug_zval_dump_b.phpt | Bin 4554 -> 4551 bytes .../general_functions/debug_zval_dump_b_64bit.phpt | Bin 4554 -> 4551 bytes .../tests/general_functions/debug_zval_dump_e.phpt | 2 +- .../tests/general_functions/debug_zval_dump_o.phpt | 4 +- .../tests/general_functions/debug_zval_dump_v.phpt | 8 ++-- .../tests/general_functions/dl-cve-2007-4887.phpt | 2 +- .../tests/general_functions/error_clear_last.phpt | 2 +- .../tests/general_functions/error_get_last.phpt | 2 +- .../escapeshellarg_basic-win32-mb.phpt | 2 +- .../escapeshellarg_basic-win32.phpt | 2 +- .../general_functions/escapeshellarg_basic.phpt | 2 +- .../general_functions/escapeshellarg_error.phpt | 2 +- .../escapeshellarg_variation1-win32.phpt | 4 +- .../escapeshellarg_variation1.phpt | 4 +- ext/standard/tests/general_functions/floatval.phpt | 16 +++---- .../tests/general_functions/floatval_basic.phpt | 6 +-- .../general_functions/floatval_variation1.phpt | 8 ++-- .../general_functions/get_cfg_var_variation9.phpt | 2 +- .../get_defined_constants_basic.phpt | 6 +-- .../get_defined_constants_error.phpt | 4 +- .../general_functions/get_defined_vars_basic.phpt | 40 +++++++++--------- .../get_extension_funcs_basic.phpt | 2 +- .../get_extension_funcs_error.phpt | 4 +- .../get_extension_funcs_variation.phpt | 6 +-- .../general_functions/get_include_path_basic.phpt | 2 +- .../get_loaded_extensions_basic.phpt | 4 +- .../get_loaded_extensions_error.phpt | 4 +- .../general_functions/get_magic_quotes_gpc.phpt | 4 +- .../get_magic_quotes_runtime.phpt | 4 +- .../general_functions/get_resource_type_basic.phpt | 8 ++-- .../general_functions/get_resource_type_error.phpt | 6 +-- .../get_resource_type_variation1.phpt | 6 +-- .../tests/general_functions/getmypid_basic.phpt | 2 +- .../tests/general_functions/getrusage.phpt | 2 +- .../tests/general_functions/getrusage_basic.phpt | 8 ++-- .../tests/general_functions/getrusage_error.phpt | 4 +- .../general_functions/getrusage_variation1.phpt | 8 ++-- .../general_functions/getservbyname_error.phpt | 2 +- .../getservbyname_variation14.phpt | 2 +- .../getservbyname_variation2.phpt | 2 +- .../getservbyname_variation5.phpt | 2 +- .../general_functions/getservbyport_error.phpt | 2 +- .../getservbyport_variation1.phpt | 2 +- .../general_functions/gettype_settype_basic.phpt | 22 +++++----- .../general_functions/gettype_settype_error.phpt | 10 ++--- .../gettype_settype_variation1.phpt | 42 +++++++++---------- .../gettype_settype_variation2.phpt | 28 ++++++------- .../gettype_settype_variation3.phpt | 24 +++++------ .../gettype_settype_variation4.phpt | 26 ++++++------ .../gettype_settype_variation5.phpt | 22 +++++----- .../gettype_settype_variation6.phpt | 22 +++++----- .../gettype_settype_variation7.phpt | 24 +++++------ .../gettype_settype_variation8.phpt | 22 +++++----- ext/standard/tests/general_functions/head.phpt | 2 +- .../tests/general_functions/ini_get_all.phpt | 2 +- ext/standard/tests/general_functions/intval.phpt | 14 +++---- .../tests/general_functions/intval_variation1.phpt | 6 +-- .../tests/general_functions/intval_variation2.phpt | 6 +-- ext/standard/tests/general_functions/is_array.phpt | 30 +++++++------- ext/standard/tests/general_functions/is_bool.phpt | 26 ++++++------ .../general_functions/is_callable_basic2.phpt | 10 ++--- .../general_functions/is_callable_variation2.phpt | 2 +- ext/standard/tests/general_functions/is_float.phpt | 24 +++++------ .../tests/general_functions/is_float_64bit.phpt | 22 +++++----- ext/standard/tests/general_functions/is_int.phpt | 34 +++++++-------- .../tests/general_functions/is_int_64bit.phpt | 34 +++++++-------- ext/standard/tests/general_functions/is_null.phpt | 16 +++---- .../tests/general_functions/is_numeric.phpt | 36 ++++++++-------- .../tests/general_functions/is_object.phpt | 34 +++++++-------- .../tests/general_functions/is_resource_basic.phpt | 14 +++---- .../tests/general_functions/is_resource_error.phpt | 2 +- .../tests/general_functions/is_scalar.phpt | 18 ++++---- .../tests/general_functions/is_string.phpt | 16 +++---- .../tests/general_functions/isset_basic1.phpt | 4 +- .../tests/general_functions/isset_basic2.phpt | 14 +++---- .../general_functions/ob_get_flush_basic.phpt | 6 +-- .../general_functions/ob_get_flush_error.phpt | 6 +-- .../general_functions/ob_get_length_basic.phpt | 6 +-- .../tests/general_functions/parse_ini_basic.phpt | 2 +- .../general_functions/parse_ini_booleans.phpt | 2 +- .../tests/general_functions/parse_ini_file.phpt | 2 +- .../general_functions/parse_ini_string_001.phpt | 2 +- .../general_functions/parse_ini_string_002.phpt | 2 +- .../tests/general_functions/php_uname_error.phpt | 2 +- .../general_functions/php_uname_variation1.phpt | 14 +++---- ext/standard/tests/general_functions/print_r.phpt | 16 +++---- .../tests/general_functions/print_r_64bit.phpt | 16 +++---- .../general_functions/proc_nice_basic-win.phpt | 10 ++--- .../tests/general_functions/proc_open_pipes1.phpt | 2 +- .../tests/general_functions/proc_open_pipes2.phpt | 2 +- .../tests/general_functions/proc_open_pipes3.phpt | 2 +- ext/standard/tests/general_functions/putenv.phpt | 2 +- .../putenv_bug75574_cp936_win.phpt | 2 +- .../general_functions/putenv_bug75574_utf8.phpt | 2 +- ext/standard/tests/general_functions/rand.phpt | 2 +- .../tests/general_functions/sleep_basic.phpt | 10 ++--- .../tests/general_functions/sleep_error.phpt | 6 +-- ext/standard/tests/general_functions/strval.phpt | 28 ++++++------- ext/standard/tests/general_functions/type.phpt | 2 +- .../tests/general_functions/uniqid_basic.phpt | 12 +++--- .../tests/general_functions/uniqid_error.phpt | 6 +-- .../tests/general_functions/usleep_basic.phpt | 8 ++-- .../tests/general_functions/usleep_error.phpt | 8 ++-- ext/standard/tests/general_functions/var_dump.phpt | 24 +++++------ .../tests/general_functions/var_dump_64bit.phpt | 24 +++++------ .../tests/general_functions/var_export-locale.phpt | 40 +++++++++--------- .../tests/general_functions/var_export_basic1.phpt | 8 ++-- .../tests/general_functions/var_export_basic2.phpt | 10 ++--- .../tests/general_functions/var_export_basic3.phpt | 6 +-- .../tests/general_functions/var_export_basic4.phpt | 6 +-- .../tests/general_functions/var_export_basic5.phpt | 6 +-- .../tests/general_functions/var_export_basic6.phpt | 22 +++++----- .../tests/general_functions/var_export_basic7.phpt | 6 +-- .../tests/general_functions/var_export_basic8.phpt | 10 ++--- .../tests/general_functions/var_export_error1.phpt | 6 +-- .../tests/general_functions/var_export_error2.phpt | 4 +- .../tests/general_functions/var_export_error3.phpt | 4 +- ext/standard/tests/http/bug60570.phpt | 2 +- ext/standard/tests/image/getimagesize_basic.phpt | 8 ++-- ext/standard/tests/image/getimagesize_error1.phpt | 4 +- ext/standard/tests/image/getimagesize_jpgapp.phpt | 4 +- ext/standard/tests/image/getimagesize_tif_mm.phpt | 4 +- .../tests/image/getimagesize_variation1.phpt | 4 +- .../tests/image/getimagesize_variation2.phpt | 4 +- .../tests/image/getimagesize_variation3.phpt | 2 +- .../tests/image/getimagesize_variation4.phpt | 2 +- .../tests/image/getimagesize_variation_003.phpt | 2 +- .../tests/image/getimagesize_variation_005.phpt | 2 +- ext/standard/tests/image/getimagesize_wbmp.phpt | 4 +- ext/standard/tests/image/getimagesize_xbm.phpt | 4 +- .../tests/image/getimagesizefromstring1.phpt | 4 +- .../tests/image/image_type_to_extension.phpt | 4 +- .../tests/image/image_type_to_mime_type_basic.phpt | 34 +++++++-------- .../tests/image/image_type_to_mime_type_error.phpt | 2 +- .../image/image_type_to_mime_type_variation1.phpt | 2 +- .../image/image_type_to_mime_type_variation2.phpt | 6 +-- .../image/image_type_to_mime_type_variation3.phpt | 2 +- .../image/image_type_to_mime_type_variation4.phpt | 2 +- ext/standard/tests/mail/bug66535.phpt | 4 +- ext/standard/tests/mail/bug69115.phpt | 2 +- ext/standard/tests/mail/bug73203.phpt | 2 +- ext/standard/tests/mail/ezmlm_hash_basic.phpt | 2 +- .../tests/mail/ezmlm_hash_basic_64bit.phpt | 2 +- ext/standard/tests/mail/ezmlm_hash_error.phpt | 2 +- ext/standard/tests/mail/ezmlm_hash_variation1.phpt | 2 +- ext/standard/tests/mail/mail_basic.phpt | 6 +-- ext/standard/tests/mail/mail_basic2.phpt | 6 +-- ext/standard/tests/mail/mail_basic3.phpt | 6 +-- ext/standard/tests/mail/mail_basic4.phpt | 6 +-- ext/standard/tests/mail/mail_basic5.phpt | 6 +-- ext/standard/tests/mail/mail_basic_alt1-win32.phpt | 28 ++++++------- ext/standard/tests/mail/mail_basic_alt2-win32.phpt | 28 ++++++------- ext/standard/tests/mail/mail_basic_alt3-win32.phpt | 28 ++++++------- ext/standard/tests/mail/mail_basic_alt4-win32.phpt | 28 ++++++------- ext/standard/tests/mail/mail_error.phpt | 6 +-- ext/standard/tests/mail/mail_variation1.phpt | 4 +- ext/standard/tests/mail/mail_variation2.phpt | 4 +- .../tests/mail/mail_variation_alt1-win32.phpt | 28 ++++++------- .../tests/mail/mail_variation_alt2-win32.phpt | 28 ++++++------- .../tests/mail/mail_variation_alt3-win32.phpt | 28 ++++++------- ext/standard/tests/math/abs_basic.phpt | 8 ++-- ext/standard/tests/math/abs_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/abs_error.phpt | 2 +- ext/standard/tests/math/abs_variation.phpt | 4 +- ext/standard/tests/math/acos_basic.phpt | 4 +- ext/standard/tests/math/acos_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/acos_error.phpt | 4 +- ext/standard/tests/math/acos_variation.phpt | 8 ++-- ext/standard/tests/math/acosh_basic.phpt | 4 +- ext/standard/tests/math/acosh_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/acosh_error.phpt | 4 +- ext/standard/tests/math/acosh_variation.phpt | 8 ++-- ext/standard/tests/math/asin_basic.phpt | 4 +- ext/standard/tests/math/asin_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/asin_error.phpt | 4 +- ext/standard/tests/math/asin_variation.phpt | 8 ++-- ext/standard/tests/math/asinh_basic.phpt | 4 +- ext/standard/tests/math/asinh_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/asinh_error.phpt | 4 +- ext/standard/tests/math/asinh_variation.phpt | 8 ++-- ext/standard/tests/math/atan2_basic.phpt | 12 +++--- ext/standard/tests/math/atan2_basiclong_64bit.phpt | 6 +-- ext/standard/tests/math/atan2_variation1.phpt | 10 ++--- ext/standard/tests/math/atan2_variation2.phpt | 10 ++--- ext/standard/tests/math/atan_basic.phpt | 4 +- ext/standard/tests/math/atan_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/atan_error.phpt | 4 +- ext/standard/tests/math/atan_variation.phpt | 8 ++-- ext/standard/tests/math/atanh_basic.phpt | 4 +- ext/standard/tests/math/atanh_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/atanh_error.phpt | 4 +- ext/standard/tests/math/atanh_variation.phpt | 8 ++-- ext/standard/tests/math/base_convert_basic.phpt | 14 +++---- .../tests/math/base_convert_variation1.phpt | 6 +-- .../tests/math/base_convert_variation2.phpt | 6 +-- .../tests/math/base_convert_variation3.phpt | 6 +-- ext/standard/tests/math/bindec_basic.phpt | 4 +- ext/standard/tests/math/bindec_basic_64bit.phpt | 4 +- .../tests/math/bindec_basiclong_64bit.phpt | 16 +++---- ext/standard/tests/math/bindec_error.phpt | 2 +- ext/standard/tests/math/bindec_variation1.phpt | 4 +- .../tests/math/bindec_variation1_64bit.phpt | 4 +- ext/standard/tests/math/bug25665.phpt | 2 +- ext/standard/tests/math/bug45712.phpt | 4 +- ext/standard/tests/math/ceil_basic.phpt | 6 +-- ext/standard/tests/math/ceil_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/ceil_variation1.phpt | 4 +- ext/standard/tests/math/constants_basic.phpt | 2 +- ext/standard/tests/math/cos_basic.phpt | 4 +- ext/standard/tests/math/cos_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/cos_error.phpt | 4 +- ext/standard/tests/math/cos_variation.phpt | 8 ++-- ext/standard/tests/math/cosh_basic.phpt | 4 +- ext/standard/tests/math/cosh_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/cosh_error.phpt | 4 +- ext/standard/tests/math/cosh_variation.phpt | 8 ++-- ext/standard/tests/math/decbin_basic.phpt | 6 +-- .../tests/math/decbin_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/decbin_error.phpt | 2 +- ext/standard/tests/math/decbin_variation1.phpt | 10 ++--- .../tests/math/decbin_variation1_64bit.phpt | 10 ++--- ext/standard/tests/math/dechex_basic.phpt | 6 +-- .../tests/math/dechex_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/dechex_error.phpt | 2 +- ext/standard/tests/math/dechex_variation1.phpt | 12 +++--- .../tests/math/dechex_variation1_64bit.phpt | 14 +++---- ext/standard/tests/math/decoct_basic.phpt | 6 +-- .../tests/math/decoct_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/decoct_variation1.phpt | 14 +++---- .../tests/math/decoct_variation1_64bit.phpt | 14 +++---- ext/standard/tests/math/deg2rad_basic.phpt | 4 +- .../tests/math/deg2rad_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/deg2rad_error.phpt | 4 +- ext/standard/tests/math/deg2rad_variation.phpt | 8 ++-- ext/standard/tests/math/exp_basic.phpt | 6 +-- ext/standard/tests/math/exp_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/exp_variation1.phpt | 10 ++--- ext/standard/tests/math/expm1_basic.phpt | 8 ++-- ext/standard/tests/math/expm1_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/expm1_error.phpt | 2 +- ext/standard/tests/math/expm1_variation1.phpt | 14 +++---- ext/standard/tests/math/floor_basic.phpt | 10 ++--- ext/standard/tests/math/floor_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/floor_variation1.phpt | 4 +- ext/standard/tests/math/floorceil.phpt | 10 ++--- ext/standard/tests/math/fmod_basic.phpt | 16 +++---- ext/standard/tests/math/fmod_basiclong_64bit.phpt | 6 +-- ext/standard/tests/math/fmod_variation1.phpt | 10 ++--- ext/standard/tests/math/fmod_variation2.phpt | 10 ++--- ext/standard/tests/math/hexdec_basic.phpt | 6 +-- ext/standard/tests/math/hexdec_basic_64bit.phpt | 10 ++--- .../tests/math/hexdec_basiclong_64bit.phpt | 14 +++---- ext/standard/tests/math/hexdec_error.phpt | 2 +- ext/standard/tests/math/hexdec_variation1.phpt | 10 ++--- .../tests/math/hexdec_variation1_64bit.phpt | 10 ++--- ext/standard/tests/math/hypot_basic.phpt | 14 +++---- ext/standard/tests/math/hypot_basiclong_64bit.phpt | 6 +-- ext/standard/tests/math/hypot_error.phpt | 2 +- ext/standard/tests/math/hypot_variation1.phpt | 10 ++--- ext/standard/tests/math/hypot_variation2.phpt | 10 ++--- ext/standard/tests/math/is_finite_basic.phpt | 6 +-- .../tests/math/is_finite_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/is_finite_variation1.phpt | 10 ++--- ext/standard/tests/math/is_infinite_basic.phpt | 6 +-- .../tests/math/is_infinite_basiclong_64bit.phpt | 4 +- .../tests/math/is_infinite_variation1.phpt | 10 ++--- ext/standard/tests/math/is_nan_basic.phpt | 10 ++--- .../tests/math/is_nan_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/is_nan_variation1.phpt | 10 ++--- ext/standard/tests/math/lcg_value_basic.phpt | 16 +++---- ext/standard/tests/math/log.phpt | 8 ++-- ext/standard/tests/math/log10_basic.phpt | 4 +- ext/standard/tests/math/log10_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/log10_error.phpt | 4 +- ext/standard/tests/math/log10_variation.phpt | 8 ++-- ext/standard/tests/math/log1p_basic.phpt | 8 ++-- ext/standard/tests/math/log1p_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/log1p_error.phpt | 4 +- ext/standard/tests/math/log1p_variation1.phpt | 12 +++--- ext/standard/tests/math/log_basic.phpt | 4 +- ext/standard/tests/math/log_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/log_variation1.phpt | 10 ++--- ext/standard/tests/math/log_variation2.phpt | 10 ++--- ext/standard/tests/math/mt_rand_basic.phpt | 36 ++++++++-------- ext/standard/tests/math/mt_rand_variation1.phpt | 10 ++--- ext/standard/tests/math/mt_rand_variation2.phpt | 10 ++--- ext/standard/tests/math/mt_srand_variation1.phpt | 10 ++--- ext/standard/tests/math/number_format_basic.phpt | 4 +- .../tests/math/number_format_multichar.phpt | 4 +- ext/standard/tests/math/octdec_basic.phpt | 4 +- ext/standard/tests/math/octdec_basic_64bit.phpt | 4 +- .../tests/math/octdec_basiclong_64bit.phpt | 8 ++-- ext/standard/tests/math/octdec_error.phpt | 4 +- ext/standard/tests/math/octdec_variation1.phpt | 12 +++--- ext/standard/tests/math/pi_basic.phpt | 4 +- ext/standard/tests/math/pow_basic.phpt | 8 ++-- ext/standard/tests/math/pow_basic2.phpt | 4 +- ext/standard/tests/math/pow_basic_64bit.phpt | 8 ++-- ext/standard/tests/math/pow_basiclong_64bit.phpt | 6 +-- ext/standard/tests/math/pow_variation1.phpt | 10 ++--- ext/standard/tests/math/pow_variation1_64bit.phpt | 10 ++--- ext/standard/tests/math/pow_variation2.phpt | 10 ++--- ext/standard/tests/math/rad2deg_basic.phpt | 4 +- .../tests/math/rad2deg_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/rad2deg_error.phpt | 4 +- ext/standard/tests/math/rad2deg_variation.phpt | 8 ++-- ext/standard/tests/math/rand_basic.phpt | 34 +++++++-------- ext/standard/tests/math/rand_variation1.phpt | 10 ++--- ext/standard/tests/math/rand_variation2.phpt | 10 ++--- ext/standard/tests/math/round_basic.phpt | 10 ++--- ext/standard/tests/math/round_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/round_error.phpt | 4 +- ext/standard/tests/math/round_variation1.phpt | 10 ++--- ext/standard/tests/math/round_variation2.phpt | 10 ++--- ext/standard/tests/math/sin_basic.phpt | 6 +-- ext/standard/tests/math/sin_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/sin_error.phpt | 4 +- ext/standard/tests/math/sin_variation.phpt | 8 ++-- ext/standard/tests/math/sinh_basic.phpt | 4 +- ext/standard/tests/math/sinh_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/sinh_error.phpt | 4 +- ext/standard/tests/math/sinh_variation.phpt | 8 ++-- ext/standard/tests/math/sqrt_basic.phpt | 4 +- ext/standard/tests/math/sqrt_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/sqrt_error.phpt | 4 +- ext/standard/tests/math/sqrt_variation.phpt | 8 ++-- ext/standard/tests/math/srand_error.phpt | 4 +- ext/standard/tests/math/srand_variation1.phpt | 10 ++--- ext/standard/tests/math/tan_basic.phpt | 6 +-- ext/standard/tests/math/tan_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/tan_error.phpt | 4 +- ext/standard/tests/math/tan_variation.phpt | 8 ++-- ext/standard/tests/math/tanh_basic.phpt | 4 +- ext/standard/tests/math/tanh_basiclong_64bit.phpt | 4 +- ext/standard/tests/math/tanh_error.phpt | 4 +- ext/standard/tests/math/tanh_variation.phpt | 8 ++-- ext/standard/tests/misc/get_browser_basic.phpt | 10 ++--- ext/standard/tests/misc/get_browser_error.phpt | 10 ++--- .../tests/misc/get_browser_variation1.phpt | 8 ++-- ext/standard/tests/misc/time_nanosleep_error3.phpt | 2 +- .../tests/misc/time_sleep_until_basic.phpt | 2 +- ext/standard/tests/network/closelog_basic.phpt | 6 +-- ext/standard/tests/network/closelog_error.phpt | 6 +-- ext/standard/tests/network/fsockopen_basic.phpt | 6 +-- ext/standard/tests/network/fsockopen_error.phpt | 6 +-- .../tests/network/gethostbyaddr_basic1.phpt | 4 +- .../tests/network/gethostbyaddr_error.phpt | 6 +-- .../tests/network/gethostbyname_basic003.phpt | 4 +- .../tests/network/gethostbynamel_basic1.phpt | 4 +- .../tests/network/gethostbynamel_error.phpt | 6 +-- ext/standard/tests/network/inet.phpt | 8 ++-- ext/standard/tests/network/inet_ipv6.phpt | 8 ++-- ext/standard/tests/network/ip.phpt | 2 +- ext/standard/tests/network/ip2long_error.phpt | 6 +-- ext/standard/tests/network/ip2long_variation1.phpt | 6 +-- ext/standard/tests/network/ip2long_variation2.phpt | 4 +- ext/standard/tests/network/ip_x86_64.phpt | 2 +- ext/standard/tests/network/long2ip_error.phpt | 6 +-- ext/standard/tests/network/long2ip_variation1.phpt | 12 +++--- ext/standard/tests/network/shutdown.phpt | 4 +- ext/standard/tests/network/syslog_basic-win32.phpt | 6 +-- ext/standard/tests/network/syslog_error.phpt | 6 +-- ext/standard/tests/network/tcp6loop.phpt | 2 +- ext/standard/tests/network/udgloop.phpt | 2 +- ext/standard/tests/network/unixloop.phpt | 2 +- ext/standard/tests/serialize/001.phpt | 2 +- ext/standard/tests/serialize/002.phpt | 2 +- ext/standard/tests/serialize/003.phpt | 2 +- ext/standard/tests/serialize/005.phpt | 12 +++--- ext/standard/tests/serialize/006.phpt | 6 +-- ext/standard/tests/serialize/bug14293.phpt | 4 +- ext/standard/tests/serialize/bug21957.phpt | 2 +- ext/standard/tests/serialize/bug23298.phpt | 2 +- ext/standard/tests/serialize/bug24063.phpt | 2 +- ext/standard/tests/serialize/bug25378.phpt | 2 +- ext/standard/tests/serialize/bug26762.phpt | 4 +- ext/standard/tests/serialize/bug30234.phpt | 2 +- ext/standard/tests/serialize/bug31402.phpt | 2 +- ext/standard/tests/serialize/bug49649.phpt | 6 +-- ext/standard/tests/serialize/bug49649_1.phpt | 6 +-- ext/standard/tests/serialize/bug49649_2.phpt | 6 +-- ext/standard/tests/serialize/bug62373.phpt | 2 +- ext/standard/tests/serialize/bug64354_1.phpt | 4 +- ext/standard/tests/serialize/bug64354_2.phpt | 2 +- ext/standard/tests/serialize/bug64354_3.phpt | 2 +- ext/standard/tests/serialize/bug68545.phpt | 4 +- ext/standard/tests/serialize/bug68976.phpt | 2 +- ext/standard/tests/serialize/bug69425.phpt | 2 +- ext/standard/tests/serialize/bug70219.phpt | 2 +- ext/standard/tests/serialize/bug70436.phpt | 8 ++-- ext/standard/tests/serialize/bug70513.phpt | 2 +- ext/standard/tests/serialize/bug72229.phpt | 2 +- ext/standard/tests/serialize/incomplete_class.phpt | 2 +- .../tests/serialize/serialization_arrays_001.phpt | 10 ++--- .../tests/serialize/serialization_arrays_002.phpt | 12 +++--- .../tests/serialize/serialization_arrays_003.phpt | 12 +++--- .../tests/serialize/serialization_arrays_004.phpt | 12 +++--- .../tests/serialize/serialization_arrays_005.phpt | 14 +++---- .../tests/serialize/serialization_error_001.phpt | 10 ++--- .../serialize/serialization_miscTypes_001.phpt | Bin 7617 -> 7606 bytes .../tests/serialize/serialization_objects_001.phpt | Bin 2435 -> 2429 bytes .../tests/serialize/serialization_objects_002.phpt | Bin 7244 -> 7231 bytes .../tests/serialize/serialization_objects_003.phpt | 16 +++---- .../tests/serialize/serialization_objects_004.phpt | 10 ++--- .../tests/serialize/serialization_objects_005.phpt | 8 ++-- .../tests/serialize/serialization_objects_006.phpt | 8 ++-- .../tests/serialize/serialization_objects_007.phpt | 10 ++--- .../tests/serialize/serialization_objects_008.phpt | 10 ++--- .../tests/serialize/serialization_objects_009.phpt | 8 ++-- .../tests/serialize/serialization_objects_010.phpt | 12 +++--- .../tests/serialize/serialization_objects_011.phpt | 34 +++++++-------- .../tests/serialize/serialization_objects_012.phpt | 20 ++++----- .../tests/serialize/serialization_objects_013.phpt | 14 +++---- .../tests/serialize/serialization_objects_014.phpt | 14 +++---- .../tests/serialize/serialization_objects_015.phpt | 6 +-- .../serialize/serialization_precision_001.phpt | 8 ++-- .../serialize/serialization_precision_002.phpt | 8 ++-- .../serialize/serialization_resources_001.phpt | 10 ++--- ext/standard/tests/streams/bug40459.phpt | 2 +- ext/standard/tests/streams/bug46024.phpt | 2 +- ext/standard/tests/streams/bug60455_02.phpt | 4 +- ext/standard/tests/streams/bug60455_03.phpt | 2 +- ext/standard/tests/streams/bug60455_04.phpt | 4 +- ext/standard/tests/streams/bug60602.phpt | 2 +- ext/standard/tests/streams/bug61019.phpt | 18 ++++---- ext/standard/tests/streams/bug61115-1.phpt | 2 +- ext/standard/tests/streams/bug64166_2.phpt | 2 +- ext/standard/tests/streams/bug64433.phpt | 6 +-- ext/standard/tests/streams/bug64770.phpt | 4 +- ext/standard/tests/streams/bug67626.phpt | 6 +-- ext/standard/tests/streams/bug70198.phpt | 2 +- ext/standard/tests/streams/bug72771.phpt | 2 +- ext/standard/tests/streams/bug72857.phpt | 2 +- ext/standard/tests/streams/bug73457.phpt | 2 +- ext/standard/tests/streams/opendir-001.phpt | 4 +- ext/standard/tests/streams/opendir-002.phpt | 4 +- ext/standard/tests/streams/opendir-003.phpt | 4 +- ext/standard/tests/streams/opendir-004.phpt | 4 +- ext/standard/tests/streams/proc_open_bug69900.phpt | 2 +- ext/standard/tests/streams/set_file_buffer.phpt | 6 +-- .../tests/streams/stream_context_tcp_nodelay.phpt | 2 +- .../streams/stream_context_tcp_nodelay_fopen.phpt | 2 +- .../streams/stream_context_tcp_nodelay_server.phpt | 2 +- .../streams/stream_get_line_NUL_delimiter.phpt | 4 +- .../streams/stream_get_meta_data_file_error.phpt | 4 +- .../stream_get_meta_data_file_variation1.phpt | 2 +- .../stream_get_meta_data_process_basic.phpt | 4 +- .../tests/streams/stream_set_timeout_error.phpt | 4 +- .../tests/streams/stream_socket_enable_crypto.phpt | 2 +- ext/standard/tests/strings/004.phpt | 2 +- ext/standard/tests/strings/005.phpt | 2 +- ext/standard/tests/strings/006.phpt | 2 +- ext/standard/tests/strings/007-win32.phpt | 2 +- ext/standard/tests/strings/007.phpt | 2 +- ext/standard/tests/strings/addcslashes_001.phpt | Bin 1587 -> 1585 bytes ext/standard/tests/strings/addcslashes_002.phpt | 2 +- ext/standard/tests/strings/addcslashes_003.phpt | Bin 1314 -> 1313 bytes ext/standard/tests/strings/addcslashes_004.phpt | 2 +- ext/standard/tests/strings/addslashes_basic.phpt | 6 +-- ext/standard/tests/strings/addslashes_error.phpt | 2 +- .../tests/strings/addslashes_variation1.phpt | 24 +++++------ .../tests/strings/addslashes_variation2.phpt | 14 +++---- ext/standard/tests/strings/basename_basic.phpt | Bin 3225 -> 3213 bytes ext/standard/tests/strings/basename_error.phpt | 6 +-- .../tests/strings/basename_invalid_path.phpt | 2 +- .../tests/strings/basename_invalid_path_win.phpt | 2 +- ext/standard/tests/strings/basename_variation.phpt | 8 ++-- ext/standard/tests/strings/bin2hex_basic.phpt | 10 ++--- ext/standard/tests/strings/bin2hex_error.phpt | 5 +-- ext/standard/tests/strings/bin2hex_variation1.phpt | 18 ++++---- ext/standard/tests/strings/bug20934.phpt | 2 +- ext/standard/tests/strings/bug22207.phpt | 2 +- ext/standard/tests/strings/bug22224.phpt | 2 +- ext/standard/tests/strings/bug26817.phpt | 2 +- ext/standard/tests/strings/bug33076.phpt | 2 +- ext/standard/tests/strings/bug36306.phpt | 2 +- ext/standard/tests/strings/bug36944.phpt | 2 +- ext/standard/tests/strings/bug37262.phpt | 2 +- ext/standard/tests/strings/bug38322.phpt | 2 +- ext/standard/tests/strings/bug38770.phpt | 2 +- ext/standard/tests/strings/bug39032.phpt | 2 +- ext/standard/tests/strings/bug39350.phpt | 2 +- ext/standard/tests/strings/bug39621.phpt | Bin 866 -> 865 bytes ext/standard/tests/strings/bug39873.phpt | 2 +- ext/standard/tests/strings/bug40637.phpt | 2 +- ext/standard/tests/strings/bug40704.phpt | 2 +- ext/standard/tests/strings/bug40754.phpt | 2 +- ext/standard/tests/strings/bug45166.phpt | 2 +- ext/standard/tests/strings/bug48709.phpt | 4 +- ext/standard/tests/strings/bug54721.phpt | 2 +- ext/standard/tests/strings/bug55871.phpt | 2 +- ext/standard/tests/strings/bug64879.phpt | 6 +-- ext/standard/tests/strings/bug65230.phpt | 2 +- ext/standard/tests/strings/bug65947.phpt | 6 +-- ext/standard/tests/strings/bug67252.phpt | 2 +- ext/standard/tests/strings/bug73058.phpt | 2 +- ext/standard/tests/strings/chop_basic.phpt | Bin 861 -> 860 bytes ext/standard/tests/strings/chop_error.phpt | 2 +- ext/standard/tests/strings/chop_variation1.phpt | 6 +-- ext/standard/tests/strings/chop_variation2.phpt | 4 +- ext/standard/tests/strings/chr_basic.phpt | 2 +- ext/standard/tests/strings/chr_ord.phpt | Bin 3203 -> 3171 bytes ext/standard/tests/strings/chr_variation1.phpt | 18 ++++---- ext/standard/tests/strings/chunk_split_basic.phpt | 16 +++---- ext/standard/tests/strings/chunk_split_error.phpt | 6 +-- .../tests/strings/chunk_split_variation1.phpt | 2 +- .../tests/strings/chunk_split_variation10.phpt | 6 +-- .../tests/strings/chunk_split_variation11.phpt | 4 +- .../tests/strings/chunk_split_variation12.phpt | 6 +-- .../tests/strings/chunk_split_variation13.phpt | 2 +- .../tests/strings/chunk_split_variation2.phpt | 2 +- .../tests/strings/chunk_split_variation3.phpt | 2 +- .../tests/strings/chunk_split_variation4.phpt | 6 +-- .../tests/strings/chunk_split_variation5.phpt | Bin 2287 -> 2283 bytes .../tests/strings/chunk_split_variation6.phpt | 26 ++++++------ .../tests/strings/chunk_split_variation7.phpt | Bin 2462 -> 2452 bytes .../tests/strings/chunk_split_variation8.phpt | 6 +-- .../tests/strings/chunk_split_variation9.phpt | Bin 3344 -> 3336 bytes ext/standard/tests/strings/convert_cyr_string.phpt | 2 +- .../tests/strings/convert_cyr_string_basic.phpt | 2 +- .../tests/strings/convert_cyr_string_error.phpt | 7 ++-- .../strings/convert_cyr_string_variation1.phpt | 18 ++++---- .../tests/strings/convert_uudecode_basic.phpt | 22 +++++----- .../tests/strings/convert_uudecode_error.phpt | 5 +-- .../tests/strings/convert_uudecode_variation1.phpt | 18 ++++---- .../tests/strings/convert_uuencode_basic.phpt | 10 ++--- .../tests/strings/convert_uuencode_error.phpt | 5 +-- .../tests/strings/convert_uuencode_variation1.phpt | 18 ++++---- ext/standard/tests/strings/count_chars_basic.phpt | 2 +- ext/standard/tests/strings/count_chars_error.phpt | 2 +- .../tests/strings/count_chars_variation1.phpt | 18 ++++---- .../tests/strings/count_chars_variation2.phpt | 16 +++---- ext/standard/tests/strings/crc32_basic.phpt | 6 +-- ext/standard/tests/strings/crc32_error.phpt | 6 +-- ext/standard/tests/strings/crc32_variation1.phpt | 4 +- ext/standard/tests/strings/crc32_variation2.phpt | 4 +- ext/standard/tests/strings/crc32_variation3.phpt | 4 +- ext/standard/tests/strings/crc32_variation4.phpt | 2 +- ext/standard/tests/strings/crypt.phpt | 2 +- ext/standard/tests/strings/crypt_sha256.phpt | 4 +- ext/standard/tests/strings/crypt_sha512.phpt | 2 +- ext/standard/tests/strings/crypt_variation1.phpt | 2 +- ext/standard/tests/strings/dirname_basic.phpt | 10 ++--- ext/standard/tests/strings/dirname_error.phpt | 2 +- ext/standard/tests/strings/dirname_variation.phpt | 8 ++-- ext/standard/tests/strings/explode1.phpt | 8 ++-- ext/standard/tests/strings/explode_variation1.phpt | 18 ++++---- ext/standard/tests/strings/explode_variation2.phpt | 18 ++++---- ext/standard/tests/strings/explode_variation3.phpt | 18 ++++---- ext/standard/tests/strings/explode_variation6.phpt | 4 +- .../strings/get_html_translation_table_basic4.phpt | 2 +- .../strings/get_html_translation_table_basic5.phpt | 2 +- .../strings/get_html_translation_table_basic6.phpt | 2 +- .../strings/get_html_translation_table_basic7.phpt | 2 +- .../strings/get_html_translation_table_basic8.phpt | 2 +- .../strings/get_html_translation_table_basic9.phpt | 2 +- .../strings/get_html_translation_table_error.phpt | 2 +- .../get_html_translation_table_variation1.phpt | 6 +-- .../get_html_translation_table_variation2.phpt | 2 +- ext/standard/tests/strings/get_meta_tags.phpt | 2 +- ext/standard/tests/strings/hebrev_basic.phpt | 2 +- ext/standard/tests/strings/hebrev_error.phpt | 7 ++-- ext/standard/tests/strings/hebrev_variation1.phpt | 18 ++++---- ext/standard/tests/strings/hebrev_variation2.phpt | 20 ++++----- ext/standard/tests/strings/hebrevc_basic.phpt | 2 +- ext/standard/tests/strings/hebrevc_error.phpt | 5 +-- ext/standard/tests/strings/hebrevc_variation1.phpt | 18 ++++---- ext/standard/tests/strings/hebrevc_variation2.phpt | 20 ++++----- ext/standard/tests/strings/highlight_file.phpt | 2 +- .../tests/strings/html_entity_decode_cp866.phpt | 2 +- .../strings/html_entity_decode_iso8859-15.phpt | 2 +- .../strings/html_entity_decode_iso8859-5.phpt | 2 +- .../tests/strings/html_entity_decode_koi8-r.phpt | 2 +- .../tests/strings/html_entity_decode_macroman.phpt | 2 +- .../tests/strings/html_entity_decode_win1251.phpt | 2 +- .../tests/strings/html_entity_decode_win1252.phpt | 2 +- ext/standard/tests/strings/htmlentities-utf-2.phpt | 4 +- ext/standard/tests/strings/htmlentities-utf.phpt | 2 +- ext/standard/tests/strings/htmlentities.phpt | 2 +- ext/standard/tests/strings/htmlentities02.phpt | 2 +- ext/standard/tests/strings/htmlentities20.phpt | 2 +- ext/standard/tests/strings/htmlentities22.phpt | 2 +- ext/standard/tests/strings/htmlentities_html4.phpt | 2 +- ext/standard/tests/strings/htmlentities_html5.phpt | 2 +- .../tests/strings/htmlspecialchars_basic.phpt | 2 +- .../strings/htmlspecialchars_decode_basic.phpt | 8 ++-- .../strings/htmlspecialchars_decode_error.phpt | 4 +- .../htmlspecialchars_decode_variation1.phpt | 4 +- .../htmlspecialchars_decode_variation2.phpt | 4 +- .../htmlspecialchars_decode_variation3.phpt | 2 +- .../htmlspecialchars_decode_variation4.phpt | 2 +- .../htmlspecialchars_decode_variation5.phpt | 4 +- .../htmlspecialchars_decode_variation6.phpt | Bin 1522 -> 1510 bytes .../tests/strings/http_build_query_variation1.phpt | 4 +- .../tests/strings/http_build_query_variation2.phpt | 18 ++++---- .../tests/strings/http_build_query_variation3.phpt | 2 +- ext/standard/tests/strings/implode1.phpt | Bin 5877 -> 5873 bytes ext/standard/tests/strings/join_basic.phpt | 2 +- ext/standard/tests/strings/join_error.phpt | 4 +- ext/standard/tests/strings/join_variation1.phpt | 2 +- ext/standard/tests/strings/join_variation2.phpt | 2 +- ext/standard/tests/strings/join_variation3.phpt | 12 +++--- ext/standard/tests/strings/join_variation5.phpt | 2 +- ext/standard/tests/strings/join_variation6.phpt | Bin 728 -> 727 bytes ext/standard/tests/strings/lcfirst.phpt | Bin 6963 -> 6951 bytes ext/standard/tests/strings/levenshtein.phpt | 32 +++++++------- ext/standard/tests/strings/ltrim.phpt | 2 +- ext/standard/tests/strings/ltrim_basic.phpt | 8 ++-- ext/standard/tests/strings/ltrim_error.phpt | 2 +- ext/standard/tests/strings/ltrim_variation1.phpt | 18 ++++---- ext/standard/tests/strings/ltrim_variation2.phpt | 18 ++++---- ext/standard/tests/strings/md5_basic1.phpt | 2 +- ext/standard/tests/strings/md5_basic2.phpt | 2 +- ext/standard/tests/strings/md5_file.phpt | Bin 2849 -> 2847 bytes ext/standard/tests/strings/metaphone.phpt | 4 +- .../tests/strings/money_format_basic1.phpt | 8 ++-- .../tests/strings/money_format_variation1.phpt | 24 +++++------ .../tests/strings/money_format_variation2.phpt | 22 +++++----- ext/standard/tests/strings/nl2br.phpt | 4 +- ext/standard/tests/strings/nl2br_error.phpt | 2 +- ext/standard/tests/strings/nl2br_variation1.phpt | 4 +- ext/standard/tests/strings/nl2br_variation5.phpt | 4 +- ext/standard/tests/strings/nl_langinfo_basic.phpt | 6 +-- ext/standard/tests/strings/nl_langinfo_error1.phpt | 4 +- .../tests/strings/nl_langinfo_variation1.phpt | 12 +++--- .../tests/strings/number_format_basic.phpt | 6 +-- .../tests/strings/number_format_error.phpt | 2 +- ext/standard/tests/strings/ord_basic.phpt | 4 +- ext/standard/tests/strings/ord_variation1.phpt | 18 ++++---- ext/standard/tests/strings/pack_float.phpt | 16 +++---- ext/standard/tests/strings/parse_str_basic1.phpt | 6 +-- ext/standard/tests/strings/parse_str_basic2.phpt | 2 +- ext/standard/tests/strings/parse_str_basic3.phpt | Bin 5636 -> 5634 bytes ext/standard/tests/strings/parse_str_error1.phpt | 4 +- ext/standard/tests/strings/pathinfo.phpt | 2 +- .../tests/strings/php_strip_whitespace.phpt | 2 +- ext/standard/tests/strings/print_basic.phpt | 4 +- ext/standard/tests/strings/print_variation1.phpt | 22 +++++----- ext/standard/tests/strings/printf.phpt | 12 +++--- ext/standard/tests/strings/printf_64bit.phpt | 12 +++--- ext/standard/tests/strings/printf_basic2.phpt | 2 +- ext/standard/tests/strings/printf_basic4.phpt | 2 +- ext/standard/tests/strings/printf_basic7.phpt | 2 +- ext/standard/tests/strings/printf_basic8.phpt | 2 +- ext/standard/tests/strings/printf_basic9.phpt | 8 ++-- ext/standard/tests/strings/printf_error.phpt | 4 +- ext/standard/tests/strings/printf_variation1.phpt | 22 +++++----- ext/standard/tests/strings/printf_variation2.phpt | 28 ++++++------- .../strings/quoted_printable_decode_basic.phpt | 4 +- .../strings/quoted_printable_decode_error.phpt | 4 +- .../quoted_printable_decode_variation1.phpt | 18 ++++---- .../tests/strings/quoted_printable_encode_001.phpt | 2 +- ext/standard/tests/strings/quotemeta_basic.phpt | 2 +- ext/standard/tests/strings/rtrim_basic.phpt | 8 ++-- ext/standard/tests/strings/rtrim_error.phpt | 2 +- ext/standard/tests/strings/rtrim_variation1.phpt | 18 ++++---- ext/standard/tests/strings/rtrim_variation2.phpt | 18 ++++---- ext/standard/tests/strings/setlocale_basic1.phpt | 28 ++++++------- ext/standard/tests/strings/setlocale_basic2.phpt | 18 ++++---- ext/standard/tests/strings/setlocale_basic3.phpt | 4 +- ext/standard/tests/strings/setlocale_error.phpt | 4 +- .../tests/strings/setlocale_variation1.phpt | 4 +- .../tests/strings/setlocale_variation2.phpt | 16 +++---- .../tests/strings/setlocale_variation3.phpt | 4 +- .../tests/strings/setlocale_variation4.phpt | 4 +- .../tests/strings/setlocale_variation5.phpt | 6 +-- ext/standard/tests/strings/sha1_error.phpt | 4 +- ext/standard/tests/strings/sha1_file.phpt | 4 +- ext/standard/tests/strings/sha1_variation1.phpt | 20 ++++----- ext/standard/tests/strings/sha1_variation2.phpt | 20 ++++----- ext/standard/tests/strings/show_source_basic.phpt | 6 +-- .../tests/strings/show_source_variation1.phpt | 6 +-- .../tests/strings/show_source_variation2.phpt | 8 ++-- ext/standard/tests/strings/soundex.phpt | 8 ++-- ext/standard/tests/strings/soundex_basic.phpt | 11 +++-- ext/standard/tests/strings/soundex_error.phpt | 7 ++-- ext/standard/tests/strings/sprintf_basic1.phpt | 2 +- ext/standard/tests/strings/sprintf_basic2.phpt | 2 +- ext/standard/tests/strings/sprintf_basic3.phpt | 2 +- ext/standard/tests/strings/sprintf_basic4.phpt | 2 +- ext/standard/tests/strings/sprintf_basic5.phpt | 2 +- ext/standard/tests/strings/sprintf_basic6.phpt | 2 +- ext/standard/tests/strings/sprintf_basic7.phpt | 2 +- .../tests/strings/sprintf_basic7_64bit.phpt | 2 +- ext/standard/tests/strings/sprintf_basic8.phpt | 2 +- .../tests/strings/sprintf_basic8_64bit.phpt | 2 +- ext/standard/tests/strings/sprintf_basic9.phpt | 2 +- ext/standard/tests/strings/sprintf_error.phpt | 6 +-- ext/standard/tests/strings/sprintf_f_2.phpt | 2 +- ext/standard/tests/strings/sprintf_variation1.phpt | 4 +- .../tests/strings/sprintf_variation10.phpt | 4 +- .../tests/strings/sprintf_variation11.phpt | 8 ++-- .../tests/strings/sprintf_variation12.phpt | 10 ++--- .../tests/strings/sprintf_variation13.phpt | 8 ++-- .../tests/strings/sprintf_variation14.phpt | 8 ++-- .../tests/strings/sprintf_variation15.phpt | Bin 7416 -> 7412 bytes .../tests/strings/sprintf_variation16.phpt | 12 +++--- .../tests/strings/sprintf_variation17.phpt | 10 ++--- .../tests/strings/sprintf_variation18.phpt | 10 ++--- .../tests/strings/sprintf_variation19.phpt | 12 +++--- ext/standard/tests/strings/sprintf_variation2.phpt | 10 ++--- .../tests/strings/sprintf_variation20.phpt | 12 +++--- .../tests/strings/sprintf_variation21.phpt | Bin 5046 -> 5042 bytes .../tests/strings/sprintf_variation22.phpt | Bin 2517 -> 2513 bytes .../tests/strings/sprintf_variation23.phpt | 8 ++-- .../tests/strings/sprintf_variation24.phpt | Bin 3464 -> 3458 bytes .../tests/strings/sprintf_variation25.phpt | Bin 4657 -> 4651 bytes .../tests/strings/sprintf_variation26.phpt | Bin 1699 -> 1693 bytes .../tests/strings/sprintf_variation27.phpt | Bin 2693 -> 2687 bytes .../tests/strings/sprintf_variation28.phpt | 6 +-- .../tests/strings/sprintf_variation28_64bit.phpt | 6 +-- .../tests/strings/sprintf_variation29.phpt | 12 +++--- .../tests/strings/sprintf_variation29_64bit.phpt | 12 +++--- ext/standard/tests/strings/sprintf_variation3.phpt | 6 +-- .../tests/strings/sprintf_variation30.phpt | 10 ++--- .../tests/strings/sprintf_variation31.phpt | 12 +++--- .../tests/strings/sprintf_variation32.phpt | 12 +++--- .../tests/strings/sprintf_variation33.phpt | 12 +++--- .../tests/strings/sprintf_variation34.phpt | 10 ++--- .../tests/strings/sprintf_variation34_64bit.phpt | 10 ++--- .../tests/strings/sprintf_variation35.phpt | 10 ++--- .../tests/strings/sprintf_variation35_64bit.phpt | 10 ++--- .../tests/strings/sprintf_variation36.phpt | 8 ++-- .../tests/strings/sprintf_variation37.phpt | 10 ++--- .../tests/strings/sprintf_variation38.phpt | 10 ++--- .../tests/strings/sprintf_variation39.phpt | 10 ++--- ext/standard/tests/strings/sprintf_variation4.phpt | 6 +-- .../tests/strings/sprintf_variation40.phpt | 10 ++--- .../tests/strings/sprintf_variation40_64bit.phpt | 10 ++--- .../tests/strings/sprintf_variation41.phpt | 8 ++-- .../tests/strings/sprintf_variation41_64bit.phpt | 8 ++-- .../tests/strings/sprintf_variation42.phpt | 6 +-- .../tests/strings/sprintf_variation43.phpt | 12 +++--- .../tests/strings/sprintf_variation44.phpt | 12 +++--- .../tests/strings/sprintf_variation44_64bit.phpt | 12 +++--- .../tests/strings/sprintf_variation45.phpt | 12 +++--- .../tests/strings/sprintf_variation46.phpt | 10 ++--- .../tests/strings/sprintf_variation47.phpt | 6 +-- .../tests/strings/sprintf_variation48.phpt | 8 ++-- .../tests/strings/sprintf_variation49.phpt | 10 ++--- .../tests/strings/sprintf_variation4_64bit.phpt | 6 +-- ext/standard/tests/strings/sprintf_variation5.phpt | 8 ++-- .../tests/strings/sprintf_variation50.phpt | 6 +-- .../tests/strings/sprintf_variation51.phpt | 10 ++--- .../tests/strings/sprintf_variation52.phpt | 2 +- .../tests/strings/sprintf_variation53.phpt | 2 +- ext/standard/tests/strings/sprintf_variation6.phpt | 8 ++-- ext/standard/tests/strings/sprintf_variation7.phpt | 8 ++-- ext/standard/tests/strings/sprintf_variation8.phpt | 6 +-- ext/standard/tests/strings/sprintf_variation9.phpt | 4 +- ext/standard/tests/strings/sscanf_basic1.phpt | 6 +-- ext/standard/tests/strings/sscanf_basic2.phpt | 6 +-- ext/standard/tests/strings/sscanf_basic3.phpt | 6 +-- ext/standard/tests/strings/sscanf_basic4.phpt | 6 +-- ext/standard/tests/strings/sscanf_basic5.phpt | 8 ++-- ext/standard/tests/strings/sscanf_basic6.phpt | 6 +-- ext/standard/tests/strings/sscanf_basic7.phpt | 6 +-- ext/standard/tests/strings/sscanf_basic8.phpt | 8 ++-- ext/standard/tests/strings/sscanf_error.phpt | 2 +- ext/standard/tests/strings/sscanf_variation1.phpt | 18 ++++---- ext/standard/tests/strings/sscanf_variation2.phpt | 18 ++++---- ext/standard/tests/strings/str_ireplace.phpt | 2 +- ext/standard/tests/strings/str_pad.phpt | Bin 9818 -> 9812 bytes ext/standard/tests/strings/str_pad_variation1.phpt | 20 ++++----- ext/standard/tests/strings/str_pad_variation2.phpt | 20 ++++----- ext/standard/tests/strings/str_pad_variation3.phpt | 20 ++++----- ext/standard/tests/strings/str_pad_variation4.phpt | 22 +++++----- ext/standard/tests/strings/str_pad_variation5.phpt | 2 +- ext/standard/tests/strings/str_repeat.phpt | Bin 17017 -> 17010 bytes ext/standard/tests/strings/str_replace.phpt | 44 ++++++++++---------- ext/standard/tests/strings/str_replace_basic.phpt | 10 ++--- ext/standard/tests/strings/str_replace_error.phpt | 8 ++-- .../tests/strings/str_replace_variation1.phpt | 12 +++--- .../tests/strings/str_replace_variation2.phpt | Bin 12679 -> 12674 bytes .../tests/strings/str_replace_variation3.phpt | 34 +++++++-------- ext/standard/tests/strings/str_rot13_basic.phpt | 12 +++--- ext/standard/tests/strings/str_shuffle_basic.phpt | 16 +++---- ext/standard/tests/strings/str_shuffle_error.phpt | 2 +- .../tests/strings/str_shuffle_variation1.phpt | 18 ++++---- ext/standard/tests/strings/str_split_basic.phpt | 8 ++-- ext/standard/tests/strings/str_split_error.phpt | 8 ++-- .../tests/strings/str_split_variation1.phpt | 8 ++-- .../tests/strings/str_split_variation2.phpt | 6 +-- .../tests/strings/str_split_variation2_64bit.phpt | 6 +-- .../tests/strings/str_split_variation3.phpt | Bin 3006 -> 3001 bytes .../tests/strings/str_split_variation4.phpt | 10 ++--- .../tests/strings/str_split_variation5.phpt | 14 +++---- .../tests/strings/str_split_variation6.phpt | 8 ++-- .../tests/strings/str_split_variation6_64bit.phpt | 8 ++-- .../tests/strings/str_split_variation7.phpt | 8 ++-- .../tests/strings/str_split_variation7_64bit.phpt | 8 ++-- ext/standard/tests/strings/str_word_count.phpt | 4 +- ext/standard/tests/strings/str_word_count1.phpt | 2 +- ext/standard/tests/strings/strcasecmp.phpt | Bin 22271 -> 22264 bytes ext/standard/tests/strings/strcmp.phpt | Bin 20037 -> 20032 bytes ext/standard/tests/strings/strcoll_error.phpt | 4 +- ext/standard/tests/strings/strcspn_basic.phpt | 4 +- ext/standard/tests/strings/strcspn_error.phpt | 4 +- ext/standard/tests/strings/strcspn_variation1.phpt | 2 +- .../tests/strings/strcspn_variation10.phpt | 4 +- .../tests/strings/strcspn_variation11.phpt | 4 +- .../tests/strings/strcspn_variation12.phpt | 6 +-- ext/standard/tests/strings/strcspn_variation2.phpt | 2 +- ext/standard/tests/strings/strcspn_variation3.phpt | 2 +- ext/standard/tests/strings/strcspn_variation4.phpt | 2 +- ext/standard/tests/strings/strcspn_variation5.phpt | Bin 2421 -> 2420 bytes ext/standard/tests/strings/strcspn_variation6.phpt | 4 +- ext/standard/tests/strings/strcspn_variation7.phpt | 4 +- ext/standard/tests/strings/strcspn_variation8.phpt | 8 ++-- ext/standard/tests/strings/strcspn_variation9.phpt | Bin 2539 -> 2535 bytes ext/standard/tests/strings/strip_tags_basic1.phpt | 8 ++-- ext/standard/tests/strings/strip_tags_error.phpt | 2 +- .../tests/strings/strip_tags_variation1.phpt | 20 ++++----- .../tests/strings/strip_tags_variation11.phpt | 6 +-- .../tests/strings/strip_tags_variation2.phpt | 2 +- .../tests/strings/strip_tags_variation3.phpt | 2 +- .../tests/strings/stripcslashes_basic.phpt | 4 +- .../tests/strings/stripcslashes_error.phpt | 4 +- .../tests/strings/stripcslashes_variation1.phpt | 26 ++++++------ ext/standard/tests/strings/stripos_error.phpt | 2 +- ext/standard/tests/strings/stripos_variation1.phpt | 2 +- .../tests/strings/stripos_variation10.phpt | 6 +-- .../tests/strings/stripos_variation11.phpt | 4 +- .../tests/strings/stripos_variation12.phpt | 4 +- .../tests/strings/stripos_variation13.phpt | 4 +- .../tests/strings/stripos_variation14.phpt | 4 +- .../tests/strings/stripos_variation15.phpt | 4 +- ext/standard/tests/strings/stripos_variation3.phpt | 2 +- ext/standard/tests/strings/stripos_variation4.phpt | 2 +- ext/standard/tests/strings/stripos_variation5.phpt | 4 +- ext/standard/tests/strings/stripos_variation6.phpt | 2 +- ext/standard/tests/strings/stripos_variation7.phpt | 2 +- ext/standard/tests/strings/stripos_variation8.phpt | 2 +- ext/standard/tests/strings/stripos_variation9.phpt | 2 +- ext/standard/tests/strings/stripslashes_basic.phpt | Bin 2036 -> 2033 bytes ext/standard/tests/strings/stripslashes_error.phpt | 2 +- .../tests/strings/stripslashes_variation1.phpt | 24 +++++------ .../tests/strings/stripslashes_variation2.phpt | Bin 9548 -> 9498 bytes .../tests/strings/stripslashes_variation3.phpt | 4 +- .../tests/strings/stripslashes_variation4.phpt | 2 +- ext/standard/tests/strings/stristr_basic.phpt | 2 +- ext/standard/tests/strings/stristr_error.phpt | 2 +- ext/standard/tests/strings/stristr_variation1.phpt | 18 ++++---- ext/standard/tests/strings/stristr_variation2.phpt | 18 ++++---- ext/standard/tests/strings/strlen.phpt | Bin 7101 -> 7085 bytes ext/standard/tests/strings/strlen_basic.phpt | 2 +- ext/standard/tests/strings/strlen_error.phpt | 2 +- ext/standard/tests/strings/strlen_variation1.phpt | 18 ++++---- .../tests/strings/strnatcasecmp_basic.phpt | 6 +-- .../tests/strings/strnatcasecmp_error.phpt | 2 +- .../tests/strings/strnatcasecmp_variation1.phpt | 6 +-- ext/standard/tests/strings/strnatcmp_basic.phpt | 2 +- ext/standard/tests/strings/strncasecmp_basic.phpt | 2 +- ext/standard/tests/strings/strncasecmp_error.phpt | 2 +- .../tests/strings/strncasecmp_variation10.phpt | 6 +-- .../tests/strings/strncasecmp_variation11.phpt | 6 +-- .../tests/strings/strncasecmp_variation3.phpt | 2 +- .../tests/strings/strncasecmp_variation4.phpt | 6 +-- .../tests/strings/strncasecmp_variation8.phpt | 2 +- ext/standard/tests/strings/strncmp_basic.phpt | 2 +- ext/standard/tests/strings/strncmp_error.phpt | 2 +- ext/standard/tests/strings/strncmp_variation1.phpt | 2 +- ext/standard/tests/strings/strncmp_variation4.phpt | 6 +-- ext/standard/tests/strings/strncmp_variation6.phpt | 2 +- ext/standard/tests/strings/strncmp_variation8.phpt | 2 +- ext/standard/tests/strings/strpbrk_basic.phpt | 6 +-- ext/standard/tests/strings/strpbrk_error.phpt | 6 +-- ext/standard/tests/strings/strpos.phpt | Bin 10241 -> 10210 bytes ext/standard/tests/strings/strrchr.phpt | 2 +- ext/standard/tests/strings/strrchr_basic.phpt | 6 +-- ext/standard/tests/strings/strrchr_error.phpt | 4 +- ext/standard/tests/strings/strrchr_variation1.phpt | Bin 4406 -> 4399 bytes .../tests/strings/strrchr_variation10.phpt | 8 ++-- .../tests/strings/strrchr_variation11.phpt | 2 +- ext/standard/tests/strings/strrchr_variation2.phpt | 2 +- ext/standard/tests/strings/strrchr_variation3.phpt | 8 ++-- ext/standard/tests/strings/strrchr_variation4.phpt | 2 +- ext/standard/tests/strings/strrchr_variation5.phpt | 2 +- ext/standard/tests/strings/strrchr_variation7.phpt | 2 +- ext/standard/tests/strings/strrchr_variation9.phpt | 8 ++-- ext/standard/tests/strings/strrev.phpt | 2 +- ext/standard/tests/strings/strrev_basic.phpt | 4 +- ext/standard/tests/strings/strrev_error.phpt | 4 +- ext/standard/tests/strings/strrev_variation1.phpt | Bin 2942 -> 2938 bytes ext/standard/tests/strings/strrev_variation2.phpt | Bin 2955 -> 2952 bytes ext/standard/tests/strings/strrev_variation3.phpt | Bin 1628 -> 1627 bytes ext/standard/tests/strings/strrev_variation4.phpt | 4 +- ext/standard/tests/strings/strripos_basic1.phpt | 2 +- ext/standard/tests/strings/strripos_basic2.phpt | 8 ++-- ext/standard/tests/strings/strripos_error.phpt | 2 +- ext/standard/tests/strings/strripos_offset.phpt | 2 +- .../tests/strings/strripos_variation1.phpt | 34 +++++++-------- .../tests/strings/strripos_variation2.phpt | 28 ++++++------- .../tests/strings/strripos_variation3.phpt | 2 +- .../tests/strings/strripos_variation4.phpt | 2 +- .../tests/strings/strripos_variation5.phpt | 4 +- ext/standard/tests/strings/strrpos_error.phpt | 2 +- ext/standard/tests/strings/strrpos_offset.phpt | 2 +- ext/standard/tests/strings/strrpos_variation1.phpt | 22 +++++----- .../tests/strings/strrpos_variation10.phpt | 6 +-- .../tests/strings/strrpos_variation11.phpt | 4 +- .../tests/strings/strrpos_variation12.phpt | 4 +- .../tests/strings/strrpos_variation13.phpt | 4 +- .../tests/strings/strrpos_variation14.phpt | 4 +- .../tests/strings/strrpos_variation15.phpt | 4 +- ext/standard/tests/strings/strrpos_variation2.phpt | 16 +++---- ext/standard/tests/strings/strrpos_variation3.phpt | 2 +- ext/standard/tests/strings/strrpos_variation4.phpt | 2 +- ext/standard/tests/strings/strrpos_variation5.phpt | 4 +- ext/standard/tests/strings/strrpos_variation6.phpt | 2 +- ext/standard/tests/strings/strrpos_variation7.phpt | 2 +- ext/standard/tests/strings/strrpos_variation8.phpt | 2 +- ext/standard/tests/strings/strrpos_variation9.phpt | 2 +- ext/standard/tests/strings/strspn_basic.phpt | 4 +- ext/standard/tests/strings/strspn_error.phpt | 4 +- ext/standard/tests/strings/strspn_variation1.phpt | 2 +- ext/standard/tests/strings/strspn_variation10.phpt | 4 +- ext/standard/tests/strings/strspn_variation11.phpt | 6 +-- ext/standard/tests/strings/strspn_variation12.phpt | 8 ++-- ext/standard/tests/strings/strspn_variation2.phpt | 2 +- ext/standard/tests/strings/strspn_variation3.phpt | 2 +- ext/standard/tests/strings/strspn_variation4.phpt | 2 +- ext/standard/tests/strings/strspn_variation5.phpt | Bin 2415 -> 2414 bytes ext/standard/tests/strings/strspn_variation6.phpt | 4 +- ext/standard/tests/strings/strspn_variation7.phpt | 4 +- ext/standard/tests/strings/strspn_variation8.phpt | 10 ++--- ext/standard/tests/strings/strspn_variation9.phpt | Bin 2538 -> 2534 bytes ext/standard/tests/strings/strstr.phpt | Bin 10541 -> 10503 bytes ext/standard/tests/strings/strtok_basic.phpt | 2 +- ext/standard/tests/strings/strtok_error.phpt | 6 +-- ext/standard/tests/strings/strtok_variation1.phpt | 2 +- ext/standard/tests/strings/strtok_variation2.phpt | 4 +- ext/standard/tests/strings/strtok_variation5.phpt | 8 ++-- ext/standard/tests/strings/strtok_variation6.phpt | 12 +++--- ext/standard/tests/strings/strtok_variation7.phpt | 6 +-- ext/standard/tests/strings/strtolower-win32.phpt | Bin 4878 -> 4875 bytes ext/standard/tests/strings/strtolower.phpt | Bin 3889 -> 3886 bytes ext/standard/tests/strings/strtoupper1-win32.phpt | Bin 4889 -> 4884 bytes ext/standard/tests/strings/strtoupper1.phpt | Bin 3900 -> 3895 bytes ext/standard/tests/strings/strtr_basic.phpt | 2 +- ext/standard/tests/strings/strtr_error.phpt | 4 +- ext/standard/tests/strings/strtr_variation5.phpt | 22 +++++----- ext/standard/tests/strings/strtr_variation6.phpt | 22 +++++----- ext/standard/tests/strings/strtr_variation7.phpt | 22 +++++----- ext/standard/tests/strings/strtr_variation8.phpt | 6 +-- ext/standard/tests/strings/strtr_variation9.phpt | 18 ++++---- .../tests/strings/strtr_with_reference.phpt | 2 +- ext/standard/tests/strings/strval_basic.phpt | 14 +++---- ext/standard/tests/strings/strval_error.phpt | 6 +-- ext/standard/tests/strings/strval_variation1.phpt | 26 ++++++------ ext/standard/tests/strings/strval_variation2.phpt | 2 +- ext/standard/tests/strings/substr.phpt | Bin 4782 -> 4781 bytes ext/standard/tests/strings/substr_count_basic.phpt | 2 +- ext/standard/tests/strings/substr_count_error.phpt | 4 +- .../tests/strings/substr_count_variation_001.phpt | 6 +-- .../tests/strings/substr_count_variation_002.phpt | 2 +- .../tests/strings/substr_replace_error.phpt | 14 +++---- ext/standard/tests/strings/trim1.phpt | Bin 2046 -> 2045 bytes ext/standard/tests/strings/trim_basic.phpt | 6 +-- ext/standard/tests/strings/trim_error.phpt | 2 +- ext/standard/tests/strings/trim_variation1.phpt | 18 ++++---- ext/standard/tests/strings/trim_variation2.phpt | 18 ++++---- ext/standard/tests/strings/ucfirst.phpt | Bin 6187 -> 6183 bytes ext/standard/tests/strings/ucwords_basic.phpt | 4 +- ext/standard/tests/strings/ucwords_error.phpt | 2 +- ext/standard/tests/strings/ucwords_variation1.phpt | 8 ++-- ext/standard/tests/strings/ucwords_variation3.phpt | 4 +- ext/standard/tests/strings/ucwords_variation4.phpt | 4 +- ext/standard/tests/strings/unpack_error.phpt | 2 +- ext/standard/tests/strings/utf8_decode_error.phpt | 6 +-- .../tests/strings/utf8_decode_variation1.phpt | 4 +- ext/standard/tests/strings/utf8_encode_error.phpt | 4 +- .../tests/strings/utf8_encode_variation1.phpt | 4 +- ext/standard/tests/strings/uuencode.phpt | 2 +- ext/standard/tests/strings/vfprintf_basic.phpt | 6 +-- ext/standard/tests/strings/vfprintf_basic2.phpt | 6 +-- ext/standard/tests/strings/vfprintf_basic3.phpt | 12 +++--- ext/standard/tests/strings/vfprintf_basic5.phpt | 2 +- ext/standard/tests/strings/vfprintf_basic6.phpt | 2 +- ext/standard/tests/strings/vfprintf_basic7.phpt | 2 +- .../tests/strings/vfprintf_basic7_64bit.phpt | 2 +- ext/standard/tests/strings/vfprintf_basic8.phpt | 2 +- ext/standard/tests/strings/vfprintf_error1.phpt | 6 +-- ext/standard/tests/strings/vfprintf_error2.phpt | 6 +-- ext/standard/tests/strings/vfprintf_error3.phpt | 4 +- ext/standard/tests/strings/vfprintf_error4.phpt | 4 +- .../tests/strings/vfprintf_variation1.phpt | 6 +-- .../tests/strings/vfprintf_variation10.phpt | Bin 2979 -> 2974 bytes .../tests/strings/vfprintf_variation12.phpt | 6 +-- .../tests/strings/vfprintf_variation12_64bit.phpt | 6 +-- .../tests/strings/vfprintf_variation14.phpt | 4 +- .../tests/strings/vfprintf_variation14_64bit.phpt | 4 +- .../tests/strings/vfprintf_variation15.phpt | 6 +-- .../tests/strings/vfprintf_variation15_64bit.phpt | 6 +-- .../tests/strings/vfprintf_variation16.phpt | 8 ++-- .../tests/strings/vfprintf_variation16_64bit.phpt | 8 ++-- .../tests/strings/vfprintf_variation17.phpt | 8 ++-- .../tests/strings/vfprintf_variation18.phpt | 8 ++-- .../tests/strings/vfprintf_variation19.phpt | 4 +- .../tests/strings/vfprintf_variation19_64bit.phpt | 4 +- .../tests/strings/vfprintf_variation20.phpt | 18 ++++---- .../tests/strings/vfprintf_variation21.phpt | 18 ++++---- .../tests/strings/vfprintf_variation4.phpt | 4 +- .../tests/strings/vfprintf_variation4_64bit.phpt | 4 +- .../tests/strings/vfprintf_variation6.phpt | 4 +- .../tests/strings/vfprintf_variation8.phpt | 8 ++-- .../tests/strings/vfprintf_variation9.phpt | Bin 1870 -> 1869 bytes ext/standard/tests/strings/vprintf_basic1.phpt | 2 +- ext/standard/tests/strings/vprintf_basic2.phpt | 2 +- ext/standard/tests/strings/vprintf_basic3.phpt | 2 +- ext/standard/tests/strings/vprintf_basic4.phpt | 2 +- ext/standard/tests/strings/vprintf_basic5.phpt | 2 +- ext/standard/tests/strings/vprintf_basic6.phpt | 2 +- ext/standard/tests/strings/vprintf_basic7.phpt | 2 +- .../tests/strings/vprintf_basic7_64bit.phpt | 2 +- ext/standard/tests/strings/vprintf_basic8.phpt | 8 ++-- ext/standard/tests/strings/vprintf_basic9.phpt | 2 +- ext/standard/tests/strings/vprintf_error.phpt | 6 +-- ext/standard/tests/strings/vprintf_variation1.phpt | 24 +++++------ .../tests/strings/vprintf_variation10.phpt | Bin 2783 -> 2776 bytes .../tests/strings/vprintf_variation11.phpt | 6 +-- .../tests/strings/vprintf_variation11_64bit.phpt | 6 +-- .../tests/strings/vprintf_variation12.phpt | 10 ++--- .../tests/strings/vprintf_variation12_64bit.phpt | 8 ++-- .../tests/strings/vprintf_variation13.phpt | 4 +- .../tests/strings/vprintf_variation13_64bit.phpt | 4 +- .../tests/strings/vprintf_variation14.phpt | 8 ++-- .../tests/strings/vprintf_variation14_64bit.phpt | 10 ++--- .../tests/strings/vprintf_variation15.phpt | 10 ++--- .../tests/strings/vprintf_variation15_64bit.phpt | 8 ++-- .../tests/strings/vprintf_variation16.phpt | 8 ++-- .../tests/strings/vprintf_variation16_64bit.phpt | 10 ++--- .../tests/strings/vprintf_variation17.phpt | 8 ++-- .../tests/strings/vprintf_variation18.phpt | 6 +-- .../tests/strings/vprintf_variation19.phpt | 2 +- .../tests/strings/vprintf_variation19_64bit.phpt | 4 +- ext/standard/tests/strings/vprintf_variation2.phpt | 20 ++++----- ext/standard/tests/strings/vprintf_variation3.phpt | 4 +- ext/standard/tests/strings/vprintf_variation4.phpt | 6 +-- .../tests/strings/vprintf_variation4_64bit.phpt | 8 ++-- ext/standard/tests/strings/vprintf_variation5.phpt | 4 +- ext/standard/tests/strings/vprintf_variation6.phpt | 8 ++-- ext/standard/tests/strings/vprintf_variation7.phpt | Bin 2230 -> 2226 bytes ext/standard/tests/strings/vprintf_variation8.phpt | 12 +++--- ext/standard/tests/strings/vprintf_variation9.phpt | Bin 1696 -> 1691 bytes ext/standard/tests/strings/vsprintf_basic1.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic2.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic3.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic4.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic5.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic6.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic7.phpt | 2 +- .../tests/strings/vsprintf_basic7_64bit.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic8.phpt | 2 +- ext/standard/tests/strings/vsprintf_basic9.phpt | 2 +- ext/standard/tests/strings/vsprintf_error.phpt | 6 +-- .../tests/strings/vsprintf_variation1.phpt | 6 +-- .../tests/strings/vsprintf_variation10.phpt | Bin 2779 -> 2772 bytes .../tests/strings/vsprintf_variation11.phpt | 4 +- .../tests/strings/vsprintf_variation11_64bit.phpt | 4 +- .../tests/strings/vsprintf_variation12.phpt | 8 ++-- .../tests/strings/vsprintf_variation12_64bit.phpt | 8 ++-- .../tests/strings/vsprintf_variation13.phpt | 4 +- .../tests/strings/vsprintf_variation13_64bit.phpt | 4 +- .../tests/strings/vsprintf_variation14.phpt | 8 ++-- .../tests/strings/vsprintf_variation14_64bit.phpt | 8 ++-- .../tests/strings/vsprintf_variation15.phpt | 8 ++-- .../tests/strings/vsprintf_variation15_64bit.phpt | 8 ++-- .../tests/strings/vsprintf_variation16.phpt | 8 ++-- .../tests/strings/vsprintf_variation16_64bit.phpt | 8 ++-- .../tests/strings/vsprintf_variation17.phpt | 8 ++-- .../tests/strings/vsprintf_variation18.phpt | 6 +-- .../tests/strings/vsprintf_variation19.phpt | 2 +- .../tests/strings/vsprintf_variation19_64bit.phpt | 2 +- .../tests/strings/vsprintf_variation2.phpt | 2 +- .../tests/strings/vsprintf_variation3.phpt | 4 +- .../tests/strings/vsprintf_variation4.phpt | 6 +-- .../tests/strings/vsprintf_variation4_64bit.phpt | 6 +-- .../tests/strings/vsprintf_variation5.phpt | 4 +- .../tests/strings/vsprintf_variation6.phpt | 8 ++-- .../tests/strings/vsprintf_variation7.phpt | Bin 2238 -> 2234 bytes .../tests/strings/vsprintf_variation8.phpt | 10 ++--- .../tests/strings/vsprintf_variation9.phpt | Bin 1707 -> 1703 bytes ext/standard/tests/strings/wordwrap_basic.phpt | 2 +- ext/standard/tests/strings/wordwrap_error.phpt | 6 +-- .../tests/strings/wordwrap_variation1.phpt | 2 +- .../tests/strings/wordwrap_variation2.phpt | 8 ++-- .../tests/strings/wordwrap_variation3.phpt | 4 +- .../tests/strings/wordwrap_variation5.phpt | 2 +- ext/standard/tests/time/001.phpt | 4 +- ext/standard/tests/time/strptime_basic.phpt | 14 +++---- ext/standard/tests/time/strptime_error.phpt | 10 ++--- ext/standard/tests/time/strptime_parts.phpt | 14 +++---- .../tests/url/base64_decode_basic_001.phpt | 4 +- .../tests/url/base64_decode_basic_002.phpt | 4 +- .../tests/url/base64_decode_error_001.phpt | 4 +- .../tests/url/base64_decode_variation_001.phpt | 30 +++++++------- .../tests/url/base64_decode_variation_002.phpt | 22 +++++----- .../tests/url/base64_encode_basic_001.phpt | 6 +-- .../tests/url/base64_encode_basic_002.phpt | 10 ++--- .../tests/url/base64_encode_error_001.phpt | 4 +- .../tests/url/base64_encode_variation_001.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_001.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_002.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_003.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_004.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_005.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_006.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_007.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_008.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_009.phpt | 6 +-- ext/standard/tests/url/parse_url_basic_010.phpt | 6 +-- ext/standard/tests/url/parse_url_error_001.phpt | 4 +- ext/standard/tests/url/parse_url_error_002.phpt | 4 +- .../tests/url/parse_url_variation_001.phpt | 4 +- .../tests/url/parse_url_variation_002_32bit.phpt | 4 +- .../tests/url/parse_url_variation_002_64bit.phpt | 4 +- ext/standard/tests/url/rawurldecode_error_001.phpt | 4 +- .../tests/url/rawurldecode_variation_001.phpt | 4 +- ext/standard/tests/url/rawurlencode_error_001.phpt | 6 +-- .../tests/url/rawurlencode_variation_001.phpt | 4 +- ext/standard/tests/url/urldecode_error_001.phpt | 6 +-- .../tests/url/urldecode_variation_001.phpt | 4 +- ext/standard/tests/url/urlencode_error_001.phpt | 6 +-- .../tests/url/urlencode_variation_001.phpt | 4 +- .../versioning/php_sapi_name_variation001.phpt | 2 +- 2741 files changed, 8738 insertions(+), 8746 deletions(-) (limited to 'ext/standard') diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index f72493215f..99b1fc27d7 100644 --- a/ext/standard/tests/array/005.phpt +++ b/ext/standard/tests/array/005.phpt @@ -16,7 +16,7 @@ $str = "abc"; /* Various combinations of arrays to be used for the test */ $mixed_array = array( array(), - array( 1,2,3,4,5,6,7,8,9 ), + array( 1,2,3,4,5,6,7,8,9 ), array( "One", "_Two", "Three", "Four", "Five" ), array( 6, "six", 7, "seven", 8, "eight", 9, "nine" ), array( "a" => "aaa", "A" => "AAA", "c" => "ccc", "d" => "ddd", "e" => "eee" ), @@ -52,13 +52,13 @@ var_dump( array_shift($empty_array) ); echo "\n*** Testing with various array inputs ***\n"; $counter = 1; -foreach( $mixed_array as $sub_array ) { +foreach( $mixed_array as $sub_array ) { echo "\n-- Input Array for Iteration $counter is -- \n"; print_r( $sub_array ); echo "\nOutput after shift is :\n"; var_dump( array_shift($sub_array) ); $counter++; -} +} /*Checking for internal array pointer beint reset when shift is called */ diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index e0618ad70e..c338265b5e 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -2,7 +2,7 @@ Test key(), current(), next() & reset() functions --FILE-- returns the index element of the current array position mixed current ( array &$array ) -> returns the current element in the array mixed next ( array &$array ) -> similar to current() but advances the internal pointer to next element @@ -19,16 +19,16 @@ $basic_arrays = array ( array('d' => 'drink', 'p' => 'port', 's' => 'set'), // another associative array array(1 => 'One', 2 => 'two', 3 => "three") // associative array with key as integers ); - + $varient_arrays = array ( array(), // empty array array(""), // array with null string - array(NULL),// array with NULL + array(NULL),// array with NULL array(null),// array with null array(NULL, true, null, "", 1), // mixed array - array(-1.5 => "test", -2 => "rest", 2.5 => "two", + array(-1.5 => "test", -2 => "rest", 2.5 => "two", "" => "string", 0 => "zero", "" => "" ) // mixed array -); +); echo "*** Testing basic operations ***\n"; $loop_count = 1; @@ -69,7 +69,7 @@ foreach ($varient_arrays as $sub_array ) { echo "\n"; } -/*test these functions on array which is already unset */ +/*test these functions on array which is already unset */ echo "\n-- Testing variation: when array is unset --\n"; $unset_array = array (1); unset($unset_array); @@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) ); var_dump( reset($temp_array, $temp_array) ); var_dump( next($temp_array, $temp_array) ); -// invalid args type, valid argument: array +// invalid args type, valid argument: array $int_var = 1; $float_var = 1.5; $string = "string"; @@ -116,7 +116,7 @@ var_dump( reset($string) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing basic operations *** -- Iteration 1 -- int(0) diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt index 3123458252..0721c00623 100644 --- a/ext/standard/tests/array/array_change_key_case.phpt +++ b/ext/standard/tests/array/array_change_key_case.phpt @@ -3,10 +3,10 @@ Test array_change_key_case() function --FILE-- 1, "TWO" => 2), array ("OnE" => 1, "TWO" => 2), array ("oNe" => 1, "TWO" => 2), - array ("one" => 1, "TwO" => 2), + array ("one" => 1, "TwO" => 2), array ("ONE" => 1, "TwO" => 2), array ("OnE" => 1, "TwO" => 2), array ("oNe" => 1, "TwO" => 2), diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt index 2a6148e251..cad38e4ac7 100644 --- a/ext/standard/tests/array/array_change_key_case_variation.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation.phpt @@ -6,17 +6,17 @@ Test array_change_key_case() function - 2 $item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four"); /* use 'case' argument other than CASE_LOWER & CASE_UPPER */ -var_dump(array_change_key_case($item, "CASE_UPPER")); -var_dump(array_change_key_case($item, 5)); +var_dump(array_change_key_case($item, "CASE_UPPER")); +var_dump(array_change_key_case($item, 5)); /* when keys are different in terms of only case */ /* should return one value key pair with key being in lowercase */ -var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); -var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); /* should return one value key pair with key being in uppercase */ -var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); -var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); echo "end\n"; ?> 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 86653930f1..8a7c805390 100644 --- a/ext/standard/tests/array/array_change_key_case_variation1.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - Pass different data t --FILE-- 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -49,7 +49,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), @@ -63,7 +63,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', diff --git a/ext/standard/tests/array/array_change_key_case_variation4.phpt b/ext/standard/tests/array/array_change_key_case_variation4.phpt index ad9ad75a38..3bd3035c63 100644 --- a/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - different int values --FILE-- --EXPECTF-- Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index 56a90f479b..c16d2988e3 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -20,19 +20,19 @@ $input_arrays = array ( // associative arrays - key as string array('key1' => 1, "key2" => 2, "key3" => 3), - + // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), - // array containing elements with/witout keys + // array containing elements with/witout keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) -); +); $count = 1; // loop through each element of the array for input -foreach ($input_arrays as $input_array){ - echo "\n-- Iteration $count --\n"; +foreach ($input_arrays as $input_array){ + echo "\n-- Iteration $count --\n"; var_dump( array_chunk($input_array, $size) ); $count++; } diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index f96d863e12..3ef9851b0e 100644 --- a/ext/standard/tests/array/array_chunk_basic2.phpt +++ b/ext/standard/tests/array/array_chunk_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : basic functionality - 'preserve_keys' as true/false +Test array_chunk() function : basic functionality - 'preserve_keys' as true/false --FILE-- 1, "key2" => 2, "key3" => 3), - + // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), // array containing elements with/without keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) -); +); $count = 1; // loop through each element of the array for input -foreach ($input_arrays as $input_array){ - echo "\n-- Iteration $count --\n"; +foreach ($input_arrays as $input_array){ + echo "\n-- Iteration $count --\n"; var_dump( array_chunk($input_array, $size, true) ); var_dump( array_chunk($input_array, $size, false) ); $count++; diff --git a/ext/standard/tests/array/array_chunk_error.phpt b/ext/standard/tests/array/array_chunk_error.phpt index 5197945994..d2cbbe16e3 100644 --- a/ext/standard/tests/array/array_chunk_error.phpt +++ b/ext/standard/tests/array/array_chunk_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_chunk() function : error conditions +Test array_chunk() function : error conditions --FILE-- array(), - "array2" => array(1, 2, 3), - "array3" => array(1) + "array1" => array(), + "array2" => array(1, 2, 3), + "array3" => array(1) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; var_dump( array_chunk($input_array, $size) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; var_dump( array_chunk($input_array, $size, true) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; var_dump( array_chunk($input_array, $size, false) ); echo "Done"; diff --git a/ext/standard/tests/array/array_chunk_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt index 8d36092822..50050892e7 100644 --- a/ext/standard/tests/array/array_chunk_variation5.phpt +++ b/ext/standard/tests/array/array_chunk_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : usage variations - different 'size' values +Test array_chunk() function : usage variations - different 'size' values --FILE-- array(1), - + // associative array with duplicate keys "array3" => array("a" => 1, "b" => 2, "c" => 3, "a" => 4, "d" => 5) diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index c8a71964f1..7ba5c279bf 100644 --- a/ext/standard/tests/array/array_chunk_variation7.phpt +++ b/ext/standard/tests/array/array_chunk_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : usage variations - references +Test array_chunk() function : usage variations - references --FILE-- &$numbers[0], - "two" => &$numbers[1], +$input_array = array ( + "one" => &$numbers[0], + "two" => &$numbers[1], "three" => &$numbers[2], "four" => &$numbers[3] ); diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt index 5d855cfec6..52a6237c2d 100644 --- a/ext/standard/tests/array/array_combine_basic.phpt +++ b/ext/standard/tests/array/array_combine_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test array_combine() function : basic functionality +Test array_combine() function : basic functionality --FILE-- 0, 2 => "float", 4 => "f3", 33333333 => "f4", - "\tHello" => 111, 2.2, 'color', "Hello world" => "string", + "\tHello" => 111, 2.2, 'color', "Hello world" => "string", "pen\n" => 33, new classA() => 11, 133 => "int"); // loop through each sub-array within $arrays to check the behavior of array_combine() diff --git a/ext/standard/tests/array/array_combine_variation5.phpt b/ext/standard/tests/array/array_combine_variation5.phpt index 4d9f185786..db5c90df34 100644 --- a/ext/standard/tests/array/array_combine_variation5.phpt +++ b/ext/standard/tests/array/array_combine_variation5.phpt @@ -60,8 +60,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt index 94c7b4d664..5bd3652a4e 100644 --- a/ext/standard/tests/array/array_combine_variation6.phpt +++ b/ext/standard/tests/array/array_combine_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_combine() function : usage variations - binary safe checking +Test array_combine() function : usage variations - binary safe checking --FILE-- diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt index 843e34ee59..5578693beb 100644 --- a/ext/standard/tests/array/array_count_values_error.phpt +++ b/ext/standard/tests/array/array_count_values_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_count_values() function : Invalid parameters +Test array_count_values() function : Invalid parameters --FILE-- "green", "b" => "brown", "c" => "blue", "red", ""); $array2 = array("a" => "green", "yellow", "red", TRUE); diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt index c6b3aef00b..ecf0c7079e 100644 --- a/ext/standard/tests/array/array_diff_assoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt @@ -3,8 +3,8 @@ Test array_diff_assoc() function : basic functionality --FILE-- "hello", +$array1 = array( b"1", + b"hello", + "world", + "str1" => "hello", "str2" => "world"); $array2 = array( b"1" => 'hello', b"world", - "hello", + "hello", 'test'); var_dump(array_diff_assoc($array1, $array2)); diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index 5de94424e8..0ea6480b9e 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations - unexpected values for 'ar --FILE-- array( +'int' => array( 0, 1, 12345, @@ -46,7 +46,7 @@ $inputs = array( // float data /*2*/ -'float' => array( +'float' => array( 10.5, -10.5, 12.3456789000e10, @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE), - + // empty data /*5*/ 'empty' => array( @@ -79,13 +79,13 @@ $inputs = array( "string", 'string', $heredoc), - + // binary data /*7*/ 'binary' => array( b"binary", (binary)"binary"), - + // object data /*8*/ 'object' => array( diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index 34e979ab29..cd1aafedef 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -4,16 +4,16 @@ Test array_diff_assoc() function : usage variations - arrays with different data array( +'int' => array( 0 => 'zero', 1 => 'one', 12345 => 'positive', @@ -40,7 +40,7 @@ $inputs = array( // float data /*2*/ -'float' => array( +'float' => array( 10.5 => 'float 1', -10.5 => 'float 2', .5 => 'float 3'), @@ -58,7 +58,7 @@ $inputs = array( false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'), - + // empty data /*5*/ 'empty' => array( @@ -71,7 +71,7 @@ $inputs = array( "string" => 'stringd', 'string' => 'strings', $heredoc => 'stringh'), - + // binary data /*7*/ 'binary' => array( diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index c89c656421..c949191c1f 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt @@ -3,8 +3,8 @@ Test array_diff_assoc() function : usage variations - compare integers, floats a --FILE-- 1, +$array = array ('zero', + 1 => 1, 'two' => 2.00000000000001); - + $inputs = array ( //default keys => string values /*1*/ array('2.00000000000001', '1', 'zero', 'a'), - + //numeric keys => string values -/*2*/ array(2 => '2.00000000000001', - 1 => '1', - 0 => 'zero', +/*2*/ array(2 => '2.00000000000001', + 1 => '1', + 0 => 'zero', 3 => 'a'), //string keys => string values -/*3*/ array('2' => '2.00000000000001', - '1' => '1', - '0' => 'zero', +/*3*/ array('2' => '2.00000000000001', + '1' => '1', + '0' => 'zero', '3' => 'a') , - + //default keys => numeric values /*4*/ array(2, 1, 0), - + //numeric keys => numeric values /*5*/ array(2 => 2, 1 => 1, 0 => 0), - + //string keys => numeric values -/*6*/ array('two' => 2, - '1' => 1, +/*6*/ array('two' => 2, + '1' => 1, '0' => 0), - + //defualt keys => float values /*7*/ array(2.00000000000001, 1.00, 0.01E-9), - + //numeric keys => float values /*8*/ array(2 => 2.00000000000001, 1 => 1.00, 0 => 0.01E-9), - + //string keys => float values -/*9*/ array ('two' => 2.00000000000001, - '1' => 1.00, +/*9*/ array ('two' => 2.00000000000001, + '1' => 1.00, '0' =>0.01E-9) ); diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt index 6fab0aebfd..a2de41bc08 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt @@ -4,8 +4,8 @@ Test array_diff_assoc() function : usage variations - arrays containing referenc 'd', 'b'); //duplicate key (0), duplicate value (b) $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', - '0' => 'a', - 'b' => '3', //key and value from array_index swapped + '0' => 'a', + 'b' => '3', //key and value from array_index swapped 'c' => 2); //same as above, using integer var_dump(array_diff_assoc($array_index, $array_assoc)); diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index 5ab6232659..56e0a0bd43 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -3,14 +3,14 @@ Test array_diff_assoc() function : usage variations - compare multidimensional a --FILE-- array (1, 3, 5), echo "-- Compare two 2-D arrays --\n"; var_dump(array_diff_assoc($array1, $array2)); var_dump(array_diff_assoc($array2, $array1)); - + echo "\n-- Compare subarrays from two 2-D arrays --\n"; var_dump(array_diff_assoc($array1['sub_array1'], $array2['sub_arraya'])); var_dump(array_diff_assoc($array2['sub_arraya'], $array1['sub_array1'])); diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt index 30aead657c..668f6fe3e7 100644 --- a/ext/standard/tests/array/array_diff_basic.phpt +++ b/ext/standard/tests/array/array_diff_basic.phpt @@ -3,8 +3,8 @@ Test array_diff() function : basic functionality --FILE-- '-07', 0xA => '0xA'); +$input_array = array(-07 => '-07', 0xA => '0xA'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index f777953c59..72dca96826 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -3,15 +3,15 @@ Test array_diff_key() function : usage variation - Passing float indexed array --FILE-- '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; // loop through each element of the array for arr1 diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 48334fc0a9..b98b5b54e8 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing boolean indexed array --FILE-- '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_diff_key() function with boolean indexed array --\n"; diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index c2e806c009..53807cb115 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing null,unset and undefi --FILE-- '10', "" => 'empty'); +$input_array = array(10 => '10', "" => 'empty'); //get an unset variable $unset_var = 10; @@ -27,7 +27,7 @@ foreach($input_arrays as $key =>$value) { // loop through each element of the array for arr1 var_dump( array_diff_key($input_array, $value) ); var_dump( array_diff_key($value, $input_array) ); -} +} ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 3242e6970b..25b445d00a 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_diff_key() function : usage variation - Passing multi-dimensional array +Test array_diff_key() function : usage variation - Passing multi-dimensional array --FILE-- array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 => 'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - - 'fourth' => array(2 => 'two'), + + 'fourth' => array(2 => 'two'), ); echo "\n-- Testing array_diff_key() function with multi dimensional array --\n"; diff --git a/ext/standard/tests/array/array_diff_uassoc_basic.phpt b/ext/standard/tests/array/array_diff_uassoc_basic.phpt index 6a96be6b7c..419b916fd8 100644 --- a/ext/standard/tests/array/array_diff_uassoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_diff_uassoc(): Basic test +array_diff_uassoc(): Basic test --FILE-- '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_uassoc($input_array, $float_indx_array, "strcasecmp") ); var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") ); - + ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index b77df32796..3d984899e0 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing boolean indexed ar --FILE-- '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_uassoc($input_array, $boolean_indx_array, "strcasecmp") ); var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") ); - + ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 9d48231a3f..6106bfd3c0 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing null,unset and und --FILE-- '10', "" => ''); +$input_array = array(10 => '10', "" => ''); //get an unset variable $unset_var = 10; @@ -27,8 +27,8 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") ); var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") ); -} - +} + ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt index 92194262ab..f817452be2 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variations - arrays containing referen --FILE-- 10, 12 => 12); +$input_array = array(10 => 10, 12 => 12); $input_arrays = array( 'decimal indexed' => array(10 => 10, -17 => -17), @@ -23,8 +23,8 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") ); var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") ); -} - +} + ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_diff_ukey_basic.phpt b/ext/standard/tests/array/array_diff_ukey_basic.phpt index 7ac309a01e..3dde1646af 100644 --- a/ext/standard/tests/array/array_diff_ukey_basic.phpt +++ b/ext/standard/tests/array/array_diff_ukey_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_diff_ukey() : Basic test. +array_diff_ukey() : Basic test. --FILE-- 1, 'red' => 2, 'green' => 3, 'purple' => 4); $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8); $extra_arg = 10; diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt index 9a849e0ebf..e2234595ad 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to --FILE-- array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 => 'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - - 'fourth' => array(2 => 'two'), + + 'fourth' => array(2 => 'two'), ); echo "\n-- Testing array_diff_ukey() function with multi dimensional array --\n"; diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index 2188a88dda..c6bb1ccbc6 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing integer indexed arra --FILE-- '-07', 0xA => '0xA'); +$input_array = array(-07 => '-07', 0xA => '0xA'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index 88888d6b37..03f18ee967 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -3,15 +3,15 @@ Test array_diff_ukey() function : usage variation - Passing float indexed array --FILE-- '0', 10 => '10', -10 => '-10', 20 =>'20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); function key_compare_func($key1, $key2) { diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index 9bb9498996..26830f3f4e 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing boolean indexed arra --FILE-- '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); function key_compare_func($key1, $key2) diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index 024f5f4247..1bfbddad15 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing null,unset and undef --FILE-- '10', "" => 'empty'); +$input_array = array(10 => '10', "" => 'empty'); //get an unset variable $unset_var = 10; @@ -26,7 +26,7 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_ukey($value, $input_array, 'strcasecmp') ); var_dump( array_diff_ukey($input_array, $value, 'strcasecmp') ); -} +} ?> ===DONE=== diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index f9a34b0a59..06cb3d6981 100644 --- a/ext/standard/tests/array/array_diff_variation1.phpt +++ b/ext/standard/tests/array/array_diff_variation1.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - unexpected values for 'arr1' arg --FILE-- "hello", +$array1 = array( b"1", + b"hello", + "world", + "str1" => "hello", "str2" => "world"); $array2 = array( b"1" => 'hello', b"world", - "hello", + "hello", 'test'); var_dump(array_diff($array1, $array2)); diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index be68c40c2f..70bfc05fc0 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - unexpected values for 'arr2' arg --FILE-- array( +"null" => array( // null data NULL, null), @@ -64,7 +64,7 @@ $values = array( FALSE), /*6*/ -"empty" => array( +"empty" => array( // empty data "", ''), @@ -75,20 +75,20 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ + +/*8*/ "binary" => array( // binary data b"binary", (binary)"binary"), - -/*9*/ + +/*9*/ "undefined" => array( // undefined data @$undefined_var), /*10*/ -"unset" => array( +"unset" => array( // unset data @$unset_var) ); diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 75b01adaa1..cb0dcc315a 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - array with different data types --FILE-- array( +"null" => array( // null data NULL, null), @@ -64,7 +64,7 @@ $values = array( FALSE), /*6*/ -"empty" => array( +"empty" => array( // empty data "", ''), @@ -75,20 +75,20 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ + +/*8*/ "binary" => array( // binary data b"binary", (binary)"binary"), - -/*9*/ + +/*9*/ "undefined" => array( // undefined data @$undefined_var), /*10*/ -"unset" => array( +"unset" => array( // unset data @$unset_var) ); diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index cb6b5d3dab..d9e97f5606 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_diff() function : usage variations - comparing integers, float +Test array_diff() function : usage variations - comparing integers, float and string array values --FILE-- 'd', 'b'); //duplicate key (0), duplicate value (b) $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', - '0' => 'a', - 'b' => '3', //key and value from array_index swapped + '0' => 'a', + 'b' => '3', //key and value from array_index swapped 'c' => 2); //same as above, using integer var_dump(array_diff($array_index, $array_assoc)); diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt index c53cbb3d1c..3577c9d14b 100644 --- a/ext/standard/tests/array/array_diff_variation7.phpt +++ b/ext/standard/tests/array/array_diff_variation7.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - arrays containing referenced var --FILE-- diff --git a/ext/standard/tests/array/array_fill_error.phpt b/ext/standard/tests/array/array_fill_error.phpt index 33ee2b3858..2fbdb850c3 100644 --- a/ext/standard/tests/array/array_fill_error.phpt +++ b/ext/standard/tests/array/array_fill_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_fill() function : error conditions +Test array_fill() function : error conditions --FILE-- diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index 10fcc9c2eb..c8b67a7def 100644 --- a/ext/standard/tests/array/array_fill_variation5.phpt +++ b/ext/standard/tests/array/array_fill_variation5.phpt @@ -3,7 +3,7 @@ Test array_fill() function : usage variations - different types of array values --FILE-- "Hi" , 2 => "Hello"), @@ -32,11 +32,11 @@ $values = array( array( true => "red" , FALSE => "green" ), /* 10 */ array( 1 => "Hi" , "color" => "red" , 'item' => 'pen'), array( NULL => "Hi", '1' => "Hello" , "1" => "Green"), - array( ""=>1, "color" => "green"), + array( ""=>1, "color" => "green"), /* 13 */ array('Saffron' , 'White' , 'Green') ); -// loop through each element of the values array for 'val' argument +// loop through each element of the values array for 'val' argument // check the working of array_fill() echo "--- Testing array_fill() with different types of array values for 'val' argument ---\n"; $counter = 1; @@ -44,7 +44,7 @@ for($i = 0; $i < count($values); $i++) { echo "-- Iteration $counter --\n"; $val = $values[$i]; - + var_dump( array_fill($start_key , $num , $val) ); $counter++; diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt index 94f8e39331..ba27a59c96 100644 --- a/ext/standard/tests/array/array_filter.phpt +++ b/ext/standard/tests/array/array_filter.phpt @@ -31,7 +31,7 @@ var_dump(array_filter("", null)); var_dump(array_filter($array1, 1)); echo '== DONE =='; -?> +?> --EXPECTF-- Odd : array(3) { diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt index daec07bacd..0b59c1cb75 100644 --- a/ext/standard/tests/array/array_filter_basic.phpt +++ b/ext/standard/tests/array/array_filter_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : basic functionality +Test array_filter() function : basic functionality --FILE-- 0 ) { + if($input > 0 ) { return true; } else { diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index 66b140a224..1f267908ea 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -3,12 +3,12 @@ Test array_filter() function : usage variations - 'input' argument with differen --FILE-- diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index 1020c28aad..df13dc2d12 100644 --- a/ext/standard/tests/array/array_filter_variation6.phpt +++ b/ext/standard/tests/array/array_filter_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : usage variations - 'input' array containing references +Test array_filter() function : usage variations - 'input' array containing references --FILE-- diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt index 79fb574e23..1e46800c5d 100644 --- a/ext/standard/tests/array/array_filter_variation7.phpt +++ b/ext/standard/tests/array/array_filter_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : usage variations - anonymous callback functions +Test array_filter() function : usage variations - anonymous callback functions --FILE-- 1, - "b" => 1, - "c" => 2, - "z" => 0, - "d" => TRUE, - "E" => FALSE, - "F" => NULL, - 0 => "G", - 1 => "h", +$trans = array("a" => 1, + "b" => 1, + "c" => 2, + "z" => 0, + "d" => TRUE, + "E" => FALSE, + "F" => NULL, + 0 => "G", + 1 => "h", 2 => "i"); $trans = array_flip($trans); var_dump($trans); diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index 08a63fb66b..c704b295fe 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test array_flip() function : basic functionality +Test array_flip() function : basic functionality --FILE-- value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ echo "*** Testing array_flip() : basic functionality ***\n"; // array with default keys - numeric values -$input = array(1, 2); +$input = array(1, 2); var_dump( array_flip($input) ); // array with default keys - string values @@ -18,7 +18,7 @@ $input = array('value1', "value2"); var_dump( array_flip($input) ); // associative arrays - key as string -$input = array('key1' => 1, "key2" => 2); +$input = array('key1' => 1, "key2" => 2); var_dump( array_flip($input) ); // associative arrays - key as numeric diff --git a/ext/standard/tests/array/array_flip_error.phpt b/ext/standard/tests/array/array_flip_error.phpt index 3aa0f98271..c193a00896 100644 --- a/ext/standard/tests/array/array_flip_error.phpt +++ b/ext/standard/tests/array/array_flip_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_flip() function : error conditions +Test array_flip() function : error conditions --FILE-- value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt index f03c377422..5dd84e600b 100644 --- a/ext/standard/tests/array/array_flip_variation1.phpt +++ b/ext/standard/tests/array/array_flip_variation1.phpt @@ -3,7 +3,7 @@ Test array_flip() function : usage variations - unexpected values for 'input' ar --FILE-- value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ @@ -24,7 +24,7 @@ class MyClass //resource variable $fp = fopen(__FILE__,'r'); - + //array of values for 'input' argument $values = array( // int data diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt index 997c391306..8d86210f0f 100644 Binary files a/ext/standard/tests/array/array_flip_variation2.phpt and b/ext/standard/tests/array/array_flip_variation2.phpt differ diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt index 1d56dfa6e0..b1159d4382 100644 Binary files a/ext/standard/tests/array/array_flip_variation3.phpt and b/ext/standard/tests/array/array_flip_variation3.phpt differ diff --git a/ext/standard/tests/array/array_flip_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt index 2420c7e00f..b8badb0caa 100644 --- a/ext/standard/tests/array/array_flip_variation4.phpt +++ b/ext/standard/tests/array/array_flip_variation4.phpt @@ -3,7 +3,7 @@ Test array_flip() function : usage variations - 'input' argument with different --FILE-- value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ @@ -38,7 +38,7 @@ $input = array( 'bool_value2' => false, 'bool_value3' => TRUE, 'bool_value4' => FALSE, - + // null values 'null_value1' => null, @@ -51,7 +51,7 @@ $input = array( // resource value 'resource_value' => $fp, ); - + var_dump( array_flip($input) ); // closing resource diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt index 29222a12ce..f39a49069a 100644 --- a/ext/standard/tests/array/array_flip_variation5.phpt +++ b/ext/standard/tests/array/array_flip_variation5.phpt @@ -3,7 +3,7 @@ Test array_flip() function : usage variations - 'input' argument with repeatitiv --FILE-- value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index bf0f2195a1..d509487ec5 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test array_intersect_assoc() function : basic functionality +Test array_intersect_assoc() function : basic functionality --FILE-- 1, "two" => 2); +$arr3 = array(1, 2, "one" => 1, "two" => 2); // get an unset variable $unset_var = 10; @@ -71,7 +71,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -94,7 +94,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iteration $iterator --"; - + // Calling array_intersect_assoc() with default arguments var_dump( array_intersect_assoc($unexpected_value, $arr2) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt index 9bce974a9d..b230271be4 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_intersect_assoc() function : usage variations - binary safe checking +Test array_intersect_assoc() function : usage variations - binary safe checking --FILE-- 0, 2 => "float", 4 => "f3", 33333333 => "f4", - "\tHello" => 111, 2.2, 'color', "Hello world" => "string", + "\tHello" => 111, 2.2, 'color', "Hello world" => "string", "pen\n" => 33, 133 => "int"); // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt index 75806225ca..0c49a2cc46 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt @@ -49,7 +49,7 @@ $arrays = array ( "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc - // array with unset variable + // array with unset variable /*10*/ array( @$unset_var => "hello"), // array with mixed keys diff --git a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt index ba2f79a7ec..ca803e50a9 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt @@ -60,15 +60,15 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr2 argument -$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, - "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld', - "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp, +$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, + "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld', + "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp, "int" => 133, 222 => "fruit"); // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() diff --git a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt index 6ec8fb08d7..a287f4742f 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt @@ -60,8 +60,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt index 338d40936e..26a491ad64 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_intersect_assoc() function : usage variations - two dimensional arrays for $arr1 and $arr2 arguments +Test array_intersect_assoc() function : usage variations - two dimensional arrays for $arr1 and $arr2 arguments --FILE-- "one", 2 => "two", 3 => "three"), array("ten" => 10, "twenty" => 20.00, "thirty" => 30) -); +); $arr2 = array ( array(1, 2, 3, 4), diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt index fde5782c90..702260b49f 100644 --- a/ext/standard/tests/array/array_intersect_basic.phpt +++ b/ext/standard/tests/array/array_intersect_basic.phpt @@ -3,12 +3,12 @@ Test array_intersect() function : basic functionality --FILE-- '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); +$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index c286de6e3f..461a1e8590 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -3,15 +3,15 @@ Test array_intersect_key() function : usage variation - Passing float indexed ar --FILE-- '0', 10 => '10' , -10 => '-10'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10' , -10 => '-10'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_intersect_key() function with float indexed array --\n"; var_dump( array_intersect_key($input_array, $float_indx_array) ); diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index 823b0707d9..344cb7bf6f 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing boolean indexed --FILE-- '0', 1 => '1' , -10 => '-10'); +$input_array = array(0 => '0', 1 => '1' , -10 => '-10'); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_intersect_key() function with boolean indexed array --\n"; diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index fe4446a243..2deb99b4d4 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing null,unset and u --FILE-- '0', 1 => '1' , -10 => '-10' , null => 'null'); +$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null'); //get an unset variable $unset_var = 10; unset ($unset_var); @@ -25,7 +25,7 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_intersect_key($input_array, $value) ); var_dump( array_intersect_key($value,$input_array ) ); -} +} ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 2b889b5965..e3d8898c83 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing Multi dimensiona --FILE-- array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 =>'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - - 'fourth' => array(2 => 'two'), + + 'fourth' => array(2 => 'two'), ); var_dump( array_intersect_key($array1, $array2) ); -var_dump( array_intersect_key($array2,$array1 ) ); +var_dump( array_intersect_key($array2,$array1 ) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/array/array_intersect_uassoc_error.phpt b/ext/standard/tests/array/array_intersect_uassoc_error.phpt index ae7acb133b..f7ee0303ed 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_error.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_intersect_uassoc() function : error conditions +Test array_intersect_uassoc() function : error conditions --FILE-- "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index 86dec03d2d..ac825682b0 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index aa0c82d158..09759a607d 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -18,11 +18,11 @@ class MyClass static function static_compare_func($a, $b) { return strcasecmp($a, $b); } - + public function class_compare_func($a, $b) { return strcasecmp($a, $b); } - + } echo "\n-- Testing array_intersect_uassoc() function using class with static method as callback --\n"; diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt index cf2611aeb9..c880f7a057 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing class without echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index 51341bb45e..dd3cd05dc0 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt index f596e9c32b..edda0b5ef9 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt index e5d0f56568..d998721bd8 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_ukey_basic.phpt b/ext/standard/tests/array/array_intersect_ukey_basic.phpt index db21b9b01e..57ed1322fe 100644 --- a/ext/standard/tests/array/array_intersect_ukey_basic.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_intersect_ukey(): Basic test. +array_intersect_ukey(): Basic test. --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //Test array_intersect_ukey with one more than the expected number of arguments diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index 7012057800..0f97998078 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable diff --git a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt index 69a6500d2f..7156bf5404 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing class without s --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable diff --git a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt index 1236bcd3df..d99059e52d 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index c1520fbb64..59fb1c48d0 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of integer --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of integers and floating point intersection --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index a918660e42..cc9d8bbd15 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of floatin --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of floating points and strings containing integers intersection --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 75b601c11f..af5e002a69 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of strings --FILE-- $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of strings containing integers intersection --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt index 89286f8986..c686899aad 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing non-existing fu --FILE-- 1, "two" => 2); +$arr3 = array(1, 2, "one" => 1, "two" => 2); // get an unset variable $unset_var = 10; @@ -70,7 +70,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -93,7 +93,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iterator $iterator --"; - + // Calling array_intersect() with default arguments var_dump( array_intersect($unexpected_value,$arr2) ); diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt index e193f97d46..df395b053c 100644 --- a/ext/standard/tests/array/array_intersect_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_variation10.phpt @@ -1,15 +1,15 @@ --TEST-- -Test array_intersect() function : usage variations - binary safe checking +Test array_intersect() function : usage variations - binary safe checking --FILE-- 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc - // array with unset variable + // array with unset variable /*10*/ array( @$unset_var => "hello"), // array with mixed keys diff --git a/ext/standard/tests/array/array_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt index da1088c5ed..4da1b9b7ac 100644 --- a/ext/standard/tests/array/array_intersect_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_variation7.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff value --FILE-- new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr2 argument -$arr2 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, +$arr2 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, "Hello world", $heredoc, new classA(), 444.432, "fruit"); // loop through each sub-array within $arrrays to check the behavior of array_intersect() diff --git a/ext/standard/tests/array/array_intersect_variation8.phpt b/ext/standard/tests/array/array_intersect_variation8.phpt index 91eae49aab..2934fe09a4 100644 --- a/ext/standard/tests/array/array_intersect_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_variation8.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff value --FILE-- new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr1 argument -$arr1 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, +$arr1 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, "Hello world", $heredoc, new classA(), 444.432, "fruit"); // loop through each sub-array within $arrrays to check the behavior of array_intersect() diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt index 0dba1af6d3..6c7c956ea7 100644 --- a/ext/standard/tests/array/array_intersect_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_variation9.phpt @@ -3,13 +3,13 @@ Test array_intersect() function : usage variations - two dimensional arrays for --FILE-- "one", 2 => "two", 3 => "three"), array("ten" => 10, "twenty" => 20.00, "thirty" => 30) -); +); $arr2 = array ( array(1, 2, 3, 4), diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index ef40f846ad..63bcf82d93 100644 --- a/ext/standard/tests/array/array_key_exists.phpt +++ b/ext/standard/tests/array/array_key_exists.phpt @@ -2,13 +2,13 @@ Test array_key_exists() function --FILE-- 'Zero', 1 => 'One', 2 => 'Two', 3 => "Three" ), array(0.1 => 'Zero', 1.1 => 'One', 2.2 => 'Two', 3.3 => "Three" ) ); -/* keys to search in $search_arrays. $keys[0] +/* keys to search in $search_arrays. $keys[0] is the key to be searched in $search_arrays[0] and so on */ -$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); +$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); $key_counter = 0; foreach ($search_arrays as $search_array) { @@ -48,7 +48,7 @@ foreach ($search_arrays as $search_array) { var_dump( array_key_exists($key, $search_array) ); } } -// arrays with variation in elements +// arrays with variation in elements $search_arrays_v = array ( array(), array(NULL), @@ -71,24 +71,24 @@ foreach ($search_arrays_v as $search_array) { echo "\n*** Testing error conditions ***\n"; //Zeor args var_dump( array_key_exists() ); -// first args as array +// first args as array var_dump( array_key_exists(array(), array()) ); // second args as string -var_dump( array_key_exists("", "") ); +var_dump( array_key_exists("", "") ); // second args a integer -var_dump( array_key_exists(1, 1) ); +var_dump( array_key_exists(1, 1) ); // second args as NULL -var_dump( array_key_exists(1, NULL) ); +var_dump( array_key_exists(1, NULL) ); // second args as boolean -var_dump( array_key_exists(1, true) ); +var_dump( array_key_exists(1, true) ); // first args as boolean -var_dump( array_key_exists(false, true) ); -// second args as float -var_dump( array_key_exists(false, 17.5) ); -// args more than expected -var_dump( array_key_exists(1, array(), array()) ); +var_dump( array_key_exists(false, true) ); +// second args as float +var_dump( array_key_exists(false, 17.5) ); +// args more than expected +var_dump( array_key_exists(1, array(), array()) ); // first argument as floating point value -var_dump( array_key_exists(17.5, array(1,23) ) ) ; +var_dump( array_key_exists(17.5, array(1,23) ) ) ; echo "\n*** Testing operation on objects ***\n"; class key_check @@ -118,7 +118,7 @@ var_dump(array_key_exists("var", $key_check_obj->arr)); //found, key is in memb var_dump( array_key_exists($key_check_obj, $key_check_obj) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing basic functionalities *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt index 6fbd415dc5..1c40fdb809 100644 --- a/ext/standard/tests/array/array_key_exists_basic.phpt +++ b/ext/standard/tests/array/array_key_exists_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_key_exists() function : basic functionality +Test array_key_exists() function : basic functionality --FILE-- var1 = $a; $this->var2 = $b; diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 4a790e9d37..fac71b9487 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : object functionality - different visibilities --FILE-- var1 = $a; $this->var2 = $b; diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt index 2f50d3e86f..b989160db7 100644 --- a/ext/standard/tests/array/array_key_exists_variation1.phpt +++ b/ext/standard/tests/array/array_key_exists_variation1.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - Pass different data types --FILE-- 'val1', - 'one' => 'val2', +$multi_array = array ('zero' => 'val1', + 'one' => 'val2', 'sub1' => array (1, 2, 3)); echo "\n-- Attempt to match key in sub-array --\n"; diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index d19e58e764..09fe30d958 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -3,13 +3,13 @@ Test array_key_exists() function : usage variations - equality test for certain --FILE-- null, - 'NULL' => NULL, - 'empty single quoted string' => '', - "empty double quoted string" => "", +$array = array ('null' => null, + 'NULL' => NULL, + 'empty single quoted string' => '', + "empty double quoted string" => "", 'undefined variable' => @$undefined, 'unset variable' => @$unset); @@ -30,7 +30,7 @@ foreach($array as $name => $input) { $iterator = 1; echo "\n-- Key in \$search array is : $name --\n"; $search[$input] = 'test'; - + //iterate through array again to see which values are considered equal foreach($array as $key) { echo "Iteration $iterator: "; diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt index 845c1e54ba..8d9beacc75 100644 --- a/ext/standard/tests/array/array_key_exists_variation7.phpt +++ b/ext/standard/tests/array/array_key_exists_variation7.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - position of internal array --FILE-- 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -51,7 +51,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), @@ -65,7 +65,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index 1891c131cb..3e2b13381a 100644 --- a/ext/standard/tests/array/array_keys_variation_001.phpt +++ b/ext/standard/tests/array/array_keys_variation_001.phpt @@ -5,14 +5,14 @@ Test array_keys() function (variation - 1) echo "\n*** Testing array_keys() on various arrays ***"; $arrays = array( - array(), + array(), array(0), - array( array() ), - array("Hello" => "World"), - array("" => ""), + array( array() ), + array("Hello" => "World"), + array("" => ""), array(1,2,3, "d" => array(4,6, "d")), array("a" => 1, "b" => 2, "c" =>3, "d" => array()), - array(0 => 0, 1 => 1, 2 => 2, 3 => 3), + array(0 => 0, 1 => 1, 2 => 2, 3 => 3), array(0.001=>3.000, 1.002=>2, 1.999=>3, "a"=>3, 3=>5, "5"=>3.000), array(TRUE => TRUE, FALSE => FALSE, NULL => NULL, "\x000", "\000"), array("a" => "abcd", "a" => "", "ab" => -6, "cd" => -0.5 ), @@ -23,7 +23,7 @@ $i = 0; /* loop through to test array_keys() with different arrays */ foreach ($arrays as $array) { echo "\n-- Iteration $i --\n"; - var_dump(array_keys($array)); + var_dump(array_keys($array)); $i++; } diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt index d5df95b828..204f214ef9 100644 --- a/ext/standard/tests/array/array_keys_variation_002.phpt +++ b/ext/standard/tests/array/array_keys_variation_002.phpt @@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n"; $arr_range = array( 2147483647 => 1, 2147483648 => 2, - -2147483647 => 3, + -2147483647 => 3, -2147483648 => 4, -2147483649 => 5, -0 => 6, diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt index c0a034ec3e..532c6d054a 100644 --- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt +++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt @@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n"; $arr_range = array( 2147483647 => 1, 2147483648 => 2, - -2147483647 => 3, + -2147483647 => 3, -2147483648 => 4, -2147483649 => 5, -0 => 6, diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt index 5ccf542b69..f5e6f265e0 100644 --- a/ext/standard/tests/array/array_keys_variation_003.phpt +++ b/ext/standard/tests/array/array_keys_variation_003.phpt @@ -9,7 +9,7 @@ $types_arr = array( FALSE => FALSE, 1 => 1, 0 => 0, - -1 => -1, + -1 => -1, "1" => "1", "0" => "0", "-1" => "-1", @@ -21,7 +21,7 @@ $types_arr = array( $values = array(TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); foreach ($values as $value){ var_dump($value); - var_dump(array_keys($types_arr, $value)); + var_dump(array_keys($types_arr, $value)); } echo "Done\n"; diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt index 1a4f0fcca1..47262e2848 100644 --- a/ext/standard/tests/array/array_keys_variation_004.phpt +++ b/ext/standard/tests/array/array_keys_variation_004.phpt @@ -9,7 +9,7 @@ $types_arr = array( FALSE => FALSE, 1 => 1, 0 => 0, - -1 => -1, + -1 => -1, "1" => "1", "0" => "0", "-1" => "-1", diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index 9a912d68ed..ec6aff8d2c 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -8,9 +8,9 @@ $resource1 = fopen( __FILE__, "r"); $resource2 = opendir( "." ); /* creating an array with resource types as elements */ -$arr_resource = array($resource1, $resource2); +$arr_resource = array($resource1, $resource2); -var_dump(array_keys($arr_resource, $resource1)); // loose type checking +var_dump(array_keys($arr_resource, $resource1)); // loose type checking var_dump(array_keys($arr_resource, $resource1, TRUE)); // strict type checking var_dump(array_keys($arr_resource, $resource2)); // loose type checking var_dump(array_keys($arr_resource, $resource2, TRUE)); // strict type checking diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt index 7d313b59f6..cd95e6c991 100644 --- a/ext/standard/tests/array/array_map_001.phpt +++ b/ext/standard/tests/array/array_map_001.phpt @@ -5,18 +5,18 @@ array_map() and exceptions in the callback $a = array(1,2,3); -function foo() { - throw new exception(1); -} +function foo() { + throw new exception(1); +} -try { - array_map("foo", $a, array(2,3)); +try { + array_map("foo", $a, array(2,3)); } catch (Exception $e) { var_dump("exception caught!"); } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(17) "exception caught!" Done diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt index c98b2cf29c..7cfb528bf2 100644 --- a/ext/standard/tests/array/array_map_object2.phpt +++ b/ext/standard/tests/array/array_map_object2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_map() function : object functionality - with non-existent class and method +Test array_map() function : object functionality - with non-existent class and method --FILE-- 11, @$unset_var => "hello", $fp => 'resource'), // array with mixed values -/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, - $fp => 'resource', 133 => "int", 444.432 => "float", +/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, + $fp => 'resource', 133 => "int", 444.432 => "float", @$unset_var => "unset", $heredoc => "heredoc") ); diff --git a/ext/standard/tests/array/array_map_variation5.phpt b/ext/standard/tests/array/array_map_variation5.phpt index 55f1569211..e286095576 100644 --- a/ext/standard/tests/array/array_map_variation5.phpt +++ b/ext/standard/tests/array/array_map_variation5.phpt @@ -61,8 +61,8 @@ $arrays = array ( array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index 2409a5763c..566fd95e0b 100644 --- a/ext/standard/tests/array/array_map_variation6.phpt +++ b/ext/standard/tests/array/array_map_variation6.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - array having subarrays --FILE-- 'a', 'b' => 2) -); +); var_dump( array_map('callback', $arr1)); echo "Done"; diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt index 8f88a0f88c..dc29fdf770 100644 --- a/ext/standard/tests/array/array_map_variation7.phpt +++ b/ext/standard/tests/array/array_map_variation7.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - arrays of different size --FILE-- 12), array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,1 => -2.344), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -26,8 +26,8 @@ $end_array = array( array( "" => "string"), array( -2.44444 => 12), array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), - array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -41,22 +41,22 @@ foreach($begin_array as $first) { $result = array_merge($first, $second); print_r($result); $count_inner++; - } + } $count_outer++; } echo "\n*** Testing array_merge() with three or more arrays ***\n"; -var_dump( array_merge( $end_array[0], - $end_array[5], +var_dump( array_merge( $end_array[0], + $end_array[5], $end_array[4], $end_array[6] ) ); -var_dump( array_merge( $end_array[0], - $end_array[5], - array("array on fly"), +var_dump( array_merge( $end_array[0], + $end_array[5], + array("array on fly"), array("nullarray" => array()) ) ); @@ -64,7 +64,7 @@ var_dump( array_merge( $end_array[0], echo "\n*** Testing single array argument ***\n"; /* Empty array */ -var_dump(array_merge(array())); +var_dump(array_merge(array())); /* associative array with string keys, which will not be re-indexed */ var_dump(array_merge($begin_array[4])); @@ -86,7 +86,7 @@ var_dump(array_merge($begin_array[0], $begin_array[1], 100)); var_dump(array_merge($begin_array[0], $begin_array[1], $arr4)); echo "Done\n"; -?> +?> --EXPECTF-- *** Testing array_merge() basic functionality *** diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt index c4dc69638e..9836a131a9 100644 --- a/ext/standard/tests/array/array_merge_basic.phpt +++ b/ext/standard/tests/array/array_merge_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_merge() function : basic functionality +Test array_merge() function : basic functionality --FILE-- array("hello", "world", "str1" => "hello", "str2" => 'world'), array(1 => "one", 2 => "two", "one", 'two'), array(1, 2, 3, 1) ); -// initialize the second argument +// initialize the second argument $arr2 = array(1, "hello", "array" => array("hello", 'world')); echo "-- Passing the entire 2-d array --\n"; diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt index 83f2374741..48ad02877f 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - unexpected values for */ /* - * Passing non array values to 'arr2' argument of array_merge_recursive() and see + * Passing non array values to 'arr2' argument of array_merge_recursive() and see * that the function outputs proper warning messages wherever expected. */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 76bf913918..d63037d898 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -92,7 +92,7 @@ foreach($arrays as $arr1) { $iterator++; } - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index b497acec7e..f73dd9c628 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt @@ -53,7 +53,7 @@ $arrays = array ( /*8*/ array(new classA() => 11, @$unset_var => array("unset"), $fp => 'resource', 11, "hello") ); -// initialise the second array +// initialise the second array $arr2 = array( 1 => "one", 2, "string" => "hello", "array" => array("a", "b", "c")); // loop through each sub array of $arrays and check the behavior of array_merge_recursive() @@ -74,7 +74,7 @@ foreach($arrays as $arr1) { // close the file resource used fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt index 3b251220ea..34cdfe409f 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt @@ -53,7 +53,7 @@ $arrays = array ( /*8*/ array(11 => new classA(), "string" => @$unset_var, "resource" => $fp, new classA(), $fp), ); -// initialise the second array +// initialise the second array $arr2 = array( 1 => "one", 2, "string" => "hello", "array" => array("a", "b", "c")); // loop through each sub array of $arrays and check the behavior of array_merge_recursive() @@ -74,7 +74,7 @@ foreach($arrays as $arr1) { // close the file resource used fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt index 8e460ba366..56c67916c7 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - array with duplicate */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * array having duplicate keys. */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt index b244e7d6b8..fce0cb1070 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - array with reference */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * array having reference variables. */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt index 6ad2f6989f..482bab1f72 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt @@ -18,7 +18,7 @@ $arr1 = array(b"1", b"hello" => "hello", b"world", "str1" => b"hello", "str2" => // initialize the second argument $arr2 = array(b"str1" => b"binary", b"hello" => "binary", b"str2" => b"binary"); - + echo "-- With default argument --\n"; var_dump( array_merge_recursive($arr1) ); diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt index d51d2f8908..e3bd8a173f 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - common key and value( */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * arrays having common key and value. */ diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt index 1ce71debb0..02c82e2320 100644 --- a/ext/standard/tests/array/array_merge_variation1.phpt +++ b/ext/standard/tests/array/array_merge_variation1.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Pass different data types to $a --FILE-- array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -86,7 +86,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index e4eb2570cd..24eee4c257 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -3,12 +3,12 @@ Test array_merge() function : usage variations - Diff. data types as array keys --FILE-- 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -52,8 +52,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -63,17 +63,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt index eca6078e6a..d2989ea6cc 100644 --- a/ext/standard/tests/array/array_merge_variation5.phpt +++ b/ext/standard/tests/array/array_merge_variation5.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - numeric keys --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_pad_error.phpt b/ext/standard/tests/array/array_pad_error.phpt index 63b4c83bf0..d0dc9ccb7f 100644 --- a/ext/standard/tests/array/array_pad_error.phpt +++ b/ext/standard/tests/array/array_pad_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_pad() function : error conditions +Test array_pad() function : error conditions --FILE-- diff --git a/ext/standard/tests/array/array_product_error.phpt b/ext/standard/tests/array/array_product_error.phpt index 79f7cb4a08..3ef23b9210 100644 --- a/ext/standard/tests/array/array_product_error.phpt +++ b/ext/standard/tests/array/array_product_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_product() function : error conditions +Test array_product() function : error conditions --FILE-- true, "boolean (false)" => false, +$types = array("boolean (true)" => true, "boolean (false)" => false, "string" => "hello", "numeric string" => "12", "resource" => $fp, "object" => new A(), "null" => null, "array" => array(3,2)); diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index c4c47d86a2..410f2c827e 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -3,9 +3,9 @@ Test array_product() function : variation --FILE-- 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -51,7 +51,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), @@ -65,7 +65,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt index c158b0f74b..c36ab3de7a 100644 --- a/ext/standard/tests/array/array_rand.phpt +++ b/ext/standard/tests/array/array_rand.phpt @@ -15,7 +15,7 @@ var_dump(array_rand(array(1,2,3), 2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_rand() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_rand_basic1.phpt b/ext/standard/tests/array/array_rand_basic1.phpt index 30b5b5ce9a..46d265aa99 100644 --- a/ext/standard/tests/array/array_rand_basic1.phpt +++ b/ext/standard/tests/array/array_rand_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_rand() function : basic functionality - array with default keys +Test array_rand() function : basic functionality - array with default keys --FILE-- 1, 'two' => 2, 'three' => 3, + 'one' => 1, 'two' => 2, 'three' => 3, 'FoUr' => 'four', '#5' => 5, 'SIX' => 'six', "seven" => 7, "#8" => "eight", "nine" => "NINE" ); diff --git a/ext/standard/tests/array/array_rand_error.phpt b/ext/standard/tests/array/array_rand_error.phpt index 30cc85ae6c..2ffae12178 100644 --- a/ext/standard/tests/array/array_rand_error.phpt +++ b/ext/standard/tests/array/array_rand_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_rand() function : error conditions +Test array_rand() function : error conditions --FILE-- 'one', 2 => 2, 1234567890 => 'big', -1 => 'negative key', 2.3 => 'float key', 0 => "zero key", 0.2 => 'decimal key', 2e2 => 'exp key1', -2e3 => 'negative exp key'), - + // array with string keys array('one' => 1, "two" => 2.0, "three" => 'three', '12twelve' => 12.00, "" => 'empty string', " " => "space key"), @@ -29,7 +29,7 @@ $asso_arrays = array( // array with hexa values as keys /*3*/ array(0xabc => 2748, 0x12f => '303', 0xff => "255", -0xff => "-255"), - // array with octal values as keys + // array with octal values as keys array(0123 => 83, 012 => 10, 010 => "8", -034 => "-28", 0012 => '10'), // array with bool values as keys @@ -42,7 +42,7 @@ $asso_arrays = array( "\t" => "tab as key", "'" => 'single quote as key', '"' => 'double quote as key', "\0" => "null char as key") ); - + /* looping to test array_rand() function with different arrays having * different types of keys */ @@ -59,10 +59,10 @@ foreach($asso_arrays as $input) { var_dump( array_rand($input, 1) ); // with $num_req=1 echo"\nWith num_req = 2\n"; var_dump( array_rand($input, 2) ); // with $num_req=2 - + $counter++; } // end of for loop - + echo "Done"; ?> diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt index 44f5cd8573..7c4043e464 100644 --- a/ext/standard/tests/array/array_rand_variation5.phpt +++ b/ext/standard/tests/array/array_rand_variation5.phpt @@ -3,13 +3,13 @@ Test array_rand() function : usage variation - invalid values for 'req_num' para --FILE-- 2748, 0x12f => '303', 0xff => "255", 0123 => 83, 012 => 10, 010 => "8" ); - + // Testing array_rand() function with various invalid 'req_num' values -// with valid num_req values +// with valid num_req values echo"\n-- With default num_req value --\n"; var_dump( array_rand($input) ); // with default $num_req value echo"\n-- With num_req = 1 --\n"; @@ -39,7 +39,7 @@ echo"\n-- With num_req = -2 --\n"; var_dump( array_rand($input, -2) ); // with $num_req=-2 echo"\n-- With num_req more than number of members in 'input' array --\n"; var_dump( array_rand($input, 13) ); // with $num_req=13 - + echo "Done"; ?> diff --git a/ext/standard/tests/array/array_rand_variation6.phpt b/ext/standard/tests/array/array_rand_variation6.phpt index 3f1fea28cd..d60630eb32 100644 --- a/ext/standard/tests/array/array_rand_variation6.phpt +++ b/ext/standard/tests/array/array_rand_variation6.phpt @@ -3,7 +3,7 @@ Test array_rand() function : usage variation - with heredoc string as key in the --FILE-- +?> --EXPECTF-- *** Testing array_reduce() to integer *** int(61) diff --git a/ext/standard/tests/array/array_reduce_error.phpt b/ext/standard/tests/array/array_reduce_error.phpt index 954aa43d76..88070dee55 100644 --- a/ext/standard/tests/array/array_reduce_error.phpt +++ b/ext/standard/tests/array/array_reduce_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_reduce() function : error conditions +Test array_reduce() function : error conditions --FILE-- "0"), array(1 => "1"), array(1 => "1", 2 => "2", 3 => "3", 4 => "4"), - + // arrays with float keys /*5*/ array(2.3333 => "float"), array(1.2 => "f1", 3.33 => "f2", 4.89999922839999 => "f3", 33333333.333333 => "f4"), - + // arrays with string keys array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), /*8*/ array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc // array with object, unset variable and resource variable - array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), + array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), // array with mixed values /*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, $fp => 'resource', 133 => "int", 444.432 => "float", @$unset_var => "unset", $heredoc => "heredoc") diff --git a/ext/standard/tests/array/array_reverse_variation5.phpt b/ext/standard/tests/array/array_reverse_variation5.phpt index 6c4c952240..dbd316ab8a 100644 --- a/ext/standard/tests/array/array_reverse_variation5.phpt +++ b/ext/standard/tests/array/array_reverse_variation5.phpt @@ -46,18 +46,18 @@ $arrays = array ( array('0' => 0), array("1" => 1), array("one" => 1, 'two' => 2, "three" => 3, 4 => 4), - + // arrays with float values /*5*/ array("float" => 2.3333), array("f1" => 1.2, 'f2' => 3.33, 3 => 4.89999922839999, 'f4' => 33333333.333333), - + // arrays with string values array(111 => "\tHello", "red" => "col\tor", 2 => "\v\fworld", 3.3 => "pen\n"), -/*8*/ array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 => 'pen\n'), +/*8*/ array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 => 'pen\n'), array(1 => "hello", "heredoc" => $heredoc), // array with object, unset variable and resource variable - array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), + array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values /*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt index ae1e195ca6..7c222b9286 100644 --- a/ext/standard/tests/array/array_reverse_variation6.phpt +++ b/ext/standard/tests/array/array_reverse_variation6.phpt @@ -15,7 +15,7 @@ echo "*** Testing array_reverse() : usage variations ***\n"; // Initializing the 2-d arrays $two_dimensional_array = array( - + // associative array array('color' => 'red', 'item' => 'pen', 'place' => 'LA'), @@ -24,7 +24,7 @@ $two_dimensional_array = array( // combination of numeric and associative arrays array('a' => 'green', 'red', 'brown', 33, 88, 'orange', 'item' => 'ball') -); +); // calling array_reverse() with various types of 2-d arrays // with default arguments diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt index 26377d218f..f3fcf872f4 100644 --- a/ext/standard/tests/array/array_search1.phpt +++ b/ext/standard/tests/array/array_search1.phpt @@ -18,7 +18,7 @@ var_dump(array_search(-1,$a, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt index 96395013bb..43f3888021 100644 --- a/ext/standard/tests/array/array_search_variation1.phpt +++ b/ext/standard/tests/array/array_search_variation1.phpt @@ -19,7 +19,7 @@ $arrays = array ( array(TRUE, FALSE), array("", array()), array("abcd\x00abcd\x00abcd"), - array("abcd\tabcd\nabcd\rabcd\0abcdefghij") + array("abcd\tabcd\nabcd\rabcd\0abcdefghij") ); $array_compare = array ( @@ -49,15 +49,15 @@ foreach($arrays as $array) { foreach($array_compare as $compare) { echo "-- Iteration $counter --\n"; //strict option OFF - var_dump(array_search($compare,$array)); + var_dump(array_search($compare,$array)); //strict option ON - var_dump(array_search($compare,$array,TRUE)); + var_dump(array_search($compare,$array,TRUE)); //strict option OFF - var_dump(array_search($compare,$array,FALSE)); + var_dump(array_search($compare,$array,FALSE)); $counter++; } } - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt index da90de0cb7..2609ed82f7 100644 --- a/ext/standard/tests/array/array_search_variation2.phpt +++ b/ext/standard/tests/array/array_search_variation2.phpt @@ -16,10 +16,10 @@ $misc_array = array ( 'a', 'key' =>'d', 3, - ".001" =>-67, + ".001" =>-67, "-.051" =>"k", 0.091 =>"-.08", - "e" =>"5", + "e" =>"5", "y" =>NULL, NULL =>"", 0, @@ -39,11 +39,11 @@ $counter = 1; foreach($array_type as $type) { echo "-- Iteration $counter --\n"; //loose type checking - var_dump( array_search($type,$misc_array ) ); + var_dump( array_search($type,$misc_array ) ); //strict type checking - var_dump( array_search($type,$misc_array,true) ); + var_dump( array_search($type,$misc_array,true) ); //loose type checking - var_dump( array_search($type,$misc_array,false) ); + var_dump( array_search($type,$misc_array,false) ); $counter++; } diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt index 8af089a72c..41b0b5bb20 100644 --- a/ext/standard/tests/array/array_search_variation3.phpt +++ b/ext/standard/tests/array/array_search_variation3.phpt @@ -11,7 +11,7 @@ Test array_search() function : usage variations - haystack as sub-array/object /* checking for sub-arrays with array_search() */ echo "*** Testing sub-arrays with array_search() ***\n"; $sub_array = array ( - "one", + "one", array(1, 2 => "two", "three" => 3), 4 => "four", "five" => 5, @@ -19,7 +19,7 @@ $sub_array = array ( ); var_dump( array_search("four", $sub_array) ); //checking for element in a sub-array -var_dump( array_search(3, $sub_array[1]) ); +var_dump( array_search(3, $sub_array[1]) ); var_dump( array_search(array('','i'), $sub_array) ); /* checking for objects in array_search() */ @@ -33,11 +33,11 @@ class array_search_check { $array_search_obj = new array_search_check(); //creating new object //error: as wrong datatype for second argument -var_dump( array_search("array_var", $array_search_obj) ); +var_dump( array_search("array_var", $array_search_obj) ); //error: as wrong datatype for second argument -var_dump( array_search("foo", $array_search_obj) ); +var_dump( array_search("foo", $array_search_obj) ); //element found as "one" exists in array $array_var -var_dump( array_search("one", $array_search_obj->array_var) ); +var_dump( array_search("one", $array_search_obj->array_var) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 7feb2ef147..425872afcc 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -20,38 +20,38 @@ $dir_handle = opendir( dirname(__FILE__) ); $resources = array($file_handle, $dir_handle); // search for resouce type in the resource array -var_dump( array_search($file_handle, $resources, true) ); +var_dump( array_search($file_handle, $resources, true) ); //checking for (int) type resource -var_dump( array_search((int)$dir_handle, $resources, true) ); +var_dump( array_search((int)$dir_handle, $resources, true) ); /* Miscellenous input check */ echo "\n*** Testing miscelleneos inputs with array_search() ***\n"; //matching "Good" in array(0,"hello"), result:true in loose type check -var_dump( array_search("Good", array(0,"hello")) ); -//false in strict mode -var_dump( array_search("Good", array(0,"hello"), TRUE) ); +var_dump( array_search("Good", array(0,"hello")) ); +//false in strict mode +var_dump( array_search("Good", array(0,"hello"), TRUE) ); //matching integer 0 in array("this"), result:true in loose type check -var_dump( array_search(0, array("this")) ); +var_dump( array_search(0, array("this")) ); // false in strict mode -var_dump( array_search(0, array("this")),TRUE ); +var_dump( array_search(0, array("this")),TRUE ); //matching string "this" in array(0), result:true in loose type check -var_dump( array_search("this", array(0)) ); +var_dump( array_search("this", array(0)) ); // false in stric mode -var_dump( array_search("this", array(0), TRUE) ); +var_dump( array_search("this", array(0), TRUE) ); //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check -var_dump( array_search(FALSE, - array("a"=> TRUE, "b"=> TRUE, - array("c"=> TRUE, "d"=>TRUE) - ) - ) - ); +var_dump( array_search(FALSE, + array("a"=> TRUE, "b"=> TRUE, + array("c"=> TRUE, "d"=>TRUE) + ) + ) + ); //matching string having integer in beginning, result:true in loose type check -var_dump( array_search('123abc', array(123)) ); -var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode +var_dump( array_search('123abc', array(123)) ); +var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt index 2bb4ae93ae..8e9cb97c28 100644 --- a/ext/standard/tests/array/array_shift_basic.phpt +++ b/ext/standard/tests/array/array_shift_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_shift() function : basic functionality +Test array_shift() function : basic functionality --FILE-- array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index cc260c6305..a1a2697072 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass array with different data --FILE-- 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -48,8 +48,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt index f27681561a..5cc0e48c94 100644 --- a/ext/standard/tests/array/array_shift_variation4.phpt +++ b/ext/standard/tests/array/array_shift_variation4.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - multi-dimensional arrays --FILE-- 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -53,8 +53,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -64,17 +64,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt index aece410c02..90d4645f49 100644 --- a/ext/standard/tests/array/array_slice_variation8.phpt +++ b/ext/standard/tests/array/array_slice_variation8.phpt @@ -3,12 +3,12 @@ Test array_slice() function : usage variations - multidimensional arrays --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt index 4959deee7d..8dd6976eee 100644 --- a/ext/standard/tests/array/array_sum_variation4.phpt +++ b/ext/standard/tests/array/array_sum_variation4.phpt @@ -3,12 +3,12 @@ Test array_sum() function : usage variations - array with duplicate values --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index 49103c8154..95cd1887d1 100644 --- a/ext/standard/tests/array/array_unique_variation3.phpt +++ b/ext/standard/tests/array/array_unique_variation3.phpt @@ -3,7 +3,7 @@ Test array_unique() function : usage variations - associative array with differe --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt index a1fc13e94d..752ebf54ea 100644 --- a/ext/standard/tests/array/array_unique_variation4.phpt +++ b/ext/standard/tests/array/array_unique_variation4.phpt @@ -3,7 +3,7 @@ Test array_unique() function : usage variations - associative array with differe --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt index 5e3f7c36d0..bb69f2e9c7 100644 --- a/ext/standard/tests/array/array_unique_variation5.phpt +++ b/ext/standard/tests/array/array_unique_variation5.phpt @@ -3,12 +3,12 @@ Test array_unique() function : usage variations - array with duplicate keys --FILE-- "hello", "str2" => 'world'), array(1 => "one", 2 => "two", "one", 'two'), diff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt index ebcf19041f..9b474277a9 100644 --- a/ext/standard/tests/array/array_unshift.phpt +++ b/ext/standard/tests/array/array_unshift.phpt @@ -14,7 +14,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) array(1) { [0]=> diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index 97ea895547..7a0b7ba3b2 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -3,11 +3,11 @@ Test array_unshift() function : basic functionality - array with default keys fo --FILE-- "first", "s" => 'second', 1, 2.222); -// get a class +// get a class class classA { public function __toString() { @@ -44,7 +44,7 @@ $vars = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, @@ -58,7 +58,7 @@ $vars = array( array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, @@ -68,7 +68,7 @@ $vars = array( false, TRUE, FALSE, - + // empty data /*21*/ "", '', @@ -86,7 +86,7 @@ $vars = array( // unset data @$unset_var, - + // resource variable /*29*/ $fp ); @@ -103,7 +103,7 @@ foreach($vars as $var) { var_dump( array_unshift($temp_array, $var) ); // dump the resulting array - var_dump($temp_array); + var_dump($temp_array); /* with optional arguments */ // returns element count in the resulting array after arguments are pushed to diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt index 286cb290b8..fa4f6b5853 100644 --- a/ext/standard/tests/array/array_unshift_variation3.phpt +++ b/ext/standard/tests/array/array_unshift_variation3.phpt @@ -8,7 +8,7 @@ Test array_unshift() function : usage variations - different array values for 'a */ /* - * Testing the behavior of array_unshift() by passing different types of arrays + * Testing the behavior of array_unshift() by passing different types of arrays * to $array argument to which the $var arguments will be prepended */ diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt index 25c9159a11..64bf3a8d82 100644 --- a/ext/standard/tests/array/array_unshift_variation4.phpt +++ b/ext/standard/tests/array/array_unshift_variation4.phpt @@ -8,7 +8,7 @@ Test array_unshift() function : usage variations - assoc. array with diff. keys */ /* - * Testing the functionality of array_unshift() by passing different + * Testing the functionality of array_unshift() by passing different * associative arrays having different possible keys to $array argument. * The $var argument passed is a fixed value */ @@ -52,13 +52,13 @@ $arrays = array ( // arrays with float keys /*5*/ array(2.3333 => "float"), array(1.2 => "f1", 3.33 => "f2", - 4.89999922839999 => "f3", + 4.89999922839999 => "f3", 33333333.333333 => "f4"), // arrays with string keys /*7*/ array('\tHello' => 111, 're\td' => "color", '\v\fworld' => 2.2, 'pen\n' => 33), - array("\tHello" => 111, "re\td" => "color", + array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt index 7f083694af..0cc3064864 100644 --- a/ext/standard/tests/array/array_unshift_variation5.phpt +++ b/ext/standard/tests/array/array_unshift_variation5.phpt @@ -2,7 +2,7 @@ Test array_unshift() function : usage variations - assoc. array with diff values for 'array' argument --INI-- precision=12 ---FILE-- +--FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** Warning: array_values() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/standard/tests/array/array_values_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt index 15da1a621e..15eb77dac0 100644 --- a/ext/standard/tests/array/array_values_variation.phpt +++ b/ext/standard/tests/array/array_values_variation.phpt @@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) ); echo "\n*** Testing array_values() with range checking ***\n"; $arr_range = array( - 2147483647, - 2147483648, + 2147483647, + 2147483648, -2147483647, -2147483648, -0, @@ -35,7 +35,7 @@ var_dump( array_values(array()) ); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing array_values() with resource type *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt index 516beec6f6..eb1ff7aef7 100644 --- a/ext/standard/tests/array/array_values_variation1.phpt +++ b/ext/standard/tests/array/array_values_variation1.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - Pass different data types as $ --FILE-- array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -82,7 +82,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 5c74c0d47d..5afa0d2c42 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - array keys different data type --FILE-- 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -49,8 +49,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -60,17 +60,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index 9c35331fdd..9f23dac1ed 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - multi-dimensional arrays --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing array_values() with resource type *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt index 35ef02e15e..5808f4b948 100644 --- a/ext/standard/tests/array/array_walk.phpt +++ b/ext/standard/tests/array/array_walk.phpt @@ -30,7 +30,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_basic1.phpt b/ext/standard/tests/array/array_walk_basic1.phpt index e4bdf1b895..bb106b1fba 100644 --- a/ext/standard/tests/array/array_walk_basic1.phpt +++ b/ext/standard/tests/array/array_walk_basic1.phpt @@ -3,7 +3,7 @@ Test array_walk() function : basic functionality - regular array --FILE-- "lemon", "a" => "orange", "b" => "banana", "c" => "apple" // User defined callback functions /* Prototype : test_alter(mixed $item, mixed $key, string $prefix) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair - * prefix - string to be added + * prefix - string to be added * Description : alters the array values by appending prefix string - */ + */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed @@ -30,7 +30,7 @@ function test_alter(&$item, $key, $prefix) } /* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair * Description : prints the array values with keys */ diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt index 4e22bb8946..3799fde1cc 100644 --- a/ext/standard/tests/array/array_walk_closure.phpt +++ b/ext/standard/tests/array/array_walk_closure.phpt @@ -93,7 +93,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt index 334dfe4ef7..fb77e92e8a 100644 --- a/ext/standard/tests/array/array_walk_error1.phpt +++ b/ext/standard/tests/array/array_walk_error1.phpt @@ -3,7 +3,7 @@ Test array_walk() function : error conditions --FILE-- getMessage() . "\n"; } try { - var_dump( @array_walk($input, "callback2", 4) ); + var_dump( @array_walk($input, "callback2", 4) ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt index 3bd83fdab2..cd06ea3096 100644 --- a/ext/standard/tests/array/array_walk_object1.phpt +++ b/ext/standard/tests/array/array_walk_object1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_walk() function : object functionality +Test array_walk() function : object functionality --FILE-- pub_value = $setVal; $this->pro_value = $setVal; } -}; +}; // object for 'input' argument -$input = new MyClass(10); +$input = new MyClass(10); var_dump( array_walk($input, "callback", 1)); diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 61d0529753..89442078b1 100644 --- a/ext/standard/tests/array/array_walk_object2.phpt +++ b/ext/standard/tests/array/array_walk_object2.phpt @@ -3,7 +3,7 @@ Test array_walk() function : object functionality - array of objects --FILE-- getValue()); echo "key : "; @@ -58,7 +58,7 @@ class MyClass { return $this->pro_value; } -}; +}; // array containing objects of MyClass $input = array ( @@ -73,7 +73,7 @@ var_dump( array_walk($input, "callback_private", 1)); echo "-- For public member --\n"; var_dump( array_walk($input, "callback_public")); echo "-- For protected member --\n"; -var_dump( array_walk($input, "callback_protected")); +var_dump( array_walk($input, "callback_protected")); echo "Done" ?> diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt index f9214d25a5..fc04304fc5 100644 --- a/ext/standard/tests/array/array_walk_objects.phpt +++ b/ext/standard/tests/array/array_walk_objects.phpt @@ -3,8 +3,8 @@ array_walk() and objects --FILE-- ---EXPECTF-- +--EXPECTF-- string(3) "foo" string(3) "foo" string(3) "bar" diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt index d2fa9b86eb..a83c227a3b 100644 --- a/ext/standard/tests/array/array_walk_rec_objects.phpt +++ b/ext/standard/tests/array/array_walk_rec_objects.phpt @@ -3,8 +3,8 @@ array_walk_recursive() and objects --FILE-- ---EXPECTF-- +--EXPECTF-- string(3) "foo" string(3) "foo" string(3) "bar" diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt index 65939d5eec..a030011f7c 100644 --- a/ext/standard/tests/array/array_walk_recursive1.phpt +++ b/ext/standard/tests/array/array_walk_recursive1.phpt @@ -30,7 +30,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_recursive_basic1.phpt b/ext/standard/tests/array/array_walk_recursive_basic1.phpt index df192b6a79..606861565c 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic1.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : basic functionality - regular array --FILE-- "lemon", "b" => array( "c" => "orange", "d" => "banana"), // User defined callback functions /* Prototype : test_alter(mixed $item, mixed $key, string $prefix) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair - * prefix - string to be added + * prefix - string to be added * Description : alters the array values by appending prefix string - */ + */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed @@ -30,7 +30,7 @@ function test_alter(&$item, $key, $prefix) } /* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair * Description : prints the array values with keys */ diff --git a/ext/standard/tests/array/array_walk_recursive_error1.phpt b/ext/standard/tests/array/array_walk_recursive_error1.phpt index 75966e8833..b149eecbfd 100644 --- a/ext/standard/tests/array/array_walk_recursive_error1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : error conditions --FILE-- getMessage() . "\n"; } try { - var_dump( @array_walk_recursive($input, "callback2", 4) ); + var_dump( @array_walk_recursive($input, "callback2", 4) ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt index 5c01c55817..0bfbeee067 100644 --- a/ext/standard/tests/array/array_walk_recursive_object1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object1.phpt @@ -3,11 +3,11 @@ Test array_walk_recursive() function : object functionality --FILE-- pub_value = $setVal; $this->pro_value = $setVal; } -}; +}; // object for 'input' argument -$input = new MyClass(10); +$input = new MyClass(10); var_dump( array_walk_recursive($input, "callback", 1)); diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index aa12fe869a..89e8feb71c 100644 --- a/ext/standard/tests/array/array_walk_recursive_object2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : object functionality - array of objects --FILE-- getValue()); echo "key : "; @@ -58,7 +58,7 @@ class MyClass { return $this->pro_value; } -}; +}; // array containing objects of MyClass $input = array ( @@ -75,7 +75,7 @@ var_dump( array_walk_recursive($input, "callback_private", 1)); echo "-- For public member --\n"; var_dump( array_walk_recursive($input, "callback_public")); echo "-- For protected member --\n"; -var_dump( array_walk_recursive($input, "callback_protected")); +var_dump( array_walk_recursive($input, "callback_protected")); echo "Done" ?> diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt index 9ed6792598..daea816456 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_walk_recursive() function : usage variations - unexpected values for 'input' argument +Test array_walk_recursive() function : usage variations - unexpected values for 'input' argument --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt index 4db34979a4..009148633b 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt @@ -3,12 +3,12 @@ Test array_walk_recursive() function : usage variations - 'input' array with sub --FILE-- diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt index a45ce4da03..f9d8782ed4 100644 --- a/ext/standard/tests/array/array_walk_variation1.phpt +++ b/ext/standard/tests/array/array_walk_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_walk() function : usage variations - unexpected values for 'input' argument +Test array_walk() function : usage variations - unexpected values for 'input' argument --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt index 868732daaf..a94338209a 100644 --- a/ext/standard/tests/array/array_walk_variation4.phpt +++ b/ext/standard/tests/array/array_walk_variation4.phpt @@ -3,12 +3,12 @@ Test array_walk() function : usage variations - 'input' array with subarray --FILE-- diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt index 24799ab771..87c5138835 100644 --- a/ext/standard/tests/array/arsort_basic.phpt +++ b/ext/standard/tests/array/arsort_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test arsort() function : basic functionality +Test arsort() function : basic functionality --FILE-- "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 1 => 100, 2 => 33, 3 => 555, 4 => 22 ); echo "\n-- Testing arsort() by supplying string array, 'flag' value is default --\n"; diff --git a/ext/standard/tests/array/arsort_error.phpt b/ext/standard/tests/array/arsort_error.phpt index 676d8265ed..5a24815697 100644 --- a/ext/standard/tests/array/arsort_error.phpt +++ b/ext/standard/tests/array/arsort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test arsort() function : error conditions +Test arsort() function : error conditions --FILE-- new for_integer_arsort(11), 2 => new for_integer_asort(66), 3 => new for_integer_arsort(23), 4 => new for_integer_asort(-5), 5 => new for_integer_arsort(0.001), 6 => new for_integer_asort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_arsort("axx"), "b" => new for_string_asort("t"), "c" => new for_string_arsort("w"), "d" => new for_string_asort("py"), "e" => new for_string_arsort("apple"), "f" => new for_string_asort("Orange"), diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt index f5ed333623..338c852446 100644 --- a/ext/standard/tests/array/arsort_object2.phpt +++ b/ext/standard/tests/array/arsort_object2.phpt @@ -1,15 +1,15 @@ --TEST-- -Test arsort() function : object functionality - sorting objects with diff. accessibility of member vars +Test arsort() function : object functionality - sorting objects with diff. accessibility of member vars --FILE-- public_class_value = $value1; @@ -36,7 +36,7 @@ class for_string_arsort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -51,13 +51,13 @@ class for_string_arsort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_arsort(11, 33,2), 2 => new for_integer_asort(44, 66,3), 3 => new for_integer_arsort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4), ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_arsort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"), "c" => new for_string_arsort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"), ); diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index acf39e75e6..7deb964b9d 100644 --- a/ext/standard/tests/array/arsort_variation1.phpt +++ b/ext/standard/tests/array/arsort_variation1.phpt @@ -4,7 +4,7 @@ Test arsort() function : usage variations - unexpected values for 'array_arg' ar 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, +$unsorted_oct_array = array ( + 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 077 => 077, -066 => -066, -0345 => -0345, 0 => 0 ); diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt index 0ab1c8abf5..b70c3ad6c4 100644 Binary files a/ext/standard/tests/array/arsort_variation11.phpt and b/ext/standard/tests/array/arsort_variation11.phpt differ diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt index 1db1efe25d..901c03950f 100644 --- a/ext/standard/tests/array/arsort_variation2.phpt +++ b/ext/standard/tests/array/arsort_variation2.phpt @@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( arsort($temp_array, $value) ); + var_dump( arsort($temp_array, $value) ); var_dump($temp_array); $counter++; } diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt index 765efe874d..9f8d47f47c 100644 --- a/ext/standard/tests/array/arsort_variation3.phpt +++ b/ext/standard/tests/array/arsort_variation3.phpt @@ -3,7 +3,7 @@ Test arsort() function : usage variations - sort integer/float values --FILE-- .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33), - + // array values contains minimum and maximum ranges array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649) ); @@ -42,20 +42,20 @@ echo "\n-- Testing arsort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With default sort_flag -\n"; - $temp_array = $array; + echo "- With default sort_flag -\n"; + $temp_array = $array; var_dump(arsort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort_flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(arsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt index a76a180f40..2d72a6d776 100644 --- a/ext/standard/tests/array/arsort_variation4.phpt +++ b/ext/standard/tests/array/arsort_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort reference variables +Test arsort() function : usage variations - sort reference variables --FILE-- &$value1 , 2 => &$value2, 3 => &$value3); echo "\n-- Testing arsort() by supplying reference variable array, 'flag' value is defualt --\n"; diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index 187d43c482..acdff90957 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + // group of escape sequences + array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), - // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", + // array contains combination of capital/small letters + array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt index 687b20a714..32e732dd4a 100644 --- a/ext/standard/tests/array/arsort_variation6.phpt +++ b/ext/standard/tests/array/arsort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort hexadecimal values +Test arsort() function : usage variations - sort hexadecimal values --FILE-- 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt index dc661b572e..b4bbdd0d0e 100644 --- a/ext/standard/tests/array/arsort_variation7.phpt +++ b/ext/standard/tests/array/arsort_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort bool values +Test arsort() function : usage variations - sort bool values --FILE-- array("data[2,0]" => 44, "data[2,1]" => 11, "sub_array[2][0] " => array(64,61) ), // array contains sub arrays - "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), + "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), "sub_array[3][2]" => array(22,-55), "sub_array[3][3]" => array() ) ); @@ -39,8 +39,8 @@ echo "\n-- Testing arsort() by supplying various arrays containing sub arrays -- // loop through to test arsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing arsort() function by supplying different arrays, flag value is default echo "- With default sort_flag -\n"; $temp_array = $array; diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt index 1e319e783c..2e746e2fa4 100644 --- a/ext/standard/tests/array/arsort_variation9.phpt +++ b/ext/standard/tests/array/arsort_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR +Test arsort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR --FILE-- "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 1 => 100, 2 => 33, 3 => 555, 4 => 22 ); echo "\n-- Testing asort() by supplying string array, 'flag' value is default --\n"; diff --git a/ext/standard/tests/array/asort_error.phpt b/ext/standard/tests/array/asort_error.phpt index ef2329585b..821663fa64 100644 --- a/ext/standard/tests/array/asort_error.phpt +++ b/ext/standard/tests/array/asort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test asort() function : error conditions +Test asort() function : error conditions --FILE-- new for_integer_asort(11), 2 => new for_integer_asort(66), 3 => new for_integer_asort(23), 4 => new for_integer_asort(-5), 5 => new for_integer_asort(0.001), 6 => new for_integer_asort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_asort("axx"), "b" => new for_string_asort("t"), "c" => new for_string_asort("w"), "d" => new for_string_asort("py"), "e" => new for_string_asort("apple"), "f" => new for_string_asort("Orange"), diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/asort_object2.phpt index be761205b2..8f2a666146 100644 --- a/ext/standard/tests/array/asort_object2.phpt +++ b/ext/standard/tests/array/asort_object2.phpt @@ -1,15 +1,15 @@ --TEST-- -Test asort() function : object functionality - sorting objects with diff. accessibility of member vars +Test asort() function : object functionality - sorting objects with diff. accessibility of member vars --FILE-- public_class_value = $value1; @@ -36,7 +36,7 @@ class for_string_asort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -51,13 +51,13 @@ class for_string_asort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_asort(11, 33,2), 2 => new for_integer_asort(44, 66,3), 3 => new for_integer_asort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4), ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_asort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"), "c" => new for_string_asort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"), ); diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt index 1713f12919..15c4faa67a 100644 --- a/ext/standard/tests/array/asort_variation1.phpt +++ b/ext/standard/tests/array/asort_variation1.phpt @@ -4,7 +4,7 @@ Test asort() function : usage variations - unexpected values for 'array_arg' arg 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, +$unsorted_oct_array = array ( + 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 077 => 077, -066 => -066, -0345 => -0345, 0 => 0 ); diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt index 013865f2c2..6872ca235c 100644 Binary files a/ext/standard/tests/array/asort_variation11.phpt and b/ext/standard/tests/array/asort_variation11.phpt differ diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt index ce2247f894..c35d112034 100644 --- a/ext/standard/tests/array/asort_variation2.phpt +++ b/ext/standard/tests/array/asort_variation2.phpt @@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( asort($temp_array, $value) ); + var_dump( asort($temp_array, $value) ); var_dump($temp_array); $counter++; } diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt index a9d3f6afa3..4ad106b658 100644 --- a/ext/standard/tests/array/asort_variation3.phpt +++ b/ext/standard/tests/array/asort_variation3.phpt @@ -3,7 +3,7 @@ Test asort() function : usage variations - sort integer/float values --FILE-- .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33), - + // array values contains minimum and maximum ranges array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649) ); @@ -42,20 +42,20 @@ echo "\n-- Testing asort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With default sort_flag -\n"; - $temp_array = $array; + echo "- With default sort_flag -\n"; + $temp_array = $array; var_dump(asort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort_flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(asort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt index 9fd76009ff..222ed2d1d0 100644 --- a/ext/standard/tests/array/asort_variation4.phpt +++ b/ext/standard/tests/array/asort_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort reference variables +Test asort() function : usage variations - sort reference variables --FILE-- &$value1 , 2 => &$value2, 3 => &$value3); echo "\n-- Testing asort() by supplying reference variable array, 'flag' value is defualt --\n"; diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index 3d6a12ef27..ae7c3c4784 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + // group of escape sequences + array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), - // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", + // array contains combination of capital/small letters + array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt index 117f30d38b..3d9b5e5070 100644 --- a/ext/standard/tests/array/asort_variation6.phpt +++ b/ext/standard/tests/array/asort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort hexadecimal values +Test asort() function : usage variations - sort hexadecimal values --FILE-- 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt index c078eb042c..10c03cb840 100644 --- a/ext/standard/tests/array/asort_variation7.phpt +++ b/ext/standard/tests/array/asort_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort bool values +Test asort() function : usage variations - sort bool values --FILE-- array("data[2,0]" => 44, "data[2,1]" => 11, "sub_array[2][0] " => array(64,61) ), // array contains sub arrays - "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), + "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), "sub_array[3][2]" => array(22,-55), "sub_array[3][3]" => array() ) ); @@ -39,8 +39,8 @@ echo "\n-- Testing asort() by supplying various arrays containing sub arrays --\ // loop through to test asort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing asort() function by supplying different arrays, flag value is default echo "- With default sort_flag -\n"; $temp_array = $array; diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt index 85ef679daa..60b647b5d5 100644 --- a/ext/standard/tests/array/asort_variation9.phpt +++ b/ext/standard/tests/array/asort_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR +Test asort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR --FILE-- --EXPECT-- diff --git a/ext/standard/tests/array/bug22463.phpt b/ext/standard/tests/array/bug22463.phpt index dcede511bb..7993ac2576 100644 --- a/ext/standard/tests/array/bug22463.phpt +++ b/ext/standard/tests/array/bug22463.phpt @@ -8,7 +8,7 @@ function a($ary) { } function cb($v, $elem) { - return $v + a($elem); + return $v + a($elem); } $ary = array( diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt index b1cd523026..a1a30afb6d 100644 --- a/ext/standard/tests/array/bug24198.phpt +++ b/ext/standard/tests/array/bug24198.phpt @@ -2,9 +2,9 @@ Bug #24198 (array_merge_recursive() invalid recursion detection) --FILE-- 'aa','b' => 'bb'); +$c = array('a' => 'aa','b' => 'bb'); -var_dump(array_merge_recursive($c, $c)); +var_dump(array_merge_recursive($c, $c)); ?> --EXPECT-- array(2) { diff --git a/ext/standard/tests/array/bug24980.phpt b/ext/standard/tests/array/bug24980.phpt index b9e04fd67f..6c97562f6c 100644 --- a/ext/standard/tests/array/bug24980.phpt +++ b/ext/standard/tests/array/bug24980.phpt @@ -9,7 +9,7 @@ function add_up($running_total, $current_value) $running_total += $current_value * $current_value; return $running_total; } - + $numbers = array (2,3,5,7); $total = array_reduce($numbers, 'add_up'); print "Total is $total\n"; @@ -21,7 +21,7 @@ function foo ($a, $b) return $a . $b; } var_dump(array_reduce($a, "foo")); - + /* test #3: basic test (used to leak memory) */ function rsum($v, $w) { diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index 7720fe0006..289e802c00 100644 --- a/ext/standard/tests/array/bug30074.phpt +++ b/ext/standard/tests/array/bug30074.phpt @@ -3,7 +3,7 @@ Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, af --FILE-- $undefined), EXTR_REFS); +$result = extract(array('a'=>$undefined), EXTR_REFS); var_dump(array($a)); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/bug30833.phpt b/ext/standard/tests/array/bug30833.phpt index 728a659d8f..c79c33fa74 100644 --- a/ext/standard/tests/array/bug30833.phpt +++ b/ext/standard/tests/array/bug30833.phpt @@ -13,7 +13,7 @@ var_dump($foo); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> string(3) "abc" diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/bug33382.phpt index e54b984fd0..0153da90bd 100644 --- a/ext/standard/tests/array/bug33382.phpt +++ b/ext/standard/tests/array/bug33382.phpt @@ -11,7 +11,7 @@ var_dump(array_reverse($array)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> int(5) diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt index 023f4176fc..9110379d9d 100644 --- a/ext/standard/tests/array/bug34066.phpt +++ b/ext/standard/tests/array/bug34066.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- gen_xml(prefix=/Docs/) gen_xml(prefix=/Docs/@) /Docs/@Version=1.0 diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt index 6d0f7f84e9..2f0a361aa0 100644 --- a/ext/standard/tests/array/bug34066_1.phpt +++ b/ext/standard/tests/array/bug34066_1.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- gen_xml(prefix=/Docs/) /Docs/Version=1.0 gen_xml(prefix=/Docs/) end diff --git a/ext/standard/tests/array/bug35014.phpt b/ext/standard/tests/array/bug35014.phpt index 9250c03e10..f858bf107b 100644 --- a/ext/standard/tests/array/bug35014.phpt +++ b/ext/standard/tests/array/bug35014.phpt @@ -22,7 +22,7 @@ foreach ($tests as $v) { var_dump(array_product($v)); } ?> ---EXPECTF-- +--EXPECTF-- Warning: array_product() expects parameter 1 to be array, string given in %s on line %d NULL int(1) diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt index efd791ac99..5caf48c6ee 100644 --- a/ext/standard/tests/array/bug35014_64bit.phpt +++ b/ext/standard/tests/array/bug35014_64bit.phpt @@ -22,7 +22,7 @@ foreach ($tests as $v) { var_dump(array_product($v)); } ?> ---EXPECTF-- +--EXPECTF-- Warning: array_product() expects parameter 1 to be array, string given in %s on line %d NULL int(1) diff --git a/ext/standard/tests/array/bug35022.phpt b/ext/standard/tests/array/bug35022.phpt index e3f5386482..07138f138d 100644 --- a/ext/standard/tests/array/bug35022.phpt +++ b/ext/standard/tests/array/bug35022.phpt @@ -13,7 +13,7 @@ foo($state); reset($state); var_dump( key($state), current($state) ); ?> ---EXPECT-- +--EXPECT-- three => 3 two => 2 one => 1 diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt index d7abc7773b..be48ca8570 100644 --- a/ext/standard/tests/array/bug35821.phpt +++ b/ext/standard/tests/array/bug35821.phpt @@ -21,7 +21,7 @@ array_map(array('Element', 'CallBack'), $arr); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Exception in %s:%d Stack trace: diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/bug36975.phpt index 7912fffca4..67a34325d0 100644 --- a/ext/standard/tests/array/bug36975.phpt +++ b/ext/standard/tests/array/bug36975.phpt @@ -2,13 +2,13 @@ Bug #36975 (natcasesort() causes array_pop() to misbehave) --FILE-- 'foo', 0 => 'baz'); diff --git a/ext/standard/tests/array/bug38464.phpt b/ext/standard/tests/array/bug38464.phpt index 42f7a6ab54..5480109ba2 100644 --- a/ext/standard/tests/array/bug38464.phpt +++ b/ext/standard/tests/array/bug38464.phpt @@ -5,7 +5,7 @@ Bug #38464 (array_count_values() mishandles numeric strings) $array = array('-000', ' 001', 1, ' 123', '+123'); var_dump(array_count_values($array)); ?> ---EXPECT-- +--EXPECT-- array(5) { ["-000"]=> int(1) diff --git a/ext/standard/tests/array/bug39576.phpt b/ext/standard/tests/array/bug39576.phpt index f94aa3a2be..bb58e79183 100644 --- a/ext/standard/tests/array/bug39576.phpt +++ b/ext/standard/tests/array/bug39576.phpt @@ -32,7 +32,7 @@ array_intersect_key ( echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Only variables should be passed by reference in %s on line %d object(Test)#%d (4) { ["_table"]=> diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt index 244ce787af..db239487ea 100644 --- a/ext/standard/tests/array/bug40191.phpt +++ b/ext/standard/tests/array/bug40191.phpt @@ -15,7 +15,7 @@ var_dump($arr); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_unique() expects parameter 1 to be array, object given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt index 7e132ba3d4..93836d0398 100644 --- a/ext/standard/tests/array/bug40709.phpt +++ b/ext/standard/tests/array/bug40709.phpt @@ -19,7 +19,7 @@ echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n"; echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- result for arr1: 1,2,3 result for arr2: 1 result for arr1: 1,2,3 diff --git a/ext/standard/tests/array/bug41121.phpt b/ext/standard/tests/array/bug41121.phpt index a03bdaf4ce..b2d133ef13 100644 --- a/ext/standard/tests/array/bug41121.phpt +++ b/ext/standard/tests/array/bug41121.phpt @@ -12,8 +12,8 @@ var_dump(range(2147483400, 2147483600, 100)); var_dump( range(2147483646, 2147483648, 1 ) ); var_dump( range(2147483646, 2147483657, 1 ) ); var_dump( range(2147483630, 2147483646, 5 ) ); - -// negative steps + +// negative steps var_dump( range(-2147483645, -2147483648, 1 ) ); var_dump( range(-2147483645, -2147483649, 1 ) ); var_dump( range(-2147483630, -2147483646, 5 ) ); @@ -23,7 +23,7 @@ var_dump(range(2147483647, 2147483645, 1 )); var_dump(range(2147483648, 2147483645, 1 )); ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(2147483400) diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt index 9f1384eddd..4c41607d34 100644 --- a/ext/standard/tests/array/bug41686.phpt +++ b/ext/standard/tests/array/bug41686.phpt @@ -6,17 +6,17 @@ $a = array(1,2,3); $b = array('a'=>1,'b'=>1,'c'=>2); var_dump( - array_slice($a, 1), + array_slice($a, 1), array_slice($a, 1, 2, TRUE), - array_slice($a, 1, NULL, TRUE), - array_slice($b, 1), - array_slice($b, 1, 2, TRUE), + array_slice($a, 1, NULL, TRUE), + array_slice($b, 1), + array_slice($b, 1, 2, TRUE), array_slice($b, 1, NULL, TRUE) ); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> int(2) diff --git a/ext/standard/tests/array/bug42850.phpt b/ext/standard/tests/array/bug42850.phpt index 3baec831bd..16063bbdfc 100644 --- a/ext/standard/tests/array/bug42850.phpt +++ b/ext/standard/tests/array/bug42850.phpt @@ -1,11 +1,11 @@ --TEST-- -Bug #42850 (array_walk_recursive() leaves references) +Bug #42850 (array_walk_recursive() leaves references) --FILE-- 'val1', array('key2' => 'val2')); -function apply_dumb($item, $key) {}; +function apply_dumb($item, $key) {}; var_dump($data); array_walk_recursive($data, 'apply_dumb'); $data2 = $data; diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt index 8b8f3a6edb..522ff1903b 100644 --- a/ext/standard/tests/array/bug43495.phpt +++ b/ext/standard/tests/array/bug43495.phpt @@ -8,7 +8,7 @@ $a["key1"]["key2"]["key3"]=&$a; $b=array("key1"=>array("key2"=>array())); $b["key1"]["key2"]["key3"]=&$b; -array_merge_recursive($a,$b); +array_merge_recursive($a,$b); /* Break recursion */ $a["key1"]["key2"]["key3"] = null; diff --git a/ext/standard/tests/array/bug48484.phpt b/ext/standard/tests/array/bug48484.phpt index 0b4afe277a..5688c0cad8 100644 --- a/ext/standard/tests/array/bug48484.phpt +++ b/ext/standard/tests/array/bug48484.phpt @@ -4,5 +4,5 @@ Bug 48484 (array_product() always returns 0 for an empty array) ---EXPECT-- +--EXPECT-- int(1) diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt index 3df67f3a4b..13d70bc42a 100644 --- a/ext/standard/tests/array/bug50006_1.phpt +++ b/ext/standard/tests/array/bug50006_1.phpt @@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - usort variant $data = array( 'bar-bazbazbaz.', - 'bar-bazbazbaz-', + 'bar-bazbazbaz-', 'foo' ); usort($data, 'magic_sort_cmp'); diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt index 48bb751703..04e799eaff 100644 --- a/ext/standard/tests/array/bug50006_2.phpt +++ b/ext/standard/tests/array/bug50006_2.phpt @@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - uasort variant $data = array( 'bar-bazbazbaz.', - 'bar-bazbazbaz-', + 'bar-bazbazbaz-', 'foo' ); uasort($data, 'magic_sort_cmp'); diff --git a/ext/standard/tests/array/bug61058.phpt b/ext/standard/tests/array/bug61058.phpt index 1f0f6fe630..f5e06a4a02 100644 --- a/ext/standard/tests/array/bug61058.phpt +++ b/ext/standard/tests/array/bug61058.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #61058 (array_fill leaks if start index is PHP_INT_MAX) --FILE-- - --EXPECTF-- diff --git a/ext/standard/tests/array/bug65304.phpt b/ext/standard/tests/array/bug65304.phpt index e5c9dfc5e6..8ed4c5081b 100644 --- a/ext/standard/tests/array/bug65304.phpt +++ b/ext/standard/tests/array/bug65304.phpt @@ -5,6 +5,6 @@ Bug #65304 (Use of max int in array_sum) var_dump(array_sum(array(PHP_INT_MAX, 1))); var_dump(PHP_INT_MAX + 1); ?> ---EXPECTF-- +--EXPECTF-- float(%s) float(%s) diff --git a/ext/standard/tests/array/bug68553.phpt b/ext/standard/tests/array/bug68553.phpt index 91c5b080a9..fbee975d17 100644 --- a/ext/standard/tests/array/bug68553.phpt +++ b/ext/standard/tests/array/bug68553.phpt @@ -8,7 +8,7 @@ while ($i--) { $fd = fopen(__FILE__, "r"); fclose($fd); } -$a = [ +$a = [ ['a' => 10], ['a' => 20], ['a' => true], diff --git a/ext/standard/tests/array/bug70713.phpt b/ext/standard/tests/array/bug70713.phpt index 4e2792ab4b..7cd0a0f113 100644 --- a/ext/standard/tests/array/bug70713.phpt +++ b/ext/standard/tests/array/bug70713.phpt @@ -8,12 +8,12 @@ class obj function __tostring() { global $arr; - + $arr = 1; for ($i = 0; $i < 5; $i++) { $v[$i] = 'hi'.$i; } - + return 'hi'; } } diff --git a/ext/standard/tests/array/bug71220.phpt b/ext/standard/tests/array/bug71220.phpt index 28b5c08a8a..49e5bb7719 100644 --- a/ext/standard/tests/array/bug71220.phpt +++ b/ext/standard/tests/array/bug71220.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #71220 (Null pointer deref (segfault) in compact via ob_start) --FILE-- - diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt index 53a946e12a..9f4021a409 100644 --- a/ext/standard/tests/array/compact_basic.phpt +++ b/ext/standard/tests/array/compact_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test compact() function : basic functionality +Test compact() function : basic functionality --FILE-- --FILE-- @@ -48,9 +48,9 @@ $count_array = array( array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1 => -2.344, array()), - array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", + array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", NULL => NULL, "\x000" => "\x000", "\000" => "\000"), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -58,14 +58,14 @@ $i = 0; foreach ($count_array as $count_value) { echo "\n-- Iteration $i --\n"; print "COUNT_NORMAL is ".count($count_value, COUNT_NORMAL)."\n"; - print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n"; + print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n"; $i++; } /* Testing count() by passing constant with no second argument */ print "\n-- Testing count() on constants with no second argument --\n"; -print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; +print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; print "COUNT_NORMAL: should be 1, is ".count(-23.45)."\n"; print "\n-- Testing count() on NULL and Unset variables --\n"; @@ -106,13 +106,13 @@ echo "\n-- Testing count() on arrays containing references --\n"; $arr = array(1, array("a", "b", "c")); $arr[2] = &$arr[1]; -$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, +$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, FALSE, NULL); for( $i =0; $i < count( $mode_arr ); $i++) { echo "For mode '$mode_arr[$i]' count is => "; var_dump(count($arr, $mode_arr[$i])); } - + echo "\n-- Testing error conditions --"; var_dump( count() ); // No. of args = 0 diff --git a/ext/standard/tests/array/count_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt index a58473c219..5152f65445 100644 --- a/ext/standard/tests/array/count_variation1.phpt +++ b/ext/standard/tests/array/count_variation1.phpt @@ -3,7 +3,7 @@ Test count() function : usage variations - Pass different data types as $var arg --FILE-- array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt index f1b6f76ea6..74e571160e 100644 Binary files a/ext/standard/tests/array/each.phpt and b/ext/standard/tests/array/each.phpt differ diff --git a/ext/standard/tests/array/each_basic.phpt b/ext/standard/tests/array/each_basic.phpt index b12b4c19f7..cd38682dc7 100644 --- a/ext/standard/tests/array/each_basic.phpt +++ b/ext/standard/tests/array/each_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test each() function : basic functionality +Test each() function : basic functionality --FILE-- array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt index 375615643f..8a0773f0b5 100644 --- a/ext/standard/tests/array/each_variation3.phpt +++ b/ext/standard/tests/array/each_variation3.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - keys of different data types 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -49,8 +49,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -60,17 +60,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/each_variation4.phpt b/ext/standard/tests/array/each_variation4.phpt index 14b5536135..7cddd3e5c3 100644 --- a/ext/standard/tests/array/each_variation4.phpt +++ b/ext/standard/tests/array/each_variation4.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - Referenced variables "U", -4, "-.008" => "neg.008"); -// remove first element from array +// remove first element from array echo "\n-- Remove first element from array --\n"; unset($array_test[0]); var_dump( end($array_test) ); -// remove last element from array, rewind and check end() +// remove last element from array, rewind and check end() echo "\n-- Remove last element from array --\n"; unset($array_test['-.008']); var_dump( end($array_test) ); reset( $array_test ); var_dump( end($array_test) ); -// remove any element !first, !last, rewind and check end() +// remove any element !first, !last, rewind and check end() echo "\n-- Remove any element from array apart from first and last element --\n"; unset($array_test[7]); var_dump( end($array_test) ); diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index 23d410ee1b..9bfd03a88f 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -29,14 +29,14 @@ $arrays = array ( array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ), array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 ) ); -/* loop through $arrays to print the last element of each sub-array */ +/* loop through $arrays to print the last element of each sub-array */ echo "*** Testing end() on different arrays ***\n"; $counter = 1; foreach ($arrays as $sub_array){ echo "-- Iteration $counter --\n"; var_dump( end($sub_array) ); /* ensure that internal pointer is moved to last element */ - var_dump( current($sub_array) ); + var_dump( current($sub_array) ); $counter++; } @@ -50,19 +50,19 @@ var_dump( end($test_array[1]) ); echo "\n*** Testing end() when array elements are deleted ***\n"; $array_test = array("a", "b", "d", 7, "u" => "U", -4, "-.008" => "neg.008"); -// remove first element from array +// remove first element from array echo "\n-- Remove first element from array --\n"; unset($array_test[0]); var_dump( end($array_test) ); -// remove last element from array, rewind and check end() +// remove last element from array, rewind and check end() echo "\n-- Remove last element from array --\n"; unset($array_test['-.008']); var_dump( end($array_test) ); reset( $array_test ); var_dump( end($array_test) ); -// remove any element !first, !last, rewind and check end() +// remove any element !first, !last, rewind and check end() echo "\n-- Remove any element from array apart from first and last element --\n"; unset($array_test[7]); var_dump( end($array_test) ); diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt index 5a6606d381..aa899eb939 100644 --- a/ext/standard/tests/array/end_basic.phpt +++ b/ext/standard/tests/array/end_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test end() function : basic functionality +Test end() function : basic functionality --FILE-- 'original.foo'); diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt index dfab4ddbba..b26207b970 100644 --- a/ext/standard/tests/array/extract_variation11.phpt +++ b/ext/standard/tests/array/extract_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function - ensure EXTR_REFS works when array is referenced and keys clash with variables in current scope. +Test extract() function - ensure EXTR_REFS works when array is referenced and keys clash with variables in current scope. --FILE-- 'original.foo'); diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt index 570e75f076..99d1016a70 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 2) +Test extract() function (variation 2) --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index ee1267f4e2..a394b6035e 100644 --- a/ext/standard/tests/array/in_array_variation2.phpt +++ b/ext/standard/tests/array/in_array_variation2.phpt @@ -4,7 +4,7 @@ Test in_array() function : usage variations - different haystack values 'd', 3, - ".001" =>-67, + ".001" =>-67, "-.051" =>"k", 0.091 =>"-.08", - "e" =>"5", + "e" =>"5", "y" =>NULL, NULL =>"", 0, @@ -39,11 +39,11 @@ $counter = 1; foreach($array_type as $type) { echo "-- Iteration $counter --\n"; //loose type checking - var_dump( in_array($type,$misc_array ) ); + var_dump( in_array($type,$misc_array ) ); //strict type checking - var_dump( in_array($type,$misc_array,true) ); + var_dump( in_array($type,$misc_array,true) ); //loose type checking - var_dump( in_array($type,$misc_array,false) ); + var_dump( in_array($type,$misc_array,false) ); $counter++; } diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt index c8b6445cd1..f07d1dea89 100644 --- a/ext/standard/tests/array/in_array_variation3.phpt +++ b/ext/standard/tests/array/in_array_variation3.phpt @@ -4,7 +4,7 @@ Test in_array() function : usage variations - haystack as sub-array/object "two", "three" => 3), 4 => "four", "five" => 5, @@ -22,7 +22,7 @@ $sub_array = array ( ); var_dump( in_array("four", $sub_array) ); //checking for element in a sub-array -var_dump( in_array(3, $sub_array[1]) ); +var_dump( in_array(3, $sub_array[1]) ); var_dump( in_array(array('','i'), $sub_array) ); /* checking for objects in in_array() */ @@ -36,11 +36,11 @@ class in_array_check { $in_array_obj = new in_array_check(); //creating new object //error: as wrong datatype for second argument -var_dump( in_array("array_var", $in_array_obj) ); +var_dump( in_array("array_var", $in_array_obj) ); //error: as wrong datatype for second argument -var_dump( in_array("foo", $in_array_obj) ); +var_dump( in_array("foo", $in_array_obj) ); //element found as "one" exists in array $array_var -var_dump( in_array("one", $in_array_obj->array_var) ); +var_dump( in_array("one", $in_array_obj->array_var) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index 9a5312b268..e166bdfad5 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -4,7 +4,7 @@ Test in_array() function : usage variations - haystack as resource/multi dimensi TRUE, "b"=> TRUE, - array("c"=> TRUE, "d"=>TRUE) - ) - ) - ); +var_dump( in_array(FALSE, + array("a"=> TRUE, "b"=> TRUE, + array("c"=> TRUE, "d"=>TRUE) + ) + ) + ); //matching string having integer in beginning, result:true in loose type check -var_dump( in_array('123abc', array(123)) ); -var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode +var_dump( in_array('123abc', array(123)) ); +var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt index 8fdca1966c..4d5b15b340 100644 --- a/ext/standard/tests/array/key_basic.phpt +++ b/ext/standard/tests/array/key_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test key() function : basic functionality +Test key() function : basic functionality --FILE-- 1); +$a = array('bar' => 1); var_dump(key_exists('bar', $a)); var_dump(key_exists('foo', $a)); --EXPECTF-- diff --git a/ext/standard/tests/array/key_exists_error.phpt b/ext/standard/tests/array/key_exists_error.phpt index 1bbd41e20e..a1af3910ba 100644 --- a/ext/standard/tests/array/key_exists_error.phpt +++ b/ext/standard/tests/array/key_exists_error.phpt @@ -8,7 +8,7 @@ Francesco Fullone ff@ideato.it echo "*** Test by calling method or function with incorrect numbers of arguments ***\n"; -$a = array('bar' => 1); +$a = array('bar' => 1); var_dump(key_exists()); var_dump(key_exists('foo', $a, 'baz')); diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt index 94ea8d45f7..0baa17eff7 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it --FILE-- 1, 'foo' => array('bar' => 2, 'baz' => 3)); +$a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); var_dump(key_exists('baz', $a)); var_dump(key_exists('baz', $a['foo'])); --EXPECTF-- diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index 5f5ab86a4f..8afeaa8615 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -8,25 +8,25 @@ Francesco Fullone ff@ideato.it echo "*** test key_exists() by using mixed type of arrays ***\n"; // there is not a index = 0 element -$a = array(1 => 'bar', 'foo' => 'baz'); +$a = array(1 => 'bar', 'foo' => 'baz'); var_dump(key_exists(0, $a)); echo "integer\n"; // 1 has index = 0 -$b = array(1, 'foo' => 'baz'); +$b = array(1, 'foo' => 'baz'); var_dump(key_exists(0, $b)); // 42 has index = 0, netherless its position is the latest -$c = array('foo' => 'baz', 42); +$c = array('foo' => 'baz', 42); var_dump(key_exists(0, $c)); echo "string\n"; // 'bar' has index = 0, netherless it is a string -$d = array('bar', 'foo' => 'baz'); +$d = array('bar', 'foo' => 'baz'); var_dump(key_exists(0, $d)); // 'baz' has index = 0, netherless its position is the latest -$e = array('foo' => 'baz', 'baz'); +$e = array('foo' => 'baz', 'baz'); var_dump(key_exists(0, $e)); echo "obj\n"; @@ -38,21 +38,21 @@ class ObjectA $obj = new ObjectA(); // object has index = 0, netherless its position is the latest -$f = array('foo' => 'baz', $obj); +$f = array('foo' => 'baz', $obj); var_dump(key_exists(0, $f)); // object has index = 0, netherless its position is the first -$g = array($obj, 'foo' => 'baz'); +$g = array($obj, 'foo' => 'baz'); var_dump(key_exists(0, $g)); echo "stream resource\n"; // stream resource has index = 0, netherless its position is the first $st = fopen('php://memory', '+r'); -$h = array($st, 'foo' => 'baz'); +$h = array($st, 'foo' => 'baz'); var_dump(key_exists(0, $h)); // stream resource has index = 0, netherless its position is the latest -$i = array('foo' => 'baz', $st); +$i = array('foo' => 'baz', $st); var_dump(key_exists(0, $i)); --EXPECTF-- diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt index 42565ba8e4..bf0a1ef614 100644 --- a/ext/standard/tests/array/key_variation1.phpt +++ b/ext/standard/tests/array/key_variation1.phpt @@ -3,7 +3,7 @@ Test key() function : usage variations - Pass different data types as $array_arg --FILE-- 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -48,8 +48,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt index a231917814..2d8058d51c 100644 --- a/ext/standard/tests/array/key_variation3.phpt +++ b/ext/standard/tests/array/key_variation3.phpt @@ -3,7 +3,7 @@ Test key() function : usage variations --FILE-- "l", "orange" => "o", "banana" => "b" ); +// an array containing unsorted string values with indices +$unsorted_strings = array( "lemon" => "l", "orange" => "o", "banana" => "b" ); $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 ); echo "\n-- Testing krsort() by supplying string array, 'flag' value is defualt --\n"; diff --git a/ext/standard/tests/array/krsort_error.phpt b/ext/standard/tests/array/krsort_error.phpt index 1bca5f928d..250d9da03b 100644 --- a/ext/standard/tests/array/krsort_error.phpt +++ b/ext/standard/tests/array/krsort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test krsort() function : error conditions +Test krsort() function : error conditions --FILE-- $flag){ echo "\n- Sort flag = $key -\n"; $temp_array = $array_arg; var_dump( krsort($temp_array,$flag, $extra_arg) ); - var_dump($temp_array); + var_dump($temp_array); } echo "Done"; diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/krsort_object.phpt index 6236595796..308be2cc26 100644 --- a/ext/standard/tests/array/krsort_object.phpt +++ b/ext/standard/tests/array/krsort_object.phpt @@ -3,7 +3,7 @@ Test krsort() function : object functionality - sort objects --FILE-- new IntegerObject(11), 20 => new IntegerObject(66), 3 => new IntegerObject(23), 4 => new IntegerObject(-5), 50 => new IntegerObject(0.001), 6 => new IntegerObject(0) ); // array of string objects with different key values -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "axx" => new StringObject("axx"), "t" => new StringObject("t"), "w" => new StringObject("w"), "py" => new StringObject("py"), "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"), diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt index 7275a22c8b..9a30c4ec1e 100644 --- a/ext/standard/tests/array/krsort_variation1.phpt +++ b/ext/standard/tests/array/krsort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of krsort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index f56d2870b8..32e9b8b3ef 100644 --- a/ext/standard/tests/array/krsort_variation10.phpt +++ b/ext/standard/tests/array/krsort_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test krsort() function : usage variations - sort heredoc strings +Test krsort() function : usage variations - sort heredoc strings --FILE-- "Heredoc", + $simple_heredoc1 => "Heredoc", $simple_heredoc2 => "HEREDOC", $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!" ); diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index 1f0b331ce8..b754021bb5 100644 --- a/ext/standard/tests/array/krsort_variation2.phpt +++ b/ext/standard/tests/array/krsort_variation2.phpt @@ -3,7 +3,7 @@ Test krsort() function : usage variations - unexpected values for 'sort_flags' a --FILE-- 11, -2 => -11, 3 => 21, -4 => -21, 5 => 31, -6 => -31, 7 => 0, 8 => 41, -10 =>-41), // float key values - array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), + array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), // mixed value array with different types of keys array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 9 => 10.6E-2, @@ -40,20 +40,20 @@ echo "\n-- Testing krsort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With defualt sort flag -\n"; - $temp_array = $array; + echo "- With defualt sort flag -\n"; + $temp_array = $array; var_dump(krsort($temp_array) ); var_dump($temp_array); // loop through $flags array and call krsort() with all possible sort flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(krsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt index 3df924ac82..335cbea003 100644 --- a/ext/standard/tests/array/krsort_variation4.phpt +++ b/ext/standard/tests/array/krsort_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test krsort() function : usage variations - sort octal values +Test krsort() function : usage variations - sort octal values --FILE-- null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", + array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index 167d0ee7d6..c0c789fd2b 100644 --- a/ext/standard/tests/array/krsort_variation6.phpt +++ b/ext/standard/tests/array/krsort_variation6.phpt @@ -3,7 +3,7 @@ Test krsort() function : usage variations - sort hexadecimal values --FILE-- 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa ); diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt index 9ba3fc5447..c08d89ec20 100644 --- a/ext/standard/tests/array/krsort_variation7.phpt +++ b/ext/standard/tests/array/krsort_variation7.phpt @@ -1,14 +1,14 @@ --TEST-- -Test krsort() function : usage variations - sort array with diff. sub arrays +Test krsort() function : usage variations - sort array with diff. sub arrays --FILE-- array(), @@ -28,7 +28,7 @@ $various_arrays = array ( 3 => array(4 => 44, 1 => 11, 3 => array(64,61) ), // array contains sub arrays - 4 => array ( 3 => array(33,-5,6), 1 => array(11), + 4 => array ( 3 => array(33,-5,6), 1 => array(11), 2 => array(22,-55), 0 => array() ) ); @@ -38,8 +38,8 @@ echo "\n-- Testing krsort() by supplying various arrays containing sub arrays -- // loop through to test krsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; echo "- With defualt sort flag -\n"; $temp_array = $array; var_dump( krsort($temp_array) ); diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt index f5a40cbeed..50a9d63e57 100644 Binary files a/ext/standard/tests/array/krsort_variation8.phpt and b/ext/standard/tests/array/krsort_variation8.phpt differ diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt index 1b8ae5dd36..52b857b972 100644 --- a/ext/standard/tests/array/krsort_variation9.phpt +++ b/ext/standard/tests/array/krsort_variation9.phpt @@ -3,7 +3,7 @@ Test krsort() function : usage variations - sort array with/without key values --FILE-- "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 ); echo "\n-- Testing ksort() by supplying string array, 'flag' value is defualt --\n"; diff --git a/ext/standard/tests/array/ksort_error.phpt b/ext/standard/tests/array/ksort_error.phpt index f2b102ae01..7631e9ee0e 100644 --- a/ext/standard/tests/array/ksort_error.phpt +++ b/ext/standard/tests/array/ksort_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ksort() function : error conditions +Test ksort() function : error conditions --FILE-- new IntegerObject(11), 66 => new IntegerObject(66), 23 => new IntegerObject(23), -5 => new IntegerObject(-5), 1 => new IntegerObject(0.001), 0 => new IntegerObject(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "axx" => new StringObject("axx"), "t" => new StringObject("t"), "w" => new StringObject("w"), "py" => new StringObject("py"), "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"), diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt index a22954db78..df3b294240 100644 --- a/ext/standard/tests/array/ksort_variation1.phpt +++ b/ext/standard/tests/array/ksort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of ksort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 051bc30615..1037042a7f 100644 --- a/ext/standard/tests/array/ksort_variation10.phpt +++ b/ext/standard/tests/array/ksort_variation10.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ksort() function : usage variations - sort octal values +Test ksort() function : usage variations - sort octal values --FILE-- 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, +$unsorted_oct_array = array ( + 01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, 077 => 06, -066 => -01, -0345 => -02, 0 => 0 ); diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 347df65c4f..4dfdad05fe 100644 --- a/ext/standard/tests/array/ksort_variation11.phpt +++ b/ext/standard/tests/array/ksort_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ksort() function : usage variations - sort heredoc strings +Test ksort() function : usage variations - sort heredoc strings --FILE-- "Heredoc", + $simple_heredoc1 => "Heredoc", $simple_heredoc2 => "HEREDOC", $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!" ); diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index 830181d993..3ad987ccf4 100644 --- a/ext/standard/tests/array/ksort_variation2.phpt +++ b/ext/standard/tests/array/ksort_variation2.phpt @@ -3,7 +3,7 @@ Test ksort() function : usage variations - unexpected values for 'sort_flags' ar --FILE-- 11, -2 => -11, 3 => 21, -4 => -21, 5 => 31, -6 => -31, 7 => 0, 8 => 41, -10 =>-41), // float key values - array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), + array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), // mixed value array with different types of keys - array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, + array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 9 => 10.6E-2, -10 => -10.6E-2, 11 => 33) ); @@ -40,20 +40,20 @@ echo "\n-- Testing ksort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With defualt sort flag -\n"; - $temp_array = $array; + echo "- With defualt sort flag -\n"; + $temp_array = $array; var_dump(ksort($temp_array) ); var_dump($temp_array); // loop through $flags array and call ksort() with all possible sort flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(ksort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index 6e6a38b0a5..eed437fd5b 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing ksort() : usage variations ***\n"; $various_arrays = array ( // diff. escape sequence chars with key values - array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", + array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 1243ab1236..4ecf7a28ae 100644 --- a/ext/standard/tests/array/ksort_variation6.phpt +++ b/ext/standard/tests/array/ksort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ksort() function : usage variations - sort hexadecimal values +Test ksort() function : usage variations - sort hexadecimal values --FILE-- 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa ); diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index a0f454bbd1..1d6d58960f 100644 --- a/ext/standard/tests/array/ksort_variation7.phpt +++ b/ext/standard/tests/array/ksort_variation7.phpt @@ -1,14 +1,14 @@ --TEST-- -Test ksort() function : usage variations - sort array with diff. sub arrays +Test ksort() function : usage variations - sort array with diff. sub arrays --FILE-- array(), @@ -28,7 +28,7 @@ $various_arrays = array ( 3 => array(4 => 44, 1 => 11, 3 => array(64,61) ), // array contains sub arrays - 4 => array ( 3 => array(33,-5,6), 1 => array(11), + 4 => array ( 3 => array(33,-5,6), 1 => array(11), 2 => array(22,-55), 0 => array() ) ); @@ -38,8 +38,8 @@ echo "\n-- Testing ksort() by supplying various arrays containing sub arrays --\ // loop through to test ksort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; echo "- With defualt sort flag -\n"; $temp_array = $array; var_dump( ksort($temp_array) ); diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt index f827883ce9..58f6a7aeb1 100644 Binary files a/ext/standard/tests/array/ksort_variation8.phpt and b/ext/standard/tests/array/ksort_variation8.phpt differ diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt index 8aa1e2f29d..39c672bbf5 100644 --- a/ext/standard/tests/array/ksort_variation9.phpt +++ b/ext/standard/tests/array/ksort_variation9.phpt @@ -3,12 +3,12 @@ Test ksort() function : usage variations - sorting arrays with/without keys --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: max() expects at least 1 parameter, 0 given in %s on line 3 NULL diff --git a/ext/standard/tests/array/max_basic.phpt b/ext/standard/tests/array/max_basic.phpt index f304212293..c880810cb3 100644 --- a/ext/standard/tests/array/max_basic.phpt +++ b/ext/standard/tests/array/max_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input max() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/max_error.phpt b/ext/standard/tests/array/max_error.phpt index b20a3c08f6..a8736a3d88 100644 --- a/ext/standard/tests/array/max_error.phpt +++ b/ext/standard/tests/array/max_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for min() --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: min() expects at least 1 parameter, 0 given in %s on line 3 NULL diff --git a/ext/standard/tests/array/min_basic.phpt b/ext/standard/tests/array/min_basic.phpt index 34f853fedb..f76770f40d 100644 --- a/ext/standard/tests/array/min_basic.phpt +++ b/ext/standard/tests/array/min_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input min() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/min_error.phpt b/ext/standard/tests/array/min_error.phpt index dc472bc258..deb84f276d 100644 --- a/ext/standard/tests/array/min_error.phpt +++ b/ext/standard/tests/array/min_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for min() --FILE-- 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -48,8 +48,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -90,14 +90,14 @@ $inputs = array( /*12*/ 'unset' => array( @$unset_var => 'unset', ), - + // duplicate values /*13*/ 'duplicate' => array( 'foo' => 'bar', 'baz' => 'bar', 'hello' => 'world' ), - + ); // loop through each element of $inputs to check the behavior of natcasesort() diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt index 8a05c12f93..a38dbedfe4 100644 --- a/ext/standard/tests/array/natcasesort_variation2.phpt +++ b/ext/standard/tests/array/natcasesort_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index 452e886995..31b0d47ae9 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -27,7 +27,7 @@ $inputs = array ( // mixed value array array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33), - + // array values contains minimum and maximum ranges array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649) ); diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt index cc40378238..8929e40784 100644 Binary files a/ext/standard/tests/array/natcasesort_variation9.phpt and b/ext/standard/tests/array/natcasesort_variation9.phpt differ diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt index fe8b70c88b..f66f14adf5 100644 --- a/ext/standard/tests/array/next_basic.phpt +++ b/ext/standard/tests/array/next_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test next() function : basic functionality +Test next() function : basic functionality --FILE-- high) && (low-high < step) ) --"; var_dump( range(7.0, 1.0, 6.5) ); -echo "\n-- Testing Invalid number of arguments --"; +echo "\n-- Testing Invalid number of arguments --"; var_dump( range() ); // No.of args = 0 var_dump( range(1) ); // No.of args < expected var_dump( range(1,2,3,4) ); // No.of args > expected -var_dump( range(-1, -2, 2) ); +var_dump( range(-1, -2, 2) ); var_dump( range("a", "j", "z") ); var_dump( range(0, 1, "140962482048819216326.24") ); var_dump( range(0, 1, "140962482048819216326.24.") ); diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt index d376e68a21..e698e5c4f2 100644 --- a/ext/standard/tests/array/reset_basic.phpt +++ b/ext/standard/tests/array/reset_basic.phpt @@ -3,7 +3,7 @@ Test reset() function : basic functionality --FILE-- "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); - + // array with default keys containing unsorted numeric values $unsorted_numerics = array( 100, 33, 555, 22 ); diff --git a/ext/standard/tests/array/rsort_error.phpt b/ext/standard/tests/array/rsort_error.phpt index 6f6f2f9762..247ec79cb2 100644 --- a/ext/standard/tests/array/rsort_error.phpt +++ b/ext/standard/tests/array/rsort_error.phpt @@ -3,7 +3,7 @@ Test rsort() function : error conditions - Pass incorrect number of args --FILE-- $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(rsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done"; ?> diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt index 226284d329..0960edd36c 100644 --- a/ext/standard/tests/array/rsort_variation4.phpt +++ b/ext/standard/tests/array/rsort_variation4.phpt @@ -3,12 +3,12 @@ Test rsort() function : usage variations - referenced variables --FILE-- $flag){ echo "- Sort flag = $key -\n"; - + $temp_array = $array; var_dump(rsort($temp_array, $flag) ); var_dump($temp_array); diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt index 559a1ebaf7..59b43a8fcb 100644 --- a/ext/standard/tests/array/rsort_variation6.phpt +++ b/ext/standard/tests/array/rsort_variation6.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - Hexadecimal vales --FILE-- 2); $extra_arg = 10; var_dump( shuffle($array_arg, $extra_arg) ); -// printing the input array to check that it is not affected +// printing the input array to check that it is not affected // by above shuffle() function calls echo "\n-- original input array --\n"; var_dump( $array_arg ); diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt index 6ecbd387fe..9712d76113 100644 --- a/ext/standard/tests/array/shuffle_variation1.phpt +++ b/ext/standard/tests/array/shuffle_variation1.phpt @@ -3,7 +3,7 @@ Test shuffle() function : usage variations - unexpected values for 'array_arg' --FILE-- diff --git a/ext/standard/tests/array/sizeof_basic1.phpt b/ext/standard/tests/array/sizeof_basic1.phpt index ac86cbf8d7..c292199cb9 100644 --- a/ext/standard/tests/array/sizeof_basic1.phpt +++ b/ext/standard/tests/array/sizeof_basic1.phpt @@ -1,17 +1,17 @@ --TEST-- -Test sizeof() function : basic functionality - for scalar types +Test sizeof() function : basic functionality - for scalar types --FILE-- $fp), array(1, array(3, 4, array(6, array(8)))), @@ -32,9 +32,9 @@ $values = array ( array(false => 'red', true => 'pen' ), array('color' => "red", "item" => 'pen', 1 => "Hi", "" => "Hello" ), /* 14 */ array($fp, "resource1" => $fp, 'resource2' => $fp, array( $fp, 'type' => $fp) ) -); +); -// loop through each element of the values array for 'var' argument +// loop through each element of the values array for 'var' argument // check the working of sizeof() $counter = 1; for($i = 0; $i < count($values); $i++) @@ -42,10 +42,10 @@ for($i = 0; $i < count($values); $i++) echo "-- Iteration $counter --\n"; $var = $values[$i]; - echo "Default Mode: "; + echo "Default Mode: "; var_dump( sizeof($var) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($var, COUNT_NORMAL) ); echo "\n"; @@ -56,7 +56,7 @@ for($i = 0; $i < count($values); $i++) $counter++; } - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt index ba8afb83e6..8b5a7e1d54 100644 --- a/ext/standard/tests/array/sizeof_variation3.phpt +++ b/ext/standard/tests/array/sizeof_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sizeof() function : usage variations - checking for infinite recursion in COUNT_RECURSIVE mode +Test sizeof() function : usage variations - checking for infinite recursion in COUNT_RECURSIVE mode --FILE-- "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); - + // array with default keys containing unsorted numeric values $unsorted_numerics = array( 100, 33, 555, 22 ); diff --git a/ext/standard/tests/array/sort_error.phpt b/ext/standard/tests/array/sort_error.phpt index 4864ef33df..7c7ecb1105 100644 --- a/ext/standard/tests/array/sort_error.phpt +++ b/ext/standard/tests/array/sort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test sort() function : error conditions +Test sort() function : error conditions --FILE-- $flag){ echo "\nSort flag = $key\n"; var_dump( sort($array_arg,$flag, $extra_arg) ); - + // dump the input array to ensure that it wasn't changed var_dump($array_arg); } diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort_object1.phpt index caa9c8dbb6..a55a0962a8 100644 --- a/ext/standard/tests/array/sort_object1.phpt +++ b/ext/standard/tests/array/sort_object1.phpt @@ -3,7 +3,7 @@ Test sort() function : object functionality - sorting objects, 'sort_flags' as d --FILE-- public_class_value = $value1; $this->private_class_value = $value2; - $this->protected_class_value = $value3; + $this->protected_class_value = $value3; } } @@ -50,7 +50,7 @@ class for_string_sort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_sort(11,33,30), new for_integer_sort(66,44,4), new for_integer_sort(-88,-5,5), @@ -58,8 +58,8 @@ $unsorted_int_obj = array( ); // array of string objects -$unsorted_str_obj = array ( - new for_string_sort("axx","AXX","ass"), +$unsorted_str_obj = array ( + new for_string_sort("axx","AXX","ass"), new for_string_sort("t","eee","abb"), new for_string_sort("w","W", "c"), new for_string_sort("py","PY", "pt"), diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt index c9d0958da3..f3eba1265d 100644 --- a/ext/standard/tests/array/sort_variation1.phpt +++ b/ext/standard/tests/array/sort_variation1.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - unexpected values for 'array_arg' argu --FILE-- $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(sort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt index 82e3d9708f..cdc067a0e8 100644 --- a/ext/standard/tests/array/sort_variation4.phpt +++ b/ext/standard/tests/array/sort_variation4.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort reference values --FILE-- 1, 1 => 10, 2 => 'string', 3 => 3, 4 => 2, 5 => 100, 6 => 25); // With zero arguments diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt index 5d5b0b52c2..b728a1ffdd 100644 --- a/ext/standard/tests/array/uasort_object1.phpt +++ b/ext/standard/tests/array/uasort_object1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : object functionality +Test uasort() function : object functionality --FILE-- int_value = $value; } @@ -68,7 +68,7 @@ class SimpleClass2 } public function getValue() { return $this->int_value; - } + } } // array of SimpleClass objects with only one member diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt index b6862b7588..26fa6f11b4 100644 --- a/ext/standard/tests/array/uasort_object2.phpt +++ b/ext/standard/tests/array/uasort_object2.phpt @@ -1,18 +1,18 @@ --TEST-- -Test uasort() function : object functionality - sort diff. objects +Test uasort() function : object functionality - sort diff. objects --FILE-- int_value = $value; } - + } // Class without any member diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt index ce20666c96..aae2f33167 100644 --- a/ext/standard/tests/array/uasort_variation1.phpt +++ b/ext/standard/tests/array/uasort_variation1.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - unexpected values for 'array_arg' ar --FILE-- " ", 1 => "test", 3 => "Hello", 4 => "HELLO", + 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%" ); echo "-- Sorting Double Quoted String values --\n"; diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt index 1c0b927764..bcc7138270 100644 --- a/ext/standard/tests/array/uasort_variation6.phpt +++ b/ext/standard/tests/array/uasort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : usage variations - sort array having subarrays +Test uasort() function : usage variations - sort array having subarrays --FILE-- "Banana", "m" => "Mango", "a" => "apple", "p" => "Pine $builtin_fun_arg = $array_arg; $languageConstruct_fun_arg = $array_arg; -// Testing library functions as comparison function +// Testing library functions as comparison function echo "-- Testing uasort() with built-in 'cmp_function': strcasecmp() --\n"; var_dump( uasort($builtin_fun_arg, 'strcasecmp') ); // expecting: bool(true) var_dump($builtin_fun_arg); diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt index 85578b0207..53f32b848d 100644 --- a/ext/standard/tests/array/uasort_variation9.phpt +++ b/ext/standard/tests/array/uasort_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : usage variations - 'cmp_function' with reference argument +Test uasort() function : usage variations - 'cmp_function' with reference argument --FILE-- $b; } $my_var = array(1 => "entry_1", diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt index eaf30188de..c25f2a7525 100644 --- a/ext/standard/tests/array/usort_basic.phpt +++ b/ext/standard/tests/array/usort_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test usort() function : basic functionality +Test usort() function : basic functionality --FILE-- 1, 1 => 10, 2 => 'string', 3 => 3, 4 => 2, 5 => 100, 6 => 25); $extra_arg = 10; diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/usort_object1.phpt index 0e87443d1c..8fccc49047 100644 --- a/ext/standard/tests/array/usort_object1.phpt +++ b/ext/standard/tests/array/usort_object1.phpt @@ -3,7 +3,7 @@ Test usort() function : object functionality - different number of properties --FILE-- 2, "a" => 8, "d" => 9, - 3 => 3, 5 => 2, "o" => 6, +$array_arg = array(0 => 2, "a" => 8, "d" => 9, + 3 => 3, 5 => 2, "o" => 6, "z" => -99, 0 => 1, "z" => 3); echo "\n-- Array with duplicate keys --\n"; diff --git a/ext/standard/tests/array/usort_variation2.phpt b/ext/standard/tests/array/usort_variation2.phpt index 70d21649ce..fa5d463ade 100644 --- a/ext/standard/tests/array/usort_variation2.phpt +++ b/ext/standard/tests/array/usort_variation2.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - Pass different data types as $cmp_fun --FILE-- 9, - 8.9 => 8, + 8.9 => 8, 012 => 7, 0x34 => 6, // string keys 'key' => 5, //single quoted key - "two" => 4, //double quoted key + "two" => 4, //double quoted key " " => 0, // space as key - + // bool keys - TRUE => 100, + TRUE => 100, FALSE => 25, // null keys @@ -65,7 +65,7 @@ $array_arg = array( //heredoc keys $simple_heredoc => 75, $multiline_heredoc => 200, - + // default key 1, ); diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index 36624b7c3c..0c66516bf1 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - numeric data --FILE-- 3, 1 => 2, 3 => 100, - 4 => 150, 5 => 25, 6 => 350, +$int_values = array(0 => 3, 1 => 2, 3 => 100, + 4 => 150, 5 => 25, 6 => 350, 7 => 0, 8 => -3, 9 => -1200); - + echo "\n-- Sorting Integer array --\n"; var_dump( usort($int_values, 'cmp_function') ); var_dump($int_values); // Octal array -$octal_values = array(0 => 056, 1 => 023, 2 => 00, +$octal_values = array(0 => 056, 1 => 023, 2 => 00, 3 => 015, 4 => -045, 5 => 01, 6 => -07); echo "\n-- Sorting Octal array --\n"; @@ -44,17 +44,17 @@ var_dump( usort($octal_values, 'cmp_function') ); var_dump($octal_values); // Hexadecimal array -$hex_values = array(0 => 0xAE, 1 => 0x2B, 2 => 0X10, +$hex_values = array(0 => 0xAE, 1 => 0x2B, 2 => 0X10, 3 => -0xCF, 4 => 0X12, 5 => -0XF2); - + echo "\n-- Sorting Hex array --\n"; var_dump( usort($hex_values, 'cmp_function') ); var_dump($hex_values); // Float array -$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, +$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, 3 => 0, 4 => 0.5, 5 => 7.3e3, 6 => -9.34E-2); - + echo "\n-- Sorting Float array --\n"; var_dump( usort($float_values, 'cmp_function') ); var_dump($float_values); diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index 922321c237..b8660e1438 100644 --- a/ext/standard/tests/array/usort_variation5.phpt +++ b/ext/standard/tests/array/usort_variation5.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - string data --FILE-- ' ', 1 => 'test', 3 => 'Hello', 4 => 'HELLO', - 5 => '', 6 => '\t', 7 => '0', 8 => '123Hello', + 5 => '', 6 => '\t', 7 => '0', 8 => '123Hello', 9 => '\'', 10 => '@#$%' ); @@ -56,8 +56,8 @@ var_dump($single_quoted_values); // Double quoted strings $double_quoted_values = array( - 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", - 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", + 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", + 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%" ); @@ -66,7 +66,7 @@ var_dump( usort($double_quoted_values, 'cmp_function') ); var_dump($double_quoted_values); // Heredoc strings -$heredoc_values = array(0 => $empty_heredoc, 1 => $simple_heredoc1, +$heredoc_values = array(0 => $empty_heredoc, 1 => $simple_heredoc1, 2 => $simple_heredoc2, 3 => $multiline_heredoc); echo "\n-- Sorting Heredoc String values --\n"; diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt index 3eb2eaa852..740da53f78 100644 --- a/ext/standard/tests/array/usort_variation6.phpt +++ b/ext/standard/tests/array/usort_variation6.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - multi-dimensional arrays --FILE-- "Banana", "m" => "Mango", "a" => "apple", +$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", "p" => "Pineapple", "o" => "orange"); -// Testing library functions as comparison function +// Testing library functions as comparison function echo "\n-- Testing usort() with built-in 'cmp_function': strcasecmp() --\n"; $temp_array1 = $array_arg; var_dump( usort($temp_array1, 'strcasecmp') ); diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 6a067992e7..538befa902 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - referenced variables --FILE-- --EXPECTF-- Warning: assert() expects at most 2 parameters, 3 given in %s on line %d diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt index 7db2a13b19..73b3e73206 100644 --- a/ext/standard/tests/assert/assert_basic.phpt +++ b/ext/standard/tests/assert/assert_basic.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- [".assert_options(ASSERT_ACTIVE)."]\n"; diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt index ac84a158f9..f4943cdf16 100644 --- a/ext/standard/tests/assert/assert_basic5.phpt +++ b/ext/standard/tests/assert/assert_basic5.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- >> With Defined class\n"; echo str_pad('is_a( OBJECT:'.get_class($this).', '.$sub.') = ', 60) . (is_a($this, $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_a(get_class($this), $sub) ? 'yes' : 'no')."\n"; - echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n"; + echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( OBJECT:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of($this, $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of(get_class($this), $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.',false) = ', 60). (is_subclass_of(get_class($this), $sub , false) ? 'yes' : 'no')."\n"; - + // with autoload options.. echo ">>> With Undefined\n"; echo str_pad('is_a( STRING:undefB, '.$sub.',true) = ', 60). (is_a('undefB', $sub, true) ? 'yes' : 'no')."\n"; @@ -31,8 +31,8 @@ class base { } function test() { echo $this->_is_a('base'); - echo $this->_is_a('derived_a'); - echo $this->_is_a('if_a'); + echo $this->_is_a('derived_a'); + echo $this->_is_a('if_a'); echo $this->_is_a('undefA'); echo "\n"; } @@ -75,7 +75,7 @@ $t->test(); $t = new derived_b(); $t->test(); - + 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 6518a03c0f..3f5c7e01c4 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -5,9 +5,9 @@ error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- dir_path = $dir; } - + public function __toString() { return "$this->dir_path"; } @@ -74,7 +74,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -84,7 +84,7 @@ $inputs = array( /*19*/ "$dir_path", 'string', $heredoc, - + // object data /*22*/ new classA($dir_path), diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt index c4c0431ccc..f456f1e1a7 100644 --- a/ext/standard/tests/dir/chdir_variation1.phpt +++ b/ext/standard/tests/dir/chdir_variation1.phpt @@ -3,7 +3,7 @@ Test chdir() function : usage variations - different data type as $directory arg --FILE-- dir_path = $dir; } - + public function __toString() { return "$this->dir_path"; } @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*19*/ "$dir_path", 'string', $heredoc, - + // object data /*22*/ new classA($dir_path), diff --git a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt index f28d57ab4f..0d67b0fbc3 100644 --- a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- +?> --EXPECTF-- *** Testing readdir() : error conditions *** diff --git a/ext/standard/tests/dir/readdir_error.phpt b/ext/standard/tests/dir/readdir_error.phpt index 23ba3dfa63..24fbad37a9 100644 --- a/ext/standard/tests/dir/readdir_error.phpt +++ b/ext/standard/tests/dir/readdir_error.phpt @@ -3,7 +3,7 @@ Test readdir() function : error conditions - Incorrect number of args --FILE-- +?> --EXPECTF-- *** Testing readdir() : error conditions *** diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt index 2815e8d26f..d392e67114 100644 --- a/ext/standard/tests/dir/readdir_variation1.phpt +++ b/ext/standard/tests/dir/readdir_variation1.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - different data types as $dir_handle --FILE-- $input) { echo "\n-- Call to readdir() --\n"; $dir_handle = opendir($dir_path); while(FALSE !== ($file = readdir($dir_handle))){ - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; - + // remove files while going through directory @unlink($dir_path . $file); } diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt index 9b04a986a6..acbb8f32ab 100644 --- a/ext/standard/tests/dir/readdir_variation4.phpt +++ b/ext/standard/tests/dir/readdir_variation4.phpt @@ -3,12 +3,12 @@ Test readdir() function : usage variations - different file names --FILE-- $input) { echo "\n-- Call to readdir() --\n"; $dir_handle = opendir($dir_path); while(FALSE !== ($file = readdir($dir_handle))){ - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; - + // remove files while going through directory @unlink($dir_path . $file); } diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt index 8c12f13dfb..0ed40964a6 100644 --- a/ext/standard/tests/dir/readdir_variation5.phpt +++ b/ext/standard/tests/dir/readdir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- sub_dir ( sub parent ) diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index 754c615290..c4467d1536 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%sbug74589_新建文件夹" string(%d) "%sbug74589_新建文件夹%etest.php" bool(true) diff --git a/ext/standard/tests/file/004.phpt b/ext/standard/tests/file/004.phpt index f1fab47ac3..3fead8b215 100644 --- a/ext/standard/tests/file/004.phpt +++ b/ext/standard/tests/file/004.phpt @@ -20,7 +20,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $old_int = $int = time() / 1000; $ret = file_put_contents("TEST3", $int); echo "Float Test: "; @@ -30,7 +30,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = file_put_contents("TEST4", __FILE__); echo "Bool Test: "; if ($ret !== FALSE && md5(__FILE__) == md5_file("TEST4")) { @@ -39,7 +39,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = @file_put_contents("TEST5", $_SERVER); echo "Array Test: "; if ($ret !== FALSE && @md5(implode('', $_SERVER)) == md5_file("TEST5")) { diff --git a/ext/standard/tests/file/005_basic.phpt b/ext/standard/tests/file/005_basic.phpt index 5ed1118902..329fd15773 100644 --- a/ext/standard/tests/file/005_basic.phpt +++ b/ext/standard/tests/file/005_basic.phpt @@ -39,7 +39,7 @@ echo "\n*** Done ***\n"; unlink(dirname(__FILE__)."/005_basic.tmp"); unlink(dirname(__FILE__)."/005_basic"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing the basic functionality with file *** %d:%s:%s:%d:%d:%d %d:%s:%s:%d:%d:%d diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt index 20ba3a7fc0..6ac22914db 100644 --- a/ext/standard/tests/file/005_error.phpt +++ b/ext/standard/tests/file/005_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fileatime(), filemtime(), filectime() & touch() functions : error conditions +Test fileatime(), filemtime(), filectime() & touch() functions : error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** -- Testing with Non-existing files -- diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt index ffcdc33cd6..68fa209b24 100644 --- a/ext/standard/tests/file/005_variation-win32.phpt +++ b/ext/standard/tests/file/005_variation-win32.phpt @@ -10,12 +10,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -45,7 +45,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); @@ -120,7 +120,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -134,8 +134,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt index 7e5eedc2b1..f2bf19f6a3 100644 --- a/ext/standard/tests/file/005_variation.phpt +++ b/ext/standard/tests/file/005_variation.phpt @@ -13,12 +13,12 @@ if (getenv("SKIP_SLOW_TESTS")) { "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -48,7 +48,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); @@ -135,7 +135,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -149,8 +149,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 8508ecf7fb..63b3c1db67 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt index 6d4ca5e83d..f365174a84 100644 --- a/ext/standard/tests/file/005_variation2.phpt +++ b/ext/standard/tests/file/005_variation2.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 213442c15f..733be71126 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -29,7 +29,7 @@ unlink($filename); */ $path = dirname(__FILE__); -echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; +echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; fopen($path."/perm.tmp", "w"); var_dump( chmod($path."/perm.tmp", 0755 ) ); printf("%o", fileperms($path."/perm.tmp") ); diff --git a/ext/standard/tests/file/006_error.phpt b/ext/standard/tests/file/006_error.phpt index 04cc274ecc..c35eba2128 100644 --- a/ext/standard/tests/file/006_error.phpt +++ b/ext/standard/tests/file/006_error.phpt @@ -24,7 +24,7 @@ unlink($filename); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ) - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index b752d21fea..e2ec2f1a22 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -19,12 +19,12 @@ unlink($filename); ?> --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing fileperms() & chmod() : usage variations *** -- Testing all permission from octal 0000 to octal 0777 on file and dir -- -- Iteration 1 -- diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt index 7c5d2c838b..5219cf84c3 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -19,12 +19,12 @@ unlink($filename); ?> --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing fileperms() & chmod() : usage variations *** *** Testing fileperms(), chmod() with miscellaneous permissions *** diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt index ceb9b29943..9fb473b368 100644 --- a/ext/standard/tests/file/007_basic.phpt +++ b/ext/standard/tests/file/007_basic.phpt @@ -2,8 +2,8 @@ Test fopen(), fclose() & feof() functions: basic functionality --FILE-- Description: Closes an open file pointer Prototype: bool feof ( resource $handle ) - Description: Returns TRUE if the file pointer is at EOF or an error occurs - (including socket timeout); otherwise returns FALSE. + Description: Returns TRUE if the file pointer is at EOF or an error occurs + (including socket timeout); otherwise returns FALSE. */ echo "*** Testing error conditions for fopen(), fclsoe() & feof() ***\n"; @@ -29,7 +29,7 @@ $fp = fopen(__FILE__, "r"); fclose($fp); var_dump( fclose($fp) ); // closed handle var_dump( fclose(__FILE__) ); // invalid handle -var_dump( fclose() ); // zero argument +var_dump( fclose() ); // zero argument //feof() var_dump( feof($fp) ); // closed handle diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt index 6cba146655..2731b3bdc9 100644 --- a/ext/standard/tests/file/007_variation1.phpt +++ b/ext/standard/tests/file/007_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r" mode +Test fopen and fclose() functions - usage variations - "r" mode --FILE-- --FILE-- '.$tmpfile ; @@ -30,7 +30,7 @@ output_handler= } else { echo "Does not work\n"; } - + @unlink($tmpfile); ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug24482.phpt b/ext/standard/tests/file/bug24482.phpt index 9d0568af33..9fe4d2d9ee 100644 --- a/ext/standard/tests/file/bug24482.phpt +++ b/ext/standard/tests/file/bug24482.phpt @@ -26,13 +26,13 @@ closedir($dh); if (count($dirs) != count($globdirs)) { echo "Directory count mismatch\n"; - + echo "glob found:\n"; - sort($globdirs); + sort($globdirs); var_dump($globdirs); - + echo "opendir/readdir/isdir found:\n"; - sort($dirs); + sort($dirs); var_dump($dirs); } else { echo "OK\n"; diff --git a/ext/standard/tests/file/bug26938.phpt b/ext/standard/tests/file/bug26938.phpt index a68d5728d7..d1ad6b6526 100644 --- a/ext/standard/tests/file/bug26938.phpt +++ b/ext/standard/tests/file/bug26938.phpt @@ -6,14 +6,14 @@ $out = array(); $status = -1; $php = getenv('TEST_PHP_EXECUTABLE'); if (substr(PHP_OS, 0, 3) != 'WIN') { - exec($php . ' -n -r \'' + exec($php . ' -n -r \'' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' . ' print "\n";' . '}\'', $out, $status); } else { - exec($php . ' -n -r "' + exec($php . ' -n -r "' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index 26959ec511..e342a17348 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -4,8 +4,8 @@ Bug #27508 (userspace wrappers have bogus eof indicator) fp = fopen($url, $mode); @@ -13,22 +13,22 @@ class FileStream { return true; } - function stream_read($count) + function stream_read($count) { return fread($this->fp, $count); } - function stream_write($data) + function stream_write($data) { return fwrite($this->fp, $data); } - function stream_tell() + function stream_tell() { return ftell($this->fp); } - function stream_eof() + function stream_eof() { if (!$this->fp) { return true; @@ -36,7 +36,7 @@ class FileStream { return feof($this->fp); } - function stream_seek($offset, $whence) + function stream_seek($offset, $whence) { return fseek($this->fp, $offset, $whence) == 0 ? true : false; } diff --git a/ext/standard/tests/file/bug30362.phpt b/ext/standard/tests/file/bug30362.phpt index 1c2b4be979..59fe02ad06 100644 --- a/ext/standard/tests/file/bug30362.phpt +++ b/ext/standard/tests/file/bug30362.phpt @@ -11,7 +11,7 @@ for ($i = 0; ($i < 10) && !feof($resource); ++$i ) { echo $line . "\n"; } fclose($resource); - + ?> --EXPECT-- 111 diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt index 3526b24973..184dff264f 100644 --- a/ext/standard/tests/file/bug35740.phpt +++ b/ext/standard/tests/file/bug35740.phpt @@ -7,7 +7,7 @@ include (dirname(__FILE__)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: include(%s): failed to open stream: %s in %s on line %d Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index 5dc684a65d..fc14816f40 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -4,7 +4,7 @@ Bug #35781 (stream_filter_append() causes segfault) ---EXPECTF-- +--EXPECTF-- string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug37158.phpt b/ext/standard/tests/file/bug37158.phpt index 48df46cc63..68a07c1539 100644 --- a/ext/standard/tests/file/bug37158.phpt +++ b/ext/standard/tests/file/bug37158.phpt @@ -4,8 +4,8 @@ Bug #37158 (if userspace stream is present, fread() reads in 8192 max, otherwise ---EXPECT-- +--EXPECT-- string(26) "size of contents 1 = 20000" string(26) "size of contents 2 = 40960" Done diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt index d92289ef6e..0544e06692 100644 --- a/ext/standard/tests/file/bug38086.phpt +++ b/ext/standard/tests/file/bug38086.phpt @@ -37,7 +37,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) string(134) "Nabgure qnl Jura gur cnvaf bs yvsr jba'g one zl jnl diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 2b59f50750..6fd653de44 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index 07ca7166f3..5cbcba303c 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 64c9f8d94a..318a2a3eb9 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index a72a00310d..0bcaeb2a89 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7 diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index c047a306ec..8cd8ca8a67 100644 --- a/ext/standard/tests/file/bug39551.phpt +++ b/ext/standard/tests/file/bug39551.phpt @@ -20,5 +20,5 @@ stream_get_contents($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Done diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt index 00c29b28da..f12f2e0444 100644 --- a/ext/standard/tests/file/bug39673.phpt +++ b/ext/standard/tests/file/bug39673.phpt @@ -28,7 +28,7 @@ foreach ($offsets as $offset) { @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) int(13824) int(0) diff --git a/ext/standard/tests/file/bug40374.phpt b/ext/standard/tests/file/bug40374.phpt index 327289eba2..c1f1bc5796 100644 --- a/ext/standard/tests/file/bug40374.phpt +++ b/ext/standard/tests/file/bug40374.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #40374 (php_shutdown_temporary_directory() tries to free local value) +Bug #40374 (php_shutdown_temporary_directory() tries to free local value) --FILE-- ---EXPECTF-- +--EXPECTF-- string(%d) "%s" Done diff --git a/ext/standard/tests/file/bug41693.phpt b/ext/standard/tests/file/bug41693.phpt index 6c7ff5bf4b..ea074fa4fd 100644 --- a/ext/standard/tests/file/bug41693.phpt +++ b/ext/standard/tests/file/bug41693.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41693 (scandir() allows empty directory names) +Bug #41693 (scandir() allows empty directory names) --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: scandir(): Directory name cannot be empty in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index f77468d96d..5411000fc1 100644 --- a/ext/standard/tests/file/bug41815.phpt +++ b/ext/standard/tests/file/bug41815.phpt @@ -22,6 +22,6 @@ fclose($reader); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- OK Done diff --git a/ext/standard/tests/file/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt index 0e414f2321..ff49a554a4 100644 --- a/ext/standard/tests/file/bug66509.phpt +++ b/ext/standard/tests/file/bug66509.phpt @@ -4,9 +4,9 @@ Bug #66509 (copy() showing $context parameter as required) getParameters() as $p) { - var_dump($p->isOptional()); + var_dump($p->isOptional()); } ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt index a2abbb7f35..feb4eb9acd 100644 --- a/ext/standard/tests/file/bug72035.phpt +++ b/ext/standard/tests/file/bug72035.phpt @@ -24,7 +24,7 @@ $cmd = "$cgi -n -C $fl"; $desc = array(0 => array("pipe", "r")); $proc = proc_open($cmd, $desc, $pipes, getcwd(), array()); if (is_resource($proc)) { - echo stream_get_contents($pipes[0]); + echo stream_get_contents($pipes[0]); proc_close($proc); } diff --git a/ext/standard/tests/file/chmod_error.phpt b/ext/standard/tests/file/chmod_error.phpt index f4cae3b5cf..3b234c741f 100644 --- a/ext/standard/tests/file/chmod_error.phpt +++ b/ext/standard/tests/file/chmod_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test chmod() function : error conditions +Test chmod() function : error conditions --FILE-- "; -var_dump( copy($src_file_name, $dest_file_name) ); +var_dump( copy($src_file_name, $dest_file_name) ); $stat_after_copy = stat($src_file_name); clearstatcache(); // compare all stat fields except access time -$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", +$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "mtime", "ctime", "blksize", "blocks"); diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt index 95688c97c5..cb7c96fa0b 100644 --- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; +$src_file_name = $file_path."/copy_variation2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt index 82235ba814..029c6c5f8e 100644 --- a/ext/standard/tests/file/copy_variation2-win32.phpt +++ b/ext/standard/tests/file/copy_variation2-win32.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt index a9b36803d9..681a00750c 100644 --- a/ext/standard/tests/file/copy_variation2.phpt +++ b/ext/standard/tests/file/copy_variation2.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 5055c297f6..259412f460 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 56f797bc95..3bc0bfd139 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt index 47152d4239..f856d1665a 100644 Binary files a/ext/standard/tests/file/copy_variation4.phpt and b/ext/standard/tests/file/copy_variation4.phpt differ diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index 48e85eaf02..1245191806 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* Checking case sensitiveness */ - "COPY.tmp", + "COPY.tmp", "COPY.TMP", "CopY.TMP" ); diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt index c480fcc3bf..df13f4bd1a 100644 --- a/ext/standard/tests/file/copy_variation5.phpt +++ b/ext/standard/tests/file/copy_variation5.phpt @@ -12,7 +12,7 @@ if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) ) Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index 524b21d377..9d4fb9d9c9 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt index 3213c6b436..2ce9bb3072 100644 --- a/ext/standard/tests/file/copy_variation6.phpt +++ b/ext/standard/tests/file/copy_variation6.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 63f57f3a25..52ad6892ae 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Trying to copy the links across dir paths given in various notations +/* Trying to copy the links across dir paths given in various notations and dirs having limited access */ echo "*** Testing copy() function: copying links across different directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt index 34d5b907d9..e2817aaef3 100644 --- a/ext/standard/tests/file/copy_variation9.phpt +++ b/ext/standard/tests/file/copy_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - destination file access perms +Test copy() function: usage variations - destination file access perms --SKIPIF-- --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- --FILE-- = 10000) { print "ERROR: " . PHP_EOL; var_dump(dirname($s)); var_dump(strlen($s)); -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt index 15041ffd53..fd7aec1210 100644 --- a/ext/standard/tests/file/dirname_variation1.phpt +++ b/ext/standard/tests/file/dirname_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test dirname() function : usage variation +Test dirname() function : usage variation --CREDITS-- Dave Kelsey --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 57446b6ee0..9dbbea4e31 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -10,23 +10,23 @@ memory_limit=32M $space2 ) echo "\n Free Space Value Is Correct\n"; @@ -45,7 +45,7 @@ else { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); +var_dump( disk_free_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt index 21e7bf653d..27a1c0def6 100644 --- a/ext/standard/tests/file/disk_free_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * Prototype: float disk_free_space( string directory ) * Description: Given a string containing a directory, this function will - * return the number of bytes available on the corresponding + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt index ab2ad09081..a62954c74f 100644 --- a/ext/standard/tests/file/disk_free_space_error.phpt +++ b/ext/standard/tests/file/disk_free_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt index 78774e58e9..2fc2e4b855 100644 --- a/ext/standard/tests/file/feof_basic.phpt +++ b/ext/standard/tests/file/feof_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test feof() function : basic functionality +Test feof() function : basic functionality --CREDITS-- Dave Kelsey --FILE-- diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt index 14c72a24b1..44eb066e9c 100644 --- a/ext/standard/tests/file/fgetcsv_variation14.phpt +++ b/ext/standard/tests/file/fgetcsv_variation14.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - reading the blank line +Test fgetcsv() : usage variations - reading the blank line --FILE-- diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt index c6859497ee..212f197745 100644 --- a/ext/standard/tests/file/fgetcsv_variation15.phpt +++ b/ext/standard/tests/file/fgetcsv_variation15.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure --FILE-- diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt index ae8c4f1ef6..6acbbf4f88 100644 --- a/ext/standard/tests/file/fgetcsv_variation21.phpt +++ b/ext/standard/tests/file/fgetcsv_variation21.phpt @@ -2,13 +2,13 @@ Test fgetcsv() : usage variations - with default enclosure, blank line --FILE-- diff --git a/ext/standard/tests/file/fgetcsv_variation22.phpt b/ext/standard/tests/file/fgetcsv_variation22.phpt index 9f35c1c1c3..ed4e129eb5 100644 --- a/ext/standard/tests/file/fgetcsv_variation22.phpt +++ b/ext/standard/tests/file/fgetcsv_variation22.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file --FILE-- ---EXPECTF-- +--EXPECTF-- string(18) "askasdfasdfaaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt index 58dd00c11a..2ae3abf355 100644 --- a/ext/standard/tests/file/fgetss1.phpt +++ b/ext/standard/tests/file/fgetss1.phpt @@ -36,7 +36,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fgetss1.html"; unlink($filename); ?> ---EXPECTF-- +--EXPECTF-- string(21) "askasdfasdfaaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt index 4c5881d588..e7b6a5776d 100644 --- a/ext/standard/tests/file/fgetss_basic1.phpt +++ b/ext/standard/tests/file/fgetss_basic1.phpt @@ -9,7 +9,7 @@ Test fgetss() function : Basic functionality - read modes only /* test fgetss with all read modes */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : Basic operations ***\n"; @@ -32,33 +32,33 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "\n-- Testing fgetss() with file opened using $file_modes[$mode_counter] mode --\n"; /* create an empty file and write the strings with tags */ - $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; + $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; exit(); } - - rewind($file_handle); - /* read entire file and strip tags */ + + rewind($file_handle); + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 --\n"; var_dump( fgetss($file_handle) ); // no length and allowable tags provided, reads entire file var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + rewind($file_handle); /* read entire file and strip tags tags */ echo "-- fgets() with length = 30, file pointer at 0 --\n"; var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 7edf7bcbd1..3a3fbb09ab 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -32,7 +32,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index ca6f40cb94..ff8f4d6b55 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -32,7 +32,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index 86be24810e..ccc02966b6 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -30,7 +30,7 @@ is a heredoc string. ksklnm@@$$&$&^%&^%&^%& html EOT; -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -45,7 +45,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -64,11 +64,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt index 2640d27900..7c99f73a25 100644 --- a/ext/standard/tests/file/fgetss_error.phpt +++ b/ext/standard/tests/file/fgetss_error.phpt @@ -17,14 +17,14 @@ echo "-- Testing fgetss() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgetss($fp, 100, '

', $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgetss() with invalid length arguments --\n"; -$len = 0; +$len = 0; $allowable_tags = '

'; var_dump( fgetss($fp, $len, $allowable_tags) ); $len = -10; var_dump( fgetss($fp, $len, $allowable_tags) ); -$len = 1; +$len = 1; var_dump( fgetss($fp, $len, $allowable_tags) ); // return length - 1 always, expect false // test invalid arguments : non-resources diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt index 7cd49333bf..b189b1b5a1 100644 --- a/ext/standard/tests/file/fgetss_variation1-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -55,23 +55,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 5a0556a198..54826fad66 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -51,23 +51,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index a436e8c4b3..43bebab6e1 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -7,7 +7,7 @@ Test fgetss() function : usage variations - read modes Description: Gets line from file pointer and strip HTML tags */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); /*Test fgetss() with all read modes , reading line by line with allowable tags: , , */ @@ -27,7 +27,7 @@ this text contains some html tags body
br
this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -37,7 +37,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + /* rewind the file and read the file line by line with allowable tags */ echo "-- Reading line by line with allowable tags: , , --\n"; rewind($file_handle); @@ -60,10 +60,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file - fclose($file_handle); - // delete the file + + // close the file + fclose($file_handle); + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt index fc7561dff5..1987592bbc 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- body
br
this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -50,7 +50,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index b93bc6afd0..f455e8b3af 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Description: Gets line from file pointer and strip HTML tags */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -30,7 +30,7 @@ this text contains some html tags body
br
this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -40,7 +40,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + echo "-- Reading when file pointer points to EOF --\n"; var_dump( fseek($file_handle,0,SEEK_END) ); // now file pointer at end var_dump( ftell($file_handle) ); //ensure file pointer at end @@ -64,10 +64,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle, 80, ", , ") ); var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file - fclose($file_handle); - // delete the file + + // close the file + fclose($file_handle); + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt index a2d4a705e8..52eaef629a 100644 --- a/ext/standard/tests/file/fgetss_variation5-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- body
br
this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -67,11 +67,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index 97a592fd0c..77d87dd820 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -2,7 +2,7 @@ Test file() function : basic functionality --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index 510ec12aed..12d740c5f0 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt index f485b0ecf5..a302bf3e2f 100644 --- a/ext/standard/tests/file/file_get_contents_variation3.phpt +++ b/ext/standard/tests/file/file_get_contents_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- --FILE-- @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt index 26ba22a47e..b63c0a1183 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey --FILE-- --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey --FILE-- --FILE-- --FILE-- -1, @@ -30,8 +30,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 5b325b0e98..97a3495d54 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -11,15 +11,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index 35d193095c..f9a2d0e7e2 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- ===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 753e287504..ae56486d5f 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_put_contents() function : usage variation - different data types to write +Test file_put_contents() function : usage variation - different data types to write --CREDITS-- Dave Kelsey --FILE-- --FILE-- @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 62d814c9fd..339e9b73a7 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -5,15 +5,15 @@ Dave Kelsey --FILE-- diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index a0977faff8..7f963a01fe 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index e1a94a2043..d4ee0585fd 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- --FILE-- -1, "TRUE" => TRUE, @@ -28,8 +28,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); @@ -42,7 +42,7 @@ foreach($names_arr as $key =>$value) { unlink($value); } else { echo "Failed to write data to: $key\n"; - } + } }; ?> diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt index 3cd92c5ec8..20a2861bca 100644 Binary files a/ext/standard/tests/file/file_put_contents_variation8.phpt and b/ext/standard/tests/file/file_put_contents_variation8.phpt differ diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt index 79a42fe9b1..64a5a67e33 100644 --- a/ext/standard/tests/file/file_put_contents_variation9.phpt +++ b/ext/standard/tests/file/file_put_contents_variation9.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- @$unset_var, - + // file stream resource 'file stream resource' => $file_stream_resource, ); diff --git a/ext/standard/tests/file/file_variation5.phpt b/ext/standard/tests/file/file_variation5.phpt index 1f15491118..b8badd0e42 100644 --- a/ext/standard/tests/file/file_variation5.phpt +++ b/ext/standard/tests/file/file_variation5.phpt @@ -25,7 +25,7 @@ var_dump(file("./$test_dirname/../$filename")); echo "\nfile() on a path containing .. with invalid directories\n"; var_dump(file("./$test_dirname/bad_dir/../../$filename")); - + echo "\nfile() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index ca3be36b56..6debeaac7e 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing size of files and directories with filesize() *** int(%d) int(%d) diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt index 6d8cfa8693..0060e66f55 100644 --- a/ext/standard/tests/file/filesize_error.phpt +++ b/ext/standard/tests/file/filesize_error.phpt @@ -2,9 +2,9 @@ Test filesize() function: error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): error conditions *** Warning: filesize(): stat failed for /no/such/file in %s on line %d bool(false) diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 14975feb49..66e193c201 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/filestat.phpt b/ext/standard/tests/file/filestat.phpt index d02f9f2a10..f6031219c7 100644 --- a/ext/standard/tests/file/filestat.phpt +++ b/ext/standard/tests/file/filestat.phpt @@ -29,7 +29,7 @@ var_dump(filectime("/no/such/file/or/dir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index 4a6d3b2bc2..b8ff92f18a 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -5,7 +5,7 @@ Test filetype() function: Basic functionality /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with files and dirs ***\n"; diff --git a/ext/standard/tests/file/filetype_error.phpt b/ext/standard/tests/file/filetype_error.phpt index b965272011..b49a5286c6 100644 --- a/ext/standard/tests/file/filetype_error.phpt +++ b/ext/standard/tests/file/filetype_error.phpt @@ -5,7 +5,7 @@ Test filetype() function: Error conditions /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing error conditions ***"; diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index 3308cee20d..4a96b71e1c 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -14,7 +14,7 @@ if (!function_exists("posix_mkfifo")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with various types ***\n"; diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index 125b48c02c..df86f67763 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -9,14 +9,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } if (!file_exists("/dev/null")) { die('skip /dev/null not available'); -} +} ?> --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: flock() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index d218cee5ef..99b1ba1c59 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -2,13 +2,13 @@ Test flock() function: Basic functionality --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing flock() fun with file and dir *** bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index 81e42f3fe6..afb68b5337 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -2,9 +2,9 @@ Test flock() function: Error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** --- Iteration 0 --- diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index af67ab402a..ff0a4bbe61 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -2,9 +2,9 @@ Test flock() function: Variations --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- diff --git a/ext/standard/tests/file/fnmatch_error.phpt b/ext/standard/tests/file/fnmatch_error.phpt index 5277874ba6..61ddb2e09c 100644 --- a/ext/standard/tests/file/fnmatch_error.phpt +++ b/ext/standard/tests/file/fnmatch_error.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- "?match?", 18 => "match.tmp", 19 => "/match.tmp", -20 => "/match.tmp/", +20 => "/match.tmp/", 21 => 'match.tmp', 22 => 'match.tmp\0', 23 => "match.tmp\0", diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index c949f86fa2..bbae6f839a 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -15,9 +15,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- --FILE-- diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index d540d70006..76cf084029 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 554d8c6ded..8c4c23fb30 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- --FILE-- ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 461807d26f..429650564b 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -1,13 +1,13 @@ --TEST-- -Test fopen() function : variation: use include path create and read a file (relative) +Test fopen() function : variation: use include path create and read a file (relative) --CREDITS-- Dave Kelsey --FILE-- ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt index 031ba45734..069ce11170 100644 --- a/ext/standard/tests/file/fopen_variation19.phpt +++ b/ext/standard/tests/file/fopen_variation19.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- --FILE-- --FILE-- @$unset_var, - + //file resource 'file resource' => $fileresource ); diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 1fccbb70a9..039722e782 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- --FILE-- --FILE-- diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index eecaec7b4c..5eb415bc14 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- --FILE-- diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt index cd6bed89cf..79922e31e1 100644 --- a/ext/standard/tests/file/fopencookie.phpt +++ b/ext/standard/tests/file/fopencookie.phpt @@ -20,12 +20,12 @@ fopencookie detected and working (or cast mechanism works) class userstream { public $position = 0; public $data = "If you can read this, it worked"; - + function stream_open($path, $mode, $options, &$opened_path) { return true; } - + function stream_read($count) { $ret = substr($this->data, $this->position, $count); diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 8924b27dd2..8555f3782a 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Basic functionality --FILE-- --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index 1a80d19348..fe351960dd 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -13,7 +13,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_error.tmp"; $file_handle = fopen($filename, 'w'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); fwrite($file_handle, "hello world"); fclose($file_handle); @@ -23,7 +23,7 @@ var_dump( fscanf() ); // single argument $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle) ); fclose($file_handle); @@ -33,7 +33,7 @@ var_dump( fscanf($file_handle, "%s") ); // number of formats in format strings not matching the no of variables $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, "%d%s%f", $int_var, $string_var) ); fclose($file_handle); @@ -47,10 +47,10 @@ $invalid_formats = array( $undefined_var, undefined_constant, // looping to use various invalid formats with fscanf() foreach($invalid_formats as $format) { $file_handle = fopen($filename, 'r'); - if ($file_handle == false) + if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, $format) ); - fclose($file_handle); + fclose($file_handle); } echo "\n*** Done ***"; diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index b0c41e5f84..57b2918b1e 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -23,7 +23,7 @@ if($file_handle == false) @fwrite($file_handle, 12345); fclose($file_handle); -// open file for reading +// open file for reading $file_handle = fopen($filename, "r"); // capturing the return value from fscanf() called without third argument $return_value = fscanf($file_handle, "%s"); @@ -36,7 +36,7 @@ echo "\n*** Done ***"; --EXPECTF-- *** Testing fscanf(): for its return type without third argument *** diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt index a46c112879..9ab441610c 100644 --- a/ext/standard/tests/file/fscanf_variation10.phpt +++ b/ext/standard/tests/file/fscanf_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with resource +Test fscanf() function: usage variations - float formats with resource --FILE-- --FILE-- --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- array(26) { [0]=> int(%i) diff --git a/ext/standard/tests/file/fstat_error.phpt b/ext/standard/tests/file/fstat_error.phpt index d75ddb9a76..c3c15295dd 100644 --- a/ext/standard/tests/file/fstat_error.phpt +++ b/ext/standard/tests/file/fstat_error.phpt @@ -3,7 +3,7 @@ Test function fstat() by calling it more than or less than its expected argument --FILE-- +?> --CLEAN-- ---EXPECTF-- +--EXPECTF-- Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d bool(false) diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index a65d81efb8..e3bb39a62b 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index 81d9360276..52d3d033c1 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index c568b7c874..e11606ade3 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index 119302a13a..6af00e1121 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -19,7 +19,7 @@ $filename = dirname(__FILE__)."/fwrite_error.tmp"; echo "-- Testing fwrite() with less than expected number of arguments --\n"; // zero argument -var_dump( fwrite() ); +var_dump( fwrite() ); // less than expected, 1 arg $file_handle = fopen ( $filename, "w"); var_dump( fwrite($file_handle) ); @@ -52,14 +52,14 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) { var_dump( fwrite($invalid_args[$loop_counter - 1], 10) ); } -// fwrite() on a file handle which is already closed +// fwrite() on a file handle which is already closed echo "-- Testing fwrite() with closed/unset file handle --\n"; fclose($file_handle); var_dump(fwrite($file_handle,"data")); -// fwrite on a file handle which is unset +// fwrite on a file handle which is unset $fp = fopen($filename, "w"); -unset($fp); //unset file handle +unset($fp); //unset file handle var_dump( fwrite(@$fp,"data")); echo "Done\n"; diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index e43a04dfd6..c109aeef0f 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt index 1091aeb60b..38d35e3612 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index 44f69392e4..133405a5f1 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -36,7 +36,7 @@ foreach($file_content_types as $file_content_type) { /* open the file using $files_modes and perform fwrite() on it */ foreach($file_modes as $file_mode) { echo "-- Opening file in $file_mode --\n"; - + // create the temp file with content of type $file_content_type $filename = dirname(__FILE__)."/fwrite_variation1.tmp"; // this is name of the file create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fwrite_variation"); @@ -50,14 +50,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ var_dump( ftell($file_handle) ); // expected: 0 - var_dump( fwrite($file_handle, $data_to_be_written )); + var_dump( fwrite($file_handle, $data_to_be_written )); var_dump( ftell($file_handle) ); // expected: 0 - var_dump( feof($file_handle) ); // expected: false - + var_dump( feof($file_handle) ); // expected: false + // move the file pointer to end of the file and try fwrite() fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expecting 1024 diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt index 8545db9691..d8a6afdfd1 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index 34804b6959..ee445448f4 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ @@ -61,14 +61,14 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); //Expecting bool(false) /*overwrite data in middle of the file*/ - fseek($file_handle, SEEK_SET, 1024/2 ); + fseek($file_handle, SEEK_SET, 1024/2 ); var_dump( ftell($file_handle)); // expected: 1024/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) /* write at the end of the file */ - fseek($file_handle, SEEK_END, 0); + fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expected: 1024 var_dump( feof($file_handle) ); var_dump( fwrite($file_handle, $data_to_be_written, 200) ); diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt index 125f88df7e..47cfd18e0a 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer var_dump( ftell($file_handle) ); // expected: 1024 diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index 7d635fdae9..a3c8a76964 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer @@ -64,9 +64,9 @@ foreach($file_content_types as $file_content_type) { fseek($file_handle, SEEK_SET, (1024 + 400)/2 ); var_dump( ftell($file_handle)); // expected: (1024 + 400)/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) - + /* check the filesize and display file content */ // close the file, get the size and content of the file. var_dump( fclose($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt index ed2114e272..76d1385bab 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt index eefc2f8837..39eeae13fc 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt index b12af3182b..7afa91216e 100644 --- a/ext/standard/tests/file/fwrite_variation5.phpt +++ b/ext/standard/tests/file/fwrite_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fwrite() function : usage variation +Test fwrite() function : usage variation --CREDITS-- Dave Kelsey --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d NULL string(%d) %s diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt index 05b16238cd..ecd47f418e 100644 --- a/ext/standard/tests/file/include_streams.phpt +++ b/ext/standard/tests/file/include_streams.phpt @@ -8,7 +8,7 @@ $data1 = $data2 = $data3 = $data4 = $data5 = $data6 = <<<'EOD' EOD; /*options = $options; $split = parse_url($path); - if ($split["host"] !== "GLOBALS" || + if ($split["host"] !== "GLOBALS" || empty($split["path"]) || empty($GLOBALS[substr($split["path"],1)])) { return false; @@ -43,7 +43,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_001.phpt b/ext/standard/tests/file/include_userstream_001.phpt index d805afd204..d769a4f3b2 100644 --- a/ext/standard/tests/file/include_userstream_001.phpt +++ b/ext/standard/tests/file/include_userstream_001.phpt @@ -15,7 +15,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt index 4841d39c51..cc1887c446 100644 --- a/ext/standard/tests/file/include_userstream_002.phpt +++ b/ext/standard/tests/file/include_userstream_002.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index 2b439cfa25..470982d9b8 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt index 65efeab9a1..76b8e8bc0c 100644 --- a/ext/standard/tests/file/is_dir_variation2.phpt +++ b/ext/standard/tests/file/is_dir_variation2.phpt @@ -24,14 +24,14 @@ mkdir($dirname); var_dump( is_dir($dirname) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_symlink"); -var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks +var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks clearstatcache(); echo "-- With hardlink --"; link($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_link"); //Not permitted to create hard-link to a dir -var_dump( is_dir($file_path."/is_dir_variation2_link") ); +var_dump( is_dir($file_path."/is_dir_variation2_link") ); clearstatcache(); echo "\n*** Testing is_dir() with file and links to a file ***\n"; @@ -41,7 +41,7 @@ fclose( fopen($filename, "w") ); var_dump( is_dir($filename) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2.tmp", $file_path."/is_dir_variation2_symlink.tmp"); var_dump( is_dir($file_path."/is_dir_variation2_symlink.tmp") ); clearstatcache(); diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt index 41826ad7ec..2070374117 100644 --- a/ext/standard/tests/file/is_dir_variation3.phpt +++ b/ext/standard/tests/file/is_dir_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_dir() function: usage variations - invalid arguments +Test is_dir() function: usage variations - invalid arguments --FILE-- expected var_dump( lstat("$file_path/temp.tmp") ); // non existing file diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index 30ce9b7217..9335ce9ef8 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -34,11 +34,11 @@ clearstatcache(); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index 8e1edd66c7..f9413f768f 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of is_link() +Test lstat() and stat() functions: usage variations - effects of is_link() --SKIPIF-- var_name) ); echo "\n-- Testing stat() on directory name stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($dir_name->var_name) ); echo "\n--- Done ---"; diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt index c481575ce9..fedf0bd154 100644 --- a/ext/standard/tests/file/lstat_stat_variation19.phpt +++ b/ext/standard/tests/file/lstat_stat_variation19.phpt @@ -32,7 +32,7 @@ echo "*** Testing stat() with filename & directory name stored inside an array * // array with default numeric index $names = array( - "$file_path/lstat_stat_variation19.tmp", + "$file_path/lstat_stat_variation19.tmp", "$file_path/lstat_stat_variation19" ); diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index e7d704a20b..aaf77b9e3d 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -37,7 +37,7 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); // compare the two stats - all except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); diff --git a/ext/standard/tests/file/lstat_stat_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt index 8dcd70c798..ad0f586f1b 100644 --- a/ext/standard/tests/file/lstat_stat_variation20.phpt +++ b/ext/standard/tests/file/lstat_stat_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - link names stored in array/object +Test lstat() and stat() functions: usage variations - link names stored in array/object --SKIPIF-- ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt index d149098df0..92c05e941d 100644 --- a/ext/standard/tests/file/mkdir-002.phpt +++ b/ext/standard/tests/file/mkdir-002.phpt @@ -30,7 +30,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-002")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) string(%d) "%s diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index fdd49f340f..dde6b35550 100644 --- a/ext/standard/tests/file/mkdir-003.phpt +++ b/ext/standard/tests/file/mkdir-003.phpt @@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt index 45c275106a..eb6c55ac1d 100644 --- a/ext/standard/tests/file/mkdir-004.phpt +++ b/ext/standard/tests/file/mkdir-004.phpt @@ -17,7 +17,7 @@ var_dump(rmdir("/testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt index af2387ca73..b8f104fb79 100644 --- a/ext/standard/tests/file/mkdir-005.phpt +++ b/ext/standard/tests/file/mkdir-005.phpt @@ -18,7 +18,7 @@ var_dump(rmdir("./testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt index 17f54926cb..cee03858cb 100644 --- a/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- @$unset_var, - + // other // php.net bug outputs message File Exists 'single space' => ' ', diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt index b5254034be..c77c66b531 100644 --- a/ext/standard/tests/file/mkdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir() function : usage variation: try invalid pathname +Test mkdir() function : usage variation: try invalid pathname --CREDITS-- Dave Kelsey --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt index 67316f2c14..430c36ec99 100644 --- a/ext/standard/tests/file/mkdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_variation2.phpt @@ -7,9 +7,9 @@ Dave Kelsey --FILE-- --FILE-- --FILE-- @$unset_var, - + // non stream context resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt index c7ebd518da..b805dee3be 100644 --- a/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey +?> --FILE-- --SKIPIF-- +?> --FILE-- diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt index a24bc1c051..666ea433b1 100644 --- a/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey --FILE-- --FILE-- --FILE-- array('pipe', 'r'), 1 => array('pipe', 'w')), @@ -24,7 +24,7 @@ fflush($pipes[0]); fclose($pipes[0]); $cnt = ''; $n=0; -for ($left = strlen($test_string); $left > 0;) { +for ($left = strlen($test_string); $left > 0;) { if (++$n >1000) { print "terminated after 1000 iterations\n"; break; diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 61f6aba7a5..a240a826b9 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -10,16 +10,16 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- -1, "TRUE" => TRUE, "FALSE" => FALSE, @@ -30,7 +30,7 @@ $names_arr = array( "array()" => array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt index 3bbc329f31..59b92ad365 100644 Binary files a/ext/standard/tests/file/readfile_variation10.phpt and b/ext/standard/tests/file/readfile_variation10.phpt differ diff --git a/ext/standard/tests/file/readfile_variation3.phpt b/ext/standard/tests/file/readfile_variation3.phpt index 854642a36d..a22b2b4044 100644 --- a/ext/standard/tests/file/readfile_variation3.phpt +++ b/ext/standard/tests/file/readfile_variation3.phpt @@ -7,7 +7,7 @@ Test readfile() function: usage variation - include path */ /* test readfile() by providing an include path, second argument */ -// include file.inc +// include file.inc require("file.inc"); $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt index 9ee5a2f3c7..1df3690849 100644 --- a/ext/standard/tests/file/readfile_variation4.phpt +++ b/ext/standard/tests/file/readfile_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey --FILE-- @$unset_var, - + // file resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt index 21856f8135..04b0477154 100644 --- a/ext/standard/tests/file/readfile_variation5.phpt +++ b/ext/standard/tests/file/readfile_variation5.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey --FILE-- --FILE-- diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index d26f52f492..b41721ae4f 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey --FILE-- diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index e53f362367..b4fb0bf322 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- --FILE-- linkname) ); -var_dump( readlink($obj1->linkname) ); +// creating the links +var_dump( symlink($filename, $obj1->linkname) ); +var_dump( readlink($obj1->linkname) ); var_dump( realpath($obj1->linkname) ); -var_dump( symlink($filename, $obj2->linkname) ); +var_dump( symlink($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); var_dump( realpath($obj2->linkname) ); // deleting the link unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an object --\n"; // creating hard links -var_dump( link($filename, $obj1->linkname) ); +var_dump( link($filename, $obj1->linkname) ); var_dump( readlink($obj1->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj1->linkname) ); -var_dump( link($filename, $obj2->linkname) ); +var_dump( link($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj2->linkname) ); -// delete the links +// delete the links unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt index 0e748576ae..c7add6b037 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt @@ -31,31 +31,31 @@ $link_arr = array ( ); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an array --\n"; -// creating the links -var_dump( symlink($filename, $link_arr[0]) ); -var_dump( readlink($link_arr[0]) ); -var_dump( realpath($link_arr[0]) ); -var_dump( symlink($filename, $link_arr[1]) ); +// creating the links +var_dump( symlink($filename, $link_arr[0]) ); +var_dump( readlink($link_arr[0]) ); +var_dump( realpath($link_arr[0]) ); +var_dump( symlink($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); var_dump( realpath($link_arr[1]) ); // deleting the link unlink($link_arr[0]); -unlink($link_arr[1]); +unlink($link_arr[1]); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an array --\n"; // creating hard links -var_dump( link($filename, $link_arr[0]) ); +var_dump( link($filename, $link_arr[0]) ); var_dump( readlink($link_arr[0]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[0]) ); -var_dump( link($filename, $link_arr[1]) ); +var_dump( link($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[1]) ); -// delete the links +// delete the links unlink($link_arr[0]); -unlink($link_arr[1]); - +unlink($link_arr[1]); + echo "Done\n"; ?> --CLEAN-- diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt index 3766a5b43a..58e58237ef 100644 --- a/ext/standard/tests/file/readlink_realpath_variation3.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing readlink() and realpath() : usage variations ***\n"; - + echo "\n*** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***\n"; $link_string = array ( /* linkname as spaces */ @@ -34,8 +34,8 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) { echo $loop_counter + 1; echo " --\n"; - var_dump( readlink($link_string[$loop_counter]) ); - var_dump( realpath($link_string[$loop_counter]) ); + var_dump( readlink($link_string[$loop_counter]) ); + var_dump( realpath($link_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt index d4f1a5ff02..c66e2a4265 100644 --- a/ext/standard/tests/file/readlink_variation1.phpt +++ b/ext/standard/tests/file/readlink_variation1.phpt @@ -27,12 +27,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( readlink($filename) ); diff --git a/ext/standard/tests/file/realpath_cache.phpt b/ext/standard/tests/file/realpath_cache.phpt index 0eb9dc519a..f16995eaa2 100644 --- a/ext/standard/tests/file/realpath_cache.phpt +++ b/ext/standard/tests/file/realpath_cache.phpt @@ -15,7 +15,7 @@ var_dump($data[__DIR__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(4) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_cache_win32.phpt b/ext/standard/tests/file/realpath_cache_win32.phpt index e74a6565a7..bb8016875a 100644 --- a/ext/standard/tests/file/realpath_cache_win32.phpt +++ b/ext/standard/tests/file/realpath_cache_win32.phpt @@ -15,7 +15,7 @@ var_dump($data[__DIR__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(8) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_variation-win32-mb.phpt b/ext/standard/tests/file/realpath_variation-win32-mb.phpt index 66d7c8b0c7..25ea530894 100644 --- a/ext/standard/tests/file/realpath_variation-win32-mb.phpt +++ b/ext/standard/tests/file/realpath_variation-win32-mb.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™/home/../home//tests//..//..//..//home//realpath_variation_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation-win32.phpt b/ext/standard/tests/file/realpath_variation-win32.phpt index f58f618993..8049d4c69a 100644 --- a/ext/standard/tests/file/realpath_variation-win32.phpt +++ b/ext/standard/tests/file/realpath_variation-win32.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation/home/../home//tests//..//..//..//home//realpath_variation.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index a5031aa7b5..0c8bdb87e5 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -10,23 +10,23 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) --FILE-- diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index a10c6dfbe7..828837a84d 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -41,16 +41,16 @@ foreach($src_filenames as $src_filename) { $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - - // unlink the file + + // unlink the file unlink($dest_filename); } -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt index 00dc309982..2f25d193f5 100644 --- a/ext/standard/tests/file/rename_variation.phpt +++ b/ext/standard/tests/file/rename_variation.phpt @@ -33,17 +33,17 @@ foreach($src_filenames as $src_filename) { fclose($fp); $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - - // unlink the file + + // unlink the file unlink($dest_filename); } // clean the temp dir and file -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 0955096d76..2196e10721 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -45,7 +45,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt index 54338d7460..f37bba0108 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -38,7 +38,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation1/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt index 42909ee484..52efd78348 100644 --- a/ext/standard/tests/file/rename_variation10.phpt +++ b/ext/standard/tests/file/rename_variation10.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- @$unset_var, - + // file resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index c13a09a951..e940f78070 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: readlink(): %s in %s on line %d bool(false) string(%d) "%srename_variation6-win32.php.tmp" diff --git a/ext/standard/tests/file/rename_variation6.phpt b/ext/standard/tests/file/rename_variation6.phpt index 413dc6e045..3385d14134 100644 --- a/ext/standard/tests/file/rename_variation6.phpt +++ b/ext/standard/tests/file/rename_variation6.phpt @@ -28,7 +28,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%srename_variation6.php.tmp" diff --git a/ext/standard/tests/file/rename_variation7-win32.phpt b/ext/standard/tests/file/rename_variation7-win32.phpt index 369e8c2d43..a9643b4491 100644 --- a/ext/standard/tests/file/rename_variation7-win32.phpt +++ b/ext/standard/tests/file/rename_variation7-win32.phpt @@ -25,7 +25,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: symlink(): Could not fetch file information(error 2) in %srename_variation7-win32.php on line %d Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d diff --git a/ext/standard/tests/file/rename_variation7.phpt b/ext/standard/tests/file/rename_variation7.phpt index 5b937728f8..dc5ce429b6 100644 --- a/ext/standard/tests/file/rename_variation7.phpt +++ b/ext/standard/tests/file/rename_variation7.phpt @@ -24,7 +24,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%sthere_is_no_such_file" diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt index 7be25949f6..b3a1797c7a 100644 --- a/ext/standard/tests/file/rename_variation8-win32.phpt +++ b/ext/standard/tests/file/rename_variation8-win32.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt index 6e236c376c..2026a249bc 100644 --- a/ext/standard/tests/file/rename_variation8.phpt +++ b/ext/standard/tests/file/rename_variation8.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt index 2516e6162e..5a958631d9 100644 --- a/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- @$unset_var, - + // other // php outputs Permission Denied, p8 outputs no suck file or dir 'single space' => ' ', diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt index 04fee0ee2a..0556266efa 100644 --- a/ext/standard/tests/file/rmdir_variation1.phpt +++ b/ext/standard/tests/file/rmdir_variation1.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt index 7b4311c245..2b4f607ade 100644 --- a/ext/standard/tests/file/rmdir_variation2.phpt +++ b/ext/standard/tests/file/rmdir_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- @$unset_var, - + // non stream context resource $fileres, ); diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index e6b3eaabb6..2418ccfd5f 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey +?> --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt index eece30a2f5..6e692c554a 100644 --- a/ext/standard/tests/file/stream_001.phpt +++ b/ext/standard/tests/file/stream_001.phpt @@ -10,7 +10,7 @@ var_dump(fopen("file://".__FILE__, "r")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt index e982f704c4..b18dd85b31 100644 --- a/ext/standard/tests/file/stream_002.phpt +++ b/ext/standard/tests/file/stream_002.phpt @@ -20,7 +20,7 @@ var_dump($a, $b); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: stream_socket_client(): unable to connect to (Failed to parse address "") in %s on line %d bool(false) int(0) diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt index 716ae1f462..1cc57b7f6d 100644 --- a/ext/standard/tests/file/stream_copy_to_stream.phpt +++ b/ext/standard/tests/file/stream_copy_to_stream.phpt @@ -111,7 +111,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) string(0) "" int(%d) diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index b62f19cd37..87e519de88 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -14,7 +14,7 @@ foreach($streams as $stream) echo "===$stream===\n"; $fp = fopen($stream, 'rb'); - + var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:4,S===\n"; diff --git a/ext/standard/tests/file/stream_supports_lock.phpt b/ext/standard/tests/file/stream_supports_lock.phpt index bbf3993b6b..38a84dd7c2 100644 --- a/ext/standard/tests/file/stream_supports_lock.phpt +++ b/ext/standard/tests/file/stream_supports_lock.phpt @@ -30,7 +30,7 @@ var_dump(stream_supports_lock($sock)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) bool(true) resource(%d) of type (stream) diff --git a/ext/standard/tests/file/symlink.phpt b/ext/standard/tests/file/symlink.phpt index 489c26644f..228e459297 100644 --- a/ext/standard/tests/file/symlink.phpt +++ b/ext/standard/tests/file/symlink.phpt @@ -44,7 +44,7 @@ var_dump(linkinfo(".")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) string(%d) "%ssymlink.dat" int(%d) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt index 416e6ae323..09fb35c973 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt @@ -50,7 +50,7 @@ $files = array ( ); $counter = 1; -/* create soft/hard link to the file +/* create soft/hard link to the file and check linkinfo() and is_link() on the link created */ foreach($files as $file) { echo "\n-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt index b1b1afc740..12e5da17e8 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt @@ -23,7 +23,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Variation 1 : Creating links across directories where linkname is stored as an object and array member */ -// creating temp directory which will contain temp file and links created +// creating temp directory which will contain temp file and links created $file_path = dirname(__FILE__); $dirname = "$file_path/symlink_link_linkinfo_is_link_variation1/test/home"; mkdir($dirname, 0777, true); @@ -58,11 +58,11 @@ clearstatcache(); /* Testing on hard links */ echo "\n-- Working with hard links --\n"; // creating hard link -var_dump( link($filename, $obj->linkname) ); +var_dump( link($filename, $obj->linkname) ); // check if the link exists var_dump( linkinfo($obj->linkname) ); // check if link is soft link; expected: false as the link is a hardlink -var_dump( is_link($obj->linkname) ); +var_dump( is_link($obj->linkname) ); // delete the link created unlink($obj->linkname); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt index 21c9b57654..cbe4785ed0 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 3 : Create file and a soft link to the file - Access data of the file through the soft link + Access data of the file through the soft link Update the file through soft link Check size of file and soft link link */ diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index f58937cd12..9d57c41f7e 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 4 : Create file and a hard link to the file - Access data of the file through the hard link + Access data of the file through the hard link Update the file through hard link Check size of file and hard link */ @@ -45,7 +45,7 @@ $data_from_link = file_get_contents($linkname); // data read from $filename var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -61,7 +61,7 @@ $data_from_file = file_get_contents($filename); var_dump( $data_from_file ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -79,7 +79,7 @@ var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; var_dump( filesize($filename) ); var_dump( filesize($linkname) ); -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt index 9b9afba10d..fe4f40a2b2 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt @@ -54,7 +54,7 @@ echo "\n-- Working with soft links --\n"; $linkname = "$dirname/non_existent_link_variation5.tmp"; // expected: false -var_dump( symlink($filename, $linkname) ); // this link won't get created +var_dump( symlink($filename, $linkname) ); // this link won't get created var_dump( linkinfo($linkname) ); var_dump( is_link($linkname) ); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt index 82ca75b64d..df63dcfc5d 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt @@ -33,7 +33,7 @@ $linkname = "$dir/symlink_link_linkinfo_is_link_link_variation7.tmp"; $dirname = "$dir/home/test"; mkdir($dirname, 0755, true); -// create file +// create file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt index aacbcd4b3f..8a771b27b9 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt @@ -21,7 +21,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Description: Gets information about a link */ -/* Variation 9 : Check lstat of soft/hard link created +/* Variation 9 : Check lstat of soft/hard link created Check linkinfo() value with lstat['dev'] */ // temp file used @@ -34,7 +34,7 @@ $soft_link = "$dirname/symlink_link_linkinfo_is_link_softlink_variation9.tmp"; // hard link name used $hard_link = "$dirname/symlink_link_linkinfo_is_link_hardlink_variation9.tmp"; -// create the file +// create the file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt index 4d985410da..3e659c092c 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1-win32.phpt b/ext/standard/tests/file/tempnam_variation1-win32.phpt index a3dd7e9d62..a571a7cd5b 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt index 0745f5397c..dbdc396656 100644 --- a/ext/standard/tests/file/tempnam_variation1.phpt +++ b/ext/standard/tests/file/tempnam_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; @@ -35,10 +35,10 @@ for($i=1; $i<=10; $i++) { echo "File inode is => "; print_r( fileinode($files[$i]) ); //checking inodes echo "\n"; - + echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } diff --git a/ext/standard/tests/file/tempnam_variation2-win32.phpt b/ext/standard/tests/file/tempnam_variation2-win32.phpt index 15d59614ff..60fe951353 100644 --- a/ext/standard/tests/file/tempnam_variation2-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation2-win32.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i "; @@ -57,27 +57,27 @@ for($i = 0; $i "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation2.phpt b/ext/standard/tests/file/tempnam_variation2.phpt index 1a2de1885b..dd98b40e8b 100644 --- a/ext/standard/tests/file/tempnam_variation2.phpt +++ b/ext/standard/tests/file/tempnam_variation2.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i "; @@ -57,11 +57,11 @@ for($i = 0; $i "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } @@ -70,14 +70,14 @@ for($i = 0; $i "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt index cf2eff8bec..fdfcee9bed 100644 --- a/ext/standard/tests/file/tempnam_variation5.phpt +++ b/ext/standard/tests/file/tempnam_variation5.phpt @@ -23,7 +23,7 @@ $h = fopen($dir_name."/tempnam_variation5.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation5.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation6-win32.phpt b/ext/standard/tests/file/tempnam_variation6-win32.phpt index efe7e86e85..acaa1abf50 100644 --- a/ext/standard/tests/file/tempnam_variation6-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation6-win32.phpt @@ -6,7 +6,7 @@ Dave Kelsey +?> --FILE-- "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -39,7 +39,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation6.phpt b/ext/standard/tests/file/tempnam_variation6.phpt index 5eb6e6fc86..08a9fce4de 100644 --- a/ext/standard/tests/file/tempnam_variation6.phpt +++ b/ext/standard/tests/file/tempnam_variation6.phpt @@ -4,7 +4,7 @@ Test tempnam() function: usage variations - Using previous unique filename +?> --FILE-- "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -37,7 +37,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 918ef36588..40999fef47 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) != "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ - + echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index d24c1d8974..4a5ffcd332 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) == "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); @@ -46,22 +46,22 @@ for( $i=0; $i "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } else { echo "unknown location\n"; - } - + } + } - else { + else { echo "-- File is not created --\n"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation8-win32.phpt b/ext/standard/tests/file/tempnam_variation8-win32.phpt index 52ff7b9daa..cceda6438f 100644 --- a/ext/standard/tests/file/tempnam_variation8-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation8-win32.phpt @@ -32,21 +32,21 @@ $dir_paths = array( "$dir_path\\..\\..\\.\\tempnam_variation2", "$dir_path\\..\\\\\\tempnam_variation2_sub\\\\..\\\\..\\tempnam_variation2", "$dir_path\\BADDIR", - - + + // relative paths "tempname_variation2\\", "tempnam_variation2\\tempnam_variation2_sub", - "tempnam_variation2\\\\tempnam_variation2_sub", + "tempnam_variation2\\\\tempnam_variation2_sub", ".\\tempnam_variation2\\..\\tempnam_variation2\\tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i "; @@ -56,27 +56,27 @@ for($i = 0; $i "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt index c6c270d065..fa000db008 100644 --- a/ext/standard/tests/file/touch.phpt +++ b/ext/standard/tests/file/touch.phpt @@ -38,7 +38,7 @@ var_dump(touch("/no/such/file/or/directory")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL bool(true) diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt index d721edc84c..9a87ac60a6 100644 --- a/ext/standard/tests/file/touch_basic-win32-mb.phpt +++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- --SKIPIF-- @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index dba41a6077..688da7ef89 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -29,7 +29,7 @@ var_dump(fileatime($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) int(101) int(101) diff --git a/ext/standard/tests/file/touch_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt index 9477a3494e..a3596adc6b 100644 --- a/ext/standard/tests/file/touch_variation2.phpt +++ b/ext/standard/tests/file/touch_variation2.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) string(6) "mydata" Done diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index 445ef3fb1c..37beb13160 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- --SKIPIF-- @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- --FILE-- ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt index 64a2607d5f..ce0b5f77f3 100644 --- a/ext/standard/tests/file/unlink_variation7.phpt +++ b/ext/standard/tests/file/unlink_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey --FILE-- @$unset_var, - + // file resource 'file resource' => $fileRes ); diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 8c9fbd895c..9ee6b49d2a 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- data); stream_bucket_append($out, $bucket); } - return PSFS_PASS_ON; + return PSFS_PASS_ON; } function oncreate() { diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index 0e649e9a92..419ecc5122 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -76,11 +76,11 @@ $DATALEN = strlen($DATA); if ($n != $DATALEN) die("tmpfile stored $n bytes; should be $DATALEN!"); -class uselessstream +class uselessstream { } -class mystream +class mystream { public $path; public $mode; @@ -102,7 +102,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } @@ -228,7 +228,7 @@ for ($i = 0; $i < 256; $i++) { $seeks[] = array($whence, $offset, $position); } -/* we compare the results of fgets using differing line lengths to +/* we compare the results of fgets using differing line lengths to * test the fgets layer also */ $line_lengths = array(1024, 256, 64, 16); $fail_count = 0; @@ -266,7 +266,7 @@ foreach($line_lengths as $line_length) { var_dump($dat); break; } - + $j++; } if ($fail_count) diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt b/ext/standard/tests/file/windows_acls/bug44859.phpt index 4454ee1173..20e10f5c5b 100644 --- a/ext/standard/tests/file/windows_acls/bug44859.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_writable) --SKIPIF-- - diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt b/ext/standard/tests/file/windows_acls/bug44859_2.phpt index 514953f42e..583e63a2a6 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --SKIPIF-- - diff --git a/ext/standard/tests/file/windows_acls/bug44859_3.phpt b/ext/standard/tests/file/windows_acls/bug44859_3.phpt index ed57abba07..35db1f29be 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_3.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_3.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_executable) --SKIPIF-- - diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt b/ext/standard/tests/file/windows_acls/bug44859_4.phpt index bf640fa660..452581fa05 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt @@ -3,7 +3,7 @@ bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --CREDITS-- Venkat Raman Don --SKIPIF-- - diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt index d5b184158e..b1bc415f05 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt @@ -27,7 +27,7 @@ foreach ($paths as $d) { } $myDirectory = opendir($prefix); -while($entryName = readdir($myDirectory)) { +while($entryName = readdir($myDirectory)) { echo get_basename_with_cp($prefix . $entryName, 65001, false) . "\n"; } closedir($myDirectory); diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt index 784cffadb7..6d9367f857 100644 --- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt @@ -36,7 +36,7 @@ var_dump(unlink($fnw)); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt index 2d74bfc8b3..418c35cd25 100644 --- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt @@ -29,7 +29,7 @@ if ($return_code != true) die("Failed to open file: " . $return_code); $return_code = $zipfile->addfile($testfile_zip, basename($testfile_zip)); if ($return_code != true) print("Failed to add file: " . $zipfile->getStatusString()); - + $return_code = $zipfile->close(); if ($return_code != true) die("Failed to close archive: " . $zipfile->getStatusString()); diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index e291dd0855..6517cf88c1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 path +Test fopen() for reading big5 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt index 74202fa966..98d4e0c89b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 path +Test mkdir/rmdir big5 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index 3be40bf61e..406b925555 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt index 3002b50c22..54710fc3c8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 to UTF-8 path +Test fopen() for reading big5 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt index abf3a76cc2..4e1ef94c00 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 to UTF-8 path +Test mkdir/rmdir big5 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt index f204790e8e..3b3b8a558a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt index 7a6496a619..a5dea1c9b8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt index bd4421e7a2..ae7eff4a13 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt index 488343d8d1..45531b6d6b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt index 84b05b71d9..c70570b2b0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt index 3759daa71d..a7df51695f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt index 7e1998ba2a..75e5c55ca9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt index 7dfd7eadbf..485ff119ef 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 path +Test fopen() for reading CP1251 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt index 3abce0d0d5..db0c9a690c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 path +Test mkdir/rmdir CP1251 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt index 2a3b7390b1..7dd32c5a90 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 path +Test fopen() for write CP1251 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt index 13395d1017..14b5176415 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 to UTF-8 path +Test fopen() for reading CP1251 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt index 193e2fdc74..7b5f71b84e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 to UTF-8 path +Test mkdir/rmdir CP1251 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt index e552464214..84ecdbff9e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 to UTF-8 path +Test fopen() for write CP1251 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt index b638eb4822..2510a2d2de 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt index e44849b061..3b55e18c67 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt index c0b685c55b..98e5852b67 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt index 85a1c41f07..6fe0d968f7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt @@ -19,9 +19,9 @@ internal_encoding=cp1252 #vim: set encoding=cp1252 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "gefäß"; +$item = "gefäß"; $prefix = create_data("file", $item, 1252); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -34,7 +34,7 @@ remove_data("file"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\gefäß" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt index bdb1a7a878..ef5dc9397d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "hallo " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt index 059ab8dd8f..2a34746183 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt index 9ea2485eeb..293824d550 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt index cae3426e75..c5e075a944 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(4) "hola" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt index cacaf5d36d..969a115392 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt index 3ac634134a..6119213289 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt index 12ae1ac7cd..24beb0d31a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 path +Test fopen() for reading cp1253 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt index 9049a65ee1..854910bc31 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 path +Test mkdir/rmdir cp1253 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt index 4c39fb5bda..79892e8ae4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index 0fbc78fc12..950c4784d8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 to UTF-8 path +Test fopen() for reading cp1253 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index ddc79b1204..25aeb513ba 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 to UTF-8 path +Test mkdir/rmdir cp1253 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index 6e28c89e0c..bd8fc22ba3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1253 to UTF-8 path +Test fopen() for write cp1253 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt index 5fbcb74602..4f160c1370 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 path +Test fopen() for reading cp1254 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt index 314f78ecb8..5a72058097 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt index d2a04d905a..21f87c501a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 path +Test fopen() for write cp1254 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt index 13357217c8..7fcb0ff66d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt @@ -19,7 +19,7 @@ default_charset=cp1254 #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlý iþleri"; @@ -35,7 +35,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlý iþleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index 9a92099cd0..7a3d496f9f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 to UTF-8 path +Test fopen() for reading cp1254 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 551a0f2235..0cb73207e8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index 12df56b11e..ea4950974c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 to UTF-8 path +Test fopen() for write cp1254 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt index cbaba44e4e..0c330ea445 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt @@ -16,7 +16,7 @@ skip_if_no_required_exts(); #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlı iÅŸleri"; @@ -32,7 +32,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlı iÅŸleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt index 8a685b68c4..01b4f7732d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 path +Test fopen() for reading cp1255 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt index 391a282a69..991d2ab615 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 path +Test mkdir/rmdir cp1255 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt index 2f38398bb5..276af84a91 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 path +Test fopen() for write cp1255 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index 31a48dbc0c..e33616ddd3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 to UTF-8 path +Test fopen() for reading cp1255 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index b6a59e4be3..b241210faa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 to UTF-8 path +Test mkdir/rmdir cp1255 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 53f83b3a0e..10fef62404 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 to UTF-8 path +Test fopen() for write cp1255 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt index 6b473abb54..617ebedddd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt index 1a4233f2c2..341c0c01a2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt index 5c25d60fc8..e8cf5709a7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index b021df7fa4..32596c2bd5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index 2fb10a97a5..fd0204aace 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index ba70e1a77e..ef0229a2e9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt index 52f080e2c2..efc43f3513 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt @@ -47,7 +47,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sà»ç¹á¿éÁ·Õè·´Êͺ1.txt string(%d) "à»ç¹á¿éÁ·Õè·´Êͺ1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt index 6cb2fb7eee..aa877d7406 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt @@ -19,10 +19,10 @@ internal_encoding=cp874 #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; +$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; $prefix = create_data("file_cp874", $item, 874); $fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item; @@ -35,7 +35,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\à»ç¹á¿éÁ·Õè·´Êͺ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt index 8d32f88a8c..2c244997b6 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt @@ -44,7 +44,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sเป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสอบ1.txt string(%d) "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสอบ1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt index 843c66f4a2..13ec027748 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสอบ11"; +$item = "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสอบ11"; $prefix = create_data("file_cp874", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสอบ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt index 1835f0d360..48e55981ca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 path +Test fopen() for reading cp932 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt index f7f24c045d..b177e2d1e2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt index d529f6a484..595f86213a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt index db31c1ad7a..95992ae79f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt @@ -19,7 +19,7 @@ internal_encoding=cp932 #vim: set encoding=cp932 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77"; // cp932 string @@ -35,7 +35,7 @@ remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt index a04c14d276..5e0e67b662 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 to UTF-8 path +Test fopen() for reading cp932 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt index 9b13922a7a..2092e40da0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp932 to UTF-8 path +Test mkdir/rmdir cp932 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt index fbe290468c..bd9b1791ea 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp932 to UTF-8 path +Test fopen() for write cp932 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt index bcaa31353f..46db0ebc4b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 path +Test fopen() for reading cp936 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt index 9edb6d1301..9eb1f08217 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 path +Test mkdir/rmdir cp936 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt index 2c05c313e9..eedee97bd0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 path +Test fopen() for write cp936 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt index 554a05d94c..b0b709c0cc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 to UTF-8 path +Test fopen() for reading cp936 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt index 79bdfa4283..2c4b2876c5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 to UTF-8 path +Test mkdir/rmdir cp936 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt index 22b64c31f9..b260b7b37f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 to UTF-8 path +Test fopen() for write cp936 to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt index 0ff640aa35..4b2bae974f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading eucjp to UTF-8 path +Test fopen() for reading eucjp to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt index 5a481e8d12..db3f1d861b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir eucjp to UTF-8 path +Test mkdir/rmdir eucjp to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt index 50727a9d71..0d06fb2489 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write eucjp to UTF-8 path +Test fopen() for write eucjp to UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index 32b6f9b066..51f1bb945b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading Kartuli UTF-8 path +Test fopen() for reading Kartuli UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index a92e7c34ed..ff32d75869 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir Kartuli UTF-8 path +Test mkdir/rmdir Kartuli UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index edfb279cd2..192072760c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write Kartuli UTF-8 path +Test fopen() for write Kartuli UTF-8 path --SKIPIF-- ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt index 46077258d1..8f08357792 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "ქáƒáƒ áƒ—ველები55"; +$item = "ქáƒáƒ áƒ—ველები55"; $prefix = create_data("file_kartuli", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ქáƒáƒ áƒ—ველები55" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt index 6bc28110e0..688fc6caca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt @@ -12,14 +12,14 @@ skip_if_no_required_exts("mbstring"); --FILE-- --FILE-- 248 has be a long path +Mkdir with path length < 260 and > 248 has be a long path --SKIPIF-- 260 || strlen($start) > 248) { --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: stream_filter_register(): Filter name cannot be empty in %s on line %d bool(false) diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 6ca84fef41..75b6829582 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stream_filter_remove() function : basic functionality +Test stream_filter_remove() function : basic functionality --SKIPIF-- ---EXPECT-- +--EXPECT-- bool(true) Done diff --git a/ext/standard/tests/general_functions/bug31190.phpt b/ext/standard/tests/general_functions/bug31190.phpt index 7d154708fa..12776448b3 100644 --- a/ext/standard/tests/general_functions/bug31190.phpt +++ b/ext/standard/tests/general_functions/bug31190.phpt @@ -4,7 +4,7 @@ Bug #31190 (exception in call_user_func_array()) ---EXPECTF-- +--EXPECTF-- array(1) { ["foo"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41037.phpt b/ext/standard/tests/general_functions/bug41037.phpt index 0ffc8d58f6..b9bb5856d8 100644 --- a/ext/standard/tests/general_functions/bug41037.phpt +++ b/ext/standard/tests/general_functions/bug41037.phpt @@ -14,7 +14,7 @@ declare (ticks=1) { echo "Done\n"; } ?> ---EXPECTF-- +--EXPECTF-- hello Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d Done diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt index 23888df7d7..a9ead940c1 100644 --- a/ext/standard/tests/general_functions/bug41445.phpt +++ b/ext/standard/tests/general_functions/bug41445.phpt @@ -35,7 +35,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(2) { ["001099030277"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt index 4698de436a..99aa76a69c 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 +Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 --FILE-- ---EXPECTF-- +--EXPECTF-- array(3) { ["2454.33"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug43293_1.phpt b/ext/standard/tests/general_functions/bug43293_1.phpt index d2c7f10ca4..34eb2f855c 100644 --- a/ext/standard/tests/general_functions/bug43293_1.phpt +++ b/ext/standard/tests/general_functions/bug43293_1.phpt @@ -4,7 +4,7 @@ Bug #43293 (Multiple segfaults in getopt()) register_argc_argv=Off --FILE-- array('pipe', 'rb'), 1 => array('pipe', 'wb'), ); - + $proc = proc_open('cat', $descriptor_spec, $pipes); - + fwrite($pipes[0], 'Hello', 5); fflush($pipes[0]); fclose($pipes[0]); - + $result = fread($pipes[1], 5); fclose($pipes[1]); - + proc_close($proc); - -echo "Result is: ", $result, "\n"; + +echo "Result is: ", $result, "\n"; echo "Done\n"; diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt index 8b33a4f4c3..89dae71f4a 100644 --- a/ext/standard/tests/general_functions/bug66094.phpt +++ b/ext/standard/tests/general_functions/bug66094.phpt @@ -7,6 +7,6 @@ register_tick_function($closure = function () { echo "Tick!\n"; }); unregister_tick_function($closure); echo "done"; ?> ---EXPECTF-- +--EXPECTF-- Tick! done diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt index 4a4845aa1d..51a079ad53 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt @@ -1,11 +1,11 @@ --TEST-- -Test call_user_func_array() function : first parameter variation +Test call_user_func_array() function : first parameter variation --FILE-- ---EXPECTF-- +--EXPECTF-- Done Hello World! diff --git a/ext/standard/tests/general_functions/closures_002.phpt b/ext/standard/tests/general_functions/closures_002.phpt index 6df389bbb1..e0ef5121c0 100644 --- a/ext/standard/tests/general_functions/closures_002.phpt +++ b/ext/standard/tests/general_functions/closures_002.phpt @@ -16,7 +16,7 @@ echo "$i\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Test %d %d diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt index ec8e0a66ed..968c4a3eb6 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt differ diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt index 4fe2f4c95b..cc3540c406 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt differ diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt index 4929362613..4f82039e2d 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt @@ -3,7 +3,7 @@ Test debug_zval_dump() function : error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: dl(): File name exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt index 02936c84cb..675affb625 100644 --- a/ext/standard/tests/general_functions/error_clear_last.phpt +++ b/ext/standard/tests/general_functions/error_clear_last.phpt @@ -15,7 +15,7 @@ var_dump(error_get_last()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL array(4) { diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt index 95a6cf434c..71f068f104 100644 --- a/ext/standard/tests/general_functions/error_get_last.phpt +++ b/ext/standard/tests/general_functions/error_get_last.phpt @@ -13,7 +13,7 @@ var_dump(error_get_last()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL Warning: error_get_last() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt index f85f4a4195..d7b27cd8de 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt index d97c1a956b..7ee46ea9a2 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt index c26915c923..1efa72d992 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_error.phpt b/ext/standard/tests/general_functions/escapeshellarg_error.phpt index 139a445202..8746b5884a 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_error.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_error.phpt @@ -38,7 +38,7 @@ var_dump( escapeshellarg($fp)); fclose($fp); echo "\n-- Testing escapeshellarg() function with a array supplied for argument --\n"; -$arg = array(1,2,3); +$arg = array(1,2,3); var_dump( escapeshellarg($arg)); ?> diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt index 8f8bc19d8f..f4e9439b14 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt index 32431a581a..6f3b6a9f32 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', diff --git a/ext/standard/tests/general_functions/floatval.phpt b/ext/standard/tests/general_functions/floatval.phpt index d7bdffd6ae..1bb4d1151c 100644 --- a/ext/standard/tests/general_functions/floatval.phpt +++ b/ext/standard/tests/general_functions/floatval.phpt @@ -7,7 +7,7 @@ Testing floatval() and its alias doubleval() Functions */ echo "*** Testing floatval() with valid float values ***\n"; -// different valid float values +// different valid float values $valid_floats = array( 0.0, 1.0, @@ -32,7 +32,7 @@ $valid_floats = array( -.5e+7 ); -/* loop to check that floatval() recognizes different +/* loop to check that floatval() recognizes different float values, expected output:float value for valid floating point number */ foreach ($valid_floats as $value ) { @@ -41,7 +41,7 @@ foreach ($valid_floats as $value ) { echo "\n*** Testing doubleval() with valid float values ***\n"; -/* loop to check that doubleval() also recognizes different +/* loop to check that doubleval() also recognizes different float values, expected output:float value for valid floating point number */ foreach ($valid_floats as $value ) { @@ -57,7 +57,7 @@ fclose($fp); $dfp = opendir ( dirname(__FILE__) ); closedir($dfp); -// other types in an array +// other types in an array $not_float_types = array ( -2147483648, // max negative integer value 2147483648, // max positive integer value @@ -76,7 +76,7 @@ $not_float_types = array ( NULL, null, ); -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of floatval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $type ) { var_dump( floatval($type) ); @@ -85,7 +85,7 @@ foreach ($not_float_types as $type ) { echo "\n*** Testing doubleval() on non floating types ***\n"; -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of doubleval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $type ) { var_dump( doubleval($type) ); @@ -99,10 +99,10 @@ echo "\n*** Testing error conditions ***\n"; var_dump( floatval() ); var_dump( doubleval() ); -//arguments more than expected +//arguments more than expected var_dump( floatval(TRUE, FALSE) ); var_dump( doubleval(TRUE, FALSE) ); - + echo "\nDone\n"; diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt index 129aa87b3c..71f4e0d139 100644 --- a/ext/standard/tests/general_functions/floatval_basic.phpt +++ b/ext/standard/tests/general_functions/floatval_basic.phpt @@ -8,7 +8,7 @@ precision = 14 * Description: Returns the float value of var. */ -// different valid float values +// different valid float values $valid_floats = array( "0.0" => 0.0, "1.0" => 1.0, @@ -33,7 +33,7 @@ $valid_floats = array( "-.5e+7" =>-.5e+7 ); -/* loop to check that floatval() recognizes different +/* loop to check that floatval() recognizes different float values, expected output:float value for valid floating point number */ echo "*** Testing floatval() with valid float values ***\n"; foreach ($valid_floats as $key => $value ) { @@ -41,7 +41,7 @@ foreach ($valid_floats as $key => $value ) { var_dump( floatval($value) ); } -/* loop to check that doubleval() also recognizes different +/* loop to check that doubleval() also recognizes different float values, expected output:float value for valid floating point number */ echo "\n*** Testing doubleval() with valid float values ***\n"; foreach ($valid_floats as $key => $value ) { diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt index aa808cfba1..2aafa0684c 100644 --- a/ext/standard/tests/general_functions/floatval_variation1.phpt +++ b/ext/standard/tests/general_functions/floatval_variation1.phpt @@ -14,11 +14,11 @@ fclose($fp); $dfp = opendir ( dirname(__FILE__) ); closedir($dfp); -// other types in an array +// other types in an array $not_float_types = array ( "-2147483648" => -2147483648, // max negative integer value "2147483647" => 2147483648, // max positive integer value - "file resoruce" => $fp, + "file resoruce" => $fp, "directory resource" => $dfp, "\"0.0\"" => "0.0", // string "\"1.0\"" => "1.0", @@ -33,7 +33,7 @@ $not_float_types = array ( "NULL" => NULL, "null" => null, ); -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of floatval() on non float types, expected output: float value valid floating point numbers */ echo "\n*** Testing floatval() on non floating types ***\n"; foreach ($not_float_types as $key => $type ) { @@ -43,7 +43,7 @@ foreach ($not_float_types as $key => $type ) { echo "\n*** Testing doubleval() on non floating types ***\n"; -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of doubleval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $key => $type ) { echo "\n-- Iteration : $key --\n"; diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt index 6e0ffc51f0..3bb08fc24f 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt @@ -21,7 +21,7 @@ EOT; $variation_array = array( 'session.use_cookies', - 'session.serialize_handler', + 'session.serialize_handler', 'session.save_handler' ); diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index 544887129f..54f0868c7f 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_defined_constants() function : basic functionality +Test get_defined_constants() function : basic functionality --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing get_defined_constants() : basic functionality *** string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/get_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt index 1092712ee9..b093ed1e0c 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_defined_constants() function : error conditions +Test get_defined_constants() function : error conditions --FILE-- ===DONE=== diff --git a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt index 4106ee9eea..620e97cf83 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt @@ -10,9 +10,9 @@ echo "Simple testcase for get_magic_quotes_runtime() function\n"; var_dump(get_magic_quotes_runtime()); -echo "\n-- Error cases --\n"; +echo "\n-- Error cases --\n"; // no checks on number of args -var_dump(get_magic_quotes_runtime(true)); +var_dump(get_magic_quotes_runtime(true)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_basic.phpt b/ext/standard/tests/general_functions/get_resource_type_basic.phpt index 7ff4aec2c3..58a49e713f 100644 --- a/ext/standard/tests/general_functions/get_resource_type_basic.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test get_resource_type() function : basic functionality +Test get_resource_type() function : basic functionality --FILE-- ===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt index 40dcf07799..a010f7eba4 100644 --- a/ext/standard/tests/general_functions/get_resource_type_error.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_resource_type() function : error conditions +Test get_resource_type() function : error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- string(5) "array" string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index b2379a7663..a2b03ee07a 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -7,7 +7,7 @@ Test getrusage() function: basic test /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for getrusage() function\n"; @@ -16,11 +16,11 @@ $dat = getrusage(); if (!is_array($dat)) { echo "TEST FAILED : getrusage should return an array\n"; -} +} -// echo the fields which are common to all platforms +// echo the fields which are common to all platforms echo "User time used (seconds) " . $dat["ru_utime.tv_sec"] . "\n"; -echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; +echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt index 7ac99655b8..ce2bbc815e 100644 --- a/ext/standard/tests/general_functions/getrusage_error.phpt +++ b/ext/standard/tests/general_functions/getrusage_error.phpt @@ -7,7 +7,7 @@ Test getrusage() function : error conditions - incorrect number of args /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ /* @@ -29,7 +29,7 @@ $array_arg = array(1,2,3); $dat = getrusage($array_arg); echo "\n-- Testing getrusage() function with invalid argument - OBJECT --\n"; -class classA +class classA { function __toString() { return "ClassAObject"; diff --git a/ext/standard/tests/general_functions/getrusage_variation1.phpt b/ext/standard/tests/general_functions/getrusage_variation1.phpt index 568c9c7383..0c072ed6e0 100644 --- a/ext/standard/tests/general_functions/getrusage_variation1.phpt +++ b/ext/standard/tests/general_functions/getrusage_variation1.phpt @@ -3,14 +3,14 @@ Test getrusage() function : usage variation - diff data types as $who arg --SKIPIF-- --FILE-- --EXPECTF-- bool(false) diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt index b082fbf5f5..59252b5e2c 100644 --- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt @@ -8,11 +8,11 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test the basic functionalities of settype() & gettype() functions. - Use the gettype() to get the type of regular data and use settype() + Use the gettype() to get the type of regular data and use settype() to change its type to other types */ /* function to handle catchable errors */ @@ -22,8 +22,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); echo "**** Testing gettype() and settype() functions ****\n"; @@ -89,24 +89,24 @@ foreach ($values as $value) { echo "\n*** Testing settype(): basic operations ***\n"; foreach ($types as $type) { - echo "\n-- Setting type of data to $type --\n"; + echo "\n-- Setting type of data to $type --\n"; $loop_count = 1; foreach ($values as $var) { echo "-- Iteration $loop_count --\n"; $loop_count ++; // set to new type var_dump( settype($var, $type) ); - - // dump the var + + // dump the var var_dump( $var ); - - // check the new type - var_dump( gettype($var) ); + + // check the new type + var_dump( gettype($var) ); } } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- **** Testing gettype() and settype() functions **** *** Testing gettype(): basic operations *** diff --git a/ext/standard/tests/general_functions/gettype_settype_error.phpt b/ext/standard/tests/general_functions/gettype_settype_error.phpt index 2c6aac6875..325e91e47f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_error.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_error.phpt @@ -1,12 +1,12 @@ --TEST-- -Test gettype() & settype() functions : error conditions +Test gettype() & settype() functions : error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- **** Testing gettype() and settype() functions **** *** Testing gettype(): error conditions *** diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 440443bca2..ada73f0159 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -12,19 +12,19 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ -/* Test usage variation of gettype() and settype() functions: - settype() to null type. +/* Test usage variation of gettype() and settype() functions: + settype() to null type. Set type of the data to "null" and verify using gettype Following are performed in the listed sequence: - get the current type of the variable + get the current type of the variable set the type of the variable to "null type" dump the variable to see its new data get the new type of the variable */ - + /* function to handle catchable errors */ function foo($errno, $errstr, $errfile, $errline) { // var_dump($errstr); @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -155,7 +155,7 @@ $var_values = array ( $undef_var ); -/* test conversion to null type */ +/* test conversion to null type */ $type = "null"; echo "\n*** Testing gettype() & settype() functions : usage variations ***\n"; @@ -164,22 +164,22 @@ $loop_count = 1; foreach ($var_values as $var) { echo "-- Iteration $loop_count --\n"; $loop_count++; - // get the current data type + // get the current data type var_dump( gettype($var) ); - - // convert it to null + + // convert it to null var_dump( settype($var, $type) ); - // dump the converted data + // dump the converted data var_dump( $var ); - + // check the new type after conversion var_dump( gettype($var) ); } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index 18b05b6a97..ff30821380 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -15,7 +15,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -35,8 +35,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -60,15 +60,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -82,7 +82,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -128,11 +128,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -158,7 +158,7 @@ $var_values = array ( $undef_var ); -// test conversion to these types +// test conversion to these types $types = array( "integer", "int" @@ -173,13 +173,13 @@ foreach ($types as $type) { // get the current data type var_dump( gettype($var) ); - + // convert it to new type var_dump( settype($var, $type) ); - + // dump the converted $var var_dump( $var ); - + // get the new type of the $var var_dump( gettype($var) ); } diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index f00d04ef88..f0fdd34d14 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -155,7 +155,7 @@ $var_values = array ( $undef_var ); -// test conversion to these types +// test conversion to these types $types = array( "float", "double" @@ -184,7 +184,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index 6ff891391f..a0a7064698 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -61,15 +61,15 @@ class class_with_no_member { // no member(s) } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -86,7 +86,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -133,12 +133,12 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 0.0, 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -163,7 +163,7 @@ $var_values = array ( /* undefined/unset vars */ $unset_var, $undef_var, - + /* binary strings */ b"0", b'0', @@ -180,7 +180,7 @@ $var_values = array ( b"10string" ); -// test conversion to these types +// test conversion to these types $types = array( "boolean", "bool" @@ -209,7 +209,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index 7c43b8e318..0885af1a3d 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 9e5ce2e600..3854deac0f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -181,7 +181,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index c4246b4204..8d7333edfc 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -154,7 +154,7 @@ $var_values = array ( $unset_var, $undef_var ); - + /* test conversion to object type */ $type = "object"; @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 5e568fe7aa..25371faa19 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/head.phpt b/ext/standard/tests/general_functions/head.phpt index e83bbf6aca..059c56b258 100644 --- a/ext/standard/tests/general_functions/head.phpt +++ b/ext/standard/tests/general_functions/head.phpt @@ -27,7 +27,7 @@ var_dump(headers_list()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL bool(false) array(0) { diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt index 806831edfc..b97a945ee5 100644 --- a/ext/standard/tests/general_functions/ini_get_all.phpt +++ b/ext/standard/tests/general_functions/ini_get_all.phpt @@ -20,7 +20,7 @@ var_dump(ini_get_all("", "")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(5) "array" Warning: ini_get_all(): Unable to find extension '' in %s on line %d diff --git a/ext/standard/tests/general_functions/intval.phpt b/ext/standard/tests/general_functions/intval.phpt index a22b747e55..322b407aa4 100644 --- a/ext/standard/tests/general_functions/intval.phpt +++ b/ext/standard/tests/general_functions/intval.phpt @@ -11,13 +11,13 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); */ echo "*** Testing intval() with valid integer values ***\n"; -// different valid integer vlaues +// different valid integer vlaues $valid_ints = array( '0', '1', '-1', '-2147483648', // max negative integer value - '-2147483647', + '-2147483647', 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -33,7 +33,7 @@ $valid_ints = array( 017777777777, // max positive integer as octal ); -/* loop to check that intval() recognizes different +/* loop to check that intval() recognizes different integer values, expected output:integer value in decimal notation for valid integer */ echo "\n***Output with default base value ie 10 ***\n"; @@ -47,7 +47,7 @@ foreach ($valid_ints as $value ) { var_dump( intval($value, 10) ); } - + echo "\n***Output with base value of 16 ***\n"; foreach ($valid_ints as $value ) { var_dump( intval($value, 16) ); @@ -140,7 +140,7 @@ $not_int_types = array ( ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of intval() on non integer types, expected output: integer value in decimal notation for valid integers */ foreach ($not_int_types as $type ) { var_dump( intval($type) ); @@ -150,9 +150,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( intval() ); -//arguments more than expected +//arguments more than expected var_dump( intval(TRUE, FALSE, TRUE) ); - + echo "\n--- Done ---\n"; diff --git a/ext/standard/tests/general_functions/intval_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt index bf88c7c920..e76d7083d4 100644 --- a/ext/standard/tests/general_functions/intval_variation1.phpt +++ b/ext/standard/tests/general_functions/intval_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test intval() function : usage variation +Test intval() function : usage variation --FILE-- "One", "two" => 2), /* unset bool vars and undefined var */ - @$unset_bool1, - @$unset_bool2, - @$unset_var, + @$unset_bool1, + @$unset_bool2, + @$unset_var, @$undefined_var ); -/* loop through the $not_bool_types to see working of +/* loop through the $not_bool_types to see working of is_bool() on non bull types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_bool_types as $type ) { - echo "-- Iteration $loop_counter --\n"; $loop_counter++; + echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_bool($type) ); } @@ -131,9 +131,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_bool() ); -//arguments more than expected +//arguments more than expected var_dump( is_bool(TRUE, FALSE) ); - + echo "Done\n"; // close resources diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index d842534124..379defc3a8 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_callable() function : usage variations - on objects +Test is_callable() function : usage variations - on objects --INI-- precision=14 error_reporting = E_ALL & ~E_NOTICE | E_STRICT @@ -11,7 +11,7 @@ error_reporting = E_ALL & ~E_NOTICE | E_STRICT */ /* Prototype: void check_iscallable_objects( $methods ); - Description: use is_callable() on given $method to check if the array + Description: use is_callable() on given $method to check if the array contains a valid method name; returns true if valid function name, false otherwise */ @@ -35,11 +35,11 @@ echo "\n*** Testing is_callable() on objects ***\n"; class object_class { public $value = 100; - + /* static method */ static public function foo() { } - + public function foo1() { } /* function name with mixed string and integer */ @@ -50,7 +50,7 @@ class object_class } /* function name having boolean value */ public function TRUE() { - } + } protected function foo2() { } diff --git a/ext/standard/tests/general_functions/is_callable_variation2.phpt b/ext/standard/tests/general_functions/is_callable_variation2.phpt index b94a446dcf..1019bca6fa 100644 --- a/ext/standard/tests/general_functions/is_callable_variation2.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_callable() function : usage variations - on invalid function names +Test is_callable() function : usage variations - on invalid function names --INI-- precision=14 error_reporting = E_ALL & ~E_NOTICE | E_STRICT diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt index f6bbdaace0..07bcc9da9e 100644 --- a/ext/standard/tests/general_functions/is_float.phpt +++ b/ext/standard/tests/general_functions/is_float.phpt @@ -7,11 +7,11 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index eccaa1995c..9867410e40 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -7,17 +7,17 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- "One", "two" => 2), - + /* strings */ "", '', @@ -119,14 +119,14 @@ $not_int_types = array ( FALSE, /* undefined and unset vars */ - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($type) ); var_dump( is_integer($type) ); var_dump( is_long($type) ); @@ -138,11 +138,11 @@ var_dump( is_int() ); var_dump( is_integer() ); var_dump( is_long() ); -//arguments more than expected +//arguments more than expected var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); - + echo "Done\n"; // close the resources diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index cecfa700e3..228a11690d 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -9,17 +9,17 @@ precision=14 --FILE-- "One", "two" => 2), - + /* strings */ "", '', @@ -121,14 +121,14 @@ $not_int_types = array ( FALSE, /* undefined and unset vars */ - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($type) ); var_dump( is_integer($type) ); var_dump( is_long($type) ); @@ -140,11 +140,11 @@ var_dump( is_int() ); var_dump( is_integer() ); var_dump( is_long() ); -//arguments more than expected +//arguments more than expected var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt index b01b195697..ad0435b7c8 100644 --- a/ext/standard/tests/general_functions/is_null.phpt +++ b/ext/standard/tests/general_functions/is_null.phpt @@ -3,11 +3,11 @@ Test is_null() function --FILE-- "One", "two" => 2), ); -/* loop through the $not_null_types to see working of +/* loop through the $not_null_types to see working of is_null() on non null types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_null_types as $type ) { @@ -131,9 +131,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_null() ); -//arguments more than expected +//arguments more than expected var_dump( is_null(NULL, null) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt index 415ce069e9..32fb8f3094 100644 --- a/ext/standard/tests/general_functions/is_numeric.phpt +++ b/ext/standard/tests/general_functions/is_numeric.phpt @@ -3,11 +3,11 @@ Test is_numeric() function --FILE-- vars[$name] = $val; } - + public function dumpVal () { var_dump ( $vars ); } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -67,7 +67,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -88,9 +88,9 @@ $valid_objects = array( $foo_object, $Value_object, $concreteClass_object -); - -/* loop to check that is_object() recognizes different +); + +/* loop to check that is_object() recognizes different objects, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_objects as $object ) { @@ -104,11 +104,11 @@ echo "\n*** Testing is_object() on non object types ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// unset object +// unset object $unset_object = new foo(); unset ($unset_object); -// other types in a array +// other types in a array $not_objects = array ( 0, -1, @@ -130,7 +130,7 @@ $not_objects = array ( @$unset_object, // unset object @$undefined_var, // undefined variable ); -/* loop through the $not_objects to see working of +/* loop through the $not_objects to see working of is_object() on non object types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_objects as $type ) { @@ -142,9 +142,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_object() ); -//arguments more than expected +//arguments more than expected var_dump( is_object($myClass_object, $myClass_object) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_resource_basic.phpt b/ext/standard/tests/general_functions/is_resource_basic.phpt index 27583d3d87..75f4e4a8d8 100644 --- a/ext/standard/tests/general_functions/is_resource_basic.phpt +++ b/ext/standard/tests/general_functions/is_resource_basic.phpt @@ -1,18 +1,18 @@ --TEST-- -Test is_resource() function : basic functionality +Test is_resource() function : basic functionality --FILE-- diff --git a/ext/standard/tests/general_functions/is_resource_error.phpt b/ext/standard/tests/general_functions/is_resource_error.phpt index acb3cb660b..f7168737cd 100644 --- a/ext/standard/tests/general_functions/is_resource_error.phpt +++ b/ext/standard/tests/general_functions/is_resource_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_resource() function : error conditions +Test is_resource() function : error conditions --FILE-- ===DONE=== diff --git a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt index dbda1d9e66..1c62340970 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt @@ -1,13 +1,13 @@ --TEST-- -Test ob_get_flush() function : basic functionality +Test ob_get_flush() function : basic functionality --INI-- output_buffering=0 --FILE-- ---EXPECTF-- +--EXPECTF-- array(26) { ["basic"]=> array(15) { diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt index 7b012c50f6..d18eb24caf 100644 --- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt +++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt @@ -10,7 +10,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { ["error_reporting values"]=> array(6) { diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt index fb12c3f139..ebc714455d 100644 --- a/ext/standard/tests/general_functions/parse_ini_file.phpt +++ b/ext/standard/tests/general_functions/parse_ini_file.phpt @@ -120,7 +120,7 @@ var_dump(parse_ini_file($filename, true)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: parse_ini_file() expects at least 1 parameter, 0 given in %sparse_ini_file.php on line 6 bool(false) diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt index c5e70cb900..d774eeaf80 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -4,7 +4,7 @@ Test parse_ini_string() function ---EXPECTF-- +--EXPECTF-- Warning: parse_ini_string() expects at least 1 parameter, 0 given in %s bool(false) diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index ca4c3d4022..2f671cd016 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -13,7 +13,7 @@ var_dump( php_uname('a', true) ); echo "\n-- Testing php_uname() function with invalid mode --\n"; // am invalid mode should result in same o/p as mode 'a' -var_dump( php_uname('z') == php_uname('z') ); +var_dump( php_uname('z') == php_uname('z') ); class barClass { } diff --git a/ext/standard/tests/general_functions/php_uname_variation1.phpt b/ext/standard/tests/general_functions/php_uname_variation1.phpt index d94fd80049..4a47827657 100644 --- a/ext/standard/tests/general_functions/php_uname_variation1.phpt +++ b/ext/standard/tests/general_functions/php_uname_variation1.phpt @@ -26,34 +26,34 @@ $values = array( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "new fooClass()" => new fooClass(), - + // undefined data "undefined var" => $undefined_var, - + // unset data "unset var" => $unset_var, ); diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index e502f61291..cfeaca7bad 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -28,9 +28,9 @@ function check_printr( $variables ) { $counter++; } } - + echo "\n*** Testing print_r() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -46,7 +46,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_printr() to display contents of integer variables using print_r() */ check_printr($integers); @@ -84,7 +84,7 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); /* calling check_printr() to display contents of float variables using print_r() */ @@ -116,7 +116,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_printr() to display boolean variables using print_r() */ check_printr($booleans); var_dump( reset($booleans) ); @@ -231,7 +231,7 @@ print_r($recursion_obj2); echo "\n*** Testing print_r() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -259,9 +259,9 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); -/* calling check_printr() to display combinations of scalar and +/* calling check_printr() to display combinations of scalar and non-scalar variables using print_r() */ check_printr($variations); diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 3054e0a431..25776dd3ba 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -29,9 +29,9 @@ function check_printr( $variables ) { $counter++; } } - + echo "\n*** Testing print_r() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -47,7 +47,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_printr() to display contents of integer variables using print_r() */ check_printr($integers); @@ -85,7 +85,7 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); /* calling check_printr() to display contents of float variables using print_r() */ @@ -117,7 +117,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_printr() to display boolean variables using print_r() */ check_printr($booleans); var_dump( reset($booleans) ); @@ -232,7 +232,7 @@ print_r($recursion_obj2); echo "\n*** Testing print_r() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -260,9 +260,9 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); -/* calling check_printr() to display combinations of scalar and +/* calling check_printr() to display combinations of scalar and non-scalar variables using print_r() */ check_printr($variations); diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt index 157ad74783..5ff409e10d 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt @@ -45,7 +45,7 @@ function get_priority_from_wmic() { $f = false; $m = [ - strpos($t[0], ' ProcessId' ), + strpos($t[0], ' ProcessId' ), strpos($t[0], ' Priority ') ]; @@ -71,10 +71,10 @@ function get_priority_from_wmic() { $p = [ /* '' => ['', ''] */ - 'Idle' => [4, 10], - 'Below normal' => [6, 5], - 'Normal' => [8, 0], - 'Above normal' => [10, -5], + 'Idle' => [4, 10], + 'Below normal' => [6, 5], + 'Normal' => [8, 0], + 'Above normal' => [10, -5], 'High priority' => [13, -10] ]; diff --git a/ext/standard/tests/general_functions/proc_open_pipes1.phpt b/ext/standard/tests/general_functions/proc_open_pipes1.phpt index dc104283eb..f3335bc8ce 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes1.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes1.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with > 16 pipes +proc_open() with > 16 pipes --FILE-- ---EXPECTF-- +--EXPECTF-- bool(false) bool(true) string(5) "value" diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt index eb5187b205..ccb1eea884 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt @@ -35,7 +35,7 @@ var_dump(putenv('FOO= ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) string(2) "°¡" bool(true) diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt index 70f5d08cea..8760927835 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt @@ -24,7 +24,7 @@ var_dump(putenv('FOO=å•Šaå•Šå•Šå•Šå•Š'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) string(3) "å•Š" bool(true) diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt index f314200e65..e722ff5813 100644 --- a/ext/standard/tests/general_functions/rand.phpt +++ b/ext/standard/tests/general_functions/rand.phpt @@ -29,7 +29,7 @@ var_dump(mt_getrandmax(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line %d diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt index 5d7fe536f1..98ab348ecb 100644 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ b/ext/standard/tests/general_functions/sleep_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sleep() function : basic functionality +Test sleep() function : basic functionality --SKIPIF-- ---EXPECTF-- +--EXPECTF-- string(5) "array" string(6) "string" string(5) "array" diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt b/ext/standard/tests/general_functions/uniqid_basic.phpt index 2da832b8ed..285365ab60 100644 --- a/ext/standard/tests/general_functions/uniqid_basic.phpt +++ b/ext/standard/tests/general_functions/uniqid_basic.phpt @@ -3,7 +3,7 @@ Test uniqid() function : basic functionality --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing uniqid() : basic functionality *** uniqid() without a prefix diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt index 8f7f22d7d3..388bc42599 100644 --- a/ext/standard/tests/general_functions/uniqid_error.phpt +++ b/ext/standard/tests/general_functions/uniqid_error.phpt @@ -3,7 +3,7 @@ Test uniqid() function : error conditions --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing uniqid() : error conditions *** -- Testing uniqid() function with more than expected no. of arguments -- diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt index d6f312e15b..8c724d79ee 100644 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ b/ext/standard/tests/general_functions/usleep_basic.phpt @@ -7,16 +7,16 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index 3b8212204a..a7f61ec063 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -22,9 +22,9 @@ function check_vardump( $variables ) { $counter++; } } - + echo "\n*** Testing var_dump() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -40,8 +40,8 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); -/* calling check_vardump() to display contents of integer variables +); +/* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -78,9 +78,9 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); -/* calling check_vardump() to display contents of float variables +/* calling check_vardump() to display contents of float variables using var_dump() */ check_vardump($floats); @@ -101,7 +101,7 @@ $strings = array ( "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL "1234\t\n5678\n\t9100\rabcda" // strings with escape characters ); -/* calling check_vardump() to display contents of strings +/* calling check_vardump() to display contents of strings using var_dump() */ check_vardump($strings); @@ -111,7 +111,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_vardump() to display boolean variables using var_dump() */ check_vardump($booleans); @@ -226,7 +226,7 @@ var_dump($recursion_obj2); echo "\n*** Testing var_dump() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -254,7 +254,7 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); /* calling check_vardump() to display combinations of scalar and non-scalar variables using var_dump() */ @@ -271,7 +271,7 @@ $misc_values = array ( check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; -var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, +var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, $objects, $misc_values, $variations ); /* checking var_dump() on functions */ @@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n"; var_dump(); /* closing resource handle used */ -closedir($dir_handle); +closedir($dir_handle); echo "Done\n"; ?> diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index 47dfcbb3ee..7503e789b0 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -17,13 +17,13 @@ setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","d */ echo "*** Testing var_export() with integer values ***\n"; -// different integer vlaues +// different integer vlaues $valid_ints = array( '0', '1', '-1', '-2147483648', // max negative integer value - '-2147483647', + '-2147483647', 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -53,11 +53,11 @@ $counter++; } echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean vlaues $valid_bool = array( 1, TRUE, - true, + true, 0, FALSE, false @@ -77,7 +77,7 @@ $counter++; } echo "*** Testing var_export() with valid float values ***\n"; -// different valid float vlaues +// different valid float vlaues $valid_floats = array( (float)-2147483649, // float value (float)2147483648, // float value @@ -115,7 +115,7 @@ $counter++; } echo "*** Testing var_export() with valid strings ***\n"; -// different valid string +// different valid string $valid_strings = array( "", " ", @@ -148,7 +148,7 @@ $counter++; } echo "*** Testing var_export() with valid arrays ***\n"; -// different valid arrays +// different valid arrays $valid_arrays = array( array(), array(NULL), @@ -185,7 +185,7 @@ echo "*** Testing var_export() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -204,28 +204,28 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface iValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } // implement the interface class Value implements iValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_export ( $vars ); } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -239,7 +239,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -260,7 +260,7 @@ $valid_objects = array( $foo_object, $Value_object, $concreteClass_object - ); + ); $counter = 1; /* Loop to check for above objects with var_export() */ echo "\n*** Output for objects ***\n"; @@ -274,9 +274,9 @@ var_dump( var_export( $obj, TRUE) ); echo "\n"; $counter++; } - + echo "*** Testing var_export() with valid null values ***\n"; -// different valid null vlaues +// different valid null vlaues $unset_var = array(); unset ($unset_var); // now a null $null_var = NULL; @@ -304,9 +304,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_export( var_export() ); -//arguments more than expected +//arguments more than expected var_export( var_export(TRUE, FALSE, TRUE) ); - + echo "\n\nDone"; diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index 5f7b89124c..2dfd28785b 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -3,19 +3,19 @@ Test var_export() function with integer values --FILE-- '0', '1' => '1', '-1' => '-1', '-2147483648' => '-2147483648', // max negative integer value - '-2147483647' => '-2147483647', + '-2147483647' => '-2147483647', '2147483647' => 2147483647, // max positive integer value '2147483640' => 2147483640, '0x123B' => 0x123B, // integer as hexadecimal diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index 33ca400cc6..01734b54de 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -4,22 +4,22 @@ Test var_export() function with valid boolean values 1, "TRUE" => TRUE, - "true" => true, + "true" => true, "0" => 0, "FALSE" => FALSE, "false" => false ); - + /* Loop to check for above boolean values with var_export() */ echo "\n*** Output for boolean values ***\n"; foreach($valid_bool as $key => $bool_value) { diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt index 35692ad627..c85a4782ae 100644 --- a/ext/standard/tests/general_functions/var_export_basic3.phpt +++ b/ext/standard/tests/general_functions/var_export_basic3.phpt @@ -5,13 +5,13 @@ serialize_precision=17 --FILE-- (float)-2147483649, // float value "2147483648" => (float)2147483648, // float value diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt index 4668ace1c5..cfdac8b268 100644 --- a/ext/standard/tests/general_functions/var_export_basic4.phpt +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt @@ -3,14 +3,14 @@ Test var_export() function with valid strings --FILE-- "", "\" \"" => " ", diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt index dacb355323..ab81fa802e 100644 --- a/ext/standard/tests/general_functions/var_export_basic5.phpt +++ b/ext/standard/tests/general_functions/var_export_basic5.phpt @@ -5,14 +5,14 @@ serialize_precision=17 --FILE-- array(), "array(NULL)" => array(NULL), diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index 38fdb373df..ea3707d0bc 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -3,9 +3,9 @@ Test var_export() function with valid objects --FILE-- vars[$name] = $val; } - + public function dumpVal () { var_export ( $vars ); } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -67,7 +67,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -88,7 +88,7 @@ $valid_objects = array( "foo_object" => $foo_object, "Value_object" => $Value_object, "concreteClass_object" => $concreteClass_object - ); + ); /* Loop to check for above objects with var_export() */ echo "\n*** Output for objects ***\n"; foreach($valid_objects as $key => $obj) { diff --git a/ext/standard/tests/general_functions/var_export_basic7.phpt b/ext/standard/tests/general_functions/var_export_basic7.phpt index 10dc032900..b652b456e0 100644 --- a/ext/standard/tests/general_functions/var_export_basic7.phpt +++ b/ext/standard/tests/general_functions/var_export_basic7.phpt @@ -3,14 +3,14 @@ Test var_export() function with valid null values --FILE-- p = '22'; $o2 = new stdclass; $o2->a = 1; -$o2->b = array('k'=>2); -$o2->x = $o1; +$o2->b = array('k'=>2); +$o2->x = $o1; var_export($o2); echo "\n\n-- Var export on an simple array --\n"; diff --git a/ext/standard/tests/general_functions/var_export_error1.phpt b/ext/standard/tests/general_functions/var_export_error1.phpt index d9c5eee9dc..ffa542c053 100644 --- a/ext/standard/tests/general_functions/var_export_error1.phpt +++ b/ext/standard/tests/general_functions/var_export_error1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test var_export() function : error conditions +Test var_export() function : error conditions --FILE-- p =& $obj; diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index c862691e91..a5acb37027 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -3,9 +3,9 @@ Test var_export() function : error conditions - recursive array --FILE-- array('timeout'=>1))); file_get_contents('http://127.0.0.1:12342/', 0, $context); unset($context); - + $b = $a; $a = count(get_resources()); } diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index 4d47225818..66cbc50ae1 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : basic functionality --FILE-- "200x100.png", - + //SWF file "SWF image file" => "200x100.swf", - + //BMP file "BMP image file" => "200x100.bmp", - + //TIFF intel byte order "TIFF intel byte order image file" => "200x100.tif", diff --git a/ext/standard/tests/image/getimagesize_error1.phpt b/ext/standard/tests/image/getimagesize_error1.phpt index 947379d145..d72535c91c 100644 --- a/ext/standard/tests/image/getimagesize_error1.phpt +++ b/ext/standard/tests/image/getimagesize_error1.phpt @@ -3,9 +3,9 @@ Test getimagesize() function : error conditions - wrong number of args --FILE-- --FILE-- diff --git a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt index 5506570494..34b167b6e0 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt @@ -1,7 +1,7 @@ --TEST-- image_type_to_mime_type() --SKIPIF-- - --FILE-- @@ -10,27 +10,27 @@ image_type_to_mime_type() /* Prototype : string image_type_to_mime_type ( int $imagetype ) * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "Starting image_type_to_mime_type() test\n\n"; $image_types = array ( - IMAGETYPE_GIF, - IMAGETYPE_JPEG, - IMAGETYPE_PNG, - IMAGETYPE_SWF, - IMAGETYPE_PSD, - IMAGETYPE_BMP, - IMAGETYPE_TIFF_II, - IMAGETYPE_TIFF_MM, - IMAGETYPE_JPC, - IMAGETYPE_JP2, - IMAGETYPE_JPX, - IMAGETYPE_JB2, - IMAGETYPE_IFF, - IMAGETYPE_WBMP, - IMAGETYPE_JPEG2000, + IMAGETYPE_GIF, + IMAGETYPE_JPEG, + IMAGETYPE_PNG, + IMAGETYPE_SWF, + IMAGETYPE_PSD, + IMAGETYPE_BMP, + IMAGETYPE_TIFF_II, + IMAGETYPE_TIFF_MM, + IMAGETYPE_JPC, + IMAGETYPE_JP2, + IMAGETYPE_JPX, + IMAGETYPE_JB2, + IMAGETYPE_IFF, + IMAGETYPE_WBMP, + IMAGETYPE_JPEG2000, IMAGETYPE_XBM, IMAGETYPE_WEBP ); diff --git a/ext/standard/tests/image/image_type_to_mime_type_error.phpt b/ext/standard/tests/image/image_type_to_mime_type_error.phpt index 88aacbf176..9a3e2d17c5 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_error.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_error.phpt @@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : error conditions - Pass incorrect num --FILE-- --FILE-- --INI-- -SMTP = +SMTP = smtp_port = --FILE-- /dev/null mail.add_x_header = Off --SKIPIF-- - --FILE-- diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt index 2f810e2562..b6ed463edc 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ezmlm_hash() function : basic functionality +Test ezmlm_hash() function : basic functionality --SKIPIF-- ===DONE=== diff --git a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt index 58957c84a9..123195e5ec 100644 --- a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index 70f32df40f..ddc5571c7e 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path=tee mailBasic.out >/dev/null mail.add_x_header = Off @@ -11,9 +11,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- 0) { // sleep for a while to allow msg to be delivered @@ -63,22 +63,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index 892d92391e..dedb1e3ff8 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- - 0) { // sleep for a while to allow msg to be delivered @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index 1caa68c068..5d1ec6b7a3 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- - 0) { // sleep for a while to allow msg to be delivered @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index c8e45242e2..c90e909c6f 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- - 0) { // sleep for a while to allow msg to be delivered @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_error.phpt b/ext/standard/tests/mail/mail_error.phpt index 871b6da0be..efecd162e9 100644 --- a/ext/standard/tests/mail/mail_error.phpt +++ b/ext/standard/tests/mail/mail_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test mail() function : error conditions +Test mail() function : error conditions --FILE-- 0) { // sleep for a while to allow msg to be delivered @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index 817cc36af4..4c8ee2ff6c 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- - 0) { // sleep for a while to allow msg to be delivered @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt index 4062fae981..ae6e308715 100644 --- a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- - 0) { // sleep for a while to allow msg to be delivered @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 0f6ecbc09b..0665e5bfa3 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test abs() function : basic functionality +Test abs() function : basic functionality --INI-- precision = 14 --FILE-- @@ -20,11 +20,11 @@ $values = array(23, "23", "-23", "23.45", - "2.345e1", - "-2.345e1", + "2.345e1", + "-2.345e1", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = abs($values[$i]); diff --git a/ext/standard/tests/math/abs_basiclong_64bit.phpt b/ext/standard/tests/math/abs_basiclong_64bit.phpt index ccb2556427..0f0cb5d55c 100644 --- a/ext/standard/tests/math/abs_basiclong_64bit.phpt +++ b/ext/standard/tests/math/abs_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/abs_error.phpt b/ext/standard/tests/math/abs_error.phpt index 4d62259afb..8c2a9f73ce 100644 --- a/ext/standard/tests/math/abs_error.phpt +++ b/ext/standard/tests/math/abs_error.phpt @@ -10,7 +10,7 @@ Test abs() function : error conditions - incorrect number of args /* * Pass incorrect number of arguments to abs() to test behaviour */ - + echo "*** Testing abs() : error conditions ***\n"; $arg_0 = 1.0; diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index 6df1e6b55c..988eba93de 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -45,7 +45,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -55,7 +55,7 @@ $inputs = array( /*19*/ "abs", 'abs', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/math/acos_basic.phpt b/ext/standard/tests/math/acos_basic.phpt index 150eb975ad..a5af21e958 100644 --- a/ext/standard/tests/math/acos_basic.phpt +++ b/ext/standard/tests/math/acos_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input acos() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/acos_error.phpt b/ext/standard/tests/math/acos_error.phpt index 6cfdb8f857..6a9dd909a5 100644 --- a/ext/standard/tests/math/acos_error.phpt +++ b/ext/standard/tests/math/acos_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for acos() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/acosh_error.phpt b/ext/standard/tests/math/acosh_error.phpt index cb85becdb1..270796c373 100644 --- a/ext/standard/tests/math/acosh_error.phpt +++ b/ext/standard/tests/math/acosh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for acosh() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/asin_error.phpt b/ext/standard/tests/math/asin_error.phpt index a51a077b90..2428e8a5b4 100644 --- a/ext/standard/tests/math/asin_error.phpt +++ b/ext/standard/tests/math/asin_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for asin() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/asinh_error.phpt b/ext/standard/tests/math/asinh_error.phpt index 8a0d558783..ad6bf36014 100644 --- a/ext/standard/tests/math/asinh_error.phpt +++ b/ext/standard/tests/math/asinh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for asinh() --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/math/atan2_basiclong_64bit.phpt b/ext/standard/tests/math/atan2_basiclong_64bit.phpt index e0548a08ee..f646585f30 100644 --- a/ext/standard/tests/math/atan2_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan2_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atan2_variation1.phpt b/ext/standard/tests/math/atan2_variation1.phpt index 15aef71359..7f9be489e7 100644 --- a/ext/standard/tests/math/atan2_variation1.phpt +++ b/ext/standard/tests/math/atan2_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan2_variation2.phpt b/ext/standard/tests/math/atan2_variation2.phpt index 2de0bb2eec..120ac45eb5 100644 --- a/ext/standard/tests/math/atan2_variation2.phpt +++ b/ext/standard/tests/math/atan2_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan_basic.phpt b/ext/standard/tests/math/atan_basic.phpt index f4a2bedf76..180263fe59 100644 --- a/ext/standard/tests/math/atan_basic.phpt +++ b/ext/standard/tests/math/atan_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input atan() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atan_error.phpt b/ext/standard/tests/math/atan_error.phpt index 61b35b05d6..0a57818088 100644 --- a/ext/standard/tests/math/atan_error.phpt +++ b/ext/standard/tests/math/atan_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for atan() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atanh_error.phpt b/ext/standard/tests/math/atanh_error.phpt index e442825b0e..c62dadf027 100644 --- a/ext/standard/tests/math/atanh_error.phpt +++ b/ext/standard/tests/math/atanh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for atanh() --FILE-- diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index afa0c5bb8a..a285ece2a2 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -27,7 +27,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -46,7 +46,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -56,7 +56,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt index 96bc596747..c384d08d74 100644 --- a/ext/standard/tests/math/base_convert_variation2.phpt +++ b/ext/standard/tests/math/base_convert_variation2.phpt @@ -24,7 +24,7 @@ $inputs = array( /*1*/ 0, 1, -1, - -12, + -12, 2147483647, // float data @@ -43,7 +43,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -53,7 +53,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt index c5cf390f19..8c3316b84f 100644 --- a/ext/standard/tests/math/base_convert_variation3.phpt +++ b/ext/standard/tests/math/base_convert_variation3.phpt @@ -24,7 +24,7 @@ $inputs = array( /*1*/ 0, 1, -1, - -12, + -12, 2147483647, // float data @@ -43,7 +43,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -53,7 +53,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index 9fcca4a7ee..d0db2a37ea 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -23,10 +23,10 @@ $values = array(111000111, 31101.3, 31.1013e5, 0x111ABC, - 011237, + 011237, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index 949c19eea3..f6483e0807 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -23,10 +23,10 @@ $values = array(111000111, 31101.3, 31.1013e5, 0x111ABC, - 011237, + 011237, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); diff --git a/ext/standard/tests/math/bindec_basiclong_64bit.phpt b/ext/standard/tests/math/bindec_basiclong_64bit.phpt index 3cc57d5dc4..488ab538ed 100644 --- a/ext/standard/tests/math/bindec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/bindec_basiclong_64bit.phpt @@ -6,20 +6,20 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt index aa6ac9cdd1..8bd52332c4 100644 --- a/ext/standard/tests/math/bindec_error.phpt +++ b/ext/standard/tests/math/bindec_error.phpt @@ -10,7 +10,7 @@ Test bindec() function : error conditions - incorrect input /* * Pass incorrect input to bindec() to test behaviour */ - + echo "*** Testing bindec() : error conditions ***\n"; // get a class diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 1e188bab34..9efadf6e5c 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index 0a37c4c2f9..ab667126da 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/standard/tests/math/bug25665.phpt b/ext/standard/tests/math/bug25665.phpt index 469236c943..120604aff2 100644 --- a/ext/standard/tests/math/bug25665.phpt +++ b/ext/standard/tests/math/bug25665.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25665 (var_dump () hangs on Nan and INF) --SKIPIF-- - diff --git a/ext/standard/tests/math/bug45712.phpt b/ext/standard/tests/math/bug45712.phpt index 2aa4386587..23c3b6ddd3 100644 --- a/ext/standard/tests/math/bug45712.phpt +++ b/ext/standard/tests/math/bug45712.phpt @@ -14,7 +14,7 @@ var_dump($nan==50); var_dump($nan=='500'); var_dump($nan=='abc'); var_dump($nan==$nan); -// +// var_dump($nan===''); var_dump($nan===0.5); var_dump($nan===50); @@ -33,7 +33,7 @@ var_dump($inf==50); var_dump($inf=='500'); var_dump($inf=='abc'); var_dump($inf==$inf); -// +// var_dump($inf===''); var_dump($inf===0.5); var_dump($inf===50); diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index e90afd3388..3a4bb0c293 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -25,7 +25,7 @@ $values = array(0, 2.6, -2.6, 037, - 0x5F, + 0x5F, "10.5", "-10.5", "3.95E3", @@ -33,8 +33,8 @@ $values = array(0, "039", true, false, - null, - ); + null, + ); for ($i = 0; $i < count($values); $i++) { $res = ceil($values[$i]); diff --git a/ext/standard/tests/math/ceil_basiclong_64bit.phpt b/ext/standard/tests/math/ceil_basiclong_64bit.phpt index b4c23d85cd..42d9f6b413 100644 --- a/ext/standard/tests/math/ceil_basiclong_64bit.phpt +++ b/ext/standard/tests/math/ceil_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index 7c1f859277..e68dd8b878 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /* 7*/ "", '', @@ -49,7 +49,7 @@ $inputs = array( /*10*/ "abcxyz", 'abcxyz}', $heredoc, - + // object data /*13*/ new classA(), diff --git a/ext/standard/tests/math/constants_basic.phpt b/ext/standard/tests/math/constants_basic.phpt index 0220d93355..f44c6de4ff 100644 --- a/ext/standard/tests/math/constants_basic.phpt +++ b/ext/standard/tests/math/constants_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test for pre-defined math constants +Test for pre-defined math constants --INI-- precision=14 --FILE-- diff --git a/ext/standard/tests/math/cos_basic.phpt b/ext/standard/tests/math/cos_basic.phpt index f0cfa66ee5..8ad7010ce1 100644 --- a/ext/standard/tests/math/cos_basic.phpt +++ b/ext/standard/tests/math/cos_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input cos() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/cos_error.phpt b/ext/standard/tests/math/cos_error.phpt index 40901991e0..21d4692a7a 100644 --- a/ext/standard/tests/math/cos_error.phpt +++ b/ext/standard/tests/math/cos_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for cos() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/cosh_error.phpt b/ext/standard/tests/math/cosh_error.phpt index afed24fe3b..c540f72a20 100644 --- a/ext/standard/tests/math/cosh_error.phpt +++ b/ext/standard/tests/math/cosh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for cosh() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt index fcfd1874a5..e0a2db85ea 100644 --- a/ext/standard/tests/math/decbin_error.phpt +++ b/ext/standard/tests/math/decbin_error.phpt @@ -9,7 +9,7 @@ precision=14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/dechex_error.phpt b/ext/standard/tests/math/dechex_error.phpt index 7ed0c4598c..4c3fd6f858 100644 --- a/ext/standard/tests/math/dechex_error.phpt +++ b/ext/standard/tests/math/dechex_error.phpt @@ -9,7 +9,7 @@ Test dechex() - wrong params dechex() echo "*** Testing dechex() : error conditions ***\n"; -echo "\nIncorrect number of arguments\n"; +echo "\nIncorrect number of arguments\n"; dechex(); dechex(23,2,true); diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index 5bcd2b5c5d..ee51c134d5 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -37,9 +37,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -69,8 +69,8 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index a513264df2..404e9dfd82 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -37,10 +37,10 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 18446744073709551615, // largest decimal - 18446744073709551616, - + -2345, + 18446744073709551615, // largest decimal + 18446744073709551616, + // float data /*7*/ 10.5, -10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -69,8 +69,8 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index 3a5011b973..b9d9ebc060 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,8 +14,8 @@ $values = array(10, "0x5F", true, false, - null, - ); + null, + ); for ($i = 0; $i < count($values); $i++) { $res = decoct($values[$i]); diff --git a/ext/standard/tests/math/decoct_basiclong_64bit.phpt b/ext/standard/tests/math/decoct_basiclong_64bit.phpt index d7434176db..f1812b9062 100644 --- a/ext/standard/tests/math/decoct_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decoct_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index 49ba57f54b..85230df2b3 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -38,9 +38,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -68,10 +68,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 40afafa10a..14a978b2b3 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -38,9 +38,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 18446744073709551615, // largest decimal - 18446744073709551616, + -2345, + 18446744073709551615, // largest decimal + 18446744073709551616, // float data /*7*/ 10.5, @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -68,10 +68,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/deg2rad_basic.phpt b/ext/standard/tests/math/deg2rad_basic.phpt index 64771b9980..3b756281fa 100644 --- a/ext/standard/tests/math/deg2rad_basic.phpt +++ b/ext/standard/tests/math/deg2rad_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input deg2rad() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/deg2rad_error.phpt b/ext/standard/tests/math/deg2rad_error.phpt index 517680a7c3..4bdad8cdb8 100644 --- a/ext/standard/tests/math/deg2rad_error.phpt +++ b/ext/standard/tests/math/deg2rad_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for deg2rad() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/exp_variation1.phpt b/ext/standard/tests/math/exp_variation1.phpt index 150e0cee8a..5305b63660 100644 --- a/ext/standard/tests/math/exp_variation1.phpt +++ b/ext/standard/tests/math/exp_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 320b01a27d..00f8762ad5 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/expm1_error.phpt b/ext/standard/tests/math/expm1_error.phpt index 380633b67b..f743e48d18 100644 --- a/ext/standard/tests/math/expm1_error.phpt +++ b/ext/standard/tests/math/expm1_error.phpt @@ -3,7 +3,7 @@ Test expm1() - Error conditions --FILE-- ===Done=== diff --git a/ext/standard/tests/math/floor_basiclong_64bit.phpt b/ext/standard/tests/math/floor_basiclong_64bit.phpt index 65a50fc083..6b768ef90c 100644 --- a/ext/standard/tests/math/floor_basiclong_64bit.phpt +++ b/ext/standard/tests/math/floor_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index baba53aab4..adf12551f4 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /* 7*/ "", '', @@ -49,7 +49,7 @@ $inputs = array( /*10*/ "abcxyz", 'abcxyz}', $heredoc, - + // object data /*13*/ new classA(), diff --git a/ext/standard/tests/math/floorceil.phpt b/ext/standard/tests/math/floorceil.phpt index 2f7d82c6e6..55395dba3d 100644 --- a/ext/standard/tests/math/floorceil.phpt +++ b/ext/standard/tests/math/floorceil.phpt @@ -2,22 +2,22 @@ Tests for floor en ceil --FILE-- +?> --EXPECT-- float(0) float(-1) diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index c29abca9d2..d10f08af0d 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -12,11 +12,11 @@ $values1 = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, - false); - + false); + $values2 = array(2, -2, 2.3e1, @@ -25,17 +25,17 @@ $values2 = array(2, 02, "2", "2.3", - "2.3e1", + "2.3e1", null, true, - false); + false); for ($i = 0; $i < count($values1); $i++) { - echo "\niteration ", $i, "\n"; - + echo "\niteration ", $i, "\n"; + for ($j = 0; $j < count($values2); $j++) { $res = fmod($values1[$i], $values2[$j]); var_dump($res); - } + } } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/fmod_basiclong_64bit.phpt b/ext/standard/tests/math/fmod_basiclong_64bit.phpt index 1502b651e2..6513e31159 100644 --- a/ext/standard/tests/math/fmod_basiclong_64bit.phpt +++ b/ext/standard/tests/math/fmod_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/fmod_variation1.phpt b/ext/standard/tests/math/fmod_variation1.phpt index 0f0d826ac9..345d74c431 100644 --- a/ext/standard/tests/math/fmod_variation1.phpt +++ b/ext/standard/tests/math/fmod_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/fmod_variation2.phpt b/ext/standard/tests/math/fmod_variation2.phpt index 12fae1a758..6c5fc82541 100644 --- a/ext/standard/tests/math/fmod_variation2.phpt +++ b/ext/standard/tests/math/fmod_variation2.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 1c42ae7e40..08303ad20c 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -19,11 +19,11 @@ $values = array(0x123abc, '311015', 31101.3, 31.1013e5, - 011237, - '011237', + 011237, + '011237', true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = hexdec($values[$i]); var_dump($res); diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index f1a2028b5c..fff7185ef1 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -21,17 +21,17 @@ $values = array(0x123abc, '311015', 31101.3, 31.1013e5, - 011237, - '011237', + 011237, + '011237', true, false, - null); + null); foreach($values as $value) { echo "\n-- hexdec $value --\n"; var_dump(hexdec($value)); -}; - +}; + ?> ===Done=== --EXPECTF-- diff --git a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt index 29c684a155..225e42018b 100644 --- a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt @@ -6,20 +6,20 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt index c45c2aa92b..7b65e5623a 100644 --- a/ext/standard/tests/math/hexdec_error.phpt +++ b/ext/standard/tests/math/hexdec_error.phpt @@ -3,7 +3,7 @@ Test hexdec() - wrong params test hexdec() --FILE-- ===Done=== diff --git a/ext/standard/tests/math/hypot_basiclong_64bit.phpt b/ext/standard/tests/math/hypot_basiclong_64bit.phpt index 241fa9c4e9..3bbfcb4afc 100644 --- a/ext/standard/tests/math/hypot_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hypot_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/hypot_error.phpt b/ext/standard/tests/math/hypot_error.phpt index b357a3a809..b816cd58a0 100644 --- a/ext/standard/tests/math/hypot_error.phpt +++ b/ext/standard/tests/math/hypot_error.phpt @@ -6,7 +6,7 @@ Test hypot() - wrong params test hypot() * Description: Calculate the length of the hypotenuse of a right-angle triangle. * Source code: ext/standard/math.c */ - + echo "*** Testing hypot() : error conditions ***\n"; echo "\n-- Testing hypot() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/math/hypot_variation1.phpt b/ext/standard/tests/math/hypot_variation1.phpt index b083822c10..762bc58727 100644 --- a/ext/standard/tests/math/hypot_variation1.phpt +++ b/ext/standard/tests/math/hypot_variation1.phpt @@ -33,7 +33,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -62,10 +62,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hypot_variation2.phpt b/ext/standard/tests/math/hypot_variation2.phpt index 393e5eb9d1..989e7d00ae 100644 --- a/ext/standard/tests/math/hypot_variation2.phpt +++ b/ext/standard/tests/math/hypot_variation2.phpt @@ -33,7 +33,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -62,10 +62,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 85d2685273..5906517658 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -10,16 +10,16 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, pow(0, -2), - acos(1.01)); + acos(1.01)); ; for ($i = 0; $i < count($values); $i++) { $res = is_finite($values[$i]); - var_dump($res); + var_dump($res); } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt index bbc43f7349..201d8473fa 100644 --- a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_finite_variation1.phpt b/ext/standard/tests/math/is_finite_variation1.phpt index 4f6288f5df..498d0b2717 100644 --- a/ext/standard/tests/math/is_finite_variation1.phpt +++ b/ext/standard/tests/math/is_finite_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index ca79922287..508c5839bb 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -10,16 +10,16 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, pow(0, -2), - acos(1.01)); + acos(1.01)); ; for ($i = 0; $i < count($values); $i++) { $res = is_infinite($values[$i]); - var_dump($res); + var_dump($res); } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt index ab15ec71f0..ca53b77f0c 100644 --- a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_infinite_variation1.phpt b/ext/standard/tests/math/is_infinite_variation1.phpt index e7228dd7c5..0f57209b98 100644 --- a/ext/standard/tests/math/is_infinite_variation1.phpt +++ b/ext/standard/tests/math/is_infinite_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index fb10737cea..05db70db76 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -10,19 +10,19 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, pow(0, -2), - acos(1.01)); - + acos(1.01)); + for ($i = 0; $i < count($values); $i++) { $res = is_nan($values[$i]); - var_dump($res); + var_dump($res); } - + ?> --EXPECTF-- diff --git a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt index 6f66d6b71e..ca85db1660 100644 --- a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_nan_variation1.phpt b/ext/standard/tests/math/is_nan_variation1.phpt index 3106d30d74..9cd24cfd91 100644 --- a/ext/standard/tests/math/is_nan_variation1.phpt +++ b/ext/standard/tests/math/is_nan_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt index 6d624d84ab..b2e50f86f8 100644 --- a/ext/standard/tests/math/lcg_value_basic.phpt +++ b/ext/standard/tests/math/lcg_value_basic.phpt @@ -9,7 +9,7 @@ echo "MATHS test script started\n"; echo "\n lcg_value tests...\n"; for ($i = 0; $i < 100; $i++) { $res = lcg_value(); - + if (!is_float($res) || $res < 0 || $res > 1) { break; } @@ -17,28 +17,28 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED\n"; -} else { +} else { echo "PASSED\n"; -} +} echo "\n lcg_value error cases..spurious args get ignored\n"; $res = lcg_value(23); if (!is_float($res) || $res < 0 || $res > 1) { echo "FAILED\n"; -} else { +} else { echo "PASSED\n"; -} +} $res = lcg_value(10,false); if (!is_float($res) || $res < 0 || $res > 1) { echo "FAILED\n"; -} else { +} else { echo "PASSED\n"; -} +} echo "MATHS test script completed\n"; - + ?> --EXPECT-- diff --git a/ext/standard/tests/math/log.phpt b/ext/standard/tests/math/log.phpt index 4f8b47a76b..53034b3688 100644 --- a/ext/standard/tests/math/log.phpt +++ b/ext/standard/tests/math/log.phpt @@ -6,8 +6,8 @@ echo "On failure, please mail result to php-dev@lists.php.net\n"; for ($x = 0, $count= 0; $x < 200; $x++) { $x2 = (int) exp(log($x)); // e ^ log(x) should be close in range to x - if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { - $count++; + if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { + $count++; } else { print "$x : $x2\n"; } @@ -19,8 +19,8 @@ for ($base = 2; $base < 11; $base++) { for ($x = 0, $count= 0; $x < 50; $x++) { $x2 = (int) pow($base, log($x, $base)); // base ^ log(x) should be close in range to x - if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { - $count++; + if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { + $count++; } else { print "base $base: $x : $x2\n"; } diff --git a/ext/standard/tests/math/log10_basic.phpt b/ext/standard/tests/math/log10_basic.phpt index 0877df23d7..3ea14b59ac 100644 --- a/ext/standard/tests/math/log10_basic.phpt +++ b/ext/standard/tests/math/log10_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input log10() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log10_error.phpt b/ext/standard/tests/math/log10_error.phpt index e3bc604fd2..f4e5da8f48 100644 --- a/ext/standard/tests/math/log10_error.phpt +++ b/ext/standard/tests/math/log10_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for log10() precision = 14 --FILE-- diff --git a/ext/standard/tests/math/log1p_basiclong_64bit.phpt b/ext/standard/tests/math/log1p_basiclong_64bit.phpt index a0b32bdce9..05580ff731 100644 --- a/ext/standard/tests/math/log1p_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log1p_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log1p_error.phpt b/ext/standard/tests/math/log1p_error.phpt index e0b01a19ac..09d63be128 100644 --- a/ext/standard/tests/math/log1p_error.phpt +++ b/ext/standard/tests/math/log1p_error.phpt @@ -3,11 +3,11 @@ Test log1p() - Error conditions --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log_variation1.phpt b/ext/standard/tests/math/log_variation1.phpt index c1cde4bcc9..5874f63211 100644 --- a/ext/standard/tests/math/log_variation1.phpt +++ b/ext/standard/tests/math/log_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_variation2.phpt b/ext/standard/tests/math/log_variation2.phpt index 9f5c7313fa..4ea191e75c 100644 --- a/ext/standard/tests/math/log_variation2.phpt +++ b/ext/standard/tests/math/log_variation2.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 0f7b8a8b6e..2661c767d5 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -7,8 +7,8 @@ $default_max = mt_getrandmax(); echo "\nmt_rand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n"; for ($i = 0; $i < 100; $i++) { $res = mt_rand(); - -// By default RAND_MAX is 32768 although no constant is defined for it for user space apps + +// By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; } @@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n"; -} else { - echo "PASSED: range min = 0 max = ", $default_max, "\n"; -} +} else { + echo "PASSED: range min = 0 max = ", $default_max, "\n"; +} echo "\nmt_rand() tests with defined min and max value\n"; @@ -28,28 +28,28 @@ $min = array(10, 10.5e3, 0x10, 0400); - + $max = array(100, 1000, 19.5, 10.5e5, 0x10000, - 0700); + 0700); for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = mt_rand($min[$x], $max[$x]); - + if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } if ($i == 100) { - echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; } -} +} echo "\nNon-numeric cases\n"; $min = array(true, @@ -57,8 +57,8 @@ $min = array(true, null, "10", "10.5"); - -// Expected numerical equivalent of above non-numerics + +// Expected numerical equivalent of above non-numerics $minval = array(1, 0, 0, @@ -67,16 +67,16 @@ $minval = array(1, for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = mt_rand($min[$x], 100); - + if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } - + if ($i == 100) { - echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; - } + echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; + } } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt index f2adb6d39d..da4fac3e2f 100644 --- a/ext/standard/tests/math/mt_rand_variation1.phpt +++ b/ext/standard/tests/math/mt_rand_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt index 3c4be806d6..f04baa514a 100644 --- a/ext/standard/tests/math/mt_rand_variation2.phpt +++ b/ext/standard/tests/math/mt_rand_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt index 7409767f91..5648a8fd2a 100644 --- a/ext/standard/tests/math/mt_srand_variation1.phpt +++ b/ext/standard/tests/math/mt_srand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index 7f5f4beb25..303b5a2662 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -10,10 +10,10 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, - false); + false); echo "\n number_format tests.....default\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index ae36d12c73..3d4eb10e74 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -10,10 +10,10 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, - false); + false); echo " number_format tests.....multiple character decimal point\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 8fd57ecfef..d10c35cb05 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -19,10 +19,10 @@ $values = array(01234567, '0x1234ABC', '12345', 31101.3, - 31.1013e5, + 31.1013e5, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index 98996dc182..2fb9a11397 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -22,10 +22,10 @@ $values = array(01234567, '0x1234ABC', '12345', 31101.3, - 31.1013e5, + 31.1013e5, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); diff --git a/ext/standard/tests/math/octdec_basiclong_64bit.phpt b/ext/standard/tests/math/octdec_basiclong_64bit.phpt index 651b09db39..4a97a6f414 100644 --- a/ext/standard/tests/math/octdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/octdec_basiclong_64bit.phpt @@ -6,15 +6,15 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt index ba5f2116bb..5d94acc435 100644 --- a/ext/standard/tests/math/octdec_error.phpt +++ b/ext/standard/tests/math/octdec_error.phpt @@ -3,7 +3,7 @@ Test octdec() - wrong params test octdec() --FILE-- --EXPECTF-- 3.1415926535898 diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt index b7d96ca23b..abd4f26d8e 100644 --- a/ext/standard/tests/math/pow_basic.phpt +++ b/ext/standard/tests/math/pow_basic.phpt @@ -18,9 +18,9 @@ $bases = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", PHP_INT_MAX, - -PHP_INT_MAX - 1); + -PHP_INT_MAX - 1); $exponents = array(0, 1, @@ -34,8 +34,8 @@ $exponents = array(0, 500, -500, 2147483647, - -2147483648); - + -2147483648); + foreach($bases as $base) { echo "\n\nBase = $base"; foreach($exponents as $exponent) { diff --git a/ext/standard/tests/math/pow_basic2.phpt b/ext/standard/tests/math/pow_basic2.phpt index fc55caccad..a1cb124767 100644 --- a/ext/standard/tests/math/pow_basic2.phpt +++ b/ext/standard/tests/math/pow_basic2.phpt @@ -8,7 +8,7 @@ precision=14 $large_exp = 20000; echo "\n-- The following all result in INF --\n"; -var_dump(pow(24, $large_exp)); +var_dump(pow(24, $large_exp)); var_dump(pow(0.24, -$large_exp)); var_dump(pow(-0.24, -$large_exp)); @@ -16,7 +16,7 @@ echo "\n\n-- The following all result in 0 --\n"; var_dump(pow(0.24, $large_exp)); var_dump(pow(-0.24, $large_exp)); var_dump(pow(24, -$large_exp)); -var_dump(pow(-24, -$large_exp)); +var_dump(pow(-24, -$large_exp)); echo "\n\n-- The following all result in -0 --\n"; var_dump(pow(-0.24, $large_exp+1)); diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index 898f6efa33..eb1441f4fd 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -18,9 +18,9 @@ $bases = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", PHP_INT_MAX, - -PHP_INT_MAX - 1); + -PHP_INT_MAX - 1); $exponents = array(0, 1, @@ -34,8 +34,8 @@ $exponents = array(0, 500, -500, 2147483647, - -2147483648); - + -2147483648); + foreach($bases as $base) { echo "\n\nBase = $base"; foreach($exponents as $exponent) { diff --git a/ext/standard/tests/math/pow_basiclong_64bit.phpt b/ext/standard/tests/math/pow_basiclong_64bit.phpt index dfff0f6785..722b01c0c7 100644 --- a/ext/standard/tests/math/pow_basiclong_64bit.phpt +++ b/ext/standard/tests/math/pow_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt index c744c4eb9d..79b5b4d988 100644 --- a/ext/standard/tests/math/pow_variation1.phpt +++ b/ext/standard/tests/math/pow_variation1.phpt @@ -38,7 +38,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, PHP_INT_MAX, // float data @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -67,10 +67,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt index ea2ae45d18..f2979ad4ba 100644 --- a/ext/standard/tests/math/pow_variation1_64bit.phpt +++ b/ext/standard/tests/math/pow_variation1_64bit.phpt @@ -38,7 +38,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, PHP_INT_MAX, // float data @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -67,10 +67,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt index 36b085b647..f5b6717b0b 100644 --- a/ext/standard/tests/math/pow_variation2.phpt +++ b/ext/standard/tests/math/pow_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/rad2deg_basic.phpt b/ext/standard/tests/math/rad2deg_basic.phpt index 0256ffbd90..e79e591cf7 100644 --- a/ext/standard/tests/math/rad2deg_basic.phpt +++ b/ext/standard/tests/math/rad2deg_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input rad2deg() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/rad2deg_error.phpt b/ext/standard/tests/math/rad2deg_error.phpt index 32b2f4dcb6..e49eea2703 100644 --- a/ext/standard/tests/math/rad2deg_error.phpt +++ b/ext/standard/tests/math/rad2deg_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for rad2deg() precision = 14 --FILE-- $default_max) { break; } @@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n"; -} else { +} else { echo "PASSED: range min = 0 max = ", $default_max, "\n"; -} +} echo "\nrand() tests with defined min and max value\n"; @@ -28,28 +28,28 @@ $min = array(10, 10.5e3, 0x10, 0400); - + $max = array(100, 1000, 19.5, 10.5e5, 0x10000, - 0700); + 0700); for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = rand($min[$x], $max[$x]); - + if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } if ($i == 100) { - echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; } -} +} echo "\nNon-numeric cases\n"; $min = array(true, @@ -57,8 +57,8 @@ $min = array(true, null, "10", "10.5"); - -// Eexepcted numerical equivalent of above non-numerics + +// Eexepcted numerical equivalent of above non-numerics $minval = array(1, 0, 0, @@ -67,16 +67,16 @@ $minval = array(1, for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = rand($min[$x], 100); - + if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } - + if ($i == 100) { - echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; - } + echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; + } } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt index f14ada87f5..3d3d4f502c 100644 --- a/ext/standard/tests/math/rand_variation1.phpt +++ b/ext/standard/tests/math/rand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt index 824b47b0cb..f14d6f202b 100644 --- a/ext/standard/tests/math/rand_variation2.phpt +++ b/ext/standard/tests/math/rand_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index d4b94ec056..94531ba017 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -19,9 +19,9 @@ $values = array(123456789, -4.567E3, 0x234567, 067777777, - "1.234567", + "1.234567", "2.3456789e8"); - + $precision = array(2, 8, 0x3, @@ -30,10 +30,10 @@ $precision = array(2, "2", "04", "3.6", - "2.1e1", + "2.1e1", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { echo "round: $values[$i]\n"; @@ -41,7 +41,7 @@ for ($i = 0; $i < count($values); $i++) { $res = round($values[$i], $precision[$j]); echo "...with precision $precision[$j]-> "; var_dump($res); - } + } } ?> ===Done=== diff --git a/ext/standard/tests/math/round_basiclong_64bit.phpt b/ext/standard/tests/math/round_basiclong_64bit.phpt index 19db12ed81..fbae95437f 100644 --- a/ext/standard/tests/math/round_basiclong_64bit.phpt +++ b/ext/standard/tests/math/round_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/round_error.phpt b/ext/standard/tests/math/round_error.phpt index 28a6d5cf79..eb80722d92 100644 --- a/ext/standard/tests/math/round_error.phpt +++ b/ext/standard/tests/math/round_error.phpt @@ -7,11 +7,11 @@ Test round() function : error conditions - incorrect number of args * after the decimal point) * Source code: ext/standard/math.c */ - + /* * Pass incorrect number of arguments to round() to test behaviour */ - + echo "*** Testing round() : error conditions ***\n"; echo "\n-- Wrong nmumber of arguments --\n"; diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index c89dd6818a..f0d893aeeb 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt index f199ff7eb6..a90c8832a0 100644 --- a/ext/standard/tests/math/round_variation2.phpt +++ b/ext/standard/tests/math/round_variation2.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/sin_basic.phpt b/ext/standard/tests/math/sin_basic.phpt index 2b55ad7355..27579cd289 100644 --- a/ext/standard/tests/math/sin_basic.phpt +++ b/ext/standard/tests/math/sin_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sin() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sin_error.phpt b/ext/standard/tests/math/sin_error.phpt index 41a4b2e7af..c6b9f086cd 100644 --- a/ext/standard/tests/math/sin_error.phpt +++ b/ext/standard/tests/math/sin_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for sin() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sinh_error.phpt b/ext/standard/tests/math/sinh_error.phpt index 70decf252f..3f7ba923c3 100644 --- a/ext/standard/tests/math/sinh_error.phpt +++ b/ext/standard/tests/math/sinh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for sinh() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sqrt_error.phpt b/ext/standard/tests/math/sqrt_error.phpt index 66d6d27355..ac66091838 100644 --- a/ext/standard/tests/math/sqrt_error.phpt +++ b/ext/standard/tests/math/sqrt_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for sqrt() precision = 14 --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/tan_error.phpt b/ext/standard/tests/math/tan_error.phpt index b3d4cf83c1..f36e633b16 100644 --- a/ext/standard/tests/math/tan_error.phpt +++ b/ext/standard/tests/math/tan_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for tan() --FILE-- --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/tanh_error.phpt b/ext/standard/tests/math/tanh_error.phpt index cc92cb4aca..1e38a6cdcf 100644 --- a/ext/standard/tests/math/tanh_error.phpt +++ b/ext/standard/tests/math/tanh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for tanh() --FILE-- diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt index 2be972a134..cac7133e95 100644 --- a/ext/standard/tests/misc/time_sleep_until_basic.phpt +++ b/ext/standard/tests/misc/time_sleep_until_basic.phpt @@ -19,7 +19,7 @@ Michele Orselli mo@ideato.it // to 10th of a second. this means there can be up to a .9 millisecond difference // which will fail this test. this test randomly fails on Windows and this is the cause. // - // fix: round to nearest millisecond + // fix: round to nearest millisecond // passes for up to .5 milliseconds less, fails for more than .5 milliseconds // should be fine since time_sleep_until() on Windows is accurate to the // millisecond(.5 rounded up is 1 millisecond) diff --git a/ext/standard/tests/network/closelog_basic.phpt b/ext/standard/tests/network/closelog_basic.phpt index 06798a5c1d..77c7155ea8 100644 --- a/ext/standard/tests/network/closelog_basic.phpt +++ b/ext/standard/tests/network/closelog_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test closelog() function : basic functionality +Test closelog() function : basic functionality --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- string(9) "127.0.0.1" string(13) "255.255.255.0" diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt index 3b280dfec7..623f04c0ee 100644 --- a/ext/standard/tests/network/inet_ipv6.phpt +++ b/ext/standard/tests/network/inet_ipv6.phpt @@ -1,9 +1,9 @@ --TEST-- inet_ntop() & inet_pton() IPv6 tests --SKIPIF-- - ---EXPECTF-- +--EXPECTF-- string(3) "::1" string(3) "::2" string(4) "::35" diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt index abe50e7192..03329802c1 100644 --- a/ext/standard/tests/network/ip.phpt +++ b/ext/standard/tests/network/ip.phpt @@ -34,7 +34,7 @@ var_dump(long2ip(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2130706433) string(9) "127.0.0.1" int(167772161) diff --git a/ext/standard/tests/network/ip2long_error.phpt b/ext/standard/tests/network/ip2long_error.phpt index 65e7315595..4816d63943 100644 --- a/ext/standard/tests/network/ip2long_error.phpt +++ b/ext/standard/tests/network/ip2long_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ip2long() function : error conditions +Test ip2long() function : error conditions --FILE-- @$unset_var, - + // resource 'resource' => $res, ); diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt index 0ca156a67b..d85b6ba3c9 100644 --- a/ext/standard/tests/network/ip2long_variation2.phpt +++ b/ext/standard/tests/network/ip2long_variation2.phpt @@ -6,9 +6,9 @@ Test ip2long() function : usage variation 2, 32 bit --FILE-- ---EXPECTF-- +--EXPECTF-- int(2130706433) string(9) "127.0.0.1" int(167772161) diff --git a/ext/standard/tests/network/long2ip_error.phpt b/ext/standard/tests/network/long2ip_error.phpt index d56397cdd5..7003c36806 100644 --- a/ext/standard/tests/network/long2ip_error.phpt +++ b/ext/standard/tests/network/long2ip_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test long2ip() function : error conditions +Test long2ip() function : error conditions --FILE-- +?> --FILE-- @$unset_var, - + // resource - 'resource' => $res, + 'resource' => $res, ); // loop through each element of the array for proper_address diff --git a/ext/standard/tests/network/shutdown.phpt b/ext/standard/tests/network/shutdown.phpt index 1ce77fb80e..1e79b059b1 100644 --- a/ext/standard/tests/network/shutdown.phpt +++ b/ext/standard/tests/network/shutdown.phpt @@ -6,7 +6,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback ?> --FILE-- --FILE-- --FILE-- 'åäöÅÄÖ'); - class ÜberKööliäå + class ÜberKööliäå { public $åäöÅÄÖüÜber = 'åäöÅÄÖ'; } - + $foo = new Überkööliäå(); - + var_dump(serialize($foo)); var_dump(unserialize(serialize($foo))); var_dump(serialize($åäöÅÄÖ)); diff --git a/ext/standard/tests/serialize/bug14293.phpt b/ext/standard/tests/serialize/bug14293.phpt index 8e7b8a9d7d..73636ba56d 100644 --- a/ext/standard/tests/serialize/bug14293.phpt +++ b/ext/standard/tests/serialize/bug14293.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #14293 (serialize() and __sleep()) --FILE-- - --FILE-- - --FILE-- diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt index 404d57eb3e..566e959554 100644 --- a/ext/standard/tests/serialize/bug31402.phpt +++ b/ext/standard/tests/serialize/bug31402.phpt @@ -3,7 +3,7 @@ Bug #31402 (unserialize() generates references when it should not) --INI-- error_reporting=E_ALL --FILE-- -getMessage()); } try { var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"A":0:{}}')); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/ext/standard/tests/serialize/bug64354_2.phpt b/ext/standard/tests/serialize/bug64354_2.phpt index 41a455b54a..82552f426a 100644 --- a/ext/standard/tests/serialize/bug64354_2.phpt +++ b/ext/standard/tests/serialize/bug64354_2.phpt @@ -16,7 +16,7 @@ spl_autoload_register( try { var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"B":0:{}}')); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt index 3ce61152d6..520e543785 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -21,7 +21,7 @@ $data = array(new A, new B); try { serialize($data); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/ext/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt index e7250b37bc..c33155d269 100644 --- a/ext/standard/tests/serialize/bug68545.phpt +++ b/ext/standard/tests/serialize/bug68545.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #68545 NULL pointer dereference in unserialize.c:var_push_dtor --FILE-- - ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt index a79a953a4a..be06ea66ac 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -14,7 +14,7 @@ $fakezval = pack( 0x00100000, 0x00000400, 0x00000000, - 0x00000006 + 0x00000006 ); $data = unserialize('a:2:{i:0;O:9:"evilClass":1:{s:4:"name";a:2:{i:0;i:1;i:1;i:2;}}i:1;R:4;}'); diff --git a/ext/standard/tests/serialize/bug69425.phpt b/ext/standard/tests/serialize/bug69425.phpt index e39f855f23..c7f4265789 100644 --- a/ext/standard/tests/serialize/bug69425.phpt +++ b/ext/standard/tests/serialize/bug69425.phpt @@ -7,7 +7,7 @@ Bug #69425: Use After Free in unserialize() class test { var $ryat; - + function __wakeup() { $this->ryat = 1; diff --git a/ext/standard/tests/serialize/bug70219.phpt b/ext/standard/tests/serialize/bug70219.phpt index e134c78a9f..7cd13d05fb 100644 --- a/ext/standard/tests/serialize/bug70219.phpt +++ b/ext/standard/tests/serialize/bug70219.phpt @@ -24,7 +24,7 @@ for ($i = 0; $i < 5; $i++) { $v[$i] = 'hi'.$i; } -var_dump($data); +var_dump($data); ?> --EXPECTF-- Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d diff --git a/ext/standard/tests/serialize/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt index 8b0df73d60..1bbf3b98ab 100644 --- a/ext/standard/tests/serialize/bug70436.phpt +++ b/ext/standard/tests/serialize/bug70436.phpt @@ -6,12 +6,12 @@ Bug #70436: Use After Free Vulnerability in unserialize() class obj implements Serializable { var $data; - + function serialize() { return serialize($this->data); } - + function unserialize($data) { $this->data = unserialize($data); @@ -35,12 +35,12 @@ var_dump($data); function ptr2str($ptr) { $out = ''; - + for ($i = 0; $i < 8; $i++) { $out .= chr($ptr & 0xff); $ptr >>= 8; } - + return $out; } ?> diff --git a/ext/standard/tests/serialize/bug70513.phpt b/ext/standard/tests/serialize/bug70513.phpt index 2ac4ef6626..cbdbdb8222 100644 --- a/ext/standard/tests/serialize/bug70513.phpt +++ b/ext/standard/tests/serialize/bug70513.phpt @@ -8,7 +8,7 @@ Bug #70513: GMP Deserialization Type Confusion Vulnerability class obj { var $ryat; - + function __wakeup() { $this->ryat = 1; diff --git a/ext/standard/tests/serialize/bug72229.phpt b/ext/standard/tests/serialize/bug72229.phpt index 17c393c7d4..0ae1ceed03 100644 --- a/ext/standard/tests/serialize/bug72229.phpt +++ b/ext/standard/tests/serialize/bug72229.phpt @@ -11,7 +11,7 @@ class C1 $this->arr1[0] = $this; $this->arr2[0] = $this->arr1[0]; $var1 = &$this->arr1[0]; // Set a reference... - unset($var1); // ... and unset it. + unset($var1); // ... and unset it. } } $Obj1 = new C1(); diff --git a/ext/standard/tests/serialize/incomplete_class.phpt b/ext/standard/tests/serialize/incomplete_class.phpt index 7e6aa7b39f..948a31e166 100644 --- a/ext/standard/tests/serialize/incomplete_class.phpt +++ b/ext/standard/tests/serialize/incomplete_class.phpt @@ -13,7 +13,7 @@ var_dump($o->test2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(__PHP_Incomplete_Class)#%d (0) { } diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 51acfc4b46..4b9c7e2c3e 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -3,16 +3,16 @@ Test serialize() & unserialize() functions: arrays (circular references) --INI-- serialize_precision=100 --FILE-- -$v) { if (is_array($v)){ foreach($b[$k] as $sk=>$sv) { diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt index 014128b19f..97c2af4ccb 100644 --- a/ext/standard/tests/serialize/serialization_error_001.phpt +++ b/ext/standard/tests/serialize/serialization_error_001.phpt @@ -1,16 +1,16 @@ --TEST-- -Test serialize() & unserialize() functions: error conditions - wrong number of args. +Test serialize() & unserialize() functions: error conditions - wrong number of args. --FILE-- a = 10; @@ -27,10 +27,10 @@ abstract class Name abstract protected function getClassName(); public function printClassName () { return $this->getClassName(); - } + } } // implement abstract class -class extendName extends Name +class extendName extends Name { var $a, $b, $c; diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index 6b826a398b..f6a3ef6410 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -1,16 +1,16 @@ --TEST-- -Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). +Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). --FILE-- APriv, $this->AProt, $this->APub); - } + return isset($this->APriv, $this->AProt, $this->APub); + } } Class B extends A { private $BPriv = "B.BPriv"; protected $BProt = "B.BProt"; public $BPub = "B.BPub"; - + function audit() { return parent::audit() && isset($this->AProt, $this->APub, - $this->BPriv, $this->BProt, $this->BPub); - } + $this->BPriv, $this->BProt, $this->BPub); + } } Class C extends B { private $APriv = "C.APriv"; protected $AProt = "C.AProt"; public $APub = "C.APub"; - + private $CPriv = "C.CPriv"; protected $CProt = "C.BProt"; public $CPub = "C.CPub"; - + function audit() { - return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, - $this->BProt, $this->BPub, - $this->CPriv, $this->CProt, $this->CPub); + return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, + $this->BProt, $this->BPub, + $this->CPriv, $this->CProt, $this->CPub); } } @@ -58,11 +58,11 @@ function prettyPrint($obj) { $ser = serialize($obj); $serPrintable = str_replace("\0", '\0', $ser); var_dump($serPrintable); - + echo "Unserialized:\n"; $uobj = unserialize($ser); var_dump($uobj); - + echo "Sanity check: "; var_dump($uobj->audit()); } diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt index f994d8e260..b834de3221 100644 --- a/ext/standard/tests/serialize/serialization_objects_012.phpt +++ b/ext/standard/tests/serialize/serialization_objects_012.phpt @@ -3,14 +3,14 @@ Object serialization / unserialization: real references and COW references --FILE-- a = $obj; -$contaner->b = $contaner->a; +$contaner->b = $contaner->a; var_dump($contaner); $ser = serialize($contaner); -var_dump($ser); +var_dump($ser); $ucontainer = unserialize($ser); var_dump($ucontainer); @@ -68,11 +68,11 @@ echo "\n\nObject containing object and reference to that object:\n"; $obj = new stdclass; $contaner = new stdclass; $contaner->a = $obj; -$contaner->b = &$contaner->a; +$contaner->b = &$contaner->a; var_dump($contaner); $ser = serialize($contaner); -var_dump($ser); +var_dump($ser); $ucontainer = unserialize($ser); var_dump($ucontainer); diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index 403f9de08c..56e05c3756 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -1,25 +1,25 @@ --TEST-- -Object serialization / unserialization: references amongst properties +Object serialization / unserialization: references amongst properties --INI-- error_reporting = E_ALL & ~E_STRICT --FILE-- a = "obj->a.changed"; @@ -27,7 +27,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs b:\n"; diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt index 234f5e084c..b1e63b89fb 100644 --- a/ext/standard/tests/serialize/serialization_objects_014.phpt +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt @@ -1,25 +1,25 @@ --TEST-- -Object serialization / unserialization: references to external values +Object serialization / unserialization: references to external values --INI-- error_reporting = E_ALL & ~E_STRICT --FILE-- a = "obj->a.changed"; @@ -27,7 +27,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs external:\n"; diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index 2265caba93..69ac7f07ec 100644 --- a/ext/standard/tests/serialize/serialization_objects_015.phpt +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt @@ -1,5 +1,5 @@ --TEST-- -Object serialization / unserialization: properties reference containing object +Object serialization / unserialization: properties reference containing object --INI-- error_reporting = E_ALL & ~E_STRICT --FILE-- @@ -9,7 +9,7 @@ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -17,7 +17,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs container:\n"; diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index eb633beb74..040ed5ec5b 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -5,14 +5,14 @@ serialize_precision=10 --FILE-- constructorCalled ? 'yes' : 'no'; return TRUE; } - function stream_metadata() + function stream_metadata() { echo $this->constructorCalled ? 'yes' : 'no'; return TRUE; diff --git a/ext/standard/tests/streams/bug46024.phpt b/ext/standard/tests/streams/bug46024.phpt index fdfd03ee2e..49e6beeefb 100644 --- a/ext/standard/tests/streams/bug46024.phpt +++ b/ext/standard/tests/streams/bug46024.phpt @@ -4,7 +4,7 @@ Bug #46024 stream_select() doesn't return the correct number --FILE-- s++ == 0) return "a\n"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60455_03.phpt b/ext/standard/tests/streams/bug60455_03.phpt index 2429d31008..131da852b7 100644 --- a/ext/standard/tests/streams/bug60455_03.phpt +++ b/ext/standard/tests/streams/bug60455_03.phpt @@ -22,7 +22,7 @@ class TestStream { function stream_eof() { return $this->s >= $this->eofth; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60455_04.phpt b/ext/standard/tests/streams/bug60455_04.phpt index 3a82298dbc..123a8653d3 100644 --- a/ext/standard/tests/streams/bug60455_04.phpt +++ b/ext/standard/tests/streams/bug60455_04.phpt @@ -11,13 +11,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\n"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt index f0a3cf83e8..82917ecbd6 100644 --- a/ext/standard/tests/streams/bug60602.phpt +++ b/ext/standard/tests/streams/bug60602.phpt @@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', $environment); if (is_resource($p)) { $data = ''; - while (1) { + while (1) { $w = $e = NULL; $n = stream_select($pipes, $w, $e, 300); diff --git a/ext/standard/tests/streams/bug61019.phpt b/ext/standard/tests/streams/bug61019.phpt index 45b207ea9e..7fead5362f 100644 --- a/ext/standard/tests/streams/bug61019.phpt +++ b/ext/standard/tests/streams/bug61019.phpt @@ -23,17 +23,17 @@ if(is_resource($process)) $stdin_stream=""; $stderr_stream=""; - echo "External command executed\n"; - do + echo "External command executed\n"; + do { $process_state=proc_get_status($process); - $tmp_stdin=stream_get_contents($pipes[1]); - if($tmp_stdin) + $tmp_stdin=stream_get_contents($pipes[1]); + if($tmp_stdin) { $stdin_stream=$stdin_stream.$tmp_stdin; } $tmp_stderr=stream_get_contents($pipes[2]); - if($tmp_stderr) + if($tmp_stderr) { $stderr_stream=$stderr_stream.$tmp_stderr; } @@ -42,13 +42,13 @@ if(is_resource($process)) echo "External command exit: ".$process_state['exitcode']."\n"; //read outstanding data - $tmp_stdin=stream_get_contents($pipes[1]); - if($tmp_stdin) + $tmp_stdin=stream_get_contents($pipes[1]); + if($tmp_stdin) { $stdin_stream=$stdin_stream.$tmp_stdin; } $tmp_stderr=stream_get_contents($pipes[2]); - if($tmp_stderr) + if($tmp_stderr) { $stderr_stream=$stderr_stream.$tmp_stderr; } @@ -57,7 +57,7 @@ if(is_resource($process)) fclose ($pipes[1]); fclose ($pipes[2]); - proc_close($process); + proc_close($process); echo "STDOUT: ".$stdin_stream."\n"; echo "STDERR: ".$stderr_stream."\n"; diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 99e2f7929c..892b0f80e5 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -5,7 +5,7 @@ Bug #61115: Stream related segfault on fatal error in php_stream_context_del_lin if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); } -?> +?> --FILE-- 74 )); $str = ""; - while(($c = fread($fd, 1))!= "") $str .= $c; + while(($c = fread($fd, 1))!= "") $str .= $c; var_dump($str); stream_filter_remove($res); diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index f973768f81..67c66d61bc 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -2,7 +2,7 @@ Bug #60180 ($_SERVER["PHP_SELF"] incorrect) --SKIPIF-- array( - 'follow_location'=>0, + 'follow_location'=>0, ) ); $context = stream_context_create($arr); @@ -37,7 +37,7 @@ foreach($codes as $code) { echo "follow=1\n"; $arr = array('http'=> array( - 'follow_location'=>1, + 'follow_location'=>1, ) ); $context = stream_context_create($arr); diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt index 785c4237a1..86addfd809 100644 --- a/ext/standard/tests/streams/bug64770.phpt +++ b/ext/standard/tests/streams/bug64770.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64770 stream_select() fails with pipes from proc_open() +Bug #64770 stream_select() fails with pipes from proc_open() --FILE-- -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt index 97d145b595..e91e6fa4ea 100644 --- a/ext/standard/tests/streams/bug72857.phpt +++ b/ext/standard/tests/streams/bug72857.phpt @@ -8,7 +8,7 @@ Bug #72857 stream_socket_recvfrom read access violation $v3=STREAM_PEEK; $v4="A"; - var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); + var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); fclose($fp0); unlink($fname); diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt index f44c26d8a6..a49a2026b7 100644 --- a/ext/standard/tests/streams/bug73457.phpt +++ b/ext/standard/tests/streams/bug73457.phpt @@ -16,7 +16,7 @@ $path="ftp://127.0.0.1:" . $port."/bug73457"; $ds=file_get_contents($path); var_dump($ds); ?> -==DONE== +==DONE== --EXPECTF-- Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt index 28fa43cf26..d2d2ce8b9c 100644 --- a/ext/standard/tests/streams/opendir-001.phpt +++ b/ext/standard/tests/streams/opendir-001.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftp://' stream. +opendir() with 'ftp://' stream. --SKIPIF-- -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d diff --git a/ext/standard/tests/streams/opendir-002.phpt b/ext/standard/tests/streams/opendir-002.phpt index 83d40e8bb1..a995979992 100644 --- a/ext/standard/tests/streams/opendir-002.phpt +++ b/ext/standard/tests/streams/opendir-002.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftp://' stream. +opendir() with 'ftp://' stream. --SKIPIF-- -==DONE== +==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt index 1d6a9057fa..2b3aedbf30 100644 --- a/ext/standard/tests/streams/opendir-003.phpt +++ b/ext/standard/tests/streams/opendir-003.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftps://' stream. +opendir() with 'ftps://' stream. --SKIPIF-- array('cafile' => __DIR__ . '/. var_dump(opendir($path, $context)); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d diff --git a/ext/standard/tests/streams/opendir-004.phpt b/ext/standard/tests/streams/opendir-004.phpt index b50c6580c2..06a3f944be 100644 --- a/ext/standard/tests/streams/opendir-004.phpt +++ b/ext/standard/tests/streams/opendir-004.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftps://' stream. +opendir() with 'ftps://' stream. --SKIPIF-- -==DONE== +==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt index a3fdfa6c55..8049fb68ff 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -33,7 +33,7 @@ for($i = 0; $i < 10; $i++){ $s = fgets($pipes[1]); $t1 = microtime(1); - echo $s; + echo $s; echo "fgets() took ", (($t1 - $t0)*1000 > $max_ms ? 'more' : 'less'), " than $max_ms ms\n"; } diff --git a/ext/standard/tests/streams/set_file_buffer.phpt b/ext/standard/tests/streams/set_file_buffer.phpt index 04d0fb121d..79df5a441a 100644 --- a/ext/standard/tests/streams/set_file_buffer.phpt +++ b/ext/standard/tests/streams/set_file_buffer.phpt @@ -10,16 +10,16 @@ class test_wrapper { function stream_open($path, $mode, $openedpath) { return true; } - + function stream_eof() { return false; } - + function stream_write($data) { echo "size: ", strlen($data), "\n"; return strlen($data); } - + function stream_set_option($option, $arg1, $arg2) { echo "option: ", $option, ", ", $arg1, ", ", $arg2, "\n"; return false; diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt index 401c65bce0..1e5b7e31d8 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt @@ -16,7 +16,7 @@ $ctxt = stream_context_create([ $stream = stream_socket_client( "tcp://www.php.net:80", $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $ctxt); -$socket = +$socket = socket_import_stream($stream); var_dump(socket_get_option($socket, SOL_TCP, TCP_NODELAY) > 0); diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt index bf35925e4d..3f4fc48667 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt @@ -15,7 +15,7 @@ $ctxt = stream_context_create([ $stream = fopen("http://www.php.net", "r", false, $ctxt); -$socket = +$socket = @socket_import_stream($stream); var_dump(socket_get_option($socket, STREAM_IPPROTO_TCP, TCP_NODELAY) > 0); diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt index 6606a15052..ed7f7fb0ac 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt @@ -38,7 +38,7 @@ $clientCode = <<<'CODE' CODE; include sprintf( - "%s/../../../openssl/tests/ServerClientTestCase.inc", + "%s/../../../openssl/tests/ServerClientTestCase.inc", dirname(__FILE__)); ServerClientTestCase::getInstance()->run($serverCode, $clientCode); ?> diff --git a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt index 32756d7618..8cdd5c1779 100644 --- a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt +++ b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt @@ -10,13 +10,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\0"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt index c2532c714a..164c24d552 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test stream_get_meta_data() function : error conditions +Test stream_get_meta_data() function : error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- hello int(8192) bool(false) diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt index afb5d24dbf..7665aa20f5 100644 --- a/ext/standard/tests/strings/006.phpt +++ b/ext/standard/tests/strings/006.phpt @@ -12,7 +12,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt index b16c566eaa..7d06f018a5 100644 --- a/ext/standard/tests/strings/007-win32.phpt +++ b/ext/standard/tests/strings/007-win32.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt index 804b455167..a0fd8acdf4 100644 --- a/ext/standard/tests/strings/007.phpt +++ b/ext/standard/tests/strings/007.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt index c9722c7fe7..4080c7214d 100644 Binary files a/ext/standard/tests/strings/addcslashes_001.phpt and b/ext/standard/tests/strings/addcslashes_001.phpt differ diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt index eb46803bbe..09327706b9 100644 --- a/ext/standard/tests/strings/addcslashes_002.phpt +++ b/ext/standard/tests/strings/addcslashes_002.phpt @@ -21,7 +21,7 @@ class string1 $obj = new string1; var_dump( addcslashes($obj, "b") ); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt index f1d658135b..5637995796 100644 Binary files a/ext/standard/tests/strings/addcslashes_003.phpt and b/ext/standard/tests/strings/addcslashes_003.phpt differ diff --git a/ext/standard/tests/strings/addcslashes_004.phpt b/ext/standard/tests/strings/addcslashes_004.phpt index db2b6f8858..a787845506 100644 --- a/ext/standard/tests/strings/addcslashes_004.phpt +++ b/ext/standard/tests/strings/addcslashes_004.phpt @@ -13,7 +13,7 @@ var_dump( addcslashes() ); var_dump( addcslashes("foo[]") ); var_dump( addcslashes('foo[]', "o", "foo") ); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index 0912d34e48..7d5f6f0a48 100644 --- a/ext/standard/tests/strings/addslashes_basic.phpt +++ b/ext/standard/tests/strings/addslashes_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test addslashes() function : basic functionality +Test addslashes() function : basic functionality --FILE-- 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + /*25*/ NULL, null ); diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt index 792c2c30b6..628980df27 100644 --- a/ext/standard/tests/strings/addslashes_variation2.phpt +++ b/ext/standard/tests/strings/addslashes_variation2.phpt @@ -8,7 +8,7 @@ Test addslashes() function : usage variations - strings with characters to be ba */ /* - * Test addslashes() with various strings containing characters thats can be backslashed + * Test addslashes() with various strings containing characters thats can be backslashed */ echo "*** Testing addslashes() : with various strings containing characters to be backslashed ***\n"; @@ -21,21 +21,21 @@ EOT; $heredoc_null_string =<< ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/bin2hex_error.phpt b/ext/standard/tests/strings/bin2hex_error.phpt index 9d2e1313a1..efee90bdee 100644 --- a/ext/standard/tests/strings/bin2hex_error.phpt +++ b/ext/standard/tests/strings/bin2hex_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bin2hex() function : error conditions +Test bin2hex() function : error conditions --FILE-- +?> ===DONE=== --EXPECTF-- *** Testing bin2hex() : error conditions *** @@ -31,5 +31,4 @@ NULL Warning: bin2hex() expects exactly 1 parameter, 2 given in %s on line %d NULL - ===DONE=== diff --git a/ext/standard/tests/strings/bin2hex_variation1.phpt b/ext/standard/tests/strings/bin2hex_variation1.phpt index e73ff5de6a..2b8513879c 100644 --- a/ext/standard/tests/strings/bin2hex_variation1.phpt +++ b/ext/standard/tests/strings/bin2hex_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( /*1*/ 0, 1, 123456, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/true, false, TRUE, FALSE, - + // null values /*14*/NULL, null, - + // objects /*16*/new sample(), - + // resource /*17*/$file_handle, - + // undefined variable /*18*/@$undefined_var, - + // unset variable /*19*/@$unset_var ); diff --git a/ext/standard/tests/strings/bug20934.phpt b/ext/standard/tests/strings/bug20934.phpt index 0d95081d54..e8cf3e90d0 100644 --- a/ext/standard/tests/strings/bug20934.phpt +++ b/ext/standard/tests/strings/bug20934.phpt @@ -5,7 +5,7 @@ Bug #20934 (htmlspecialchars returns latin1 from UTF-8) if (!function_exists("utf8_encode") || !function_exists("utf8_decode")) { die("SKIP Neither utf8_encode() nor utf8_decode() are available"); } -?> +?> --FILE-- --EXPECT-- diff --git a/ext/standard/tests/strings/bug22224.phpt b/ext/standard/tests/strings/bug22224.phpt index c30f222f32..0ab00a6c42 100644 --- a/ext/standard/tests/strings/bug22224.phpt +++ b/ext/standard/tests/strings/bug22224.phpt @@ -14,7 +14,7 @@ class foo $a = new foo(); - + $arr = array(0=>&$a, 1=>&$a); var_dump(implode(",",$arr)); var_dump($arr) diff --git a/ext/standard/tests/strings/bug26817.phpt b/ext/standard/tests/strings/bug26817.phpt index 228348708c..2e31d30be9 100644 --- a/ext/standard/tests/strings/bug26817.phpt +++ b/ext/standard/tests/strings/bug26817.phpt @@ -2,7 +2,7 @@ Bug #26817 (http_build_query() did not handle private & protected object properties) --FILE-- ---EXPECT-- +--EXPECT-- string(6) "bzexbz" Done diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt index 6317c974ab..3c52250718 100644 --- a/ext/standard/tests/strings/bug36306.phpt +++ b/ext/standard/tests/strings/bug36306.phpt @@ -6,7 +6,7 @@ Bug #36306 (crc32() 64bit) /* as an example how to write crc32 tests PHP does not have uint values, you cannot display crc32 like a signed integer. - Have to find some small strings to truly reproduce + Have to find some small strings to truly reproduce the problem, this example being not a problem */ echo dechex(crc32("platform independent")) . "\n"; diff --git a/ext/standard/tests/strings/bug36944.phpt b/ext/standard/tests/strings/bug36944.phpt index 2a43d060e2..a9f117fe3f 100644 --- a/ext/standard/tests/strings/bug36944.phpt +++ b/ext/standard/tests/strings/bug36944.phpt @@ -13,7 +13,7 @@ var_dump(strncasecmp("test ", "E", 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Length must be greater than or equal to 0 in %s on line %d bool(false) int(%d) diff --git a/ext/standard/tests/strings/bug37262.phpt b/ext/standard/tests/strings/bug37262.phpt index ffdc994f46..b964c4a659 100644 --- a/ext/standard/tests/strings/bug37262.phpt +++ b/ext/standard/tests/strings/bug37262.phpt @@ -5,6 +5,6 @@ Bug #37262 (var_export() does not escape \0 character) $func = create_function('$a', 'return $a;'); var_export($func); ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Function create_function() is deprecated in %s on line %d '' . "\0" . 'lambda_%d' diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt index 79f66f1fa0..d0a44a0902 100644 --- a/ext/standard/tests/strings/bug38322.phpt +++ b/ext/standard/tests/strings/bug38322.phpt @@ -8,6 +8,6 @@ var_dump(sscanf("a ",'%1$s',$str)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) Done diff --git a/ext/standard/tests/strings/bug38770.phpt b/ext/standard/tests/strings/bug38770.phpt index 1821639aca..76ec33572b 100644 --- a/ext/standard/tests/strings/bug38770.phpt +++ b/ext/standard/tests/strings/bug38770.phpt @@ -13,7 +13,7 @@ foreach (array('N','l') as $v) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Array ( [1] => 4294937296 diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt index dbd39ec9d8..ac8bdba411 100644 --- a/ext/standard/tests/strings/bug39032.phpt +++ b/ext/standard/tests/strings/bug39032.phpt @@ -10,7 +10,7 @@ var_dump(strcspn(chr(1),"qweqwe")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) int(0) int(1) diff --git a/ext/standard/tests/strings/bug39350.phpt b/ext/standard/tests/strings/bug39350.phpt index 53d58b7099..8cc51e9592 100644 --- a/ext/standard/tests/strings/bug39350.phpt +++ b/ext/standard/tests/strings/bug39350.phpt @@ -9,5 +9,5 @@ implode('', array("")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt index 1a33147b68..924544f2e1 100644 Binary files a/ext/standard/tests/strings/bug39621.phpt and b/ext/standard/tests/strings/bug39621.phpt differ diff --git a/ext/standard/tests/strings/bug39873.phpt b/ext/standard/tests/strings/bug39873.phpt index e73f3c8516..527b7d3c92 100644 --- a/ext/standard/tests/strings/bug39873.phpt +++ b/ext/standard/tests/strings/bug39873.phpt @@ -9,7 +9,7 @@ if (!setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO --FILE-- diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt index 5669083aa6..d6b56918ff 100644 --- a/ext/standard/tests/strings/bug40637.phpt +++ b/ext/standard/tests/strings/bug40637.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(4) "Text" Done diff --git a/ext/standard/tests/strings/bug40704.phpt b/ext/standard/tests/strings/bug40704.phpt index 82e91b5c87..b2f6cf89cc 100644 --- a/ext/standard/tests/strings/bug40704.phpt +++ b/ext/standard/tests/strings/bug40704.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "Bug ' Trigger Missing Text" Done diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt index b30042e939..26ea5bc770 100644 --- a/ext/standard/tests/strings/bug40754.phpt +++ b/ext/standard/tests/strings/bug40754.phpt @@ -26,7 +26,7 @@ var_dump(chunk_split("abcde", $v, "abc")); var_dump(substr("abcde", $v, $v)); ?> ---EXPECTF-- +--EXPECTF-- string(4) "bcde" string(6) "abcdex" bool(false) diff --git a/ext/standard/tests/strings/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt index 60449e04f0..eb32e739e0 100644 --- a/ext/standard/tests/strings/bug45166.phpt +++ b/ext/standard/tests/strings/bug45166.phpt @@ -2,7 +2,7 @@ Bug #45166 (substr() ) --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/bug48709.phpt b/ext/standard/tests/strings/bug48709.phpt index 999a2c6513..6a93b8dae4 100644 --- a/ext/standard/tests/strings/bug48709.phpt +++ b/ext/standard/tests/strings/bug48709.phpt @@ -13,8 +13,8 @@ $exceptions = array( 'x', // s 'wh', // w 'wa' // w -); - +); + foreach ($exceptions as $letter) { printf("%s => %s\n", $letter, metaphone($letter)); } diff --git a/ext/standard/tests/strings/bug54721.phpt b/ext/standard/tests/strings/bug54721.phpt index 3851df1542..f21d65fddf 100644 --- a/ext/standard/tests/strings/bug54721.phpt +++ b/ext/standard/tests/strings/bug54721.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size) --FILE-- - ---EXPECTF-- +--EXPECTF-- Done diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index c707dd3691..9ae18c0890 100644 --- a/ext/standard/tests/strings/bug65230.phpt +++ b/ext/standard/tests/strings/bug65230.phpt @@ -11,7 +11,7 @@ date.timezone=Europe/Berlin --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt index f099850213..1d1e5a15f5 100644 --- a/ext/standard/tests/strings/bug73058.phpt +++ b/ext/standard/tests/strings/bug73058.phpt @@ -5,7 +5,7 @@ Bug #73058 crypt broken when salt is 'too' long if (!function_exists('crypt'))) { die("SKIP crypt() is not available"); } -?> +?> --FILE-- --EXPECTF-- *** Testing chunk_split() : basic functionality *** diff --git a/ext/standard/tests/strings/chunk_split_error.phpt b/ext/standard/tests/strings/chunk_split_error.phpt index 341f04ffd3..d8a72586af 100644 --- a/ext/standard/tests/strings/chunk_split_error.phpt +++ b/ext/standard/tests/strings/chunk_split_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : error conditions +Test chunk_split() function : error conditions --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/strings/chunk_split_variation13.phpt b/ext/standard/tests/strings/chunk_split_variation13.phpt index 3cbcbe466d..c042d88896 100644 --- a/ext/standard/tests/strings/chunk_split_variation13.phpt +++ b/ext/standard/tests/strings/chunk_split_variation13.phpt @@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - default 'chunklen' with long st /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt index 9240ed3ea0..3a02320887 100644 --- a/ext/standard/tests/strings/chunk_split_variation2.phpt +++ b/ext/standard/tests/strings/chunk_split_variation2.phpt @@ -40,7 +40,7 @@ $values = array( (float) PHP_INT_MAX + 1, (float) -PHP_INT_MAX - 1, .5, - + // array data array(), array(0), diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt index 758bec088b..408d8c8afb 100644 --- a/ext/standard/tests/strings/chunk_split_variation3.phpt +++ b/ext/standard/tests/strings/chunk_split_variation3.phpt @@ -75,7 +75,7 @@ $values = array( // unset data @$unset_var, - + // resource data $fp ); diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index cfa62698b9..f5c926c7a0 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : usage variations - different heredoc strings as 'str' argument +Test chunk_split() function : usage variations - different heredoc strings as 'str' argument --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt index e53b1e3240..19f1c7c66d 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 705bb31fca..4242a81a9b 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -23,19 +23,19 @@ $ending = "):("; $values = array( '', //empty ' ', //space - 'This is simple string', //regular string - 'It\'s string with quotes', - 'This contains @ # $ % ^ & chars', //special characters - 'This string\tcontains\rwhite space\nchars', //with white space chars - 'This is string with 1234 numbers', - 'This is string with \0 and ".chr(0)."null chars', //for binary safe - 'This is string with multiple space char', - 'This is to check string with ()', - ' Testing with multiple spaces ', - 'Testing invalid \k and \m escape char', - 'This is to check with \\n and \\t' -); - + 'This is simple string', //regular string + 'It\'s string with quotes', + 'This contains @ # $ % ^ & chars', //special characters + 'This string\tcontains\rwhite space\nchars', //with white space chars + 'This is string with 1234 numbers', + 'This is string with \0 and ".chr(0)."null chars', //for binary safe + 'This is string with multiple space char', + 'This is to check string with ()', + ' Testing with multiple spaces ', + 'Testing invalid \k and \m escape char', + 'This is to check with \\n and \\t' +); + //Loop through each element of values for 'str' for($count = 0;$count < count($values);$count++) { diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt index a27ff3cacd..fff05ad73a 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation7.phpt and b/ext/standard/tests/strings/chunk_split_variation7.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt index 3dfa33a2eb..9299dc13cc 100644 --- a/ext/standard/tests/strings/chunk_split_variation8.phpt +++ b/ext/standard/tests/strings/chunk_split_variation8.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* @@ -31,8 +31,8 @@ $ending = ':::'; // different values for 'chunklen' $values = array ( - 0, - 1, + 0, + 1, -123, //negative integer 0234, //octal number 0x1A, //hexadecimal number diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt index 5601bbc1e2..2196bc64b4 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation9.phpt and b/ext/standard/tests/strings/chunk_split_variation9.phpt differ diff --git a/ext/standard/tests/strings/convert_cyr_string.phpt b/ext/standard/tests/strings/convert_cyr_string.phpt index b62768eff4..af239543c5 100644 --- a/ext/standard/tests/strings/convert_cyr_string.phpt +++ b/ext/standard/tests/strings/convert_cyr_string.phpt @@ -19,7 +19,7 @@ var_dump(convert_cyr_string("", "d", "i")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_cyr_string() expects exactly 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e29ad330ce..e5ccf4cbb9 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_cyr_string() function : basic functionality +Test convert_cyr_string() function : basic functionality --FILE-- ", "?")) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_cyr_string() : error conditions *** @@ -69,5 +69,4 @@ Warning: convert_cyr_string(): Unknown source charset: > in %s on line %d Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d string(10) "68656c6c6f" - -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt index 9986ac214d..47174defef 100644 --- a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 6e334a9815..34e53cbdda 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uudecode() function : basic functionality +Test convert_uudecode() function : basic functionality --FILE-- -===DONE=== +===DONE=== --EXPECTF-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED diff --git a/ext/standard/tests/strings/convert_uudecode_error.phpt b/ext/standard/tests/strings/convert_uudecode_error.phpt index 77d3a88833..77ac18b50b 100644 --- a/ext/standard/tests/strings/convert_uudecode_error.phpt +++ b/ext/standard/tests/strings/convert_uudecode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uudecode() function : error conditions +Test convert_uudecode() function : error conditions --FILE-- +?> ===DONE=== --EXPECTF-- *** Testing convert_uudecode() : error conditions *** @@ -31,5 +31,4 @@ bool(false) Warning: convert_uudecode() expects exactly 1 parameter, 2 given in %s on line %d bool(false) - ===DONE=== diff --git a/ext/standard/tests/strings/convert_uudecode_variation1.phpt b/ext/standard/tests/strings/convert_uudecode_variation1.phpt index 049fd7f65b..4c66f076a5 100644 --- a/ext/standard/tests/strings/convert_uudecode_variation1.phpt +++ b/ext/standard/tests/strings/convert_uudecode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt index 9849997d41..b8c338a1c6 100644 --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uuencode() function : basic functionality +Test convert_uuencode() function : basic functionality --FILE-- -===DONE=== +===DONE=== --EXPECTF-- *** Testing convert_uuencode() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/convert_uuencode_error.phpt b/ext/standard/tests/strings/convert_uuencode_error.phpt index a995e18fe2..ec4d3f6477 100644 --- a/ext/standard/tests/strings/convert_uuencode_error.phpt +++ b/ext/standard/tests/strings/convert_uuencode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uuencode() function : error conditions +Test convert_uuencode() function : error conditions --FILE-- +?> ===DONE=== --EXPECTF-- *** Testing convert_uuencode() : error conditions *** @@ -31,5 +31,4 @@ bool(false) Warning: convert_uuencode() expects exactly 1 parameter, 2 given in %s on line %d bool(false) - ===DONE=== diff --git a/ext/standard/tests/strings/convert_uuencode_variation1.phpt b/ext/standard/tests/strings/convert_uuencode_variation1.phpt index 12ca281960..c9ef4335be 100644 --- a/ext/standard/tests/strings/convert_uuencode_variation1.phpt +++ b/ext/standard/tests/strings/convert_uuencode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index f28fa63b20..587beea95b 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test count_chars() function : basic functionality +Test count_chars() function : basic functionality --FILE-- --FILE-- --FILE-- --FILE-- +?> --FILE-- +?> --FILE-- +?> --FILE-- +?> --FILE-- ===DONE=== diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt index 1a908efdb4..95a5468912 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt @@ -17,7 +17,7 @@ asort( $tt ); var_dump( $tt ); echo "-- with table = HTML_SPECIALCHARS --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "WINDOWS-1252"); asort( $tt ); var_dump( $tt ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt index e60443050d..86f19f3a66 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt @@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt index 52ba2f44f3..1715b0852b 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt @@ -25,7 +25,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "Windows-1251 var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "Windows-1251"); uksort( $tt, 'so' ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt index 98ebbb9ac4..4e5c5afc14 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt @@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XHTML, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt index 8f8ca580ea..a3813262f7 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt @@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XML1, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt index cd32cccd5f..6e144c0c51 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt @@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "SJIS"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "SJIS"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_error.phpt b/ext/standard/tests/strings/get_html_translation_table_error.phpt index 149adbc197..5adfe98478 100644 --- a/ext/standard/tests/strings/get_html_translation_table_error.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_html_translation_table() function : error conditions +Test get_html_translation_table() function : error conditions --FILE-- 100) var_dump(count($v)); diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt index 67acf42ff7..459cd4fcd5 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt @@ -57,7 +57,7 @@ $values = array ( null, // resource var - $fp, + $fp, // undefined variable @$undefined_var, diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt index f086b99b76..ba944d7a95 100644 --- a/ext/standard/tests/strings/get_meta_tags.phpt +++ b/ext/standard/tests/strings/get_meta_tags.phpt @@ -55,7 +55,7 @@ foreach ($array as $html) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(4) { ["author"]=> string(4) "name" diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt index 2f53c6fc29..f583152047 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrev() function : basic functionality +Test hebrev() function : basic functionality --FILE-- +?> ===DONE=== --EXPECTF-- *** Testing hebrev() : error conditions *** @@ -31,5 +31,4 @@ NULL Warning: hebrev() expects at most 2 parameters, 3 given in %s on line %d NULL - -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/hebrev_variation1.phpt b/ext/standard/tests/strings/hebrev_variation1.phpt index 23a4c23145..33fd974eb7 100644 --- a/ext/standard/tests/strings/hebrev_variation1.phpt +++ b/ext/standard/tests/strings/hebrev_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $texts = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var, diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt index 5698cde793..2c72588b42 100644 --- a/ext/standard/tests/strings/hebrev_variation2.phpt +++ b/ext/standard/tests/strings/hebrev_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,43 +34,43 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abc", 'abc', "3abc", "0abc", "0x3", - + // objects /*24*/ new sample(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt index 9d9a7137c2..1066a4fcb0 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrevc() function : basic functionality +Test hebrevc() function : basic functionality --FILE-- +?> ===DONE=== --EXPECTF-- *** Testing hebrevc() : error conditions *** @@ -31,5 +31,4 @@ NULL Warning: hebrevc() expects at most 2 parameters, 3 given in %s on line %d NULL - ===DONE=== diff --git a/ext/standard/tests/strings/hebrevc_variation1.phpt b/ext/standard/tests/strings/hebrevc_variation1.phpt index 92c6ffabb9..c16780e769 100644 --- a/ext/standard/tests/strings/hebrevc_variation1.phpt +++ b/ext/standard/tests/strings/hebrevc_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $texts = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt index e6a6013931..33c331b94c 100644 --- a/ext/standard/tests/strings/hebrevc_variation2.phpt +++ b/ext/standard/tests/strings/hebrevc_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,43 +34,43 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abc", 'abc', "3abc", "0abc", "0x3", - + // objects /*24*/ new sample(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index d1a0323c58..65636908e6 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -36,7 +36,7 @@ var_dump(highlight_file($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: highlight_file() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/html_entity_decode_cp866.phpt b/ext/standard/tests/strings/html_entity_decode_cp866.phpt index 76323be30b..18f6f3c90b 100644 --- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt +++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt @@ -138,7 +138,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'CP866'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'CP866'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt index a3be8f3668..09fd5df02b 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt @@ -106,7 +106,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt index 6a65413c9c..070ed536f4 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt @@ -106,7 +106,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt index cb7fc7d1d8..e8523f6a09 100644 --- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt +++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt @@ -138,7 +138,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt index 4691bcf1a7..4f500dc4e7 100644 --- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt +++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt @@ -142,7 +142,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt index e47392623c..e60d7074bf 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt @@ -142,7 +142,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt index 2a7a6981dc..6163ef24ae 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt @@ -62,7 +62,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index 81c974cbf8..25391d5752 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -3,9 +3,9 @@ HTML entities with invalid chars and ENT_IGNORE --INI-- output_handler= --FILE-- -\"&åÄ\n",ENT_COMPAT,"ISO-8859-1"); echo $sc_encoded; diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt index 5d708c21c8..161f02e24a 100644 --- a/ext/standard/tests/strings/htmlentities02.phpt +++ b/ext/standard/tests/strings/htmlentities02.phpt @@ -1,5 +1,5 @@ --TEST-- -htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) +htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) --SKIPIF-- > 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlentities22.phpt b/ext/standard/tests/strings/htmlentities22.phpt index f11982044d..82dae2ba08 100644 --- a/ext/standard/tests/strings/htmlentities22.phpt +++ b/ext/standard/tests/strings/htmlentities22.phpt @@ -40,7 +40,7 @@ function test($flag, $flag2=ENT_DISALLOWED, $charset="UTF-8") { $i++; $a = htmlentities($test, $flag | $flag2, $charset, FALSE); $b = htmlspecialchars($test, $flag | $flag2, $charset, FALSE); - + if ($a == $b) echo sprintf("%s\t%s", $test, $a==$test?"NOT CHANGED":"CHANGED"), "\n"; else diff --git a/ext/standard/tests/strings/htmlentities_html4.phpt b/ext/standard/tests/strings/htmlentities_html4.phpt index 22b0305ced..5d784c2af5 100644 --- a/ext/standard/tests/strings/htmlentities_html4.phpt +++ b/ext/standard/tests/strings/htmlentities_html4.phpt @@ -6,7 +6,7 @@ function utf32_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index e7c216a292..427ba0bc35 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -6,7 +6,7 @@ function utf32_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 3ef932a70b..44396b0e2b 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test htmlspecialchars() function : basic functionality +Test htmlspecialchars() function : basic functionality --FILE-- Sam's height. 13 < 25. 1111 & 0000 = 0000. "double quoted string" $single_quote_string = "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string ""; $double_quote_string = "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string ""; @@ -21,7 +21,7 @@ var_dump( htmlspecialchars_decode($double_quote_string) ); // Calling htmlspecialchars_decode() with optional 'quote_style' argument var_dump( htmlspecialchars_decode($single_quote_string, ENT_COMPAT) ); -var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) ); +var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) ); var_dump( htmlspecialchars_decode($single_quote_string, ENT_NOQUOTES) ); var_dump( htmlspecialchars_decode($double_quote_string, ENT_NOQUOTES) ); var_dump( htmlspecialchars_decode($single_quote_string, ENT_QUOTES) ); diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt index f4201d2842..36b8e6bbec 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test htmlspecialchars_decode() function : error conditions +Test htmlspecialchars_decode() function : error conditions --FILE-- Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " +// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " $string = "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string ""; //get a class diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index b36556f1a2..451a326001 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -7,7 +7,7 @@ Test htmlspecialchars_decode() function : usage variations - heredoc strings for * Source code: ext/standard/html.c */ -/* +/* * testing htmlspecialchars_decode() with various heredoc strings as argument for $string */ diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt index e51e904fea..65b5c58b96 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt @@ -21,7 +21,7 @@ $values = array ( '\r\tRoy's height >\r; Sam\t's height', '\n 1\t3 &\tgt; 11 but 11 &\tlt; 12', ); - + // loop through each element of the values array to check htmlspecialchars_decode() function with all possible arguments $iterator = 1; foreach($values as $value) { diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index 307cfe6d90..a57abd21c4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -8,7 +8,7 @@ Test htmlspecialchars_decode() function : usage variations - double quoted strin */ /* - * testing htmlspecialchars_decode() for various double quoted strings as argument for $string + * testing htmlspecialchars_decode() for various double quoted strings as argument for $string */ echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; @@ -20,7 +20,7 @@ $strings = array ( "\r\tRoy's height >\r; Sam\t's height", "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12", ); - + // loop through each element of the array to check htmlspecialchars_decode() function with all possible arguments $iterator = 1; foreach($strings as $value) { diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt index 7b1295c54e..7991547d3b 100644 Binary files a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt and b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt differ diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt index 56d81c9fdd..4532fe18af 100644 --- a/ext/standard/tests/strings/http_build_query_variation1.phpt +++ b/ext/standard/tests/strings/http_build_query_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test http_build_query() function: usage variations - first arguments as object +Test http_build_query() function: usage variations - first arguments as object --CREDITS-- Adam Gegotek --FILE-- --FILE-- 13, + 20, + 5 => 13, "9" => array( - 1 => "val1", - 3 => "val2", + 1 => "val1", + 3 => "val2", "string" => "string" ), - "name" => "homepage", + "name" => "homepage", "page" => 10, "sort" => array( - "desc", + "desc", "admin" => array( - "admin1", + "admin1", "admin2" => array( - "who" => "admin2", + "who" => "admin2", 2 => "test" ) ) diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt index 350f3c8661..5b9ea371d2 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -5,7 +5,7 @@ Adam Gegotek --FILE-- "one", 2 => "two", 3 => "three"), // explicit numeric keys, string values array("one" => 1, "two" => 2, "three" => 3 ), // string keys & numeric values array( 1 => 10, 2 => 20, 4 => 40, 3 => 30), // explicit numeric keys and numeric values array( "one" => "ten", "two" => "twenty", "three" => "thirty"), // string key/value array("one" => 1, 2 => "two", 4 => "four"), //mixed - + // associative array, containing null/empty/boolean values as key/value array(NULL => "NULL", null => "null", "NULL" => NULL, "null" => null), array(true => "true", false => "false", "false" => false, "true" => true), array("" => "emptyd", '' => 'emptys', "emptyd" => "", 'emptys' => ''), array(1 => '', 2 => "", 3 => NULL, 4 => null, 5 => false, 6 => true), array('' => 1, "" => 2, NULL => 3, null => 4, false => 5, true => 6), - + // array with repetative keys array("One" => 1, "two" => 2, "One" => 10, "two" => 20, "three" => 3) ); @@ -44,14 +44,14 @@ $pieces_arrays = array ( // a multichar glue value $glue = "], ["; -// loop through each $pieces_arrays element and call join() +// loop through each $pieces_arrays element and call join() $iteration = 1; for($index = 0; $index < count($pieces_arrays); $index ++) { echo "-- Iteration $iteration --\n"; var_dump( join($glue, $pieces_arrays[$index]) ); $iteration ++; } - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt index a02efd7767..361f65bbc5 100644 --- a/ext/standard/tests/strings/join_variation5.phpt +++ b/ext/standard/tests/strings/join_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test join() function : usage variations - sub array as argument +Test join() function : usage variations - sub array as argument --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: metaphone() expects at least 1 parameter, 0 given in %s on line %d NULL string(0) "" diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 70b5ca574e..61fd816dae 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -23,13 +23,13 @@ $value = 1234.5678; $negative_value = -1234.5678; // Format with 14 positions of width, 8 digits of -// left precision, 2 of right precision using national +// left precision, 2 of right precision using national // format for en_US echo "Format values with 14 positions, 8 digits to left, 2 to right using national format\n"; echo gettype(money_format('%14#8.2n', $value))."\n"; echo gettype(money_format('%14#8.2n', $negative_value))."\n"; -// Same again but use '(' for negative values +// Same again but use '(' for negative values echo "Format again but with ( for negative values\n"; echo gettype(money_format('%(14#8.2n', $value))."\n"; echo gettype(money_format('%(14#8.2n', $negative_value))."\n"; @@ -45,12 +45,12 @@ echo gettype(money_format('%=*14#8.2n', $value))."\n"; echo gettype(money_format('%=*14#8.2n', $negative_value))."\n"; // Same again but disable grouping character -echo "Format again but disable grouping character\n"; +echo "Format again but disable grouping character\n"; echo gettype(money_format('%=*^14#8.2n', $value))."\n"; echo gettype(money_format('%=*^14#8.2n', $negative_value))."\n"; // Same again but suppress currency symbol -echo "Format again suppress currency symbol\n"; +echo "Format again suppress currency symbol\n"; echo gettype(money_format('%=*!14#8.2n', $value))."\n"; echo gettype(money_format('%=*!14#8.2n', $negative_value))."\n"; diff --git a/ext/standard/tests/strings/money_format_variation1.phpt b/ext/standard/tests/strings/money_format_variation1.phpt index d4fa687db3..4a381c183a 100644 --- a/ext/standard/tests/strings/money_format_variation1.phpt +++ b/ext/standard/tests/strings/money_format_variation1.phpt @@ -26,11 +26,11 @@ unset($unset_var); //defining a couple of sample classes class class_no_tostring { } - + class class_with_tostring { public function __toString() { return " sample object "; - } + } } @@ -47,43 +47,43 @@ $formats = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abcd", 'abcd', "0x12f", "%=*!14#8.2nabcd", - + // objects /*23*/ new class_no_tostring(), new class_with_tostring(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); @@ -99,7 +99,7 @@ foreach($formats as $format) { } // close the file handle -fclose($file_handle); +fclose($file_handle); ?> ===Done=== diff --git a/ext/standard/tests/strings/money_format_variation2.phpt b/ext/standard/tests/strings/money_format_variation2.phpt index 6e01bf03dd..c8de58bded 100644 --- a/ext/standard/tests/strings/money_format_variation2.phpt +++ b/ext/standard/tests/strings/money_format_variation2.phpt @@ -26,11 +26,11 @@ unset($unset_var); //defining a couple of sample classes class class_no_tostring { } - + class class_with_tostring { public function __toString() { return " sample object "; - } + } } @@ -47,43 +47,43 @@ $numbers = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abcd", 'abcd', "0x12f", "%=*!14#8.2nabcd", - + // objects /*23*/ new class_no_tostring(), new class_with_tostring(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); diff --git a/ext/standard/tests/strings/nl2br.phpt b/ext/standard/tests/strings/nl2br.phpt index 6a3b94023c..728f3339a0 100644 --- a/ext/standard/tests/strings/nl2br.phpt +++ b/ext/standard/tests/strings/nl2br.phpt @@ -9,11 +9,11 @@ nl2br() function var_dump(nl2br("\n")); var_dump(nl2br("\r")); var_dump(nl2br("\n\r")); - + var_dump(nl2br("\n\r\r\n\r\r\r\r")); var_dump(nl2br("\n\r\n\n\r\n\r\r\n\r\n")); var_dump(nl2br("\n\r\n\n\n\n\r\r\r\r\n\r")); - + ?> --EXPECT-- string(4) "test" diff --git a/ext/standard/tests/strings/nl2br_error.phpt b/ext/standard/tests/strings/nl2br_error.phpt index dbf4227378..b40e7b16a5 100644 --- a/ext/standard/tests/strings/nl2br_error.phpt +++ b/ext/standard/tests/strings/nl2br_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test nl2br() function : error conditions +Test nl2br() function : error conditions --FILE-- @@ -24,7 +24,7 @@ var_dump(nl_langinfo(ABMON_7)); var_dump(nl_langinfo(MON_4)); var_dump(nl_langinfo(RADIXCHAR)); -setlocale(LC_ALL, $original); +setlocale(LC_ALL, $original); ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/strings/nl_langinfo_error1.phpt b/ext/standard/tests/strings/nl_langinfo_error1.phpt index 7702b012e9..c8f3a284bf 100644 --- a/ext/standard/tests/strings/nl_langinfo_error1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_error1.phpt @@ -1,8 +1,8 @@ --TEST-- -Test nl_langinfo() function : error conditions +Test nl_langinfo() function : error conditions --SKIPIF-- diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt index 2d65d0ef07..774dc6da6f 100644 --- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt @@ -2,7 +2,7 @@ Test nl_langinfo() function : unexpected inputs for '$tem' argument --SKIPIF-- @@ -26,7 +26,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -38,15 +38,15 @@ $items = array ( /*1*/ 2147483647, -2147483648, -20, - + // array values /*4*/ array(), array(0), array(1, 2), - + // objects /*7*/ new sample(), - + // resource /*8*/ $file_handle, ); @@ -63,7 +63,7 @@ foreach($items as $item) { } fclose($file_handle); //closing the file handle -setlocale(LC_ALL, $original); +setlocale(LC_ALL, $original); ?> ===DONE=== diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index 94b8482eef..b52e65953b 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -7,7 +7,7 @@ Test number_format() - basic function test number_format() * Description: Format a number with grouped thousands * Source code: ext/standard/string.c */ - + echo "*** Testing number_format() : basic functionality ***\n"; $values = array(1234.5678, @@ -18,10 +18,10 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, - false); + false); echo "\n-- number_format tests.....default --\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/strings/number_format_error.phpt b/ext/standard/tests/strings/number_format_error.phpt index 334b63eacc..933466d12b 100644 --- a/ext/standard/tests/strings/number_format_error.phpt +++ b/ext/standard/tests/strings/number_format_error.phpt @@ -7,7 +7,7 @@ Test number_format() - wrong params test number_format() * Description: Format a number with grouped thousands * Source code: ext/standard/string.c */ - + echo "*** Testing number_format() : error conditions ***\n"; echo "\n-- Testing number_format() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/strings/ord_basic.phpt b/ext/standard/tests/strings/ord_basic.phpt index 19f3ea28d6..f49948206a 100644 --- a/ext/standard/tests/strings/ord_basic.phpt +++ b/ext/standard/tests/strings/ord_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ord() function : basic functionality +Test ord() function : basic functionality --FILE-- diff --git a/ext/standard/tests/strings/ord_variation1.phpt b/ext/standard/tests/strings/ord_variation1.phpt index 06d9364a08..ffca230dba 100644 --- a/ext/standard/tests/strings/ord_variation1.phpt +++ b/ext/standard/tests/strings/ord_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/pack_float.phpt b/ext/standard/tests/strings/pack_float.phpt index 088b508bc0..a164d31921 100644 --- a/ext/standard/tests/strings/pack_float.phpt +++ b/ext/standard/tests/strings/pack_float.phpt @@ -19,7 +19,7 @@ var_dump( bin2hex(pack("e", -10000000000000000)), bin2hex(pack("e", -0.591234709823149)), bin2hex(pack("e", -12345678901234567890.1234567898765432123456789)), - + 'pack E', bin2hex(pack("E", "")), bin2hex(pack("E", "a")), @@ -36,7 +36,7 @@ var_dump( bin2hex(pack("E", -10000000000000000)), bin2hex(pack("E", -0.591234709823149)), bin2hex(pack("E", -12345678901234567890.1234567898765432123456789)), - + 'pack g', bin2hex(pack("g", "")), bin2hex(pack("g", "a")), @@ -53,7 +53,7 @@ var_dump( bin2hex(pack("g", -10000000000000000)), bin2hex(pack("g", -0.591234709823149)), bin2hex(pack("g", -12345678901234567890.1234567898765432123456789)), - + 'pack G', bin2hex(pack("G", "")), bin2hex(pack("G", "a")), @@ -70,7 +70,7 @@ var_dump( bin2hex(pack("G", -10000000000000000)), bin2hex(pack("G", -0.591234709823149)), bin2hex(pack("G", -12345678901234567890.1234567898765432123456789)), - + 'unpack e', unpack('e', hex2bin('0000000000000000')), unpack('e', hex2bin('000000000000f03f')), @@ -80,7 +80,7 @@ var_dump( unpack('e', hex2bin('0080e03779c341c3')), unpack('e', hex2bin('4a6ade0d65ebe2bf')), unpack('e', hex2bin('e1639d31956ae5c3')), - + 'unpack E', unpack('E', hex2bin('3ff0000000000000')), unpack('E', hex2bin('4341c37937e08000')), @@ -90,7 +90,7 @@ var_dump( unpack('E', hex2bin('c341c37937e08000')), unpack('E', hex2bin('bfe2eb650dde6a4a')), unpack('E', hex2bin('c3e56a95319d63e1')), - + 'unpack g', unpack('g', hex2bin('0000803f')), unpack('g', hex2bin('ca1b0e5a')), @@ -100,7 +100,7 @@ var_dump( unpack('g', hex2bin('ca1b0eda')), unpack('g', hex2bin('285b17bf')), unpack('g', hex2bin('aa542bdf')), - + 'unpack G', unpack('G', hex2bin('3f800000')), unpack('G', hex2bin('5a0e1bca')), @@ -110,7 +110,7 @@ var_dump( unpack('G', hex2bin('da0e1bca')), unpack('G', hex2bin('bf175b28')), unpack('G', hex2bin('df2b54aa')) - + ); ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt index a1222814f7..b3f2fe5cfc 100644 --- a/ext/standard/tests/strings/parse_str_basic1.phpt +++ b/ext/standard/tests/strings/parse_str_basic1.phpt @@ -1,8 +1,8 @@ --TEST-- -Test parse_str() function : basic functionality +Test parse_str() function : basic functionality --FILE-- ===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic2.phpt b/ext/standard/tests/strings/parse_str_basic2.phpt index 88a13ca387..32a8fcd3fc 100644 --- a/ext/standard/tests/strings/parse_str_basic2.phpt +++ b/ext/standard/tests/strings/parse_str_basic2.phpt @@ -1,7 +1,7 @@ --TEST-- Test parse_str() function : non-default arg_separator.input specified --INI-- -arg_separator.input = "/" +arg_separator.input = "/" --FILE-- ===DONE=== diff --git a/ext/standard/tests/strings/pathinfo.phpt b/ext/standard/tests/strings/pathinfo.phpt index d9c3a2ed6c..a3d735069d 100644 --- a/ext/standard/tests/strings/pathinfo.phpt +++ b/ext/standard/tests/strings/pathinfo.phpt @@ -26,7 +26,7 @@ var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_BASENAME)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: pathinfo() expects at least 1 parameter, 0 given in %s on line %d NULL array(2) { diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt index 4f7ef909e9..d9376b101a 100644 --- a/ext/standard/tests/strings/php_strip_whitespace.phpt +++ b/ext/standard/tests/strings/php_strip_whitespace.phpt @@ -39,7 +39,7 @@ var_dump(php_strip_whitespace($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace() expects exactly 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/print_basic.phpt b/ext/standard/tests/strings/print_basic.phpt index a4bc8c239a..0b75641991 100644 --- a/ext/standard/tests/strings/print_basic.phpt +++ b/ext/standard/tests/strings/print_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test print() function : basic functionality +Test print() function : basic functionality --FILE-- diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt index d0b7aaff44..1a90970371 100644 --- a/ext/standard/tests/strings/printf_64bit.phpt +++ b/ext/standard/tests/strings/printf_64bit.phpt @@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n"; printf("%%",1.23456789e10); echo"\n\n*** Output for precision value more than maximum ***\n"; -printf("%.988f",1.23456789e10); +printf("%.988f",1.23456789e10); echo"\n\n*** Output for invalid width(-15) specifier ***\n"; -printf("%030.-15s", $tempstring); +printf("%030.-15s", $tempstring); echo"\n\n*** Output for '%F' as the format parameter ***\n"; printf("%F",1.23456789e10); @@ -211,16 +211,16 @@ echo"\n\n*** Output with no format parameter ***\n"; printf($tempnum); echo"\n\n*** Output for multiple format parameters ***\n"; -printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); +printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); echo"\n\n*** Output for excess of mixed type arguments ***\n"; -printf("%s", $tempstring, $tempstring, $tempstring); +printf("%s", $tempstring, $tempstring, $tempstring); echo"\n\n*** Output for string format parameter and integer type argument ***\n"; -printf("%s", $tempnum); +printf("%s", $tempnum); echo"\n\n*** Output for integer format parameter and string type argument ***\n"; -printf("%d", $tempstring); +printf("%d", $tempstring); ?> diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt index 195f7cb58f..4b245ebb54 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -19,7 +19,7 @@ $arg1 = 111; $arg2 = 222; $arg3 = 333; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt index 9de0497674..3cebda439a 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -19,7 +19,7 @@ $arg1 = TRUE; $arg2 = FALSE; $arg3 = true; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt index a43fcf2da1..a83f3f70a4 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -25,7 +25,7 @@ $arg1 = -1111; $arg2 = -1234567; $arg3 = +2345432; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 4127bc637f..00953b9720 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -29,7 +29,7 @@ $result = printf($format); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with one arguments --\n"; +echo "\n-- Calling printf() with one arguments --\n"; $result = printf($format1, $arg1); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index 9b441b2ccf..e5b8abd726 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -25,12 +25,12 @@ $arg1 = 11; $arg2 = 132; $arg3 = 177; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with one arguments --\n"; +echo "\n-- Calling printf() with one arguments --\n"; $result = printf($format1, $arg1); echo "\n"; var_dump($result); @@ -38,7 +38,7 @@ $result = printf($format11, $arg1); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with two arguments --\n"; +echo "\n-- Calling printf() with two arguments --\n"; $result = printf($format2, $arg1, $arg2); echo "\n"; var_dump($result); @@ -46,7 +46,7 @@ $result = printf($format22, $arg1, $arg2); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with three arguments --\n"; +echo "\n-- Calling printf() with three arguments --\n"; $result = printf($format3, $arg1, $arg2, $arg3); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index 6645613c83..bce0c4d0d7 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test printf() function : error conditions +Test printf() function : error conditions --FILE-- 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); @@ -87,12 +87,12 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with default argument $result = printf($value); echo "\n"; var_dump($result); - + // with two arguments $result = printf($value, $arg1); echo "\n"; diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt index be66ad8fca..8e7d5ec910 100644 --- a/ext/standard/tests/strings/printf_variation2.phpt +++ b/ext/standard/tests/strings/printf_variation2.phpt @@ -24,7 +24,7 @@ class sample { public function __toString() { return "Object"; - } + } } // creating a file resource @@ -38,48 +38,48 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // string data /*23*/ "string", 'string', - + // object data /*25*/ new sample(), - + // undefined data /*26*/ @$undefined_var, - + // unset data /*27*/ @$unset_var, - + // resource data /*28*/ $file_handle ); @@ -89,7 +89,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with two arguments $result = printf($format, $value); echo "\n"; @@ -99,8 +99,8 @@ foreach($values as $value) { $result = printf($format, $value, $arg2); echo "\n"; var_dump($result); - - $count++; + + $count++; }; // closing the resource diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 5b15388d08..9556dad30f 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quoted_printable_decode() function : basic functionality +Test quoted_printable_decode() function : basic functionality --FILE-- 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); diff --git a/ext/standard/tests/strings/quoted_printable_encode_001.phpt b/ext/standard/tests/strings/quoted_printable_encode_001.phpt index 6a22da8afc..1ce7d791dc 100644 --- a/ext/standard/tests/strings/quoted_printable_encode_001.phpt +++ b/ext/standard/tests/strings/quoted_printable_encode_001.phpt @@ -16,7 +16,7 @@ var_dump(quoted_printable_encode(false)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: quoted_printable_encode() expects exactly 1 parameter, 0 given in %s on line %d NULL string(0) "" diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 9a2f23c464..00572add56 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quotemeta() function : basic functionality +Test quotemeta() function : basic functionality --FILE-- "en_US.utf8", - "english_AU" => "en_AU.utf8", - "korean_KR" => "ko_KR.utf8", + "english_US"=> "en_US.utf8", + "english_AU" => "en_AU.utf8", + "korean_KR" => "ko_KR.utf8", "Chinese_zh" => "zh_CN.utf8", "germen_DE" => "de_DE.utf8", "spanish_es" => "es_EC.utf8", @@ -79,18 +79,18 @@ $currency_symbol = array( // gather all the locales installed in the system $all_system_locales = list_system_locales(); -// set the system locale to a locale, choose the right locale by -// finding a common locale in commonly used locale stored in -// $common_locales & locales that are available in the system, stored -// in $all_system_locales. +// set the system locale to a locale, choose the right locale by +// finding a common locale in commonly used locale stored in +// $common_locales & locales that are available in the system, stored +// in $all_system_locales. echo "Setting system locale(LC_ALL) to "; foreach($common_locales as $value) { - // check if a commonly used locale is installed in the system + // check if a commonly used locale is installed in the system if(in_array($value, $all_system_locales)){ echo "$value\n"; // print, this is found // set the found locale as current locale var_dump(setlocale(LC_ALL, $value )); - // stop here + // stop here break; } else{ diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt index 7204c45911..75ae1545d9 100644 --- a/ext/standard/tests/strings/setlocale_basic2.phpt +++ b/ext/standard/tests/strings/setlocale_basic2.phpt @@ -12,16 +12,16 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d --FILE-- "en_US.utf8", - "english_AU" => "en_AU.utf8", - "korean_KR" => "ko_KR.utf8", + "english_US"=> "en_US.utf8", + "english_AU" => "en_AU.utf8", + "korean_KR" => "ko_KR.utf8", "Chinese_zh" => "zh_CN.utf8", "germen_DE" => "de_DE.utf8", "spanish_es" => "es_EC.utf8", @@ -91,7 +91,7 @@ foreach($common_locales as $value) { } } -// Now $list_of_locales array contains the locales that can be passed to +// Now $list_of_locales array contains the locales that can be passed to // setlocale() function. echo "-- Testing setlocale() : 'category' argument as LC_ALL & 'locale' argument as an array --\n"; if ( count($list_of_locales) > 0 ) { @@ -111,7 +111,7 @@ if ( count($list_of_locales) > 0 ) { if(trim($currency_symbol[$new_locale]) == $new_currency){ echo "PASSED.\n"; - } else { + } else { echo "FAILED.\n"; } } else { diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt index 997dad98e7..46beeda10e 100644 --- a/ext/standard/tests/strings/setlocale_basic3.phpt +++ b/ext/standard/tests/strings/setlocale_basic3.phpt @@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { /* Test the setlocale() when multiple locales are provided as argument */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -44,7 +44,7 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and get three locales that can be use to +/* Collect existing system locales and get three locales that can be use to pass as argument to setlocale() */ echo "*** Testing setlocale() by passing multiple locales as argument ***\n"; diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt index a6a8e38205..14bb7d7ed5 100644 --- a/ext/standard/tests/strings/setlocale_error.phpt +++ b/ext/standard/tests/strings/setlocale_error.phpt @@ -11,8 +11,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new MyClass(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + //resource data /*26*/ $fp ); diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt index a5bf5f868c..f784a8900f 100644 --- a/ext/standard/tests/strings/sha1_variation2.phpt +++ b/ext/standard/tests/strings/sha1_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : usage variations - unexpected values for 'raw' argument +Test sha1() function : usage variations - unexpected values for 'raw' argument --FILE-- 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // string data /*17*/ "ABC", 'abc', "0abc", "123abc", - + // empty data /*21*/ "", '', - + // object data /*23*/ new MyClass(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + //resource data /*26*/ $fp ); diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index cfd998fe96..09a3af407d 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments ***\n"; $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = 'baz'; } /* some code here */ - + show_source(__FILE__); ?> --EXPECTF-- *** Test by calling method or function with its expected arguments *** -<?php
echo "*** Test by calling method or function with its expected arguments ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' ) 
{
  $baz = 'baz';
}

 /* some code here */
   
show_source(__FILE__);

?>
 +<?php
echo "*** Test by calling method or function with its expected arguments ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' )
{
  $baz = 'baz';
}

 /* some code here */

show_source(__FILE__);

?>
 diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index a9993ed457..b59776a4d2 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -9,13 +9,13 @@ echo "*** Test by calling method or function with its expected arguments and php $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = "baz\n"; } /* some code here */ -echo $baz; +echo $baz; show_source(__FILE__); echo $foo; ?> @@ -23,6 +23,6 @@ echo $foo; *** Test by calling method or function with its expected arguments and php output *** baz -<?php
echo "*** Test by calling method or function with its expected arguments and php output ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' ) 
{
  $baz = "baz\n";
}

 /* some code here */
echo $baz;   
show_source(__FILE__);
echo $foo;
?>
 +<?php
echo "*** Test by calling method or function with its expected arguments and php output ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' )
{
  $baz = "baz\n";
}

 /* some code here */
echo $baz;
show_source(__FILE__);
echo $foo;
?>
 bar diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index 06ef66c2d2..d9af024fd9 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments and out $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = "baz\n"; } - /* some code here */ + /* some code here */ $source = show_source(__FILE__, true); var_dump($source); ?> --EXPECTF-- *** Test by calling method or function with its expected arguments and output to variable *** -string(1987) " -<?php
echo "*** Test by calling method or function with its expected arguments and output to variable ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' ) 
{
  $baz = "baz\n";
}

 /* some code here */ 
$source = show_source(__FILE__, true);

var_dump($source);
?>
 +string(1975) " +<?php
echo "*** Test by calling method or function with its expected arguments and output to variable ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' )
{
  $baz = "baz\n";
}

 /* some code here */
$source = show_source(__FILE__, true);

var_dump($source);
?>
 " diff --git a/ext/standard/tests/strings/soundex.phpt b/ext/standard/tests/strings/soundex.phpt index 55769ad57e..650236c2e5 100644 --- a/ext/standard/tests/strings/soundex.phpt +++ b/ext/standard/tests/strings/soundex.phpt @@ -11,10 +11,10 @@ $array = array( "From", "that", "time", -"on", +"on", "Sam", -"thought", -"that", +"thought", +"that", "he", "sensed", "a", @@ -31,7 +31,7 @@ foreach ($array as $str) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(false) string(4) "0000" diff --git a/ext/standard/tests/strings/soundex_basic.phpt b/ext/standard/tests/strings/soundex_basic.phpt index 9777473ee9..401eb67460 100644 --- a/ext/standard/tests/strings/soundex_basic.phpt +++ b/ext/standard/tests/strings/soundex_basic.phpt @@ -9,9 +9,9 @@ Test soundex() function : basic functionality echo "*** Testing soundex() : basic functionality ***\n"; var_dump(soundex("Euler")); -var_dump(soundex("Gauss")); -var_dump(soundex("Hilbert")); -var_dump(soundex("Knuth")); +var_dump(soundex("Gauss")); +var_dump(soundex("Hilbert")); +var_dump(soundex("Knuth")); var_dump(soundex("Lloyd")); var_dump(soundex("Lukasiewicz")); @@ -23,8 +23,8 @@ var_dump(soundex("Lloyd") == soundex("Ladd")); // L300 var_dump(soundex("Lukasiewicz") == soundex("Lissajous")); // L222 var_dump(soundex("Lukasiewicz") == soundex("Ghosh")); -var_dump(soundex("Hilbert") == soundex("Ladd")); -?> +var_dump(soundex("Hilbert") == soundex("Ladd")); +?> ===DONE=== --EXPECT-- *** Testing soundex() : basic functionality *** @@ -42,5 +42,4 @@ bool(true) bool(true) bool(false) bool(false) - ===DONE=== diff --git a/ext/standard/tests/strings/soundex_error.phpt b/ext/standard/tests/strings/soundex_error.phpt index 20cf2c9d3e..8ff93b6d70 100644 --- a/ext/standard/tests/strings/soundex_error.phpt +++ b/ext/standard/tests/strings/soundex_error.phpt @@ -6,7 +6,7 @@ Test soundex() function : error conditions * Description: Calculate the soundex key of a string * Source code: ext/standard/string.c */ - + echo "\n*** Testing soundex error conditions ***"; echo "-- Testing soundex() function with Zero arguments --\n"; @@ -17,7 +17,7 @@ $str = "Euler"; $extra_arg = 10; var_dump( soundex( $str, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing soundex error conditions ***-- Testing soundex() function with Zero arguments -- @@ -30,5 +30,4 @@ NULL Warning: soundex() expects exactly 1 parameter, 2 given in %s on line %d NULL - -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt index b1c6194f06..4507cbd97d 100644 --- a/ext/standard/tests/strings/sprintf_basic1.phpt +++ b/ext/standard/tests/strings/sprintf_basic1.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - string format --FILE-- --EXPECTREGEX-- diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index 2a5bdfdec9..f7bb9dec00 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unexpected values for format argume --FILE-- ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic2.phpt b/ext/standard/tests/strings/sscanf_basic2.phpt index 693a307c05..92f4d1051e 100644 --- a/ext/standard/tests/strings/sscanf_basic2.phpt +++ b/ext/standard/tests/strings/sscanf_basic2.phpt @@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using integer format ***\n"; $str = "Part: Widget Serial Number: 1234789 Stock: 25"; $format = "Part: %s Serial Number: %d Stock: %d"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $number, $stock) = sscanf($str, $format); var_dump($part, $number, $stock); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $number, $stock); -var_dump($res, $part, $number, $stock); +var_dump($res, $part, $number, $stock); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic3.phpt b/ext/standard/tests/strings/sscanf_basic3.phpt index de910ef4b8..b728dea34d 100644 --- a/ext/standard/tests/strings/sscanf_basic3.phpt +++ b/ext/standard/tests/strings/sscanf_basic3.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality -- using float format ***\n"; $str = "Part: Widget Length: 111.53 Width: 22.345 Depth: 12.4"; $format = "Part: %s Length: %f Width: %f Depth: %f"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $length, $width, $depth) = sscanf($str, $format); var_dump($part, $length, $width, $depth); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $length, $width, $depth); -var_dump($res, $part, $length, $width, $depth); +var_dump($res, $part, $length, $width, $depth); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt index 8ce44ff4c8..8ed760afde 100644 --- a/ext/standard/tests/strings/sscanf_basic4.phpt +++ b/ext/standard/tests/strings/sscanf_basic4.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using char format ***\n"; $str = "X = A + B - C"; $format = "%c = %c + %c - %c"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic5.phpt b/ext/standard/tests/strings/sscanf_basic5.phpt index 5dbbf44813..36c2feba9d 100644 --- a/ext/standard/tests/strings/sscanf_basic5.phpt +++ b/ext/standard/tests/strings/sscanf_basic5.phpt @@ -14,19 +14,19 @@ $str = "10.12345 10.12345E3 10.12345e3 -10.12345e4" ; $format1 = "%e %e %e %e"; $format2 = "%E %E %E %E"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format1); var_dump($arg1, $arg2, $arg3, $arg4); list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format2); var_dump($arg1, $arg2, $arg3, $arg4); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); $res = sscanf($str, $format2,$arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> diff --git a/ext/standard/tests/strings/sscanf_basic6.phpt b/ext/standard/tests/strings/sscanf_basic6.phpt index 6efdd0b687..381ccc12c2 100644 --- a/ext/standard/tests/strings/sscanf_basic6.phpt +++ b/ext/standard/tests/strings/sscanf_basic6.phpt @@ -19,15 +19,15 @@ echo "*** Testing sscanf() : basic functionality - using unsigned format ***\n"; $str = "-11 +11 11 -11.234 +11.234 11.234"; $format = "%u %u %u %u %u %u"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic7.phpt b/ext/standard/tests/strings/sscanf_basic7.phpt index 1d54054d4b..253dd1ba53 100644 --- a/ext/standard/tests/strings/sscanf_basic7.phpt +++ b/ext/standard/tests/strings/sscanf_basic7.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using octal format ***\n"; $str = "0123 -0123 +0123 0129 -0129 +0129"; $format = "%o %o %o %o %o %o"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt index 4773f026af..bcec81eab4 100644 --- a/ext/standard/tests/strings/sscanf_basic8.phpt +++ b/ext/standard/tests/strings/sscanf_basic8.phpt @@ -14,19 +14,19 @@ $str = "129 12F 123B -123B 01ABC 1G"; $format1 = "%x %x %x %x %x %x"; $format2 = "%X %X %X %X %X %X"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format1); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format2); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); $res = sscanf($str, $format2, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt index 8d883a1f92..f2a3dcbfec 100644 --- a/ext/standard/tests/strings/sscanf_error.phpt +++ b/ext/standard/tests/strings/sscanf_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sscanf() function : error conditions +Test sscanf() function : error conditions --FILE-- ", $Data)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt index 0c0c2026cd..b44a9517ab 100644 Binary files a/ext/standard/tests/strings/str_pad.phpt and b/ext/standard/tests/strings/str_pad.phpt differ diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index aff89f598a..26902cdd4a 100644 --- a/ext/standard/tests/strings/str_pad_variation1.phpt +++ b/ext/standard/tests/strings/str_pad_variation1.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$input' argu * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$input' +/* Test str_pad() function: with unexpected inputs for '$input' * and expected type for '$pad_length' */ @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -36,36 +36,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null vlaues /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt index 6313dd0fe2..ed620d07bb 100644 --- a/ext/standard/tests/strings/str_pad_variation2.phpt +++ b/ext/standard/tests/strings/str_pad_variation2.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_length' * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_length' +/* Test str_pad() function: with unexpected inputs for '$pad_length' * and expected type for '$input' */ @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -35,36 +35,36 @@ $pad_lengths = array ( 1, -2, 255, - + // float values /*5*/ 10.5, -20.5, 10.12345e2, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - + // null vlaues /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation3.phpt b/ext/standard/tests/strings/str_pad_variation3.phpt index c277eb756b..b9209e6657 100644 --- a/ext/standard/tests/strings/str_pad_variation3.phpt +++ b/ext/standard/tests/strings/str_pad_variation3.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_string' * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_string' +/* Test str_pad() function: with unexpected inputs for '$pad_string' * and expected type for '$input' and '$pad_length' */ @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -36,36 +36,36 @@ $pad_strings = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null vlaues /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt index 585d79edb3..3574d299b5 100644 --- a/ext/standard/tests/strings/str_pad_variation4.phpt +++ b/ext/standard/tests/strings/str_pad_variation4.phpt @@ -9,7 +9,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_type' a * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_type' +/* Test str_pad() function: with unexpected inputs for '$pad_type' * and expected type for '$input', '$pad_length' and '$pad_string' */ @@ -23,7 +23,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } // array with different values for $input @@ -33,43 +33,43 @@ $pad_types = array ( /*1*/ 0, // == STR_PAD_LEFT 1, // == STR_PAD_RIGHT 2, // == STR_PAD_BOTH - -2, + -2, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // string data /*10*/ "abc", "STR_PAD_LEFT", "2", "0x2", "02", - + // array values /*15*/ array(), array(0), array(1, 2), - + // boolean values /*18*/ true, false, TRUE, FALSE, - + // null vlaues /*22*/ NULL, null, - + // objects /*24*/ new sample(), - + // undefined variable /*25*/ @$undefined_var, - + // unset variable /*26*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt index f1f47b932c..8eade37df3 100644 --- a/ext/standard/tests/strings/str_pad_variation5.phpt +++ b/ext/standard/tests/strings/str_pad_variation5.phpt @@ -16,7 +16,7 @@ if (getenv("USE_ZEND_ALLOC") === "0") { * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_length' +/* Test str_pad() function: with unexpected inputs for '$pad_length' * and expected type for '$input' */ diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt index bbcc489990..54763ddf8b 100644 Binary files a/ext/standard/tests/strings/str_repeat.phpt and b/ext/standard/tests/strings/str_repeat.phpt differ diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index b53ed665d4..7b411abac5 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -4,10 +4,10 @@ Test str_replace() function precision=14 --FILE-- ---EXPECTF-- +--EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" string(4) "tbst" diff --git a/ext/standard/tests/strings/str_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt index 10bf542342..790a32fffd 100644 --- a/ext/standard/tests/strings/str_replace_basic.phpt +++ b/ext/standard/tests/strings/str_replace_basic.phpt @@ -4,10 +4,10 @@ Test str_replace() function basic function precision=14 --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" string(4) "tbst" diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt index 9fafc57a39..b66fd8c9ec 100644 --- a/ext/standard/tests/strings/str_replace_error.phpt +++ b/ext/standard/tests/strings/str_replace_error.phpt @@ -4,10 +4,10 @@ Test str_replace() function error conditions precision=14 --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing str_replace error conditions *** Warning: str_replace() expects at least 3 parameters, 0 given in %sstr_replace_error.php on line 12 NULL diff --git a/ext/standard/tests/strings/str_replace_variation1.phpt b/ext/standard/tests/strings/str_replace_variation1.phpt index 279fb2201f..067e26307d 100644 --- a/ext/standard/tests/strings/str_replace_variation1.phpt +++ b/ext/standard/tests/strings/str_replace_variation1.phpt @@ -4,16 +4,16 @@ Test str_replace() function - test search values precision=14 --FILE-- ===DONE=== ---EXPECT-- +--EXPECT-- *** Testing str_replace() with various search values *** -- Iteration 0 -- array(12) { diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt index 5534341dcf..5cf7f7c014 100644 Binary files a/ext/standard/tests/strings/str_replace_variation2.phpt and b/ext/standard/tests/strings/str_replace_variation2.phpt differ diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 8f6f38f1f9..8ae709745f 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -4,26 +4,26 @@ Test str_replace() function precision=14 --FILE-- ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing Miscelleneous input data *** string(3) "qqq" int(5) diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 321a2bf1b7..c43e6f289f 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -14,16 +14,16 @@ var_dump(str_rot13("abcdefghijklmnopqrstuvwxyz")); echo "\nEnsure numeric characters are left untouched\n"; if (strcmp(str_rot13("0123456789"), "0123456789") == 0) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } echo "\nEnsure non-alphabetic characters are left untouched\n"; if (strcmp(str_rot13("!%^&*()_-+={}[]:;@~#<,>.?"), "!%^&*()_-+={}[]:;@~#<,>.?")) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } echo "\nEnsure strings round trip\n"; @@ -31,9 +31,9 @@ $str = "str_rot13() tests starting"; $encode = str_rot13($str); $decode = str_rot13($encode); if (strcmp($str, $decode) == 0) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } ?> ===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index b60a35f560..348f1bb731 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test str_shuffle() function : basic functionality +Test str_shuffle() function : basic functionality --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt index 53385a76de..0294ca6614 100644 --- a/ext/standard/tests/strings/str_split_variation6.phpt +++ b/ext/standard/tests/strings/str_split_variation6.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- ---EXPECTF-- +--EXPECTF-- int(0) Warning: str_word_count(): Invalid format value -1 in %s on line %d diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index 265b8708ea..9b1898fb35 100644 Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index dea94644aa..ef659014a5 100644 Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ diff --git a/ext/standard/tests/strings/strcoll_error.phpt b/ext/standard/tests/strings/strcoll_error.phpt index 7eda9817ee..8c17e65fc9 100644 --- a/ext/standard/tests/strings/strcoll_error.phpt +++ b/ext/standard/tests/strings/strcoll_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strcoll() function : error conditions +Test strcoll() function : error conditions --FILE-- hello", 'hello', @@ -28,8 +28,8 @@ $string_array = array ( "", '' ); - - + + // Calling strip_tags() with default arguments // loop through the $string_array to test strip_tags on various inputs $iteration = 1; diff --git a/ext/standard/tests/strings/strip_tags_error.phpt b/ext/standard/tests/strings/strip_tags_error.phpt index c45cbb115a..25f703c3c0 100644 --- a/ext/standard/tests/strings/strip_tags_error.phpt +++ b/ext/standard/tests/strings/strip_tags_error.phpt @@ -5,7 +5,7 @@ short_open_tag = on --FILE-- 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource variable /*26*/ $fp diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 3b47b5c6b1..4e6c5fb5c9 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -7,15 +7,15 @@ short_open_tag = on echo "*** Testing strip_tags() : obscure functionality ***\n"; -// array of arguments +// array of arguments $string_array = array ( 'hello world', 'hello world', 'hello world', "hello world" ); - - + + // Calling strip_tags() with default arguments // loop through the $string_array to test strip_tags on various inputs $iteration = 1; diff --git a/ext/standard/tests/strings/strip_tags_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt index c0a6e92423..a32e3eccad 100644 --- a/ext/standard/tests/strings/strip_tags_variation2.phpt +++ b/ext/standard/tests/strings/strip_tags_variation2.phpt @@ -5,7 +5,7 @@ short_open_tag = on --FILE-- 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + // null values /*25*/ NULL, null diff --git a/ext/standard/tests/strings/stripos_error.phpt b/ext/standard/tests/strings/stripos_error.phpt index c59473046d..324014cf6d 100644 --- a/ext/standard/tests/strings/stripos_error.phpt +++ b/ext/standard/tests/strings/stripos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripos() function : error conditions +Test stripos() function : error conditions --FILE-- 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + // null values /*25*/ NULL, null diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt index c86cd5890c..71cde1bc31 100644 Binary files a/ext/standard/tests/strings/stripslashes_variation2.phpt and b/ext/standard/tests/strings/stripslashes_variation2.phpt differ diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt index 2ccf97ffd2..ef094bcee8 100644 --- a/ext/standard/tests/strings/stripslashes_variation3.phpt +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt @@ -25,7 +25,7 @@ This is line 2 \tof "heredoc" string EOT; // initialising the string array -$str_array = array( +$str_array = array( // string with newline character "\n", "\\n", @@ -36,7 +36,7 @@ $str_array = array( 'Hello \nworld', 'Hello \\nworld', $heredoc_string_with_newline, - + // string with tab character "\t", "\\t", diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt index eccca6a64d..b41c5fe150 100644 --- a/ext/standard/tests/strings/stripslashes_variation4.phpt +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt @@ -15,7 +15,7 @@ echo "*** Testing stripslashes() : with double dimensional arrays ***\n"; // initialising the string array -$str_array = array( +$str_array = array( array("", array()), array("", array("")), array("f\\'oo", "b\\'ar", array("fo\\'o", "b\\'ar")), diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 0d2171496c..638003f18c 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stristr() function : basic functionality +Test stristr() function : basic functionality --FILE-- --FILE-- --FILE-- = 0; $len--) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Test strncasecmp() function: with different lengths *** int(0) int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt index 9d46db9ee1..93968db2da 100644 --- a/ext/standard/tests/strings/strncasecmp_variation4.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncasecmp_variation8.phpt b/ext/standard/tests/strings/strncasecmp_variation8.phpt index 6011a7b0fd..680653af90 100644 --- a/ext/standard/tests/strings/strncasecmp_variation8.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation8.phpt @@ -2,7 +2,7 @@ Test strncasecmp() function: usage variations - single quoted strings --FILE-- ---EXPECTREGEX-- +--EXPECTREGEX-- \*\*\* Test strncmp\(\) function: with alphabets \*\*\* -- Passing upper-case letters for 'str1' -- int\(0\) diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt index 84684ea551..5e96e5d16f 100644 --- a/ext/standard/tests/strings/strncmp_variation4.phpt +++ b/ext/standard/tests/strings/strncmp_variation4.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, @@ -77,7 +77,7 @@ $values = array ( $unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index b3b918920e..1ee41ccc4c 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -25,7 +25,7 @@ for($ASCII = 0; $ASCII <= 255; $ASCII++) { } echo "\n-- Checking with out of character's range, given in binary format --\n"; -/* Checking with the out of range ASCII value(given in binary format) */ +/* Checking with the out of range ASCII value(given in binary format) */ $str1 = decbin(256); $str2 = decbin( ord( chr(256) )); var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(1) diff --git a/ext/standard/tests/strings/strncmp_variation8.phpt b/ext/standard/tests/strings/strncmp_variation8.phpt index bc000d171e..9d8c841d68 100644 --- a/ext/standard/tests/strings/strncmp_variation8.phpt +++ b/ext/standard/tests/strings/strncmp_variation8.phpt @@ -2,7 +2,7 @@ Test strncmp() function: usage variations - single quoted strings --FILE-- ---EXPECTF-- +--EXPECTF-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index b5bfe2d9c2..e61fb8c108 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrchr() function : basic functionality +Test strrchr() function : basic functionality --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index b8a8943d09..56d2cd6a07 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -13,55 +13,55 @@ echo "*** Testing strripos() function: with double quoted strings ***\n"; $haystack = "Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 "; $needles = array( //regular strings -/*1*/ "l", +/*1*/ "l", "L", "HELLO", "hEllo", - + //escape characters -/*5*/ "\t", +/*5*/ "\t", "\T", //invalid input " ", "\n", "\N", //invalid input " ", //new line - + //nulls -/*11*/ "\0", +/*11*/ "\0", NULL, null, - + //boolean false -/*14*/ FALSE, +/*14*/ FALSE, false, - + //empty string /*16*/ "", - + //special chars -/*17*/ " ", +/*17*/ " ", "$", " $", "&", - "!#", + "!#", "()", - "<=>", - ">", + "<=>", + ">", "=>", "?", "@", "@hEllo", - -/*29*/ "12345", //decimal numeric string + +/*29*/ "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 "\101", //octal numeric string "A", //respective ASCII char of \101 "456HEE", //numerics + chars - $haystack //haystack as needle + $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; foreach ($needles as $needle) { diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index d8caf73742..529943bddd 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -13,54 +13,54 @@ echo "*** Testing strripos() function: with single quoted strings ***\n"; $haystack = 'Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 '; $needles = array( //regular strings -/*1*/ 'l', +/*1*/ 'l', 'L', 'HELLO', 'hEllo', - + //escape characters -/*5*/ '\t', +/*5*/ '\t', '\T', ' ', '\n', '\N', ' ', //new line - + //nulls -/*11*/ '\0', +/*11*/ '\0', NULL, null, - + //boolean false -/*14*/ FALSE, +/*14*/ FALSE, false, - + //empty string /*16*/ '', - + //special chars -/*17*/ ' ', +/*17*/ ' ', '$', ' $', '&', '!#', '()', - '<=>', + '<=>', '>', '=>', '?', '@', '@hEllo', - -/*29*/ '12345', //decimal numeric string + +/*29*/ '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //respective ASCII char of \x23 '\101', //octal numeric string 'A', // respective ASCII char for \101 '456HEE', //numerics + chars 42, //needle as int(ASCII value of '*') - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ diff --git a/ext/standard/tests/strings/strripos_variation3.phpt b/ext/standard/tests/strings/strripos_variation3.phpt index c380106341..4fccaeb47e 100644 --- a/ext/standard/tests/strings/strripos_variation3.phpt +++ b/ext/standard/tests/strings/strripos_variation3.phpt @@ -7,7 +7,7 @@ Test strripos() function : usage variations - multi line heredoc string for 'hay * Source code: ext/standard/string.c */ -/* Test strripos() function by passing multi-line heredoc string for haystack and +/* Test strripos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index c355330cab..f76ea41d36 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -8,7 +8,7 @@ Test strripos() function : usage variations - heredoc string containing special */ /* Test strripos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt index 5f6df79903..66802870d4 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -7,8 +7,8 @@ Test strripos() function : usage variations - heredoc string containing escape c * Source code: ext/standard/string.c */ -/* Test strripos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test strripos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_error.phpt b/ext/standard/tests/strings/strrpos_error.phpt index 3900ceaa5d..d97af99920 100644 --- a/ext/standard/tests/strings/strrpos_error.phpt +++ b/ext/standard/tests/strings/strrpos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrpos() function : error conditions +Test strrpos() function : error conditions --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index a7ef3e9b05..cb7078f622 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with double quoted strings ***\n"; $haystack = "Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 "; $needle = array( //regular strings - "l", + "l", "L", "HELLO", "hEllo", //escape characters - "\t", + "\t", "\T", //invalid input " ", "\n", @@ -28,40 +28,40 @@ $needle = array( ", //new line //nulls - "\0", + "\0", NULL, null, //boolean false - FALSE, + FALSE, false, //empty string "", //special chars - " ", + " ", "$", " $", "&", - "!#", + "!#", "()", - "<=>", - ">", + "<=>", + ">", "=>", "?", "@", "@hEllo", - "12345", //decimal numeric string + "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 "\101", //octal numeric string "A", //respective ASCII char of \101 "456HEE", //numerics + chars - $haystack //haystack as needle + $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index', + '<=>', '>', '=>', '?', '@', '@hEllo', - '12345', //decimal numeric string + '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //hexadecimal numeric string '\101', //octal numeric string 'A', '456HEE', //numerics + chars 42, //needle as int(ASCII value of '*') - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index a0a0d270e8..d37342e464 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - multi line heredoc string for 'hays * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing multi-line heredoc string for haystack and +/* Test strrpos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index 1ccf529856..ed032f264e 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - heredoc string containing special c */ /* Test strrpos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index f9537da0e2..b322e97e61 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - heredoc string containing escape ch * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test strrpos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index c879a91209..f361e8c5ea 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - heredoc string containing quotes fo * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing heredoc string containing quotes for haystack +/* Test strrpos() function by passing heredoc string containing quotes for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index 239dc246bc..cf70befdbd 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - empty heredoc string for 'haystack' * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing empty heredoc string for haystack +/* Test strrpos() function by passing empty heredoc string for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index eac7d8ff83..b5ee760867 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - repetitive chars for 'haystack' arg */ /* Test strrpos() function with strings containing multiple occurrences of 'needle' in the 'haystack' - * and with various needles & offsets + * and with various needles & offsets */ echo "*** Testing strrpos() function: strings repetitive chars ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation9.phpt b/ext/standard/tests/strings/strrpos_variation9.phpt index 9b3b8d673d..ca9a121def 100644 --- a/ext/standard/tests/strings/strrpos_variation9.phpt +++ b/ext/standard/tests/strings/strrpos_variation9.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index d9b1a33881..8ca2824393 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strspn() function : basic functionality +Test strspn() function : basic functionality --FILE-- diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt index 14af0ca0af..09ad531d2e 100644 Binary files a/ext/standard/tests/strings/strspn_variation9.phpt and b/ext/standard/tests/strings/strspn_variation9.phpt differ diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index a16cda9c93..d3050f93a2 100644 Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt index 6ba48f41e3..8855bac639 100644 --- a/ext/standard/tests/strings/strtok_basic.phpt +++ b/ext/standard/tests/strings/strtok_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strtok() function : basic functionality +Test strtok() function : basic functionality --FILE-- diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt index 73ea3667eb..7008e3b67e 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -20,12 +20,12 @@ $string_array = array( "/khello\k world/k", "/hellok/ world" ); -$token_array = array( +$token_array = array( "k", "/ ", "/k", "\k", - "\\\\\\\k\h\\e\l\o\w\r\l\d" + "\\\\\\\k\h\\e\l\o\w\r\l\d" ); // loop through each element of the array and check the working of strtok() @@ -34,16 +34,16 @@ $token_array = array( $counter =1; foreach( $string_array as $string ) { echo "\n--- Iteration $counter ---\n"; - foreach( $token_array as $token ) { - var_dump( strtok($string, $token) ); + foreach( $token_array as $token ) { + var_dump( strtok($string, $token) ); for( $count = 1; $count <=3; $count++ ) { var_dump( strtok($token) ); } echo "\n"; } $counter++; -} - +} + echo "Done\n"; ?> diff --git a/ext/standard/tests/strings/strtok_variation7.phpt b/ext/standard/tests/strings/strtok_variation7.phpt index 28cbf7d917..aed1c7f8a3 100644 --- a/ext/standard/tests/strings/strtok_variation7.phpt +++ b/ext/standard/tests/strings/strtok_variation7.phpt @@ -17,7 +17,7 @@ $str = "this is a sample string"; $token = " "; echo "\n*** Testing strtok() when string being tokenised is prefixed with another string in between the process ***\n"; -var_dump( strtok($str, $token) ); +var_dump( strtok($str, $token) ); // adding a string to the input string which is being tokenised $str = "extra string ".$str; for( $count = 1; $count <=6; $count++ ) { @@ -25,9 +25,9 @@ for( $count = 1; $count <=6; $count++ ) { var_dump( strtok($token) ); echo "\n-- Input str is \"$str\" --\n"; } - + echo "\n*** Testing strtok() when string being tokenised is suffixed with another string in between the process ***\n"; -var_dump( strtok($str, $token) ); +var_dump( strtok($str, $token) ); // adding a string to the input string which is being tokenised $str = $str." extra string"; for( $count = 1; $count <=10; $count++ ) { diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt index ffaa1487ba..c0ad1d0115 100644 Binary files a/ext/standard/tests/strings/strtolower-win32.phpt and b/ext/standard/tests/strings/strtolower-win32.phpt differ diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt index 166b5ccc67..47dfe09762 100644 Binary files a/ext/standard/tests/strings/strtolower.phpt and b/ext/standard/tests/strings/strtolower.phpt differ diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt index e0adc645e0..60701652e1 100644 Binary files a/ext/standard/tests/strings/strtoupper1-win32.phpt and b/ext/standard/tests/strings/strtoupper1-win32.phpt differ diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt index b83a8a3a5d..e0ebf42ea7 100644 Binary files a/ext/standard/tests/strings/strtoupper1.phpt and b/ext/standard/tests/strings/strtoupper1.phpt differ diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt index 2892ab0082..633e3f93ef 100644 --- a/ext/standard/tests/strings/strtr_basic.phpt +++ b/ext/standard/tests/strings/strtr_basic.phpt @@ -27,7 +27,7 @@ var_dump( strtr('test strtr', 'test', 'TEST') ); var_dump( strtr($heredoc_str, "test", "TEST") ); //$from and $to are of different lengths, extra chars in the longer one are ignored -var_dump( strtr("test strtr", "test", "TESTz") ); +var_dump( strtr("test strtr", "test", "TESTz") ); var_dump( strtr('test strtr', 'testz', 'TEST') ); var_dump( strtr($heredoc_str, "test", "TESTz") ); diff --git a/ext/standard/tests/strings/strtr_error.phpt b/ext/standard/tests/strings/strtr_error.phpt index f34085fb4d..0d4d157776 100644 --- a/ext/standard/tests/strings/strtr_error.phpt +++ b/ext/standard/tests/strings/strtr_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strtr() function : error conditions +Test strtr() function : error conditions --FILE-- 'red', 'item' => 'pen'), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null vlaues /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_with_reference.phpt b/ext/standard/tests/strings/strtr_with_reference.phpt index a28d1e7be9..21cdc20318 100644 --- a/ext/standard/tests/strings/strtr_with_reference.phpt +++ b/ext/standard/tests/strings/strtr_with_reference.phpt @@ -4,7 +4,7 @@ strtr() with references &$foo]; +$arr = ['bar' => &$foo]; var_dump(strtr('foobar', $arr)); ?> diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index c099058b99..f727ebdf93 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strval() function : basic functionality +Test strval() function : basic functionality --FILE-- 'red', 'item' => 'pen'), - + // null data /*20*/ NULL, null, - + // boolean data /*22*/ true, false, TRUE, FALSE, - + // empty data /*26*/ "", '', - + // object data /*28*/ new MyClass(), - + // resource -/*29*/ $file_handle, - +/*29*/ $file_handle, + // undefined data /*30*/ @$undefined_var, - + // unset data /*31*/ @$unset_var, ); diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index da74973c5e..009a190280 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -3,7 +3,7 @@ Test strval() function : usage variations - Pass all valid char codes --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt index 881da391e6..b4cf3d05df 100644 --- a/ext/standard/tests/strings/substr_count_error.phpt +++ b/ext/standard/tests/strings/substr_count_error.phpt @@ -11,14 +11,14 @@ var_dump( substr_count() ); /* more than expected no. of args */ var_dump( substr_count($str, "t", 0, 15, 30) ); - + /* offset before start */ var_dump(substr_count($str, "t", -20)); /* offset > size of the string */ var_dump(substr_count($str, "t", 25)); -/* Using offset and length to go beyond the size of the string: +/* Using offset and length to go beyond the size of the string: Warning message expected, as length+offset > length of string */ var_dump( substr_count($str, "i", 5, 7) ); diff --git a/ext/standard/tests/strings/substr_count_variation_001.phpt b/ext/standard/tests/strings/substr_count_variation_001.phpt index a9d538d17a..2e70c734c5 100644 --- a/ext/standard/tests/strings/substr_count_variation_001.phpt +++ b/ext/standard/tests/strings/substr_count_variation_001.phpt @@ -19,8 +19,8 @@ var_dump( substr_count($str, "I", NULL) ); var_dump( substr_count($str, "i", NULL, 10) ); echo "\n-- overlapped substrings --\n"; -var_dump( substr_count("abcabcabcabcabc", "abca") ); -var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); +var_dump( substr_count("abcabcabcabcabc", "abca") ); +var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); echo "\n-- complex strings containing other than 7-bit chars --\n"; $str = chr(128).chr(129).chr(128).chr(256).chr(255).chr(254).chr(255); @@ -49,7 +49,7 @@ var_dump(substr_count($str, "\0")); var_dump(substr_count($str, "\x000")); var_dump(substr_count($str, "0")); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/substr_count_variation_002.phpt b/ext/standard/tests/strings/substr_count_variation_002.phpt index f8b62bd837..a3c8ecf5ab 100644 --- a/ext/standard/tests/strings/substr_count_variation_002.phpt +++ b/ext/standard/tests/strings/substr_count_variation_002.phpt @@ -31,7 +31,7 @@ var_dump(substr_count($str, "\0")); var_dump(substr_count($str, "\x000")); var_dump(substr_count($str, "0")); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt index 0a15035af2..ac945349fe 100644 --- a/ext/standard/tests/strings/substr_replace_error.phpt +++ b/ext/standard/tests/strings/substr_replace_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test substr_replace() function : error conditions +Test substr_replace() function : error conditions --FILE-- ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt index dd52efd98e..330bd01553 100644 Binary files a/ext/standard/tests/strings/trim1.phpt and b/ext/standard/tests/strings/trim1.phpt differ diff --git a/ext/standard/tests/strings/trim_basic.phpt b/ext/standard/tests/strings/trim_basic.phpt index 501b477420..08f75846a5 100644 --- a/ext/standard/tests/strings/trim_basic.phpt +++ b/ext/standard/tests/strings/trim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test trim() function : basic functionality +Test trim() function : basic functionality --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: convert_uuencode() expects parameter 1 to be string, array given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 8189aaf0b0..ecdae30241 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : basic functionality +Test vfprintf() function : basic functionality --CREDITS-- Felix De Vliegher --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt index fe786d3f49..ffd232355c 100644 --- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,7 +64,7 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -86,7 +86,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt index 0173a27fb7..ea2957a18c 100644 --- a/ext/standard/tests/strings/vfprintf_variation14.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,7 +64,7 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt index fb34befd3c..9916967b3f 100644 --- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,7 +64,7 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt index 19e319a557..b513227836 100644 --- a/ext/standard/tests/strings/vfprintf_variation15.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15.phpt @@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -55,7 +55,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt index 7bb0d150e0..b31ffd3eb4 100644 --- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt @@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -55,7 +55,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 4995ab02a4..254bd8c2c1 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation16.txt'; if (!($fp = fopen($data_file, 'wt'))) @@ -78,7 +78,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt index 16d0624018..0819cc0e5f 100644 --- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation16_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) @@ -78,7 +78,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt index 6c17b801f6..545ae6d43d 100644 --- a/ext/standard/tests/strings/vfprintf_variation17.phpt +++ b/ext/standard/tests/strings/vfprintf_variation17.phpt @@ -16,9 +16,9 @@ echo "*** Testing vfprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -37,7 +37,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation17.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -51,7 +51,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt index 5467753dc0..3d0d810442 100644 --- a/ext/standard/tests/strings/vfprintf_variation18.phpt +++ b/ext/standard/tests/strings/vfprintf_variation18.phpt @@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - scientific formats with non-scient echo "*** Testing vfprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e @@ -53,14 +53,14 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation18.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -74,7 +74,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt index b2fbdd88cf..19aac7738b 100644 --- a/ext/standard/tests/strings/vfprintf_variation19.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19.phpt @@ -49,7 +49,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation19.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -63,7 +63,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt index 8153ce8129..8ad2df0947 100644 --- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt @@ -49,7 +49,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation19_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -63,7 +63,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index 48fea341ed..3bc9bf6b29 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -41,44 +41,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1,2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt index 09bf703957..5d8c63e207 100644 --- a/ext/standard/tests/strings/vfprintf_variation21.phpt +++ b/ext/standard/tests/strings/vfprintf_variation21.phpt @@ -41,41 +41,41 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, TRUE, FALSE, - + // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', - + // object data /*20*/ new sample(), - + // undefined data /*21*/ @$undefined_var, - + // unset data /*22*/ @$unset_var, - + // resource data /*23*/ $file_handle ); diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 642f35c46a..55bfd465bb 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt index 6bf814003a..1bf0861c0f 100644 --- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt index b5b82bbc62..9194d84866 100644 --- a/ext/standard/tests/strings/vfprintf_variation6.phpt +++ b/ext/standard/tests/strings/vfprintf_variation6.phpt @@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - float formats with non-float value echo "*** Testing vfprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index a72e260e09..036c52b04a 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vfprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %Ls %4s %-4s %10.4s %-10.4s %04s %04.4s @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, 123456234, -12346789, +12346789, @@ -56,7 +56,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -78,7 +78,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt index 8481b41ade..6f5c7dc6e6 100644 Binary files a/ext/standard/tests/strings/vfprintf_variation9.phpt and b/ext/standard/tests/strings/vfprintf_variation9.phpt differ diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index f694155b8f..e550ea1c8d 100644 --- a/ext/standard/tests/strings/vprintf_basic1.phpt +++ b/ext/standard/tests/strings/vprintf_basic1.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - string format --FILE-- ===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic9.phpt b/ext/standard/tests/strings/vprintf_basic9.phpt index 4aa12a080f..8521d82ec4 100644 --- a/ext/standard/tests/strings/vprintf_basic9.phpt +++ b/ext/standard/tests/strings/vprintf_basic9.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - hexadecimal format --FILE-- 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); @@ -90,9 +90,9 @@ foreach($values as $value) { echo "\n -- Iteration $counter --\n"; $result = vprintf($value,$args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; - + }; // closing the resource diff --git a/ext/standard/tests/strings/vprintf_variation10.phpt b/ext/standard/tests/strings/vprintf_variation10.phpt index d63738e723..747b8c40c5 100644 Binary files a/ext/standard/tests/strings/vprintf_variation10.phpt and b/ext/standard/tests/strings/vprintf_variation10.phpt differ diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt index 4207bc294e..99f5c80386 100644 --- a/ext/standard/tests/strings/vprintf_variation11.phpt +++ b/ext/standard/tests/strings/vprintf_variation11.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- \n'; $cut = true; -// resource var +// resource var $fp = fopen(__FILE__, "r"); // get an unset variable @@ -53,7 +53,7 @@ $values = array ( // objects new stdclass(), - // Null value + // Null value NULL, null, @@ -83,7 +83,7 @@ for($index = 0; $index < count($values); $index ++) { var_dump( wordwrap($str, $width) ); var_dump( wordwrap($str, $width, $break) ); - // cut as false + // cut as false $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt index ddf04c77c9..5774ce3752 100644 --- a/ext/standard/tests/strings/wordwrap_variation3.phpt +++ b/ext/standard/tests/strings/wordwrap_variation3.phpt @@ -8,7 +8,7 @@ Test wordwrap() function : usage variations - unexptected values for break argu */ /* - * test wordwrap by passing different values for break argument + * test wordwrap by passing different values for break argument */ echo "*** Testing wordwrap() : usage variations ***\n"; // initialize all required variables @@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++) { $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); - // $cut as true + // $cut as true $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); diff --git a/ext/standard/tests/strings/wordwrap_variation5.phpt b/ext/standard/tests/strings/wordwrap_variation5.phpt index b0911a899c..0235271c7a 100644 --- a/ext/standard/tests/strings/wordwrap_variation5.phpt +++ b/ext/standard/tests/strings/wordwrap_variation5.phpt @@ -37,7 +37,7 @@ echo "-- with cut value as true --\n"; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); var_dump( wordwrap($str, $width, $break1, $cut) ); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/time/001.phpt b/ext/standard/tests/time/001.phpt index 3b0ed8a77f..045271fada 100644 --- a/ext/standard/tests/time/001.phpt +++ b/ext/standard/tests/time/001.phpt @@ -1,8 +1,8 @@ --TEST-- microtime() function --SKIPIF-- - --FILE-- diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index 30e3e82cc7..e53822ffc8 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strptime() function : basic functionality +Test strptime() function : basic functionality --SKIPIF-- - @@ -16,13 +16,13 @@ Test strptime() function : basic functionality */ $orig = setlocale(LC_ALL, 'C'); -date_default_timezone_set("GMT"); +date_default_timezone_set("GMT"); echo "*** Testing strptime() : basic functionality ***\n"; $input = "10:00:00 AM July 2 1963"; $tstamp = strtotime($input); - + $str = strftime("%r %B%e %Y %Z", $tstamp); var_dump(strptime($str, '%H:%M:%S %p %B %d %Y')); diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt index ae55028cb2..a84216f4ff 100644 --- a/ext/standard/tests/time/strptime_error.phpt +++ b/ext/standard/tests/time/strptime_error.phpt @@ -1,20 +1,20 @@ --TEST-- Test localtime() function : error conditions --SKIPIF-- - +} +?> --FILE-- --FILE-- @@ -15,14 +15,14 @@ Test strptime() function : basic functionality */ $orig = setlocale(LC_ALL, 'C'); -date_default_timezone_set("GMT"); +date_default_timezone_set("GMT"); putenv("TZ=GMT"); echo "*** Testing strptime() : basic functionality ***\n"; $input = "10:01:20 AM July 2 1963"; $tstamp = strtotime($input); - + $str = strftime("%r %B%e %Y %Z", $tstamp); $res = strptime($str, '%H:%M:%S %p %B %d %Y %Z'); var_dump($res["tm_sec"]); diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index e1469c37e8..232a0a6f71 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : basic functionality - ensure all base64 alphabet --FILE-- 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // array data "array()" => array(), "array(0)" => array(0), "array(1)" => array(1), "array(1, 2)" => array(1, 2), "array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'), - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "stdClass object" => new stdclass(), - + // undefined data "undefined variable" => $undefined_var, - + // unset data "unset variable" => $unset_var, - + // resource data "resource" => $file_handle ); @@ -79,12 +79,12 @@ $values = array ( foreach($values as $key=>$value) { echo "\n-- Arg value $key --\n"; $output = base64_decode($value, $strict); - - if (is_string($output)) { + + if (is_string($output)) { var_dump(bin2hex($output)); } else { - var_dump($output); - } + var_dump($output); + } }; ?> diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt index 20bf35746b..6b4628d3bf 100644 --- a/ext/standard/tests/url/base64_decode_variation_002.phpt +++ b/ext/standard/tests/url/base64_decode_variation_002.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : usage variations - unexpected types for arg 2 --FILE-- 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // array data "array()" => array(), "array(0)" => array(0), "array(1)" => array(1), "array(1, 2)" => array(1, 2), "array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'), - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "stdClass object" => new stdclass(), - + // undefined data "undefined variable" => $undefined_var, - + // unset data "unset variable" => $unset_var, - + // resource data "resource" => $file_handle ); diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index 6ab57f4c55..c3cbf12c55 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test base64_encode() function : basic functionality +Test base64_encode() function : basic functionality --FILE--