From ba392036813bff4e17ff4834a5374f9eff19b462 Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Fri, 14 Feb 2025 23:06:02 -0800 Subject: [PATCH] Zend/tests: organize some tests with sub directories (6) Move more tests into existing directories Work towards GH-15631 --- Zend/tests/{ => ArrayAccess}/ArrayAccess_indirect_append.phpt | 0 Zend/tests/{ => anon}/anon_class_name.phpt | 0 Zend/tests/{ => attributes}/allow_dynamic_properties_on_enum.phpt | 0 .../{ => attributes}/allow_dynamic_properties_on_interface.phpt | 0 .../tests/{ => attributes}/allow_dynamic_properties_on_trait.phpt | 0 Zend/tests/{ => clone}/clone_001.phpt | 0 Zend/tests/{ => clone}/clone_002.phpt | 0 Zend/tests/{ => clone}/clone_003.phpt | 0 Zend/tests/{ => clone}/clone_004.phpt | 0 .../{ => closures}/closure_bindTo_preserves_used_variables.phpt | 0 Zend/tests/{ => closures}/closure_bug66622.phpt | 0 Zend/tests/{ => closures}/closure_call.phpt | 0 Zend/tests/{ => closures}/closure_call_bind.phpt | 0 Zend/tests/{ => closures}/closure_call_internal.phpt | 0 Zend/tests/{ => closures}/closure_call_leak_with_exception.phpt | 0 Zend/tests/{ => closures}/closure_compare.phpt | 0 Zend/tests/{ => closures}/closure_const_expr/attributes.phpt | 0 .../closure_const_expr/attributes_ast_printing.phpt | 0 .../closure_const_expr/attributes_ast_printing_runtime.phpt | 0 .../{ => closures}/closure_const_expr/attributes_scope_001.phpt | 0 .../{ => closures}/closure_const_expr/attributes_scope_002.phpt | 0 Zend/tests/{ => closures}/closure_const_expr/basic.phpt | 0 Zend/tests/{ => closures}/closure_const_expr/class_const.phpt | 0 Zend/tests/{ => closures}/closure_const_expr/complex_array.phpt | 0 Zend/tests/{ => closures}/closure_const_expr/complex_new.phpt | 0 Zend/tests/{ => closures}/closure_const_expr/default_args.phpt | 0 .../{ => closures}/closure_const_expr/disallows_non_static.phpt | 0 .../closure_const_expr/disallows_using_variables.phpt | 0 .../{ => closures}/closure_const_expr/property_initializer.phpt | 0 .../closure_const_expr/property_initializer_scope_001.phpt | 0 .../closure_const_expr/property_initializer_scope_002.phpt | 0 .../{ => closures}/closure_const_expr/static_initalizer.phpt | 0 .../closure_const_expr/static_property_initializer.phpt | 0 Zend/tests/{ => closures}/closure_extra_args.phpt | 0 Zend/tests/{ => closures}/closure_invoke_case_insensitive.phpt | 0 Zend/tests/{ => closures}/closure_invoke_ref_warning.phpt | 0 Zend/tests/{ => closures}/closure_use_auto_global.phpt | 0 Zend/tests/{ => closures}/closure_use_parameter_name.phpt | 0 Zend/tests/{ => closures}/closure_use_trailing_comma.phpt | 0 Zend/tests/{ => closures}/closure_use_variable_twice.phpt | 0 Zend/tests/{ => closures}/closure_write_prop.phpt | 0 .../class_on_expression_in_constant_expression.phpt | 0 .../{ => constants}/class_constant_inheritance_mutable_data.phpt | 0 .../tests/{ => constants}/class_constant_to_reference_cached.phpt | 0 Zend/tests/{ => constants}/class_constants_001.phpt | 0 Zend/tests/{ => constants}/class_constants_002.phpt | 0 Zend/tests/{ => constants}/class_constants_003.phpt | 0 Zend/tests/{ => constants}/class_constants_004.phpt | 0 Zend/tests/{ => constants}/class_constants_005.phpt | 0 Zend/tests/{ => constants}/class_constants_006.phpt | 0 Zend/tests/{ => constants}/class_constants_007.phpt | 0 Zend/tests/{ => constants}/constants_001.phpt | 0 Zend/tests/{ => constants}/constants_002.phpt | 0 Zend/tests/{ => constants}/constants_003.phpt | 0 Zend/tests/{ => constants}/constants_004.phpt | 0 Zend/tests/{ => constants}/constants_005.phpt | 0 Zend/tests/{ => constants}/constants_006.phpt | 0 Zend/tests/{ => constants}/constants_007.phpt | 0 Zend/tests/{ => constants}/constants_008.phpt | 0 Zend/tests/{ => constants}/constants_009.phpt | 0 Zend/tests/{ => constants}/dynamic_class_const_fetch.phpt | 0 .../{ => constants}/dynamic_class_const_fetch_cache_slot.phpt | 0 .../{ => constants}/dynamic_class_const_fetch_const_expr.phpt | 0 Zend/tests/{ => constants}/dynamic_class_const_fetch_order.phpt | 0 .../tests/{ => constants}/iface_constant_visibility_variance.phpt | 0 Zend/tests/{ => constants}/line_const_in_array.phpt | 0 Zend/tests/{ => constants}/magic_const_in_global_scope.phpt | 0 Zend/tests/{ => foreach}/goto_in_foreach.phpt | 0 Zend/tests/{ => function_arguments}/function_arguments_001.phpt | 0 Zend/tests/{ => function_arguments}/function_arguments_002.phpt | 0 Zend/tests/{ => function_arguments}/function_arguments_003.phpt | 0 .../class_toString_concat_non_interned_with_itself.phpt | 0 .../{ => magic_methods}/class_toString_concat_with_itself.phpt | 0 Zend/tests/{ => magic_methods}/constructor_args.phpt | 0 Zend/tests/{ => magic_methods}/dtor_scope.phpt | 0 Zend/tests/{ => magic_methods}/interface_with_tostring.phpt | 0 Zend/tests/{ => switch}/continue_targeting_switch_warning.phpt | 0 Zend/tests/{ => traits}/static_in_trait_insteadof_list.phpt | 0 Zend/tests/{ => traits}/static_in_trait_insteadof_reference.phpt | 0 Zend/tests/{ => traits}/trait_exists_001.phpt | 0 Zend/tests/{ => traits}/trait_exists_002.phpt | 0 Zend/tests/{ => traits}/trait_exists_003.phpt | 0 Zend/tests/{ => traits}/trait_type_errors.phpt | 0 83 files changed, 0 insertions(+), 0 deletions(-) rename Zend/tests/{ => ArrayAccess}/ArrayAccess_indirect_append.phpt (100%) rename Zend/tests/{ => anon}/anon_class_name.phpt (100%) rename Zend/tests/{ => attributes}/allow_dynamic_properties_on_enum.phpt (100%) rename Zend/tests/{ => attributes}/allow_dynamic_properties_on_interface.phpt (100%) rename Zend/tests/{ => attributes}/allow_dynamic_properties_on_trait.phpt (100%) rename Zend/tests/{ => clone}/clone_001.phpt (100%) rename Zend/tests/{ => clone}/clone_002.phpt (100%) rename Zend/tests/{ => clone}/clone_003.phpt (100%) rename Zend/tests/{ => clone}/clone_004.phpt (100%) rename Zend/tests/{ => closures}/closure_bindTo_preserves_used_variables.phpt (100%) rename Zend/tests/{ => closures}/closure_bug66622.phpt (100%) rename Zend/tests/{ => closures}/closure_call.phpt (100%) rename Zend/tests/{ => closures}/closure_call_bind.phpt (100%) rename Zend/tests/{ => closures}/closure_call_internal.phpt (100%) rename Zend/tests/{ => closures}/closure_call_leak_with_exception.phpt (100%) rename Zend/tests/{ => closures}/closure_compare.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/attributes.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/attributes_ast_printing.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/attributes_ast_printing_runtime.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/attributes_scope_001.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/attributes_scope_002.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/basic.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/class_const.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/complex_array.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/complex_new.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/default_args.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/disallows_non_static.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/disallows_using_variables.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/property_initializer.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/property_initializer_scope_001.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/property_initializer_scope_002.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/static_initalizer.phpt (100%) rename Zend/tests/{ => closures}/closure_const_expr/static_property_initializer.phpt (100%) rename Zend/tests/{ => closures}/closure_extra_args.phpt (100%) rename Zend/tests/{ => closures}/closure_invoke_case_insensitive.phpt (100%) rename Zend/tests/{ => closures}/closure_invoke_ref_warning.phpt (100%) rename Zend/tests/{ => closures}/closure_use_auto_global.phpt (100%) rename Zend/tests/{ => closures}/closure_use_parameter_name.phpt (100%) rename Zend/tests/{ => closures}/closure_use_trailing_comma.phpt (100%) rename Zend/tests/{ => closures}/closure_use_variable_twice.phpt (100%) rename Zend/tests/{ => closures}/closure_write_prop.phpt (100%) rename Zend/tests/{ => constant_expressions}/class_on_expression_in_constant_expression.phpt (100%) rename Zend/tests/{ => constants}/class_constant_inheritance_mutable_data.phpt (100%) rename Zend/tests/{ => constants}/class_constant_to_reference_cached.phpt (100%) rename Zend/tests/{ => constants}/class_constants_001.phpt (100%) rename Zend/tests/{ => constants}/class_constants_002.phpt (100%) rename Zend/tests/{ => constants}/class_constants_003.phpt (100%) rename Zend/tests/{ => constants}/class_constants_004.phpt (100%) rename Zend/tests/{ => constants}/class_constants_005.phpt (100%) rename Zend/tests/{ => constants}/class_constants_006.phpt (100%) rename Zend/tests/{ => constants}/class_constants_007.phpt (100%) rename Zend/tests/{ => constants}/constants_001.phpt (100%) rename Zend/tests/{ => constants}/constants_002.phpt (100%) rename Zend/tests/{ => constants}/constants_003.phpt (100%) rename Zend/tests/{ => constants}/constants_004.phpt (100%) rename Zend/tests/{ => constants}/constants_005.phpt (100%) rename Zend/tests/{ => constants}/constants_006.phpt (100%) rename Zend/tests/{ => constants}/constants_007.phpt (100%) rename Zend/tests/{ => constants}/constants_008.phpt (100%) rename Zend/tests/{ => constants}/constants_009.phpt (100%) rename Zend/tests/{ => constants}/dynamic_class_const_fetch.phpt (100%) rename Zend/tests/{ => constants}/dynamic_class_const_fetch_cache_slot.phpt (100%) rename Zend/tests/{ => constants}/dynamic_class_const_fetch_const_expr.phpt (100%) rename Zend/tests/{ => constants}/dynamic_class_const_fetch_order.phpt (100%) rename Zend/tests/{ => constants}/iface_constant_visibility_variance.phpt (100%) rename Zend/tests/{ => constants}/line_const_in_array.phpt (100%) rename Zend/tests/{ => constants}/magic_const_in_global_scope.phpt (100%) rename Zend/tests/{ => foreach}/goto_in_foreach.phpt (100%) rename Zend/tests/{ => function_arguments}/function_arguments_001.phpt (100%) rename Zend/tests/{ => function_arguments}/function_arguments_002.phpt (100%) rename Zend/tests/{ => function_arguments}/function_arguments_003.phpt (100%) rename Zend/tests/{ => magic_methods}/class_toString_concat_non_interned_with_itself.phpt (100%) rename Zend/tests/{ => magic_methods}/class_toString_concat_with_itself.phpt (100%) rename Zend/tests/{ => magic_methods}/constructor_args.phpt (100%) rename Zend/tests/{ => magic_methods}/dtor_scope.phpt (100%) rename Zend/tests/{ => magic_methods}/interface_with_tostring.phpt (100%) rename Zend/tests/{ => switch}/continue_targeting_switch_warning.phpt (100%) rename Zend/tests/{ => traits}/static_in_trait_insteadof_list.phpt (100%) rename Zend/tests/{ => traits}/static_in_trait_insteadof_reference.phpt (100%) rename Zend/tests/{ => traits}/trait_exists_001.phpt (100%) rename Zend/tests/{ => traits}/trait_exists_002.phpt (100%) rename Zend/tests/{ => traits}/trait_exists_003.phpt (100%) rename Zend/tests/{ => traits}/trait_type_errors.phpt (100%) diff --git a/Zend/tests/ArrayAccess_indirect_append.phpt b/Zend/tests/ArrayAccess/ArrayAccess_indirect_append.phpt similarity index 100% rename from Zend/tests/ArrayAccess_indirect_append.phpt rename to Zend/tests/ArrayAccess/ArrayAccess_indirect_append.phpt diff --git a/Zend/tests/anon_class_name.phpt b/Zend/tests/anon/anon_class_name.phpt similarity index 100% rename from Zend/tests/anon_class_name.phpt rename to Zend/tests/anon/anon_class_name.phpt diff --git a/Zend/tests/allow_dynamic_properties_on_enum.phpt b/Zend/tests/attributes/allow_dynamic_properties_on_enum.phpt similarity index 100% rename from Zend/tests/allow_dynamic_properties_on_enum.phpt rename to Zend/tests/attributes/allow_dynamic_properties_on_enum.phpt diff --git a/Zend/tests/allow_dynamic_properties_on_interface.phpt b/Zend/tests/attributes/allow_dynamic_properties_on_interface.phpt similarity index 100% rename from Zend/tests/allow_dynamic_properties_on_interface.phpt rename to Zend/tests/attributes/allow_dynamic_properties_on_interface.phpt diff --git a/Zend/tests/allow_dynamic_properties_on_trait.phpt b/Zend/tests/attributes/allow_dynamic_properties_on_trait.phpt similarity index 100% rename from Zend/tests/allow_dynamic_properties_on_trait.phpt rename to Zend/tests/attributes/allow_dynamic_properties_on_trait.phpt diff --git a/Zend/tests/clone_001.phpt b/Zend/tests/clone/clone_001.phpt similarity index 100% rename from Zend/tests/clone_001.phpt rename to Zend/tests/clone/clone_001.phpt diff --git a/Zend/tests/clone_002.phpt b/Zend/tests/clone/clone_002.phpt similarity index 100% rename from Zend/tests/clone_002.phpt rename to Zend/tests/clone/clone_002.phpt diff --git a/Zend/tests/clone_003.phpt b/Zend/tests/clone/clone_003.phpt similarity index 100% rename from Zend/tests/clone_003.phpt rename to Zend/tests/clone/clone_003.phpt diff --git a/Zend/tests/clone_004.phpt b/Zend/tests/clone/clone_004.phpt similarity index 100% rename from Zend/tests/clone_004.phpt rename to Zend/tests/clone/clone_004.phpt diff --git a/Zend/tests/closure_bindTo_preserves_used_variables.phpt b/Zend/tests/closures/closure_bindTo_preserves_used_variables.phpt similarity index 100% rename from Zend/tests/closure_bindTo_preserves_used_variables.phpt rename to Zend/tests/closures/closure_bindTo_preserves_used_variables.phpt diff --git a/Zend/tests/closure_bug66622.phpt b/Zend/tests/closures/closure_bug66622.phpt similarity index 100% rename from Zend/tests/closure_bug66622.phpt rename to Zend/tests/closures/closure_bug66622.phpt diff --git a/Zend/tests/closure_call.phpt b/Zend/tests/closures/closure_call.phpt similarity index 100% rename from Zend/tests/closure_call.phpt rename to Zend/tests/closures/closure_call.phpt diff --git a/Zend/tests/closure_call_bind.phpt b/Zend/tests/closures/closure_call_bind.phpt similarity index 100% rename from Zend/tests/closure_call_bind.phpt rename to Zend/tests/closures/closure_call_bind.phpt diff --git a/Zend/tests/closure_call_internal.phpt b/Zend/tests/closures/closure_call_internal.phpt similarity index 100% rename from Zend/tests/closure_call_internal.phpt rename to Zend/tests/closures/closure_call_internal.phpt diff --git a/Zend/tests/closure_call_leak_with_exception.phpt b/Zend/tests/closures/closure_call_leak_with_exception.phpt similarity index 100% rename from Zend/tests/closure_call_leak_with_exception.phpt rename to Zend/tests/closures/closure_call_leak_with_exception.phpt diff --git a/Zend/tests/closure_compare.phpt b/Zend/tests/closures/closure_compare.phpt similarity index 100% rename from Zend/tests/closure_compare.phpt rename to Zend/tests/closures/closure_compare.phpt diff --git a/Zend/tests/closure_const_expr/attributes.phpt b/Zend/tests/closures/closure_const_expr/attributes.phpt similarity index 100% rename from Zend/tests/closure_const_expr/attributes.phpt rename to Zend/tests/closures/closure_const_expr/attributes.phpt diff --git a/Zend/tests/closure_const_expr/attributes_ast_printing.phpt b/Zend/tests/closures/closure_const_expr/attributes_ast_printing.phpt similarity index 100% rename from Zend/tests/closure_const_expr/attributes_ast_printing.phpt rename to Zend/tests/closures/closure_const_expr/attributes_ast_printing.phpt diff --git a/Zend/tests/closure_const_expr/attributes_ast_printing_runtime.phpt b/Zend/tests/closures/closure_const_expr/attributes_ast_printing_runtime.phpt similarity index 100% rename from Zend/tests/closure_const_expr/attributes_ast_printing_runtime.phpt rename to Zend/tests/closures/closure_const_expr/attributes_ast_printing_runtime.phpt diff --git a/Zend/tests/closure_const_expr/attributes_scope_001.phpt b/Zend/tests/closures/closure_const_expr/attributes_scope_001.phpt similarity index 100% rename from Zend/tests/closure_const_expr/attributes_scope_001.phpt rename to Zend/tests/closures/closure_const_expr/attributes_scope_001.phpt diff --git a/Zend/tests/closure_const_expr/attributes_scope_002.phpt b/Zend/tests/closures/closure_const_expr/attributes_scope_002.phpt similarity index 100% rename from Zend/tests/closure_const_expr/attributes_scope_002.phpt rename to Zend/tests/closures/closure_const_expr/attributes_scope_002.phpt diff --git a/Zend/tests/closure_const_expr/basic.phpt b/Zend/tests/closures/closure_const_expr/basic.phpt similarity index 100% rename from Zend/tests/closure_const_expr/basic.phpt rename to Zend/tests/closures/closure_const_expr/basic.phpt diff --git a/Zend/tests/closure_const_expr/class_const.phpt b/Zend/tests/closures/closure_const_expr/class_const.phpt similarity index 100% rename from Zend/tests/closure_const_expr/class_const.phpt rename to Zend/tests/closures/closure_const_expr/class_const.phpt diff --git a/Zend/tests/closure_const_expr/complex_array.phpt b/Zend/tests/closures/closure_const_expr/complex_array.phpt similarity index 100% rename from Zend/tests/closure_const_expr/complex_array.phpt rename to Zend/tests/closures/closure_const_expr/complex_array.phpt diff --git a/Zend/tests/closure_const_expr/complex_new.phpt b/Zend/tests/closures/closure_const_expr/complex_new.phpt similarity index 100% rename from Zend/tests/closure_const_expr/complex_new.phpt rename to Zend/tests/closures/closure_const_expr/complex_new.phpt diff --git a/Zend/tests/closure_const_expr/default_args.phpt b/Zend/tests/closures/closure_const_expr/default_args.phpt similarity index 100% rename from Zend/tests/closure_const_expr/default_args.phpt rename to Zend/tests/closures/closure_const_expr/default_args.phpt diff --git a/Zend/tests/closure_const_expr/disallows_non_static.phpt b/Zend/tests/closures/closure_const_expr/disallows_non_static.phpt similarity index 100% rename from Zend/tests/closure_const_expr/disallows_non_static.phpt rename to Zend/tests/closures/closure_const_expr/disallows_non_static.phpt diff --git a/Zend/tests/closure_const_expr/disallows_using_variables.phpt b/Zend/tests/closures/closure_const_expr/disallows_using_variables.phpt similarity index 100% rename from Zend/tests/closure_const_expr/disallows_using_variables.phpt rename to Zend/tests/closures/closure_const_expr/disallows_using_variables.phpt diff --git a/Zend/tests/closure_const_expr/property_initializer.phpt b/Zend/tests/closures/closure_const_expr/property_initializer.phpt similarity index 100% rename from Zend/tests/closure_const_expr/property_initializer.phpt rename to Zend/tests/closures/closure_const_expr/property_initializer.phpt diff --git a/Zend/tests/closure_const_expr/property_initializer_scope_001.phpt b/Zend/tests/closures/closure_const_expr/property_initializer_scope_001.phpt similarity index 100% rename from Zend/tests/closure_const_expr/property_initializer_scope_001.phpt rename to Zend/tests/closures/closure_const_expr/property_initializer_scope_001.phpt diff --git a/Zend/tests/closure_const_expr/property_initializer_scope_002.phpt b/Zend/tests/closures/closure_const_expr/property_initializer_scope_002.phpt similarity index 100% rename from Zend/tests/closure_const_expr/property_initializer_scope_002.phpt rename to Zend/tests/closures/closure_const_expr/property_initializer_scope_002.phpt diff --git a/Zend/tests/closure_const_expr/static_initalizer.phpt b/Zend/tests/closures/closure_const_expr/static_initalizer.phpt similarity index 100% rename from Zend/tests/closure_const_expr/static_initalizer.phpt rename to Zend/tests/closures/closure_const_expr/static_initalizer.phpt diff --git a/Zend/tests/closure_const_expr/static_property_initializer.phpt b/Zend/tests/closures/closure_const_expr/static_property_initializer.phpt similarity index 100% rename from Zend/tests/closure_const_expr/static_property_initializer.phpt rename to Zend/tests/closures/closure_const_expr/static_property_initializer.phpt diff --git a/Zend/tests/closure_extra_args.phpt b/Zend/tests/closures/closure_extra_args.phpt similarity index 100% rename from Zend/tests/closure_extra_args.phpt rename to Zend/tests/closures/closure_extra_args.phpt diff --git a/Zend/tests/closure_invoke_case_insensitive.phpt b/Zend/tests/closures/closure_invoke_case_insensitive.phpt similarity index 100% rename from Zend/tests/closure_invoke_case_insensitive.phpt rename to Zend/tests/closures/closure_invoke_case_insensitive.phpt diff --git a/Zend/tests/closure_invoke_ref_warning.phpt b/Zend/tests/closures/closure_invoke_ref_warning.phpt similarity index 100% rename from Zend/tests/closure_invoke_ref_warning.phpt rename to Zend/tests/closures/closure_invoke_ref_warning.phpt diff --git a/Zend/tests/closure_use_auto_global.phpt b/Zend/tests/closures/closure_use_auto_global.phpt similarity index 100% rename from Zend/tests/closure_use_auto_global.phpt rename to Zend/tests/closures/closure_use_auto_global.phpt diff --git a/Zend/tests/closure_use_parameter_name.phpt b/Zend/tests/closures/closure_use_parameter_name.phpt similarity index 100% rename from Zend/tests/closure_use_parameter_name.phpt rename to Zend/tests/closures/closure_use_parameter_name.phpt diff --git a/Zend/tests/closure_use_trailing_comma.phpt b/Zend/tests/closures/closure_use_trailing_comma.phpt similarity index 100% rename from Zend/tests/closure_use_trailing_comma.phpt rename to Zend/tests/closures/closure_use_trailing_comma.phpt diff --git a/Zend/tests/closure_use_variable_twice.phpt b/Zend/tests/closures/closure_use_variable_twice.phpt similarity index 100% rename from Zend/tests/closure_use_variable_twice.phpt rename to Zend/tests/closures/closure_use_variable_twice.phpt diff --git a/Zend/tests/closure_write_prop.phpt b/Zend/tests/closures/closure_write_prop.phpt similarity index 100% rename from Zend/tests/closure_write_prop.phpt rename to Zend/tests/closures/closure_write_prop.phpt diff --git a/Zend/tests/class_on_expression_in_constant_expression.phpt b/Zend/tests/constant_expressions/class_on_expression_in_constant_expression.phpt similarity index 100% rename from Zend/tests/class_on_expression_in_constant_expression.phpt rename to Zend/tests/constant_expressions/class_on_expression_in_constant_expression.phpt diff --git a/Zend/tests/class_constant_inheritance_mutable_data.phpt b/Zend/tests/constants/class_constant_inheritance_mutable_data.phpt similarity index 100% rename from Zend/tests/class_constant_inheritance_mutable_data.phpt rename to Zend/tests/constants/class_constant_inheritance_mutable_data.phpt diff --git a/Zend/tests/class_constant_to_reference_cached.phpt b/Zend/tests/constants/class_constant_to_reference_cached.phpt similarity index 100% rename from Zend/tests/class_constant_to_reference_cached.phpt rename to Zend/tests/constants/class_constant_to_reference_cached.phpt diff --git a/Zend/tests/class_constants_001.phpt b/Zend/tests/constants/class_constants_001.phpt similarity index 100% rename from Zend/tests/class_constants_001.phpt rename to Zend/tests/constants/class_constants_001.phpt diff --git a/Zend/tests/class_constants_002.phpt b/Zend/tests/constants/class_constants_002.phpt similarity index 100% rename from Zend/tests/class_constants_002.phpt rename to Zend/tests/constants/class_constants_002.phpt diff --git a/Zend/tests/class_constants_003.phpt b/Zend/tests/constants/class_constants_003.phpt similarity index 100% rename from Zend/tests/class_constants_003.phpt rename to Zend/tests/constants/class_constants_003.phpt diff --git a/Zend/tests/class_constants_004.phpt b/Zend/tests/constants/class_constants_004.phpt similarity index 100% rename from Zend/tests/class_constants_004.phpt rename to Zend/tests/constants/class_constants_004.phpt diff --git a/Zend/tests/class_constants_005.phpt b/Zend/tests/constants/class_constants_005.phpt similarity index 100% rename from Zend/tests/class_constants_005.phpt rename to Zend/tests/constants/class_constants_005.phpt diff --git a/Zend/tests/class_constants_006.phpt b/Zend/tests/constants/class_constants_006.phpt similarity index 100% rename from Zend/tests/class_constants_006.phpt rename to Zend/tests/constants/class_constants_006.phpt diff --git a/Zend/tests/class_constants_007.phpt b/Zend/tests/constants/class_constants_007.phpt similarity index 100% rename from Zend/tests/class_constants_007.phpt rename to Zend/tests/constants/class_constants_007.phpt diff --git a/Zend/tests/constants_001.phpt b/Zend/tests/constants/constants_001.phpt similarity index 100% rename from Zend/tests/constants_001.phpt rename to Zend/tests/constants/constants_001.phpt diff --git a/Zend/tests/constants_002.phpt b/Zend/tests/constants/constants_002.phpt similarity index 100% rename from Zend/tests/constants_002.phpt rename to Zend/tests/constants/constants_002.phpt diff --git a/Zend/tests/constants_003.phpt b/Zend/tests/constants/constants_003.phpt similarity index 100% rename from Zend/tests/constants_003.phpt rename to Zend/tests/constants/constants_003.phpt diff --git a/Zend/tests/constants_004.phpt b/Zend/tests/constants/constants_004.phpt similarity index 100% rename from Zend/tests/constants_004.phpt rename to Zend/tests/constants/constants_004.phpt diff --git a/Zend/tests/constants_005.phpt b/Zend/tests/constants/constants_005.phpt similarity index 100% rename from Zend/tests/constants_005.phpt rename to Zend/tests/constants/constants_005.phpt diff --git a/Zend/tests/constants_006.phpt b/Zend/tests/constants/constants_006.phpt similarity index 100% rename from Zend/tests/constants_006.phpt rename to Zend/tests/constants/constants_006.phpt diff --git a/Zend/tests/constants_007.phpt b/Zend/tests/constants/constants_007.phpt similarity index 100% rename from Zend/tests/constants_007.phpt rename to Zend/tests/constants/constants_007.phpt diff --git a/Zend/tests/constants_008.phpt b/Zend/tests/constants/constants_008.phpt similarity index 100% rename from Zend/tests/constants_008.phpt rename to Zend/tests/constants/constants_008.phpt diff --git a/Zend/tests/constants_009.phpt b/Zend/tests/constants/constants_009.phpt similarity index 100% rename from Zend/tests/constants_009.phpt rename to Zend/tests/constants/constants_009.phpt diff --git a/Zend/tests/dynamic_class_const_fetch.phpt b/Zend/tests/constants/dynamic_class_const_fetch.phpt similarity index 100% rename from Zend/tests/dynamic_class_const_fetch.phpt rename to Zend/tests/constants/dynamic_class_const_fetch.phpt diff --git a/Zend/tests/dynamic_class_const_fetch_cache_slot.phpt b/Zend/tests/constants/dynamic_class_const_fetch_cache_slot.phpt similarity index 100% rename from Zend/tests/dynamic_class_const_fetch_cache_slot.phpt rename to Zend/tests/constants/dynamic_class_const_fetch_cache_slot.phpt diff --git a/Zend/tests/dynamic_class_const_fetch_const_expr.phpt b/Zend/tests/constants/dynamic_class_const_fetch_const_expr.phpt similarity index 100% rename from Zend/tests/dynamic_class_const_fetch_const_expr.phpt rename to Zend/tests/constants/dynamic_class_const_fetch_const_expr.phpt diff --git a/Zend/tests/dynamic_class_const_fetch_order.phpt b/Zend/tests/constants/dynamic_class_const_fetch_order.phpt similarity index 100% rename from Zend/tests/dynamic_class_const_fetch_order.phpt rename to Zend/tests/constants/dynamic_class_const_fetch_order.phpt diff --git a/Zend/tests/iface_constant_visibility_variance.phpt b/Zend/tests/constants/iface_constant_visibility_variance.phpt similarity index 100% rename from Zend/tests/iface_constant_visibility_variance.phpt rename to Zend/tests/constants/iface_constant_visibility_variance.phpt diff --git a/Zend/tests/line_const_in_array.phpt b/Zend/tests/constants/line_const_in_array.phpt similarity index 100% rename from Zend/tests/line_const_in_array.phpt rename to Zend/tests/constants/line_const_in_array.phpt diff --git a/Zend/tests/magic_const_in_global_scope.phpt b/Zend/tests/constants/magic_const_in_global_scope.phpt similarity index 100% rename from Zend/tests/magic_const_in_global_scope.phpt rename to Zend/tests/constants/magic_const_in_global_scope.phpt diff --git a/Zend/tests/goto_in_foreach.phpt b/Zend/tests/foreach/goto_in_foreach.phpt similarity index 100% rename from Zend/tests/goto_in_foreach.phpt rename to Zend/tests/foreach/goto_in_foreach.phpt diff --git a/Zend/tests/function_arguments_001.phpt b/Zend/tests/function_arguments/function_arguments_001.phpt similarity index 100% rename from Zend/tests/function_arguments_001.phpt rename to Zend/tests/function_arguments/function_arguments_001.phpt diff --git a/Zend/tests/function_arguments_002.phpt b/Zend/tests/function_arguments/function_arguments_002.phpt similarity index 100% rename from Zend/tests/function_arguments_002.phpt rename to Zend/tests/function_arguments/function_arguments_002.phpt diff --git a/Zend/tests/function_arguments_003.phpt b/Zend/tests/function_arguments/function_arguments_003.phpt similarity index 100% rename from Zend/tests/function_arguments_003.phpt rename to Zend/tests/function_arguments/function_arguments_003.phpt diff --git a/Zend/tests/class_toString_concat_non_interned_with_itself.phpt b/Zend/tests/magic_methods/class_toString_concat_non_interned_with_itself.phpt similarity index 100% rename from Zend/tests/class_toString_concat_non_interned_with_itself.phpt rename to Zend/tests/magic_methods/class_toString_concat_non_interned_with_itself.phpt diff --git a/Zend/tests/class_toString_concat_with_itself.phpt b/Zend/tests/magic_methods/class_toString_concat_with_itself.phpt similarity index 100% rename from Zend/tests/class_toString_concat_with_itself.phpt rename to Zend/tests/magic_methods/class_toString_concat_with_itself.phpt diff --git a/Zend/tests/constructor_args.phpt b/Zend/tests/magic_methods/constructor_args.phpt similarity index 100% rename from Zend/tests/constructor_args.phpt rename to Zend/tests/magic_methods/constructor_args.phpt diff --git a/Zend/tests/dtor_scope.phpt b/Zend/tests/magic_methods/dtor_scope.phpt similarity index 100% rename from Zend/tests/dtor_scope.phpt rename to Zend/tests/magic_methods/dtor_scope.phpt diff --git a/Zend/tests/interface_with_tostring.phpt b/Zend/tests/magic_methods/interface_with_tostring.phpt similarity index 100% rename from Zend/tests/interface_with_tostring.phpt rename to Zend/tests/magic_methods/interface_with_tostring.phpt diff --git a/Zend/tests/continue_targeting_switch_warning.phpt b/Zend/tests/switch/continue_targeting_switch_warning.phpt similarity index 100% rename from Zend/tests/continue_targeting_switch_warning.phpt rename to Zend/tests/switch/continue_targeting_switch_warning.phpt diff --git a/Zend/tests/static_in_trait_insteadof_list.phpt b/Zend/tests/traits/static_in_trait_insteadof_list.phpt similarity index 100% rename from Zend/tests/static_in_trait_insteadof_list.phpt rename to Zend/tests/traits/static_in_trait_insteadof_list.phpt diff --git a/Zend/tests/static_in_trait_insteadof_reference.phpt b/Zend/tests/traits/static_in_trait_insteadof_reference.phpt similarity index 100% rename from Zend/tests/static_in_trait_insteadof_reference.phpt rename to Zend/tests/traits/static_in_trait_insteadof_reference.phpt diff --git a/Zend/tests/trait_exists_001.phpt b/Zend/tests/traits/trait_exists_001.phpt similarity index 100% rename from Zend/tests/trait_exists_001.phpt rename to Zend/tests/traits/trait_exists_001.phpt diff --git a/Zend/tests/trait_exists_002.phpt b/Zend/tests/traits/trait_exists_002.phpt similarity index 100% rename from Zend/tests/trait_exists_002.phpt rename to Zend/tests/traits/trait_exists_002.phpt diff --git a/Zend/tests/trait_exists_003.phpt b/Zend/tests/traits/trait_exists_003.phpt similarity index 100% rename from Zend/tests/trait_exists_003.phpt rename to Zend/tests/traits/trait_exists_003.phpt diff --git a/Zend/tests/trait_type_errors.phpt b/Zend/tests/traits/trait_type_errors.phpt similarity index 100% rename from Zend/tests/trait_type_errors.phpt rename to Zend/tests/traits/trait_type_errors.phpt