From e43074a1d8ad5834af46a2cdddfb5ea10481e6b1 Mon Sep 17 00:00:00 2001 From: Alexandre Daubois <2144837+alexandre-daubois@users.noreply.github.com> Date: Thu, 31 Jul 2025 20:58:01 +0200 Subject: [PATCH] Rename poorly named tests in `Zend/tests` (#19332) And move some into their relevant folders --- Zend/tests/014.inc | 3 --- .../{022.phpt => abstract_method_optional_params.phpt} | 0 Zend/tests/{032.phpt => array_append_by_reference.phpt} | 0 Zend/tests/{031.phpt => array_append_reading_error.phpt} | 0 Zend/tests/{029.phpt => assign_array_object_property.phpt} | 0 Zend/tests/{026.phpt => assign_property_null_object.phpt} | 0 Zend/tests/{017.phpt => builtin_functions_basic.phpt} | 0 Zend/tests/{012.phpt => class_exists_basic.phpt} | 0 .../{038.phpt => closures/closure_array_key_error.phpt} | 0 .../{036.phpt => closures/closure_array_offset_error.phpt} | 0 .../closure_static_property_error.phpt} | 0 .../{025.phpt => dynamic_call/dynamic_method_calls.phpt} | 0 .../variable_variables_curly_syntax.phpt} | 0 .../variable_variables_function_names.phpt} | 0 Zend/tests/{002.phpt => func_get_arg_basic.phpt} | 2 +- Zend/tests/{020.phpt => func_get_arg_invalid.phpt} | 0 Zend/tests/{003.phpt => func_get_args_basic.phpt} | 4 ++-- Zend/tests/{001.phpt => func_num_args_basic.phpt} | 0 Zend/tests/{028.phpt => function_call_array_item.phpt} | 0 Zend/tests/{009.phpt => get_class_basic.phpt} | 0 Zend/tests/get_included_files_basic.inc | 3 +++ Zend/tests/{014.phpt => get_included_files_basic.phpt} | 6 +++--- Zend/tests/{010.phpt => get_parent_class_basic.phpt} | 0 Zend/tests/{013.phpt => interface_exists_basic.phpt} | 0 Zend/tests/{016.phpt => isset_non_object.phpt} | 0 Zend/tests/{011.phpt => property_exists_basic.phpt} | 0 Zend/tests/{035.phpt => static_global_scope.phpt} | 0 Zend/tests/{005.phpt => strcasecmp_basic.phpt} | 0 Zend/tests/{006.phpt => strncasecmp_basic.phpt} | 0 Zend/tests/{004.phpt => strncmp_basic.phpt} | 0 Zend/tests/{021.phpt => ternary_operator_basic.phpt} | 0 Zend/tests/{015.phpt => trigger_error_basic.phpt} | 0 .../{033.phpt => undefined_multidimensional_array.phpt} | 0 .../tests/{024.phpt => undefined_variables_operations.phpt} | 0 .../{019.phpt => unset_empty_isset_comprehensive.phpt} | 0 35 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 Zend/tests/014.inc rename Zend/tests/{022.phpt => abstract_method_optional_params.phpt} (100%) rename Zend/tests/{032.phpt => array_append_by_reference.phpt} (100%) rename Zend/tests/{031.phpt => array_append_reading_error.phpt} (100%) rename Zend/tests/{029.phpt => assign_array_object_property.phpt} (100%) rename Zend/tests/{026.phpt => assign_property_null_object.phpt} (100%) rename Zend/tests/{017.phpt => builtin_functions_basic.phpt} (100%) rename Zend/tests/{012.phpt => class_exists_basic.phpt} (100%) rename Zend/tests/{038.phpt => closures/closure_array_key_error.phpt} (100%) rename Zend/tests/{036.phpt => closures/closure_array_offset_error.phpt} (100%) rename Zend/tests/{037.phpt => closures/closure_static_property_error.phpt} (100%) rename Zend/tests/{025.phpt => dynamic_call/dynamic_method_calls.phpt} (100%) rename Zend/tests/{027.phpt => dynamic_call/variable_variables_curly_syntax.phpt} (100%) rename Zend/tests/{023.phpt => dynamic_call/variable_variables_function_names.phpt} (100%) rename Zend/tests/{002.phpt => func_get_arg_basic.phpt} (98%) rename Zend/tests/{020.phpt => func_get_arg_invalid.phpt} (100%) rename Zend/tests/{003.phpt => func_get_args_basic.phpt} (93%) rename Zend/tests/{001.phpt => func_num_args_basic.phpt} (100%) rename Zend/tests/{028.phpt => function_call_array_item.phpt} (100%) rename Zend/tests/{009.phpt => get_class_basic.phpt} (100%) create mode 100644 Zend/tests/get_included_files_basic.inc rename Zend/tests/{014.phpt => get_included_files_basic.phpt} (74%) rename Zend/tests/{010.phpt => get_parent_class_basic.phpt} (100%) rename Zend/tests/{013.phpt => interface_exists_basic.phpt} (100%) rename Zend/tests/{016.phpt => isset_non_object.phpt} (100%) rename Zend/tests/{011.phpt => property_exists_basic.phpt} (100%) rename Zend/tests/{035.phpt => static_global_scope.phpt} (100%) rename Zend/tests/{005.phpt => strcasecmp_basic.phpt} (100%) rename Zend/tests/{006.phpt => strncasecmp_basic.phpt} (100%) rename Zend/tests/{004.phpt => strncmp_basic.phpt} (100%) rename Zend/tests/{021.phpt => ternary_operator_basic.phpt} (100%) rename Zend/tests/{015.phpt => trigger_error_basic.phpt} (100%) rename Zend/tests/{033.phpt => undefined_multidimensional_array.phpt} (100%) rename Zend/tests/{024.phpt => undefined_variables_operations.phpt} (100%) rename Zend/tests/{019.phpt => unset_empty_isset_comprehensive.phpt} (100%) diff --git a/Zend/tests/014.inc b/Zend/tests/014.inc deleted file mode 100644 index 69c9bc07902..00000000000 --- a/Zend/tests/014.inc +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/Zend/tests/022.phpt b/Zend/tests/abstract_method_optional_params.phpt similarity index 100% rename from Zend/tests/022.phpt rename to Zend/tests/abstract_method_optional_params.phpt diff --git a/Zend/tests/032.phpt b/Zend/tests/array_append_by_reference.phpt similarity index 100% rename from Zend/tests/032.phpt rename to Zend/tests/array_append_by_reference.phpt diff --git a/Zend/tests/031.phpt b/Zend/tests/array_append_reading_error.phpt similarity index 100% rename from Zend/tests/031.phpt rename to Zend/tests/array_append_reading_error.phpt diff --git a/Zend/tests/029.phpt b/Zend/tests/assign_array_object_property.phpt similarity index 100% rename from Zend/tests/029.phpt rename to Zend/tests/assign_array_object_property.phpt diff --git a/Zend/tests/026.phpt b/Zend/tests/assign_property_null_object.phpt similarity index 100% rename from Zend/tests/026.phpt rename to Zend/tests/assign_property_null_object.phpt diff --git a/Zend/tests/017.phpt b/Zend/tests/builtin_functions_basic.phpt similarity index 100% rename from Zend/tests/017.phpt rename to Zend/tests/builtin_functions_basic.phpt diff --git a/Zend/tests/012.phpt b/Zend/tests/class_exists_basic.phpt similarity index 100% rename from Zend/tests/012.phpt rename to Zend/tests/class_exists_basic.phpt diff --git a/Zend/tests/038.phpt b/Zend/tests/closures/closure_array_key_error.phpt similarity index 100% rename from Zend/tests/038.phpt rename to Zend/tests/closures/closure_array_key_error.phpt diff --git a/Zend/tests/036.phpt b/Zend/tests/closures/closure_array_offset_error.phpt similarity index 100% rename from Zend/tests/036.phpt rename to Zend/tests/closures/closure_array_offset_error.phpt diff --git a/Zend/tests/037.phpt b/Zend/tests/closures/closure_static_property_error.phpt similarity index 100% rename from Zend/tests/037.phpt rename to Zend/tests/closures/closure_static_property_error.phpt diff --git a/Zend/tests/025.phpt b/Zend/tests/dynamic_call/dynamic_method_calls.phpt similarity index 100% rename from Zend/tests/025.phpt rename to Zend/tests/dynamic_call/dynamic_method_calls.phpt diff --git a/Zend/tests/027.phpt b/Zend/tests/dynamic_call/variable_variables_curly_syntax.phpt similarity index 100% rename from Zend/tests/027.phpt rename to Zend/tests/dynamic_call/variable_variables_curly_syntax.phpt diff --git a/Zend/tests/023.phpt b/Zend/tests/dynamic_call/variable_variables_function_names.phpt similarity index 100% rename from Zend/tests/023.phpt rename to Zend/tests/dynamic_call/variable_variables_function_names.phpt diff --git a/Zend/tests/002.phpt b/Zend/tests/func_get_arg_basic.phpt similarity index 98% rename from Zend/tests/002.phpt rename to Zend/tests/func_get_arg_basic.phpt index 7c2ff7b4d38..ec06a5c20f4 100644 --- a/Zend/tests/002.phpt +++ b/Zend/tests/func_get_arg_basic.phpt @@ -104,7 +104,7 @@ int(10) func_get_arg(): Argument #1 ($position) must be less than the number of the arguments passed to the currently executed function int(1) func_get_arg(): Argument #1 ($position) must be less than the number of the arguments passed to the currently executed function -Exception: Too few arguments to function test2(), 0 passed in %s002.php on line %d and exactly 1 expected +Exception: Too few arguments to function test2(), 0 passed in %s on line %d and exactly 1 expected int(1) int(2) func_get_arg(): Argument #1 ($position) must be less than the number of the arguments passed to the currently executed function diff --git a/Zend/tests/020.phpt b/Zend/tests/func_get_arg_invalid.phpt similarity index 100% rename from Zend/tests/020.phpt rename to Zend/tests/func_get_arg_invalid.phpt diff --git a/Zend/tests/003.phpt b/Zend/tests/func_get_args_basic.phpt similarity index 93% rename from Zend/tests/003.phpt rename to Zend/tests/func_get_args_basic.phpt index 3931628e9a9..54ddf1b40c9 100644 --- a/Zend/tests/003.phpt +++ b/Zend/tests/func_get_args_basic.phpt @@ -59,7 +59,7 @@ array(1) { [0]=> int(1) } -Exception: Too few arguments to function test2(), 0 passed in %s003.php on line %d and exactly 1 expected +Exception: Too few arguments to function test2(), 0 passed in %s on line %d and exactly 1 expected array(2) { [0]=> int(1) @@ -68,7 +68,7 @@ array(2) { } array(0) { } -Exception: Too few arguments to function test3(), 1 passed in %s003.php on line %d and exactly 2 expected +Exception: Too few arguments to function test3(), 1 passed in %s on line %d and exactly 2 expected array(2) { [0]=> int(1) diff --git a/Zend/tests/001.phpt b/Zend/tests/func_num_args_basic.phpt similarity index 100% rename from Zend/tests/001.phpt rename to Zend/tests/func_num_args_basic.phpt diff --git a/Zend/tests/028.phpt b/Zend/tests/function_call_array_item.phpt similarity index 100% rename from Zend/tests/028.phpt rename to Zend/tests/function_call_array_item.phpt diff --git a/Zend/tests/009.phpt b/Zend/tests/get_class_basic.phpt similarity index 100% rename from Zend/tests/009.phpt rename to Zend/tests/get_class_basic.phpt diff --git a/Zend/tests/get_included_files_basic.inc b/Zend/tests/get_included_files_basic.inc new file mode 100644 index 00000000000..406acaee6e4 --- /dev/null +++ b/Zend/tests/get_included_files_basic.inc @@ -0,0 +1,3 @@ + diff --git a/Zend/tests/014.phpt b/Zend/tests/get_included_files_basic.phpt similarity index 74% rename from Zend/tests/014.phpt rename to Zend/tests/get_included_files_basic.phpt index c02fee93856..be595a59262 100644 --- a/Zend/tests/014.phpt +++ b/Zend/tests/get_included_files_basic.phpt @@ -5,13 +5,13 @@ get_included_files() tests var_dump(get_included_files()); -include(__DIR__."/014.inc"); +include(__DIR__."/get_included_files_basic.inc"); var_dump(get_included_files()); -include_once(__DIR__."/014.inc"); +include_once(__DIR__."/get_included_files_basic.inc"); var_dump(get_included_files()); -include(__DIR__."/014.inc"); +include(__DIR__."/get_included_files_basic.inc"); var_dump(get_included_files()); echo "Done\n"; diff --git a/Zend/tests/010.phpt b/Zend/tests/get_parent_class_basic.phpt similarity index 100% rename from Zend/tests/010.phpt rename to Zend/tests/get_parent_class_basic.phpt diff --git a/Zend/tests/013.phpt b/Zend/tests/interface_exists_basic.phpt similarity index 100% rename from Zend/tests/013.phpt rename to Zend/tests/interface_exists_basic.phpt diff --git a/Zend/tests/016.phpt b/Zend/tests/isset_non_object.phpt similarity index 100% rename from Zend/tests/016.phpt rename to Zend/tests/isset_non_object.phpt diff --git a/Zend/tests/011.phpt b/Zend/tests/property_exists_basic.phpt similarity index 100% rename from Zend/tests/011.phpt rename to Zend/tests/property_exists_basic.phpt diff --git a/Zend/tests/035.phpt b/Zend/tests/static_global_scope.phpt similarity index 100% rename from Zend/tests/035.phpt rename to Zend/tests/static_global_scope.phpt diff --git a/Zend/tests/005.phpt b/Zend/tests/strcasecmp_basic.phpt similarity index 100% rename from Zend/tests/005.phpt rename to Zend/tests/strcasecmp_basic.phpt diff --git a/Zend/tests/006.phpt b/Zend/tests/strncasecmp_basic.phpt similarity index 100% rename from Zend/tests/006.phpt rename to Zend/tests/strncasecmp_basic.phpt diff --git a/Zend/tests/004.phpt b/Zend/tests/strncmp_basic.phpt similarity index 100% rename from Zend/tests/004.phpt rename to Zend/tests/strncmp_basic.phpt diff --git a/Zend/tests/021.phpt b/Zend/tests/ternary_operator_basic.phpt similarity index 100% rename from Zend/tests/021.phpt rename to Zend/tests/ternary_operator_basic.phpt diff --git a/Zend/tests/015.phpt b/Zend/tests/trigger_error_basic.phpt similarity index 100% rename from Zend/tests/015.phpt rename to Zend/tests/trigger_error_basic.phpt diff --git a/Zend/tests/033.phpt b/Zend/tests/undefined_multidimensional_array.phpt similarity index 100% rename from Zend/tests/033.phpt rename to Zend/tests/undefined_multidimensional_array.phpt diff --git a/Zend/tests/024.phpt b/Zend/tests/undefined_variables_operations.phpt similarity index 100% rename from Zend/tests/024.phpt rename to Zend/tests/undefined_variables_operations.phpt diff --git a/Zend/tests/019.phpt b/Zend/tests/unset_empty_isset_comprehensive.phpt similarity index 100% rename from Zend/tests/019.phpt rename to Zend/tests/unset_empty_isset_comprehensive.phpt