From 8475d5fea111380b4d8b9e232b158dd4b51c53ad Mon Sep 17 00:00:00 2001
From: DanielEScherzer <daniel.e.scherzer@gmail.com>
Date: Sun, 13 Oct 2024 06:21:07 -0700
Subject: [PATCH] Zend/tests: organize some tests with subdirectories (#15638)

Move some low-hanging fruit, creating new directories for the tests for

* access modifiers
* `class_alias()`
* constant expressions
* constructor property promotion
* `__debugInfo()`
* dereferencing
* first class callable syntax

Additionally, move some tests into the existing subdirectory for
closure-related tests

Work towards GH-15631
---
 Zend/tests/{ => access_modifiers}/access_modifiers_001.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_002.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_003.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_004.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_005.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_006.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_007.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_008.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_009.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_010.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_011.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_012.phpt     | 0
 Zend/tests/{ => access_modifiers}/access_modifiers_013.phpt     | 0
 Zend/tests/{ => class_alias}/class_alias_001.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_002.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_004.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_005.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_006.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_007.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_008.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_009.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_010.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_011.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_012.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_013.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_014.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_016.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_017.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_018.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_019.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_020.phpt               | 0
 Zend/tests/{ => class_alias}/class_alias_021.phpt               | 0
 Zend/tests/{ => closures}/closure_001.phpt                      | 0
 Zend/tests/{ => closures}/closure_002.phpt                      | 0
 Zend/tests/{ => closures}/closure_003.phpt                      | 0
 Zend/tests/{ => closures}/closure_004.phpt                      | 0
 Zend/tests/{ => closures}/closure_005.phpt                      | 0
 Zend/tests/{ => closures}/closure_006.phpt                      | 0
 Zend/tests/{ => closures}/closure_007.phpt                      | 0
 Zend/tests/{ => closures}/closure_008.phpt                      | 0
 Zend/tests/{ => closures}/closure_009.phpt                      | 0
 Zend/tests/{ => closures}/closure_010.phpt                      | 0
 Zend/tests/{ => closures}/closure_011.phpt                      | 0
 Zend/tests/{ => closures}/closure_012.phpt                      | 0
 Zend/tests/{ => closures}/closure_013.phpt                      | 0
 Zend/tests/{ => closures}/closure_014.phpt                      | 0
 Zend/tests/{ => closures}/closure_015.phpt                      | 0
 Zend/tests/{ => closures}/closure_016.phpt                      | 0
 Zend/tests/{ => closures}/closure_017.phpt                      | 0
 Zend/tests/{ => closures}/closure_018.phpt                      | 0
 Zend/tests/{ => closures}/closure_019.phpt                      | 0
 Zend/tests/{ => closures}/closure_020.phpt                      | 0
 Zend/tests/{ => closures}/closure_021.phpt                      | 0
 Zend/tests/{ => closures}/closure_022.phpt                      | 0
 Zend/tests/{ => closures}/closure_023.phpt                      | 0
 Zend/tests/{ => closures}/closure_024.phpt                      | 0
 Zend/tests/{ => closures}/closure_026.phpt                      | 0
 Zend/tests/{ => closures}/closure_027.phpt                      | 0
 Zend/tests/{ => closures}/closure_028.phpt                      | 0
 Zend/tests/{ => closures}/closure_029.phpt                      | 0
 Zend/tests/{ => closures}/closure_030.phpt                      | 0
 Zend/tests/{ => closures}/closure_031.phpt                      | 0
 Zend/tests/{ => closures}/closure_032.phpt                      | 0
 Zend/tests/{ => closures}/closure_033.phpt                      | 0
 Zend/tests/{ => closures}/closure_034.phpt                      | 0
 Zend/tests/{ => closures}/closure_035.phpt                      | 0
 Zend/tests/{ => closures}/closure_036.phpt                      | 0
 Zend/tests/{ => closures}/closure_037.phpt                      | 0
 Zend/tests/{ => closures}/closure_038.phpt                      | 0
 Zend/tests/{ => closures}/closure_039.phpt                      | 0
 Zend/tests/{ => closures}/closure_040.phpt                      | 0
 Zend/tests/{ => closures}/closure_041.phpt                      | 0
 Zend/tests/{ => closures}/closure_042.phpt                      | 0
 Zend/tests/{ => closures}/closure_043.phpt                      | 0
 Zend/tests/{ => closures}/closure_044.phpt                      | 0
 Zend/tests/{ => closures}/closure_045.phpt                      | 0
 Zend/tests/{ => closures}/closure_046.phpt                      | 0
 Zend/tests/{ => closures}/closure_047.phpt                      | 0
 Zend/tests/{ => closures}/closure_048.phpt                      | 0
 Zend/tests/{ => closures}/closure_049.phpt                      | 0
 Zend/tests/{ => closures}/closure_050.phpt                      | 0
 Zend/tests/{ => closures}/closure_051.phpt                      | 0
 Zend/tests/{ => closures}/closure_052.phpt                      | 0
 Zend/tests/{ => closures}/closure_053.phpt                      | 0
 Zend/tests/{ => closures}/closure_054.phpt                      | 0
 Zend/tests/{ => closures}/closure_055.phpt                      | 0
 Zend/tests/{ => closures}/closure_056.phpt                      | 0
 Zend/tests/{ => closures}/closure_057.phpt                      | 0
 Zend/tests/{ => closures}/closure_058.phpt                      | 0
 Zend/tests/{ => closures}/closure_059.phpt                      | 0
 Zend/tests/{ => closures}/closure_060.phpt                      | 0
 Zend/tests/{ => closures}/closure_061.phpt                      | 0
 Zend/tests/{ => closures}/closure_062.phpt                      | 0
 Zend/tests/{ => closures}/closure_063.phpt                      | 0
 Zend/tests/{ => closures}/closure_064.phpt                      | 0
 Zend/tests/{ => closures}/closure_065.phpt                      | 0
 Zend/tests/{ => closures}/closure_066.phpt                      | 0
 Zend/tests/{ => closures}/closure_067.phpt                      | 0
 Zend/tests/{ => closures}/closure_068.phpt                      | 0
 Zend/tests/{ => constant_expressions}/constant_expressions.phpt | 0
 .../{ => constant_expressions}/constant_expressions_arrays.phpt | 0
 .../constant_expressions_classes.phpt                           | 0
 .../constant_expressions_coalesce.phpt                          | 0
 .../constant_expressions_coalesce_empty_dim.phpt                | 0
 .../constant_expressions_dynamic.phpt                           | 0
 .../constant_expressions_dynamic_class_name_error.phpt          | 0
 .../constant_expressions_exceptions.inc                         | 0
 .../constant_expressions_exceptions_001.phpt                    | 0
 .../constant_expressions_exceptions_002.phpt                    | 0
 .../constant_expressions_invalid_offset_type_error.phpt         | 0
 .../constant_expressions_self_referencing_array.phpt            | 0
 .../constant_expressions_static_class_name_error.phpt           | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_abstract.phpt    | 0
 .../ctor_promotion_additional_modifiers.phpt                    | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_attributes.phpt  | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_basic.phpt       | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_by_ref.phpt      | 0
 .../{ => ctor_promotion}/ctor_promotion_callable_type.phpt      | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_defaults.phpt    | 0
 .../{ => ctor_promotion}/ctor_promotion_free_function.phpt      | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_interface.phpt   | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_mixing.phpt      | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_not_a_ctor.phpt  | 0
 .../tests/{ => ctor_promotion}/ctor_promotion_null_default.phpt | 0
 .../{ => ctor_promotion}/ctor_promotion_repeated_prop.phpt      | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_trait.phpt       | 0
 .../{ => ctor_promotion}/ctor_promotion_untyped_default.phpt    | 0
 Zend/tests/{ => ctor_promotion}/ctor_promotion_variadic.phpt    | 0
 Zend/tests/{ => debug_info}/debug_info-error-0.0.phpt           | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-0.phpt             | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-1.0.phpt           | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-1.phpt             | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-empty_str.phpt     | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-false.phpt         | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-object.phpt        | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-resource.phpt      | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-str.phpt           | 2 +-
 Zend/tests/{ => debug_info}/debug_info-error-true.phpt          | 2 +-
 Zend/tests/{ => debug_info}/debug_info.phpt                     | 0
 Zend/tests/{ => dereference}/dereference_001.phpt               | 0
 Zend/tests/{ => dereference}/dereference_002.phpt               | 0
 Zend/tests/{ => dereference}/dereference_003.phpt               | 0
 Zend/tests/{ => dereference}/dereference_004.phpt               | 0
 Zend/tests/{ => dereference}/dereference_005.phpt               | 0
 Zend/tests/{ => dereference}/dereference_006.phpt               | 0
 Zend/tests/{ => dereference}/dereference_007.phpt               | 0
 Zend/tests/{ => dereference}/dereference_008.phpt               | 0
 Zend/tests/{ => dereference}/dereference_009.phpt               | 0
 Zend/tests/{ => dereference}/dereference_010.phpt               | 0
 Zend/tests/{ => dereference}/dereference_011.phpt               | 0
 Zend/tests/{ => dereference}/dereference_012.phpt               | 0
 Zend/tests/{ => dereference}/dereference_013.phpt               | 0
 Zend/tests/{ => dereference}/dereference_014.phpt               | 0
 .../{ => first_class_callable}/first_class_callable_001.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_002.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_003.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_004.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_005.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_006.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_007.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_008.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_009.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_010.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_011.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_012.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_013.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_014.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_015.phpt    | 0
 .../first_class_callable_015_strict.inc                         | 0
 .../first_class_callable_015_weak.inc                           | 0
 .../{ => first_class_callable}/first_class_callable_016.phpt    | 0
 .../{ => first_class_callable}/first_class_callable_assert.phpt | 0
 .../first_class_callable_assert2.phpt                           | 0
 .../first_class_callable_assert3.phpt                           | 0
 .../first_class_callable_dynamic.phpt                           | 0
 .../{ => first_class_callable}/first_class_callable_errors.phpt | 0
 .../first_class_callable_optimization.phpt                      | 0
 .../{ => first_class_callable}/first_class_callable_refs.phpt   | 0
 .../first_class_callable_signature.phpt                         | 0
 179 files changed, 10 insertions(+), 10 deletions(-)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_001.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_002.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_003.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_004.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_005.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_006.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_007.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_008.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_009.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_010.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_011.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_012.phpt (100%)
 rename Zend/tests/{ => access_modifiers}/access_modifiers_013.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_001.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_002.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_004.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_005.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_006.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_007.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_008.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_009.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_010.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_011.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_012.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_013.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_014.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_016.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_017.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_018.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_019.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_020.phpt (100%)
 rename Zend/tests/{ => class_alias}/class_alias_021.phpt (100%)
 rename Zend/tests/{ => closures}/closure_001.phpt (100%)
 rename Zend/tests/{ => closures}/closure_002.phpt (100%)
 rename Zend/tests/{ => closures}/closure_003.phpt (100%)
 rename Zend/tests/{ => closures}/closure_004.phpt (100%)
 rename Zend/tests/{ => closures}/closure_005.phpt (100%)
 rename Zend/tests/{ => closures}/closure_006.phpt (100%)
 rename Zend/tests/{ => closures}/closure_007.phpt (100%)
 rename Zend/tests/{ => closures}/closure_008.phpt (100%)
 rename Zend/tests/{ => closures}/closure_009.phpt (100%)
 rename Zend/tests/{ => closures}/closure_010.phpt (100%)
 rename Zend/tests/{ => closures}/closure_011.phpt (100%)
 rename Zend/tests/{ => closures}/closure_012.phpt (100%)
 rename Zend/tests/{ => closures}/closure_013.phpt (100%)
 rename Zend/tests/{ => closures}/closure_014.phpt (100%)
 rename Zend/tests/{ => closures}/closure_015.phpt (100%)
 rename Zend/tests/{ => closures}/closure_016.phpt (100%)
 rename Zend/tests/{ => closures}/closure_017.phpt (100%)
 rename Zend/tests/{ => closures}/closure_018.phpt (100%)
 rename Zend/tests/{ => closures}/closure_019.phpt (100%)
 rename Zend/tests/{ => closures}/closure_020.phpt (100%)
 rename Zend/tests/{ => closures}/closure_021.phpt (100%)
 rename Zend/tests/{ => closures}/closure_022.phpt (100%)
 rename Zend/tests/{ => closures}/closure_023.phpt (100%)
 rename Zend/tests/{ => closures}/closure_024.phpt (100%)
 rename Zend/tests/{ => closures}/closure_026.phpt (100%)
 rename Zend/tests/{ => closures}/closure_027.phpt (100%)
 rename Zend/tests/{ => closures}/closure_028.phpt (100%)
 rename Zend/tests/{ => closures}/closure_029.phpt (100%)
 rename Zend/tests/{ => closures}/closure_030.phpt (100%)
 rename Zend/tests/{ => closures}/closure_031.phpt (100%)
 rename Zend/tests/{ => closures}/closure_032.phpt (100%)
 rename Zend/tests/{ => closures}/closure_033.phpt (100%)
 rename Zend/tests/{ => closures}/closure_034.phpt (100%)
 rename Zend/tests/{ => closures}/closure_035.phpt (100%)
 rename Zend/tests/{ => closures}/closure_036.phpt (100%)
 rename Zend/tests/{ => closures}/closure_037.phpt (100%)
 rename Zend/tests/{ => closures}/closure_038.phpt (100%)
 rename Zend/tests/{ => closures}/closure_039.phpt (100%)
 rename Zend/tests/{ => closures}/closure_040.phpt (100%)
 rename Zend/tests/{ => closures}/closure_041.phpt (100%)
 rename Zend/tests/{ => closures}/closure_042.phpt (100%)
 rename Zend/tests/{ => closures}/closure_043.phpt (100%)
 rename Zend/tests/{ => closures}/closure_044.phpt (100%)
 rename Zend/tests/{ => closures}/closure_045.phpt (100%)
 rename Zend/tests/{ => closures}/closure_046.phpt (100%)
 rename Zend/tests/{ => closures}/closure_047.phpt (100%)
 rename Zend/tests/{ => closures}/closure_048.phpt (100%)
 rename Zend/tests/{ => closures}/closure_049.phpt (100%)
 rename Zend/tests/{ => closures}/closure_050.phpt (100%)
 rename Zend/tests/{ => closures}/closure_051.phpt (100%)
 rename Zend/tests/{ => closures}/closure_052.phpt (100%)
 rename Zend/tests/{ => closures}/closure_053.phpt (100%)
 rename Zend/tests/{ => closures}/closure_054.phpt (100%)
 rename Zend/tests/{ => closures}/closure_055.phpt (100%)
 rename Zend/tests/{ => closures}/closure_056.phpt (100%)
 rename Zend/tests/{ => closures}/closure_057.phpt (100%)
 rename Zend/tests/{ => closures}/closure_058.phpt (100%)
 rename Zend/tests/{ => closures}/closure_059.phpt (100%)
 rename Zend/tests/{ => closures}/closure_060.phpt (100%)
 rename Zend/tests/{ => closures}/closure_061.phpt (100%)
 rename Zend/tests/{ => closures}/closure_062.phpt (100%)
 rename Zend/tests/{ => closures}/closure_063.phpt (100%)
 rename Zend/tests/{ => closures}/closure_064.phpt (100%)
 rename Zend/tests/{ => closures}/closure_065.phpt (100%)
 rename Zend/tests/{ => closures}/closure_066.phpt (100%)
 rename Zend/tests/{ => closures}/closure_067.phpt (100%)
 rename Zend/tests/{ => closures}/closure_068.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_arrays.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_classes.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_coalesce.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_coalesce_empty_dim.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_dynamic.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_dynamic_class_name_error.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_exceptions.inc (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_exceptions_001.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_exceptions_002.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_invalid_offset_type_error.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_self_referencing_array.phpt (100%)
 rename Zend/tests/{ => constant_expressions}/constant_expressions_static_class_name_error.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_abstract.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_additional_modifiers.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_attributes.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_basic.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_by_ref.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_callable_type.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_defaults.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_free_function.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_interface.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_mixing.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_not_a_ctor.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_null_default.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_repeated_prop.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_trait.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_untyped_default.phpt (100%)
 rename Zend/tests/{ => ctor_promotion}/ctor_promotion_variadic.phpt (100%)
 rename Zend/tests/{ => debug_info}/debug_info-error-0.0.phpt (73%)
 rename Zend/tests/{ => debug_info}/debug_info-error-0.phpt (73%)
 rename Zend/tests/{ => debug_info}/debug_info-error-1.0.phpt (73%)
 rename Zend/tests/{ => debug_info}/debug_info-error-1.phpt (73%)
 rename Zend/tests/{ => debug_info}/debug_info-error-empty_str.phpt (72%)
 rename Zend/tests/{ => debug_info}/debug_info-error-false.phpt (72%)
 rename Zend/tests/{ => debug_info}/debug_info-error-object.phpt (73%)
 rename Zend/tests/{ => debug_info}/debug_info-error-resource.phpt (75%)
 rename Zend/tests/{ => debug_info}/debug_info-error-str.phpt (73%)
 rename Zend/tests/{ => debug_info}/debug_info-error-true.phpt (72%)
 rename Zend/tests/{ => debug_info}/debug_info.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_001.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_002.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_003.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_004.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_005.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_006.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_007.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_008.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_009.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_010.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_011.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_012.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_013.phpt (100%)
 rename Zend/tests/{ => dereference}/dereference_014.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_001.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_002.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_003.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_004.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_005.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_006.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_007.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_008.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_009.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_010.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_011.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_012.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_013.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_014.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_015.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_015_strict.inc (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_015_weak.inc (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_016.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_assert.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_assert2.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_assert3.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_dynamic.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_errors.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_optimization.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_refs.phpt (100%)
 rename Zend/tests/{ => first_class_callable}/first_class_callable_signature.phpt (100%)

diff --git a/Zend/tests/access_modifiers_001.phpt b/Zend/tests/access_modifiers/access_modifiers_001.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_001.phpt
rename to Zend/tests/access_modifiers/access_modifiers_001.phpt
diff --git a/Zend/tests/access_modifiers_002.phpt b/Zend/tests/access_modifiers/access_modifiers_002.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_002.phpt
rename to Zend/tests/access_modifiers/access_modifiers_002.phpt
diff --git a/Zend/tests/access_modifiers_003.phpt b/Zend/tests/access_modifiers/access_modifiers_003.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_003.phpt
rename to Zend/tests/access_modifiers/access_modifiers_003.phpt
diff --git a/Zend/tests/access_modifiers_004.phpt b/Zend/tests/access_modifiers/access_modifiers_004.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_004.phpt
rename to Zend/tests/access_modifiers/access_modifiers_004.phpt
diff --git a/Zend/tests/access_modifiers_005.phpt b/Zend/tests/access_modifiers/access_modifiers_005.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_005.phpt
rename to Zend/tests/access_modifiers/access_modifiers_005.phpt
diff --git a/Zend/tests/access_modifiers_006.phpt b/Zend/tests/access_modifiers/access_modifiers_006.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_006.phpt
rename to Zend/tests/access_modifiers/access_modifiers_006.phpt
diff --git a/Zend/tests/access_modifiers_007.phpt b/Zend/tests/access_modifiers/access_modifiers_007.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_007.phpt
rename to Zend/tests/access_modifiers/access_modifiers_007.phpt
diff --git a/Zend/tests/access_modifiers_008.phpt b/Zend/tests/access_modifiers/access_modifiers_008.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_008.phpt
rename to Zend/tests/access_modifiers/access_modifiers_008.phpt
diff --git a/Zend/tests/access_modifiers_009.phpt b/Zend/tests/access_modifiers/access_modifiers_009.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_009.phpt
rename to Zend/tests/access_modifiers/access_modifiers_009.phpt
diff --git a/Zend/tests/access_modifiers_010.phpt b/Zend/tests/access_modifiers/access_modifiers_010.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_010.phpt
rename to Zend/tests/access_modifiers/access_modifiers_010.phpt
diff --git a/Zend/tests/access_modifiers_011.phpt b/Zend/tests/access_modifiers/access_modifiers_011.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_011.phpt
rename to Zend/tests/access_modifiers/access_modifiers_011.phpt
diff --git a/Zend/tests/access_modifiers_012.phpt b/Zend/tests/access_modifiers/access_modifiers_012.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_012.phpt
rename to Zend/tests/access_modifiers/access_modifiers_012.phpt
diff --git a/Zend/tests/access_modifiers_013.phpt b/Zend/tests/access_modifiers/access_modifiers_013.phpt
similarity index 100%
rename from Zend/tests/access_modifiers_013.phpt
rename to Zend/tests/access_modifiers/access_modifiers_013.phpt
diff --git a/Zend/tests/class_alias_001.phpt b/Zend/tests/class_alias/class_alias_001.phpt
similarity index 100%
rename from Zend/tests/class_alias_001.phpt
rename to Zend/tests/class_alias/class_alias_001.phpt
diff --git a/Zend/tests/class_alias_002.phpt b/Zend/tests/class_alias/class_alias_002.phpt
similarity index 100%
rename from Zend/tests/class_alias_002.phpt
rename to Zend/tests/class_alias/class_alias_002.phpt
diff --git a/Zend/tests/class_alias_004.phpt b/Zend/tests/class_alias/class_alias_004.phpt
similarity index 100%
rename from Zend/tests/class_alias_004.phpt
rename to Zend/tests/class_alias/class_alias_004.phpt
diff --git a/Zend/tests/class_alias_005.phpt b/Zend/tests/class_alias/class_alias_005.phpt
similarity index 100%
rename from Zend/tests/class_alias_005.phpt
rename to Zend/tests/class_alias/class_alias_005.phpt
diff --git a/Zend/tests/class_alias_006.phpt b/Zend/tests/class_alias/class_alias_006.phpt
similarity index 100%
rename from Zend/tests/class_alias_006.phpt
rename to Zend/tests/class_alias/class_alias_006.phpt
diff --git a/Zend/tests/class_alias_007.phpt b/Zend/tests/class_alias/class_alias_007.phpt
similarity index 100%
rename from Zend/tests/class_alias_007.phpt
rename to Zend/tests/class_alias/class_alias_007.phpt
diff --git a/Zend/tests/class_alias_008.phpt b/Zend/tests/class_alias/class_alias_008.phpt
similarity index 100%
rename from Zend/tests/class_alias_008.phpt
rename to Zend/tests/class_alias/class_alias_008.phpt
diff --git a/Zend/tests/class_alias_009.phpt b/Zend/tests/class_alias/class_alias_009.phpt
similarity index 100%
rename from Zend/tests/class_alias_009.phpt
rename to Zend/tests/class_alias/class_alias_009.phpt
diff --git a/Zend/tests/class_alias_010.phpt b/Zend/tests/class_alias/class_alias_010.phpt
similarity index 100%
rename from Zend/tests/class_alias_010.phpt
rename to Zend/tests/class_alias/class_alias_010.phpt
diff --git a/Zend/tests/class_alias_011.phpt b/Zend/tests/class_alias/class_alias_011.phpt
similarity index 100%
rename from Zend/tests/class_alias_011.phpt
rename to Zend/tests/class_alias/class_alias_011.phpt
diff --git a/Zend/tests/class_alias_012.phpt b/Zend/tests/class_alias/class_alias_012.phpt
similarity index 100%
rename from Zend/tests/class_alias_012.phpt
rename to Zend/tests/class_alias/class_alias_012.phpt
diff --git a/Zend/tests/class_alias_013.phpt b/Zend/tests/class_alias/class_alias_013.phpt
similarity index 100%
rename from Zend/tests/class_alias_013.phpt
rename to Zend/tests/class_alias/class_alias_013.phpt
diff --git a/Zend/tests/class_alias_014.phpt b/Zend/tests/class_alias/class_alias_014.phpt
similarity index 100%
rename from Zend/tests/class_alias_014.phpt
rename to Zend/tests/class_alias/class_alias_014.phpt
diff --git a/Zend/tests/class_alias_016.phpt b/Zend/tests/class_alias/class_alias_016.phpt
similarity index 100%
rename from Zend/tests/class_alias_016.phpt
rename to Zend/tests/class_alias/class_alias_016.phpt
diff --git a/Zend/tests/class_alias_017.phpt b/Zend/tests/class_alias/class_alias_017.phpt
similarity index 100%
rename from Zend/tests/class_alias_017.phpt
rename to Zend/tests/class_alias/class_alias_017.phpt
diff --git a/Zend/tests/class_alias_018.phpt b/Zend/tests/class_alias/class_alias_018.phpt
similarity index 100%
rename from Zend/tests/class_alias_018.phpt
rename to Zend/tests/class_alias/class_alias_018.phpt
diff --git a/Zend/tests/class_alias_019.phpt b/Zend/tests/class_alias/class_alias_019.phpt
similarity index 100%
rename from Zend/tests/class_alias_019.phpt
rename to Zend/tests/class_alias/class_alias_019.phpt
diff --git a/Zend/tests/class_alias_020.phpt b/Zend/tests/class_alias/class_alias_020.phpt
similarity index 100%
rename from Zend/tests/class_alias_020.phpt
rename to Zend/tests/class_alias/class_alias_020.phpt
diff --git a/Zend/tests/class_alias_021.phpt b/Zend/tests/class_alias/class_alias_021.phpt
similarity index 100%
rename from Zend/tests/class_alias_021.phpt
rename to Zend/tests/class_alias/class_alias_021.phpt
diff --git a/Zend/tests/closure_001.phpt b/Zend/tests/closures/closure_001.phpt
similarity index 100%
rename from Zend/tests/closure_001.phpt
rename to Zend/tests/closures/closure_001.phpt
diff --git a/Zend/tests/closure_002.phpt b/Zend/tests/closures/closure_002.phpt
similarity index 100%
rename from Zend/tests/closure_002.phpt
rename to Zend/tests/closures/closure_002.phpt
diff --git a/Zend/tests/closure_003.phpt b/Zend/tests/closures/closure_003.phpt
similarity index 100%
rename from Zend/tests/closure_003.phpt
rename to Zend/tests/closures/closure_003.phpt
diff --git a/Zend/tests/closure_004.phpt b/Zend/tests/closures/closure_004.phpt
similarity index 100%
rename from Zend/tests/closure_004.phpt
rename to Zend/tests/closures/closure_004.phpt
diff --git a/Zend/tests/closure_005.phpt b/Zend/tests/closures/closure_005.phpt
similarity index 100%
rename from Zend/tests/closure_005.phpt
rename to Zend/tests/closures/closure_005.phpt
diff --git a/Zend/tests/closure_006.phpt b/Zend/tests/closures/closure_006.phpt
similarity index 100%
rename from Zend/tests/closure_006.phpt
rename to Zend/tests/closures/closure_006.phpt
diff --git a/Zend/tests/closure_007.phpt b/Zend/tests/closures/closure_007.phpt
similarity index 100%
rename from Zend/tests/closure_007.phpt
rename to Zend/tests/closures/closure_007.phpt
diff --git a/Zend/tests/closure_008.phpt b/Zend/tests/closures/closure_008.phpt
similarity index 100%
rename from Zend/tests/closure_008.phpt
rename to Zend/tests/closures/closure_008.phpt
diff --git a/Zend/tests/closure_009.phpt b/Zend/tests/closures/closure_009.phpt
similarity index 100%
rename from Zend/tests/closure_009.phpt
rename to Zend/tests/closures/closure_009.phpt
diff --git a/Zend/tests/closure_010.phpt b/Zend/tests/closures/closure_010.phpt
similarity index 100%
rename from Zend/tests/closure_010.phpt
rename to Zend/tests/closures/closure_010.phpt
diff --git a/Zend/tests/closure_011.phpt b/Zend/tests/closures/closure_011.phpt
similarity index 100%
rename from Zend/tests/closure_011.phpt
rename to Zend/tests/closures/closure_011.phpt
diff --git a/Zend/tests/closure_012.phpt b/Zend/tests/closures/closure_012.phpt
similarity index 100%
rename from Zend/tests/closure_012.phpt
rename to Zend/tests/closures/closure_012.phpt
diff --git a/Zend/tests/closure_013.phpt b/Zend/tests/closures/closure_013.phpt
similarity index 100%
rename from Zend/tests/closure_013.phpt
rename to Zend/tests/closures/closure_013.phpt
diff --git a/Zend/tests/closure_014.phpt b/Zend/tests/closures/closure_014.phpt
similarity index 100%
rename from Zend/tests/closure_014.phpt
rename to Zend/tests/closures/closure_014.phpt
diff --git a/Zend/tests/closure_015.phpt b/Zend/tests/closures/closure_015.phpt
similarity index 100%
rename from Zend/tests/closure_015.phpt
rename to Zend/tests/closures/closure_015.phpt
diff --git a/Zend/tests/closure_016.phpt b/Zend/tests/closures/closure_016.phpt
similarity index 100%
rename from Zend/tests/closure_016.phpt
rename to Zend/tests/closures/closure_016.phpt
diff --git a/Zend/tests/closure_017.phpt b/Zend/tests/closures/closure_017.phpt
similarity index 100%
rename from Zend/tests/closure_017.phpt
rename to Zend/tests/closures/closure_017.phpt
diff --git a/Zend/tests/closure_018.phpt b/Zend/tests/closures/closure_018.phpt
similarity index 100%
rename from Zend/tests/closure_018.phpt
rename to Zend/tests/closures/closure_018.phpt
diff --git a/Zend/tests/closure_019.phpt b/Zend/tests/closures/closure_019.phpt
similarity index 100%
rename from Zend/tests/closure_019.phpt
rename to Zend/tests/closures/closure_019.phpt
diff --git a/Zend/tests/closure_020.phpt b/Zend/tests/closures/closure_020.phpt
similarity index 100%
rename from Zend/tests/closure_020.phpt
rename to Zend/tests/closures/closure_020.phpt
diff --git a/Zend/tests/closure_021.phpt b/Zend/tests/closures/closure_021.phpt
similarity index 100%
rename from Zend/tests/closure_021.phpt
rename to Zend/tests/closures/closure_021.phpt
diff --git a/Zend/tests/closure_022.phpt b/Zend/tests/closures/closure_022.phpt
similarity index 100%
rename from Zend/tests/closure_022.phpt
rename to Zend/tests/closures/closure_022.phpt
diff --git a/Zend/tests/closure_023.phpt b/Zend/tests/closures/closure_023.phpt
similarity index 100%
rename from Zend/tests/closure_023.phpt
rename to Zend/tests/closures/closure_023.phpt
diff --git a/Zend/tests/closure_024.phpt b/Zend/tests/closures/closure_024.phpt
similarity index 100%
rename from Zend/tests/closure_024.phpt
rename to Zend/tests/closures/closure_024.phpt
diff --git a/Zend/tests/closure_026.phpt b/Zend/tests/closures/closure_026.phpt
similarity index 100%
rename from Zend/tests/closure_026.phpt
rename to Zend/tests/closures/closure_026.phpt
diff --git a/Zend/tests/closure_027.phpt b/Zend/tests/closures/closure_027.phpt
similarity index 100%
rename from Zend/tests/closure_027.phpt
rename to Zend/tests/closures/closure_027.phpt
diff --git a/Zend/tests/closure_028.phpt b/Zend/tests/closures/closure_028.phpt
similarity index 100%
rename from Zend/tests/closure_028.phpt
rename to Zend/tests/closures/closure_028.phpt
diff --git a/Zend/tests/closure_029.phpt b/Zend/tests/closures/closure_029.phpt
similarity index 100%
rename from Zend/tests/closure_029.phpt
rename to Zend/tests/closures/closure_029.phpt
diff --git a/Zend/tests/closure_030.phpt b/Zend/tests/closures/closure_030.phpt
similarity index 100%
rename from Zend/tests/closure_030.phpt
rename to Zend/tests/closures/closure_030.phpt
diff --git a/Zend/tests/closure_031.phpt b/Zend/tests/closures/closure_031.phpt
similarity index 100%
rename from Zend/tests/closure_031.phpt
rename to Zend/tests/closures/closure_031.phpt
diff --git a/Zend/tests/closure_032.phpt b/Zend/tests/closures/closure_032.phpt
similarity index 100%
rename from Zend/tests/closure_032.phpt
rename to Zend/tests/closures/closure_032.phpt
diff --git a/Zend/tests/closure_033.phpt b/Zend/tests/closures/closure_033.phpt
similarity index 100%
rename from Zend/tests/closure_033.phpt
rename to Zend/tests/closures/closure_033.phpt
diff --git a/Zend/tests/closure_034.phpt b/Zend/tests/closures/closure_034.phpt
similarity index 100%
rename from Zend/tests/closure_034.phpt
rename to Zend/tests/closures/closure_034.phpt
diff --git a/Zend/tests/closure_035.phpt b/Zend/tests/closures/closure_035.phpt
similarity index 100%
rename from Zend/tests/closure_035.phpt
rename to Zend/tests/closures/closure_035.phpt
diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closures/closure_036.phpt
similarity index 100%
rename from Zend/tests/closure_036.phpt
rename to Zend/tests/closures/closure_036.phpt
diff --git a/Zend/tests/closure_037.phpt b/Zend/tests/closures/closure_037.phpt
similarity index 100%
rename from Zend/tests/closure_037.phpt
rename to Zend/tests/closures/closure_037.phpt
diff --git a/Zend/tests/closure_038.phpt b/Zend/tests/closures/closure_038.phpt
similarity index 100%
rename from Zend/tests/closure_038.phpt
rename to Zend/tests/closures/closure_038.phpt
diff --git a/Zend/tests/closure_039.phpt b/Zend/tests/closures/closure_039.phpt
similarity index 100%
rename from Zend/tests/closure_039.phpt
rename to Zend/tests/closures/closure_039.phpt
diff --git a/Zend/tests/closure_040.phpt b/Zend/tests/closures/closure_040.phpt
similarity index 100%
rename from Zend/tests/closure_040.phpt
rename to Zend/tests/closures/closure_040.phpt
diff --git a/Zend/tests/closure_041.phpt b/Zend/tests/closures/closure_041.phpt
similarity index 100%
rename from Zend/tests/closure_041.phpt
rename to Zend/tests/closures/closure_041.phpt
diff --git a/Zend/tests/closure_042.phpt b/Zend/tests/closures/closure_042.phpt
similarity index 100%
rename from Zend/tests/closure_042.phpt
rename to Zend/tests/closures/closure_042.phpt
diff --git a/Zend/tests/closure_043.phpt b/Zend/tests/closures/closure_043.phpt
similarity index 100%
rename from Zend/tests/closure_043.phpt
rename to Zend/tests/closures/closure_043.phpt
diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closures/closure_044.phpt
similarity index 100%
rename from Zend/tests/closure_044.phpt
rename to Zend/tests/closures/closure_044.phpt
diff --git a/Zend/tests/closure_045.phpt b/Zend/tests/closures/closure_045.phpt
similarity index 100%
rename from Zend/tests/closure_045.phpt
rename to Zend/tests/closures/closure_045.phpt
diff --git a/Zend/tests/closure_046.phpt b/Zend/tests/closures/closure_046.phpt
similarity index 100%
rename from Zend/tests/closure_046.phpt
rename to Zend/tests/closures/closure_046.phpt
diff --git a/Zend/tests/closure_047.phpt b/Zend/tests/closures/closure_047.phpt
similarity index 100%
rename from Zend/tests/closure_047.phpt
rename to Zend/tests/closures/closure_047.phpt
diff --git a/Zend/tests/closure_048.phpt b/Zend/tests/closures/closure_048.phpt
similarity index 100%
rename from Zend/tests/closure_048.phpt
rename to Zend/tests/closures/closure_048.phpt
diff --git a/Zend/tests/closure_049.phpt b/Zend/tests/closures/closure_049.phpt
similarity index 100%
rename from Zend/tests/closure_049.phpt
rename to Zend/tests/closures/closure_049.phpt
diff --git a/Zend/tests/closure_050.phpt b/Zend/tests/closures/closure_050.phpt
similarity index 100%
rename from Zend/tests/closure_050.phpt
rename to Zend/tests/closures/closure_050.phpt
diff --git a/Zend/tests/closure_051.phpt b/Zend/tests/closures/closure_051.phpt
similarity index 100%
rename from Zend/tests/closure_051.phpt
rename to Zend/tests/closures/closure_051.phpt
diff --git a/Zend/tests/closure_052.phpt b/Zend/tests/closures/closure_052.phpt
similarity index 100%
rename from Zend/tests/closure_052.phpt
rename to Zend/tests/closures/closure_052.phpt
diff --git a/Zend/tests/closure_053.phpt b/Zend/tests/closures/closure_053.phpt
similarity index 100%
rename from Zend/tests/closure_053.phpt
rename to Zend/tests/closures/closure_053.phpt
diff --git a/Zend/tests/closure_054.phpt b/Zend/tests/closures/closure_054.phpt
similarity index 100%
rename from Zend/tests/closure_054.phpt
rename to Zend/tests/closures/closure_054.phpt
diff --git a/Zend/tests/closure_055.phpt b/Zend/tests/closures/closure_055.phpt
similarity index 100%
rename from Zend/tests/closure_055.phpt
rename to Zend/tests/closures/closure_055.phpt
diff --git a/Zend/tests/closure_056.phpt b/Zend/tests/closures/closure_056.phpt
similarity index 100%
rename from Zend/tests/closure_056.phpt
rename to Zend/tests/closures/closure_056.phpt
diff --git a/Zend/tests/closure_057.phpt b/Zend/tests/closures/closure_057.phpt
similarity index 100%
rename from Zend/tests/closure_057.phpt
rename to Zend/tests/closures/closure_057.phpt
diff --git a/Zend/tests/closure_058.phpt b/Zend/tests/closures/closure_058.phpt
similarity index 100%
rename from Zend/tests/closure_058.phpt
rename to Zend/tests/closures/closure_058.phpt
diff --git a/Zend/tests/closure_059.phpt b/Zend/tests/closures/closure_059.phpt
similarity index 100%
rename from Zend/tests/closure_059.phpt
rename to Zend/tests/closures/closure_059.phpt
diff --git a/Zend/tests/closure_060.phpt b/Zend/tests/closures/closure_060.phpt
similarity index 100%
rename from Zend/tests/closure_060.phpt
rename to Zend/tests/closures/closure_060.phpt
diff --git a/Zend/tests/closure_061.phpt b/Zend/tests/closures/closure_061.phpt
similarity index 100%
rename from Zend/tests/closure_061.phpt
rename to Zend/tests/closures/closure_061.phpt
diff --git a/Zend/tests/closure_062.phpt b/Zend/tests/closures/closure_062.phpt
similarity index 100%
rename from Zend/tests/closure_062.phpt
rename to Zend/tests/closures/closure_062.phpt
diff --git a/Zend/tests/closure_063.phpt b/Zend/tests/closures/closure_063.phpt
similarity index 100%
rename from Zend/tests/closure_063.phpt
rename to Zend/tests/closures/closure_063.phpt
diff --git a/Zend/tests/closure_064.phpt b/Zend/tests/closures/closure_064.phpt
similarity index 100%
rename from Zend/tests/closure_064.phpt
rename to Zend/tests/closures/closure_064.phpt
diff --git a/Zend/tests/closure_065.phpt b/Zend/tests/closures/closure_065.phpt
similarity index 100%
rename from Zend/tests/closure_065.phpt
rename to Zend/tests/closures/closure_065.phpt
diff --git a/Zend/tests/closure_066.phpt b/Zend/tests/closures/closure_066.phpt
similarity index 100%
rename from Zend/tests/closure_066.phpt
rename to Zend/tests/closures/closure_066.phpt
diff --git a/Zend/tests/closure_067.phpt b/Zend/tests/closures/closure_067.phpt
similarity index 100%
rename from Zend/tests/closure_067.phpt
rename to Zend/tests/closures/closure_067.phpt
diff --git a/Zend/tests/closure_068.phpt b/Zend/tests/closures/closure_068.phpt
similarity index 100%
rename from Zend/tests/closure_068.phpt
rename to Zend/tests/closures/closure_068.phpt
diff --git a/Zend/tests/constant_expressions.phpt b/Zend/tests/constant_expressions/constant_expressions.phpt
similarity index 100%
rename from Zend/tests/constant_expressions.phpt
rename to Zend/tests/constant_expressions/constant_expressions.phpt
diff --git a/Zend/tests/constant_expressions_arrays.phpt b/Zend/tests/constant_expressions/constant_expressions_arrays.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_arrays.phpt
rename to Zend/tests/constant_expressions/constant_expressions_arrays.phpt
diff --git a/Zend/tests/constant_expressions_classes.phpt b/Zend/tests/constant_expressions/constant_expressions_classes.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_classes.phpt
rename to Zend/tests/constant_expressions/constant_expressions_classes.phpt
diff --git a/Zend/tests/constant_expressions_coalesce.phpt b/Zend/tests/constant_expressions/constant_expressions_coalesce.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_coalesce.phpt
rename to Zend/tests/constant_expressions/constant_expressions_coalesce.phpt
diff --git a/Zend/tests/constant_expressions_coalesce_empty_dim.phpt b/Zend/tests/constant_expressions/constant_expressions_coalesce_empty_dim.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_coalesce_empty_dim.phpt
rename to Zend/tests/constant_expressions/constant_expressions_coalesce_empty_dim.phpt
diff --git a/Zend/tests/constant_expressions_dynamic.phpt b/Zend/tests/constant_expressions/constant_expressions_dynamic.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_dynamic.phpt
rename to Zend/tests/constant_expressions/constant_expressions_dynamic.phpt
diff --git a/Zend/tests/constant_expressions_dynamic_class_name_error.phpt b/Zend/tests/constant_expressions/constant_expressions_dynamic_class_name_error.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_dynamic_class_name_error.phpt
rename to Zend/tests/constant_expressions/constant_expressions_dynamic_class_name_error.phpt
diff --git a/Zend/tests/constant_expressions_exceptions.inc b/Zend/tests/constant_expressions/constant_expressions_exceptions.inc
similarity index 100%
rename from Zend/tests/constant_expressions_exceptions.inc
rename to Zend/tests/constant_expressions/constant_expressions_exceptions.inc
diff --git a/Zend/tests/constant_expressions_exceptions_001.phpt b/Zend/tests/constant_expressions/constant_expressions_exceptions_001.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_exceptions_001.phpt
rename to Zend/tests/constant_expressions/constant_expressions_exceptions_001.phpt
diff --git a/Zend/tests/constant_expressions_exceptions_002.phpt b/Zend/tests/constant_expressions/constant_expressions_exceptions_002.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_exceptions_002.phpt
rename to Zend/tests/constant_expressions/constant_expressions_exceptions_002.phpt
diff --git a/Zend/tests/constant_expressions_invalid_offset_type_error.phpt b/Zend/tests/constant_expressions/constant_expressions_invalid_offset_type_error.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_invalid_offset_type_error.phpt
rename to Zend/tests/constant_expressions/constant_expressions_invalid_offset_type_error.phpt
diff --git a/Zend/tests/constant_expressions_self_referencing_array.phpt b/Zend/tests/constant_expressions/constant_expressions_self_referencing_array.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_self_referencing_array.phpt
rename to Zend/tests/constant_expressions/constant_expressions_self_referencing_array.phpt
diff --git a/Zend/tests/constant_expressions_static_class_name_error.phpt b/Zend/tests/constant_expressions/constant_expressions_static_class_name_error.phpt
similarity index 100%
rename from Zend/tests/constant_expressions_static_class_name_error.phpt
rename to Zend/tests/constant_expressions/constant_expressions_static_class_name_error.phpt
diff --git a/Zend/tests/ctor_promotion_abstract.phpt b/Zend/tests/ctor_promotion/ctor_promotion_abstract.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_abstract.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_abstract.phpt
diff --git a/Zend/tests/ctor_promotion_additional_modifiers.phpt b/Zend/tests/ctor_promotion/ctor_promotion_additional_modifiers.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_additional_modifiers.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_additional_modifiers.phpt
diff --git a/Zend/tests/ctor_promotion_attributes.phpt b/Zend/tests/ctor_promotion/ctor_promotion_attributes.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_attributes.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_attributes.phpt
diff --git a/Zend/tests/ctor_promotion_basic.phpt b/Zend/tests/ctor_promotion/ctor_promotion_basic.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_basic.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_basic.phpt
diff --git a/Zend/tests/ctor_promotion_by_ref.phpt b/Zend/tests/ctor_promotion/ctor_promotion_by_ref.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_by_ref.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_by_ref.phpt
diff --git a/Zend/tests/ctor_promotion_callable_type.phpt b/Zend/tests/ctor_promotion/ctor_promotion_callable_type.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_callable_type.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_callable_type.phpt
diff --git a/Zend/tests/ctor_promotion_defaults.phpt b/Zend/tests/ctor_promotion/ctor_promotion_defaults.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_defaults.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_defaults.phpt
diff --git a/Zend/tests/ctor_promotion_free_function.phpt b/Zend/tests/ctor_promotion/ctor_promotion_free_function.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_free_function.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_free_function.phpt
diff --git a/Zend/tests/ctor_promotion_interface.phpt b/Zend/tests/ctor_promotion/ctor_promotion_interface.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_interface.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_interface.phpt
diff --git a/Zend/tests/ctor_promotion_mixing.phpt b/Zend/tests/ctor_promotion/ctor_promotion_mixing.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_mixing.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_mixing.phpt
diff --git a/Zend/tests/ctor_promotion_not_a_ctor.phpt b/Zend/tests/ctor_promotion/ctor_promotion_not_a_ctor.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_not_a_ctor.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_not_a_ctor.phpt
diff --git a/Zend/tests/ctor_promotion_null_default.phpt b/Zend/tests/ctor_promotion/ctor_promotion_null_default.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_null_default.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_null_default.phpt
diff --git a/Zend/tests/ctor_promotion_repeated_prop.phpt b/Zend/tests/ctor_promotion/ctor_promotion_repeated_prop.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_repeated_prop.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_repeated_prop.phpt
diff --git a/Zend/tests/ctor_promotion_trait.phpt b/Zend/tests/ctor_promotion/ctor_promotion_trait.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_trait.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_trait.phpt
diff --git a/Zend/tests/ctor_promotion_untyped_default.phpt b/Zend/tests/ctor_promotion/ctor_promotion_untyped_default.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_untyped_default.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_untyped_default.phpt
diff --git a/Zend/tests/ctor_promotion_variadic.phpt b/Zend/tests/ctor_promotion/ctor_promotion_variadic.phpt
similarity index 100%
rename from Zend/tests/ctor_promotion_variadic.phpt
rename to Zend/tests/ctor_promotion/ctor_promotion_variadic.phpt
diff --git a/Zend/tests/debug_info-error-0.0.phpt b/Zend/tests/debug_info/debug_info-error-0.0.phpt
similarity index 73%
rename from Zend/tests/debug_info-error-0.0.phpt
rename to Zend/tests/debug_info/debug_info-error-0.0.phpt
index e3996e0f25996..ab41b440fc888 100644
--- a/Zend/tests/debug_info-error-0.0.phpt
+++ b/Zend/tests/debug_info/debug_info-error-0.0.phpt
@@ -17,4 +17,4 @@ $c = new C(0.0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-0.0.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-0.phpt b/Zend/tests/debug_info/debug_info-error-0.phpt
similarity index 73%
rename from Zend/tests/debug_info-error-0.phpt
rename to Zend/tests/debug_info/debug_info-error-0.phpt
index 7dbac320a1754..37289c6468fff 100644
--- a/Zend/tests/debug_info-error-0.phpt
+++ b/Zend/tests/debug_info/debug_info-error-0.phpt
@@ -17,4 +17,4 @@ $c = new C(0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-0.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-1.0.phpt b/Zend/tests/debug_info/debug_info-error-1.0.phpt
similarity index 73%
rename from Zend/tests/debug_info-error-1.0.phpt
rename to Zend/tests/debug_info/debug_info-error-1.0.phpt
index 0213e9daad250..9b168621b5efe 100644
--- a/Zend/tests/debug_info-error-1.0.phpt
+++ b/Zend/tests/debug_info/debug_info-error-1.0.phpt
@@ -17,4 +17,4 @@ $c = new C(1.0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-1.0.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-1.phpt b/Zend/tests/debug_info/debug_info-error-1.phpt
similarity index 73%
rename from Zend/tests/debug_info-error-1.phpt
rename to Zend/tests/debug_info/debug_info-error-1.phpt
index a8e4644b49083..ae01a6055c004 100644
--- a/Zend/tests/debug_info-error-1.phpt
+++ b/Zend/tests/debug_info/debug_info-error-1.phpt
@@ -17,4 +17,4 @@ $c = new C(1);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-1.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-empty_str.phpt b/Zend/tests/debug_info/debug_info-error-empty_str.phpt
similarity index 72%
rename from Zend/tests/debug_info-error-empty_str.phpt
rename to Zend/tests/debug_info/debug_info-error-empty_str.phpt
index 39f227cb96750..bbab78cd82021 100644
--- a/Zend/tests/debug_info-error-empty_str.phpt
+++ b/Zend/tests/debug_info/debug_info-error-empty_str.phpt
@@ -17,4 +17,4 @@ $c = new C("");
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-empty_str.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-false.phpt b/Zend/tests/debug_info/debug_info-error-false.phpt
similarity index 72%
rename from Zend/tests/debug_info-error-false.phpt
rename to Zend/tests/debug_info/debug_info-error-false.phpt
index bf18ed4d038d8..3e48372c420c2 100644
--- a/Zend/tests/debug_info-error-false.phpt
+++ b/Zend/tests/debug_info/debug_info-error-false.phpt
@@ -17,4 +17,4 @@ $c = new C(false);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-false.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-object.phpt b/Zend/tests/debug_info/debug_info-error-object.phpt
similarity index 73%
rename from Zend/tests/debug_info-error-object.phpt
rename to Zend/tests/debug_info/debug_info-error-object.phpt
index e94c2dfb36ccb..42e073999908c 100644
--- a/Zend/tests/debug_info-error-object.phpt
+++ b/Zend/tests/debug_info/debug_info-error-object.phpt
@@ -17,4 +17,4 @@ $c = new C(new stdClass);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-object.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-resource.phpt b/Zend/tests/debug_info/debug_info-error-resource.phpt
similarity index 75%
rename from Zend/tests/debug_info-error-resource.phpt
rename to Zend/tests/debug_info/debug_info-error-resource.phpt
index 285ed72e33072..ccacce7a74b45 100644
--- a/Zend/tests/debug_info-error-resource.phpt
+++ b/Zend/tests/debug_info/debug_info-error-resource.phpt
@@ -19,4 +19,4 @@ $c = new C(fopen("data:text/plain,Foo", 'r'));
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-resource.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-str.phpt b/Zend/tests/debug_info/debug_info-error-str.phpt
similarity index 73%
rename from Zend/tests/debug_info-error-str.phpt
rename to Zend/tests/debug_info/debug_info-error-str.phpt
index daf0ad3b588ea..85d3f63b97e05 100644
--- a/Zend/tests/debug_info-error-str.phpt
+++ b/Zend/tests/debug_info/debug_info-error-str.phpt
@@ -17,4 +17,4 @@ $c = new C("foo");
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-str.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info-error-true.phpt b/Zend/tests/debug_info/debug_info-error-true.phpt
similarity index 72%
rename from Zend/tests/debug_info-error-true.phpt
rename to Zend/tests/debug_info/debug_info-error-true.phpt
index 41a68c5c3965f..3843c6a7a14a5 100644
--- a/Zend/tests/debug_info-error-true.phpt
+++ b/Zend/tests/debug_info/debug_info-error-true.phpt
@@ -17,4 +17,4 @@ $c = new C(true);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-true.php on line %d
+Fatal error: __debuginfo() must return an array in %s on line %d
diff --git a/Zend/tests/debug_info.phpt b/Zend/tests/debug_info/debug_info.phpt
similarity index 100%
rename from Zend/tests/debug_info.phpt
rename to Zend/tests/debug_info/debug_info.phpt
diff --git a/Zend/tests/dereference_001.phpt b/Zend/tests/dereference/dereference_001.phpt
similarity index 100%
rename from Zend/tests/dereference_001.phpt
rename to Zend/tests/dereference/dereference_001.phpt
diff --git a/Zend/tests/dereference_002.phpt b/Zend/tests/dereference/dereference_002.phpt
similarity index 100%
rename from Zend/tests/dereference_002.phpt
rename to Zend/tests/dereference/dereference_002.phpt
diff --git a/Zend/tests/dereference_003.phpt b/Zend/tests/dereference/dereference_003.phpt
similarity index 100%
rename from Zend/tests/dereference_003.phpt
rename to Zend/tests/dereference/dereference_003.phpt
diff --git a/Zend/tests/dereference_004.phpt b/Zend/tests/dereference/dereference_004.phpt
similarity index 100%
rename from Zend/tests/dereference_004.phpt
rename to Zend/tests/dereference/dereference_004.phpt
diff --git a/Zend/tests/dereference_005.phpt b/Zend/tests/dereference/dereference_005.phpt
similarity index 100%
rename from Zend/tests/dereference_005.phpt
rename to Zend/tests/dereference/dereference_005.phpt
diff --git a/Zend/tests/dereference_006.phpt b/Zend/tests/dereference/dereference_006.phpt
similarity index 100%
rename from Zend/tests/dereference_006.phpt
rename to Zend/tests/dereference/dereference_006.phpt
diff --git a/Zend/tests/dereference_007.phpt b/Zend/tests/dereference/dereference_007.phpt
similarity index 100%
rename from Zend/tests/dereference_007.phpt
rename to Zend/tests/dereference/dereference_007.phpt
diff --git a/Zend/tests/dereference_008.phpt b/Zend/tests/dereference/dereference_008.phpt
similarity index 100%
rename from Zend/tests/dereference_008.phpt
rename to Zend/tests/dereference/dereference_008.phpt
diff --git a/Zend/tests/dereference_009.phpt b/Zend/tests/dereference/dereference_009.phpt
similarity index 100%
rename from Zend/tests/dereference_009.phpt
rename to Zend/tests/dereference/dereference_009.phpt
diff --git a/Zend/tests/dereference_010.phpt b/Zend/tests/dereference/dereference_010.phpt
similarity index 100%
rename from Zend/tests/dereference_010.phpt
rename to Zend/tests/dereference/dereference_010.phpt
diff --git a/Zend/tests/dereference_011.phpt b/Zend/tests/dereference/dereference_011.phpt
similarity index 100%
rename from Zend/tests/dereference_011.phpt
rename to Zend/tests/dereference/dereference_011.phpt
diff --git a/Zend/tests/dereference_012.phpt b/Zend/tests/dereference/dereference_012.phpt
similarity index 100%
rename from Zend/tests/dereference_012.phpt
rename to Zend/tests/dereference/dereference_012.phpt
diff --git a/Zend/tests/dereference_013.phpt b/Zend/tests/dereference/dereference_013.phpt
similarity index 100%
rename from Zend/tests/dereference_013.phpt
rename to Zend/tests/dereference/dereference_013.phpt
diff --git a/Zend/tests/dereference_014.phpt b/Zend/tests/dereference/dereference_014.phpt
similarity index 100%
rename from Zend/tests/dereference_014.phpt
rename to Zend/tests/dereference/dereference_014.phpt
diff --git a/Zend/tests/first_class_callable_001.phpt b/Zend/tests/first_class_callable/first_class_callable_001.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_001.phpt
rename to Zend/tests/first_class_callable/first_class_callable_001.phpt
diff --git a/Zend/tests/first_class_callable_002.phpt b/Zend/tests/first_class_callable/first_class_callable_002.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_002.phpt
rename to Zend/tests/first_class_callable/first_class_callable_002.phpt
diff --git a/Zend/tests/first_class_callable_003.phpt b/Zend/tests/first_class_callable/first_class_callable_003.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_003.phpt
rename to Zend/tests/first_class_callable/first_class_callable_003.phpt
diff --git a/Zend/tests/first_class_callable_004.phpt b/Zend/tests/first_class_callable/first_class_callable_004.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_004.phpt
rename to Zend/tests/first_class_callable/first_class_callable_004.phpt
diff --git a/Zend/tests/first_class_callable_005.phpt b/Zend/tests/first_class_callable/first_class_callable_005.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_005.phpt
rename to Zend/tests/first_class_callable/first_class_callable_005.phpt
diff --git a/Zend/tests/first_class_callable_006.phpt b/Zend/tests/first_class_callable/first_class_callable_006.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_006.phpt
rename to Zend/tests/first_class_callable/first_class_callable_006.phpt
diff --git a/Zend/tests/first_class_callable_007.phpt b/Zend/tests/first_class_callable/first_class_callable_007.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_007.phpt
rename to Zend/tests/first_class_callable/first_class_callable_007.phpt
diff --git a/Zend/tests/first_class_callable_008.phpt b/Zend/tests/first_class_callable/first_class_callable_008.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_008.phpt
rename to Zend/tests/first_class_callable/first_class_callable_008.phpt
diff --git a/Zend/tests/first_class_callable_009.phpt b/Zend/tests/first_class_callable/first_class_callable_009.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_009.phpt
rename to Zend/tests/first_class_callable/first_class_callable_009.phpt
diff --git a/Zend/tests/first_class_callable_010.phpt b/Zend/tests/first_class_callable/first_class_callable_010.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_010.phpt
rename to Zend/tests/first_class_callable/first_class_callable_010.phpt
diff --git a/Zend/tests/first_class_callable_011.phpt b/Zend/tests/first_class_callable/first_class_callable_011.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_011.phpt
rename to Zend/tests/first_class_callable/first_class_callable_011.phpt
diff --git a/Zend/tests/first_class_callable_012.phpt b/Zend/tests/first_class_callable/first_class_callable_012.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_012.phpt
rename to Zend/tests/first_class_callable/first_class_callable_012.phpt
diff --git a/Zend/tests/first_class_callable_013.phpt b/Zend/tests/first_class_callable/first_class_callable_013.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_013.phpt
rename to Zend/tests/first_class_callable/first_class_callable_013.phpt
diff --git a/Zend/tests/first_class_callable_014.phpt b/Zend/tests/first_class_callable/first_class_callable_014.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_014.phpt
rename to Zend/tests/first_class_callable/first_class_callable_014.phpt
diff --git a/Zend/tests/first_class_callable_015.phpt b/Zend/tests/first_class_callable/first_class_callable_015.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_015.phpt
rename to Zend/tests/first_class_callable/first_class_callable_015.phpt
diff --git a/Zend/tests/first_class_callable_015_strict.inc b/Zend/tests/first_class_callable/first_class_callable_015_strict.inc
similarity index 100%
rename from Zend/tests/first_class_callable_015_strict.inc
rename to Zend/tests/first_class_callable/first_class_callable_015_strict.inc
diff --git a/Zend/tests/first_class_callable_015_weak.inc b/Zend/tests/first_class_callable/first_class_callable_015_weak.inc
similarity index 100%
rename from Zend/tests/first_class_callable_015_weak.inc
rename to Zend/tests/first_class_callable/first_class_callable_015_weak.inc
diff --git a/Zend/tests/first_class_callable_016.phpt b/Zend/tests/first_class_callable/first_class_callable_016.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_016.phpt
rename to Zend/tests/first_class_callable/first_class_callable_016.phpt
diff --git a/Zend/tests/first_class_callable_assert.phpt b/Zend/tests/first_class_callable/first_class_callable_assert.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_assert.phpt
rename to Zend/tests/first_class_callable/first_class_callable_assert.phpt
diff --git a/Zend/tests/first_class_callable_assert2.phpt b/Zend/tests/first_class_callable/first_class_callable_assert2.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_assert2.phpt
rename to Zend/tests/first_class_callable/first_class_callable_assert2.phpt
diff --git a/Zend/tests/first_class_callable_assert3.phpt b/Zend/tests/first_class_callable/first_class_callable_assert3.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_assert3.phpt
rename to Zend/tests/first_class_callable/first_class_callable_assert3.phpt
diff --git a/Zend/tests/first_class_callable_dynamic.phpt b/Zend/tests/first_class_callable/first_class_callable_dynamic.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_dynamic.phpt
rename to Zend/tests/first_class_callable/first_class_callable_dynamic.phpt
diff --git a/Zend/tests/first_class_callable_errors.phpt b/Zend/tests/first_class_callable/first_class_callable_errors.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_errors.phpt
rename to Zend/tests/first_class_callable/first_class_callable_errors.phpt
diff --git a/Zend/tests/first_class_callable_optimization.phpt b/Zend/tests/first_class_callable/first_class_callable_optimization.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_optimization.phpt
rename to Zend/tests/first_class_callable/first_class_callable_optimization.phpt
diff --git a/Zend/tests/first_class_callable_refs.phpt b/Zend/tests/first_class_callable/first_class_callable_refs.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_refs.phpt
rename to Zend/tests/first_class_callable/first_class_callable_refs.phpt
diff --git a/Zend/tests/first_class_callable_signature.phpt b/Zend/tests/first_class_callable/first_class_callable_signature.phpt
similarity index 100%
rename from Zend/tests/first_class_callable_signature.phpt
rename to Zend/tests/first_class_callable/first_class_callable_signature.phpt