diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/comparison/compare_001.phpt similarity index 100% rename from Zend/tests/compare_001.phpt rename to Zend/tests/comparison/compare_001.phpt diff --git a/Zend/tests/compare_001_64bit.phpt b/Zend/tests/comparison/compare_001_64bit.phpt similarity index 100% rename from Zend/tests/compare_001_64bit.phpt rename to Zend/tests/comparison/compare_001_64bit.phpt diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/comparison/compare_002.phpt similarity index 100% rename from Zend/tests/compare_002.phpt rename to Zend/tests/comparison/compare_002.phpt diff --git a/Zend/tests/compare_002_64bit.phpt b/Zend/tests/comparison/compare_002_64bit.phpt similarity index 100% rename from Zend/tests/compare_002_64bit.phpt rename to Zend/tests/comparison/compare_002_64bit.phpt diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/comparison/compare_003.phpt similarity index 100% rename from Zend/tests/compare_003.phpt rename to Zend/tests/comparison/compare_003.phpt diff --git a/Zend/tests/compare_003_64bit.phpt b/Zend/tests/comparison/compare_003_64bit.phpt similarity index 100% rename from Zend/tests/compare_003_64bit.phpt rename to Zend/tests/comparison/compare_003_64bit.phpt diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/comparison/compare_004.phpt similarity index 100% rename from Zend/tests/compare_004.phpt rename to Zend/tests/comparison/compare_004.phpt diff --git a/Zend/tests/compare_004_64bit.phpt b/Zend/tests/comparison/compare_004_64bit.phpt similarity index 100% rename from Zend/tests/compare_004_64bit.phpt rename to Zend/tests/comparison/compare_004_64bit.phpt diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/comparison/compare_005.phpt similarity index 100% rename from Zend/tests/compare_005.phpt rename to Zend/tests/comparison/compare_005.phpt diff --git a/Zend/tests/compare_005_64bit.phpt b/Zend/tests/comparison/compare_005_64bit.phpt similarity index 100% rename from Zend/tests/compare_005_64bit.phpt rename to Zend/tests/comparison/compare_005_64bit.phpt diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/comparison/compare_006.phpt similarity index 100% rename from Zend/tests/compare_006.phpt rename to Zend/tests/comparison/compare_006.phpt diff --git a/Zend/tests/compare_006_64bit.phpt b/Zend/tests/comparison/compare_006_64bit.phpt similarity index 100% rename from Zend/tests/compare_006_64bit.phpt rename to Zend/tests/comparison/compare_006_64bit.phpt diff --git a/Zend/tests/dynamic_call_002.phpt b/Zend/tests/dynamic_call/dynamic_call_002.phpt similarity index 100% rename from Zend/tests/dynamic_call_002.phpt rename to Zend/tests/dynamic_call/dynamic_call_002.phpt diff --git a/Zend/tests/dynamic_call_003.phpt b/Zend/tests/dynamic_call/dynamic_call_003.phpt similarity index 100% rename from Zend/tests/dynamic_call_003.phpt rename to Zend/tests/dynamic_call/dynamic_call_003.phpt diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call/dynamic_call_004.phpt similarity index 100% rename from Zend/tests/dynamic_call_004.phpt rename to Zend/tests/dynamic_call/dynamic_call_004.phpt diff --git a/Zend/tests/dynamic_call_005.phpt b/Zend/tests/dynamic_call/dynamic_call_005.phpt similarity index 100% rename from Zend/tests/dynamic_call_005.phpt rename to Zend/tests/dynamic_call/dynamic_call_005.phpt diff --git a/Zend/tests/dynamic_call_006.phpt b/Zend/tests/dynamic_call/dynamic_call_006.phpt similarity index 100% rename from Zend/tests/dynamic_call_006.phpt rename to Zend/tests/dynamic_call/dynamic_call_006.phpt diff --git a/Zend/tests/dynamic_call_007.phpt b/Zend/tests/dynamic_call/dynamic_call_007.phpt similarity index 100% rename from Zend/tests/dynamic_call_007.phpt rename to Zend/tests/dynamic_call/dynamic_call_007.phpt diff --git a/Zend/tests/dynamic_call_008.phpt b/Zend/tests/dynamic_call/dynamic_call_008.phpt similarity index 100% rename from Zend/tests/dynamic_call_008.phpt rename to Zend/tests/dynamic_call/dynamic_call_008.phpt diff --git a/Zend/tests/dynamic_call_freeing.phpt b/Zend/tests/dynamic_call/dynamic_call_freeing.phpt similarity index 100% rename from Zend/tests/dynamic_call_freeing.phpt rename to Zend/tests/dynamic_call/dynamic_call_freeing.phpt diff --git a/Zend/tests/dynamic_call_non_static.phpt b/Zend/tests/dynamic_call/dynamic_call_non_static.phpt similarity index 100% rename from Zend/tests/dynamic_call_non_static.phpt rename to Zend/tests/dynamic_call/dynamic_call_non_static.phpt diff --git a/Zend/tests/dynamic_call_to_ref_returning_function.phpt b/Zend/tests/dynamic_call/dynamic_call_to_ref_returning_function.phpt similarity index 100% rename from Zend/tests/dynamic_call_to_ref_returning_function.phpt rename to Zend/tests/dynamic_call/dynamic_call_to_ref_returning_function.phpt diff --git a/Zend/tests/dynamic_fully_qualified_call.phpt b/Zend/tests/dynamic_call/dynamic_fully_qualified_call.phpt similarity index 100% rename from Zend/tests/dynamic_fully_qualified_call.phpt rename to Zend/tests/dynamic_call/dynamic_fully_qualified_call.phpt diff --git a/Zend/tests/errmsg_001.phpt b/Zend/tests/errmsg/errmsg_001.phpt similarity index 100% rename from Zend/tests/errmsg_001.phpt rename to Zend/tests/errmsg/errmsg_001.phpt diff --git a/Zend/tests/errmsg_002.phpt b/Zend/tests/errmsg/errmsg_002.phpt similarity index 100% rename from Zend/tests/errmsg_002.phpt rename to Zend/tests/errmsg/errmsg_002.phpt diff --git a/Zend/tests/errmsg_003.phpt b/Zend/tests/errmsg/errmsg_003.phpt similarity index 100% rename from Zend/tests/errmsg_003.phpt rename to Zend/tests/errmsg/errmsg_003.phpt diff --git a/Zend/tests/errmsg_004.phpt b/Zend/tests/errmsg/errmsg_004.phpt similarity index 100% rename from Zend/tests/errmsg_004.phpt rename to Zend/tests/errmsg/errmsg_004.phpt diff --git a/Zend/tests/errmsg_005.phpt b/Zend/tests/errmsg/errmsg_005.phpt similarity index 100% rename from Zend/tests/errmsg_005.phpt rename to Zend/tests/errmsg/errmsg_005.phpt diff --git a/Zend/tests/errmsg_006.phpt b/Zend/tests/errmsg/errmsg_006.phpt similarity index 100% rename from Zend/tests/errmsg_006.phpt rename to Zend/tests/errmsg/errmsg_006.phpt diff --git a/Zend/tests/errmsg_007.phpt b/Zend/tests/errmsg/errmsg_007.phpt similarity index 100% rename from Zend/tests/errmsg_007.phpt rename to Zend/tests/errmsg/errmsg_007.phpt diff --git a/Zend/tests/errmsg_008.phpt b/Zend/tests/errmsg/errmsg_008.phpt similarity index 100% rename from Zend/tests/errmsg_008.phpt rename to Zend/tests/errmsg/errmsg_008.phpt diff --git a/Zend/tests/errmsg_009.phpt b/Zend/tests/errmsg/errmsg_009.phpt similarity index 100% rename from Zend/tests/errmsg_009.phpt rename to Zend/tests/errmsg/errmsg_009.phpt diff --git a/Zend/tests/errmsg_010.phpt b/Zend/tests/errmsg/errmsg_010.phpt similarity index 100% rename from Zend/tests/errmsg_010.phpt rename to Zend/tests/errmsg/errmsg_010.phpt diff --git a/Zend/tests/errmsg_011.phpt b/Zend/tests/errmsg/errmsg_011.phpt similarity index 100% rename from Zend/tests/errmsg_011.phpt rename to Zend/tests/errmsg/errmsg_011.phpt diff --git a/Zend/tests/errmsg_013.phpt b/Zend/tests/errmsg/errmsg_013.phpt similarity index 100% rename from Zend/tests/errmsg_013.phpt rename to Zend/tests/errmsg/errmsg_013.phpt diff --git a/Zend/tests/errmsg_015.phpt b/Zend/tests/errmsg/errmsg_015.phpt similarity index 100% rename from Zend/tests/errmsg_015.phpt rename to Zend/tests/errmsg/errmsg_015.phpt diff --git a/Zend/tests/errmsg_016.phpt b/Zend/tests/errmsg/errmsg_016.phpt similarity index 100% rename from Zend/tests/errmsg_016.phpt rename to Zend/tests/errmsg/errmsg_016.phpt diff --git a/Zend/tests/errmsg_017.phpt b/Zend/tests/errmsg/errmsg_017.phpt similarity index 100% rename from Zend/tests/errmsg_017.phpt rename to Zend/tests/errmsg/errmsg_017.phpt diff --git a/Zend/tests/errmsg_018.phpt b/Zend/tests/errmsg/errmsg_018.phpt similarity index 100% rename from Zend/tests/errmsg_018.phpt rename to Zend/tests/errmsg/errmsg_018.phpt diff --git a/Zend/tests/errmsg_019.phpt b/Zend/tests/errmsg/errmsg_019.phpt similarity index 100% rename from Zend/tests/errmsg_019.phpt rename to Zend/tests/errmsg/errmsg_019.phpt diff --git a/Zend/tests/errmsg_020.phpt b/Zend/tests/errmsg/errmsg_020.phpt similarity index 100% rename from Zend/tests/errmsg_020.phpt rename to Zend/tests/errmsg/errmsg_020.phpt diff --git a/Zend/tests/errmsg_021.phpt b/Zend/tests/errmsg/errmsg_021.phpt similarity index 100% rename from Zend/tests/errmsg_021.phpt rename to Zend/tests/errmsg/errmsg_021.phpt diff --git a/Zend/tests/errmsg_022.phpt b/Zend/tests/errmsg/errmsg_022.phpt similarity index 100% rename from Zend/tests/errmsg_022.phpt rename to Zend/tests/errmsg/errmsg_022.phpt diff --git a/Zend/tests/errmsg_023.phpt b/Zend/tests/errmsg/errmsg_023.phpt similarity index 100% rename from Zend/tests/errmsg_023.phpt rename to Zend/tests/errmsg/errmsg_023.phpt diff --git a/Zend/tests/errmsg_024.phpt b/Zend/tests/errmsg/errmsg_024.phpt similarity index 100% rename from Zend/tests/errmsg_024.phpt rename to Zend/tests/errmsg/errmsg_024.phpt diff --git a/Zend/tests/errmsg_025.phpt b/Zend/tests/errmsg/errmsg_025.phpt similarity index 100% rename from Zend/tests/errmsg_025.phpt rename to Zend/tests/errmsg/errmsg_025.phpt diff --git a/Zend/tests/errmsg_026.phpt b/Zend/tests/errmsg/errmsg_026.phpt similarity index 100% rename from Zend/tests/errmsg_026.phpt rename to Zend/tests/errmsg/errmsg_026.phpt diff --git a/Zend/tests/errmsg_027.phpt b/Zend/tests/errmsg/errmsg_027.phpt similarity index 100% rename from Zend/tests/errmsg_027.phpt rename to Zend/tests/errmsg/errmsg_027.phpt diff --git a/Zend/tests/errmsg_028.phpt b/Zend/tests/errmsg/errmsg_028.phpt similarity index 100% rename from Zend/tests/errmsg_028.phpt rename to Zend/tests/errmsg/errmsg_028.phpt diff --git a/Zend/tests/errmsg_029.phpt b/Zend/tests/errmsg/errmsg_029.phpt similarity index 100% rename from Zend/tests/errmsg_029.phpt rename to Zend/tests/errmsg/errmsg_029.phpt diff --git a/Zend/tests/errmsg_030.phpt b/Zend/tests/errmsg/errmsg_030.phpt similarity index 100% rename from Zend/tests/errmsg_030.phpt rename to Zend/tests/errmsg/errmsg_030.phpt diff --git a/Zend/tests/errmsg_031.phpt b/Zend/tests/errmsg/errmsg_031.phpt similarity index 100% rename from Zend/tests/errmsg_031.phpt rename to Zend/tests/errmsg/errmsg_031.phpt diff --git a/Zend/tests/errmsg_032.phpt b/Zend/tests/errmsg/errmsg_032.phpt similarity index 100% rename from Zend/tests/errmsg_032.phpt rename to Zend/tests/errmsg/errmsg_032.phpt diff --git a/Zend/tests/errmsg_033.phpt b/Zend/tests/errmsg/errmsg_033.phpt similarity index 100% rename from Zend/tests/errmsg_033.phpt rename to Zend/tests/errmsg/errmsg_033.phpt diff --git a/Zend/tests/errmsg_034.phpt b/Zend/tests/errmsg/errmsg_034.phpt similarity index 100% rename from Zend/tests/errmsg_034.phpt rename to Zend/tests/errmsg/errmsg_034.phpt diff --git a/Zend/tests/errmsg_035.phpt b/Zend/tests/errmsg/errmsg_035.phpt similarity index 100% rename from Zend/tests/errmsg_035.phpt rename to Zend/tests/errmsg/errmsg_035.phpt diff --git a/Zend/tests/errmsg_036.phpt b/Zend/tests/errmsg/errmsg_036.phpt similarity index 100% rename from Zend/tests/errmsg_036.phpt rename to Zend/tests/errmsg/errmsg_036.phpt diff --git a/Zend/tests/errmsg_037.phpt b/Zend/tests/errmsg/errmsg_037.phpt similarity index 100% rename from Zend/tests/errmsg_037.phpt rename to Zend/tests/errmsg/errmsg_037.phpt diff --git a/Zend/tests/errmsg_039.phpt b/Zend/tests/errmsg/errmsg_039.phpt similarity index 100% rename from Zend/tests/errmsg_039.phpt rename to Zend/tests/errmsg/errmsg_039.phpt diff --git a/Zend/tests/errmsg_040.phpt b/Zend/tests/errmsg/errmsg_040.phpt similarity index 100% rename from Zend/tests/errmsg_040.phpt rename to Zend/tests/errmsg/errmsg_040.phpt diff --git a/Zend/tests/errmsg_042.phpt b/Zend/tests/errmsg/errmsg_042.phpt similarity index 100% rename from Zend/tests/errmsg_042.phpt rename to Zend/tests/errmsg/errmsg_042.phpt diff --git a/Zend/tests/errmsg_044.phpt b/Zend/tests/errmsg/errmsg_044.phpt similarity index 100% rename from Zend/tests/errmsg_044.phpt rename to Zend/tests/errmsg/errmsg_044.phpt diff --git a/Zend/tests/errmsg_045.phpt b/Zend/tests/errmsg/errmsg_045.phpt similarity index 100% rename from Zend/tests/errmsg_045.phpt rename to Zend/tests/errmsg/errmsg_045.phpt diff --git a/Zend/tests/error_reporting01.phpt b/Zend/tests/error_reporting/error_reporting01.phpt similarity index 100% rename from Zend/tests/error_reporting01.phpt rename to Zend/tests/error_reporting/error_reporting01.phpt diff --git a/Zend/tests/error_reporting02.phpt b/Zend/tests/error_reporting/error_reporting02.phpt similarity index 100% rename from Zend/tests/error_reporting02.phpt rename to Zend/tests/error_reporting/error_reporting02.phpt diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting/error_reporting03.phpt similarity index 100% rename from Zend/tests/error_reporting03.phpt rename to Zend/tests/error_reporting/error_reporting03.phpt diff --git a/Zend/tests/error_reporting04.phpt b/Zend/tests/error_reporting/error_reporting04.phpt similarity index 100% rename from Zend/tests/error_reporting04.phpt rename to Zend/tests/error_reporting/error_reporting04.phpt diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting/error_reporting05.phpt similarity index 100% rename from Zend/tests/error_reporting05.phpt rename to Zend/tests/error_reporting/error_reporting05.phpt diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting/error_reporting06.phpt similarity index 100% rename from Zend/tests/error_reporting06.phpt rename to Zend/tests/error_reporting/error_reporting06.phpt diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting/error_reporting07.phpt similarity index 100% rename from Zend/tests/error_reporting07.phpt rename to Zend/tests/error_reporting/error_reporting07.phpt diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting/error_reporting08.phpt similarity index 100% rename from Zend/tests/error_reporting08.phpt rename to Zend/tests/error_reporting/error_reporting08.phpt diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting/error_reporting09.phpt similarity index 100% rename from Zend/tests/error_reporting09.phpt rename to Zend/tests/error_reporting/error_reporting09.phpt diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting/error_reporting10.phpt similarity index 100% rename from Zend/tests/error_reporting10.phpt rename to Zend/tests/error_reporting/error_reporting10.phpt diff --git a/Zend/tests/exception_001.phpt b/Zend/tests/exceptions/exception_001.phpt similarity index 100% rename from Zend/tests/exception_001.phpt rename to Zend/tests/exceptions/exception_001.phpt diff --git a/Zend/tests/exception_002.phpt b/Zend/tests/exceptions/exception_002.phpt similarity index 100% rename from Zend/tests/exception_002.phpt rename to Zend/tests/exceptions/exception_002.phpt diff --git a/Zend/tests/exception_003.phpt b/Zend/tests/exceptions/exception_003.phpt similarity index 100% rename from Zend/tests/exception_003.phpt rename to Zend/tests/exceptions/exception_003.phpt diff --git a/Zend/tests/exception_004.phpt b/Zend/tests/exceptions/exception_004.phpt similarity index 100% rename from Zend/tests/exception_004.phpt rename to Zend/tests/exceptions/exception_004.phpt diff --git a/Zend/tests/exception_005.phpt b/Zend/tests/exceptions/exception_005.phpt similarity index 100% rename from Zend/tests/exception_005.phpt rename to Zend/tests/exceptions/exception_005.phpt diff --git a/Zend/tests/exception_006.phpt b/Zend/tests/exceptions/exception_006.phpt similarity index 100% rename from Zend/tests/exception_006.phpt rename to Zend/tests/exceptions/exception_006.phpt diff --git a/Zend/tests/exception_007.phpt b/Zend/tests/exceptions/exception_007.phpt similarity index 100% rename from Zend/tests/exception_007.phpt rename to Zend/tests/exceptions/exception_007.phpt diff --git a/Zend/tests/exception_008.phpt b/Zend/tests/exceptions/exception_008.phpt similarity index 100% rename from Zend/tests/exception_008.phpt rename to Zend/tests/exceptions/exception_008.phpt diff --git a/Zend/tests/exception_009.phpt b/Zend/tests/exceptions/exception_009.phpt similarity index 100% rename from Zend/tests/exception_009.phpt rename to Zend/tests/exceptions/exception_009.phpt diff --git a/Zend/tests/exception_011.phpt b/Zend/tests/exceptions/exception_011.phpt similarity index 100% rename from Zend/tests/exception_011.phpt rename to Zend/tests/exceptions/exception_011.phpt diff --git a/Zend/tests/exception_013.phpt b/Zend/tests/exceptions/exception_013.phpt similarity index 100% rename from Zend/tests/exception_013.phpt rename to Zend/tests/exceptions/exception_013.phpt diff --git a/Zend/tests/exception_014.phpt b/Zend/tests/exceptions/exception_014.phpt similarity index 100% rename from Zend/tests/exception_014.phpt rename to Zend/tests/exceptions/exception_014.phpt diff --git a/Zend/tests/exception_015.phpt b/Zend/tests/exceptions/exception_015.phpt similarity index 100% rename from Zend/tests/exception_015.phpt rename to Zend/tests/exceptions/exception_015.phpt diff --git a/Zend/tests/exception_016.phpt b/Zend/tests/exceptions/exception_016.phpt similarity index 100% rename from Zend/tests/exception_016.phpt rename to Zend/tests/exceptions/exception_016.phpt diff --git a/Zend/tests/exception_017.phpt b/Zend/tests/exceptions/exception_017.phpt similarity index 100% rename from Zend/tests/exception_017.phpt rename to Zend/tests/exceptions/exception_017.phpt diff --git a/Zend/tests/exception_018.phpt b/Zend/tests/exceptions/exception_018.phpt similarity index 100% rename from Zend/tests/exception_018.phpt rename to Zend/tests/exceptions/exception_018.phpt diff --git a/Zend/tests/exception_019.phpt b/Zend/tests/exceptions/exception_019.phpt similarity index 100% rename from Zend/tests/exception_019.phpt rename to Zend/tests/exceptions/exception_019.phpt diff --git a/Zend/tests/exception_020.phpt b/Zend/tests/exceptions/exception_020.phpt similarity index 100% rename from Zend/tests/exception_020.phpt rename to Zend/tests/exceptions/exception_020.phpt diff --git a/Zend/tests/exception_021.phpt b/Zend/tests/exceptions/exception_021.phpt similarity index 100% rename from Zend/tests/exception_021.phpt rename to Zend/tests/exceptions/exception_021.phpt diff --git a/Zend/tests/exception_022.phpt b/Zend/tests/exceptions/exception_022.phpt similarity index 100% rename from Zend/tests/exception_022.phpt rename to Zend/tests/exceptions/exception_022.phpt diff --git a/Zend/tests/exception_023.phpt b/Zend/tests/exceptions/exception_023.phpt similarity index 100% rename from Zend/tests/exception_023.phpt rename to Zend/tests/exceptions/exception_023.phpt diff --git a/Zend/tests/exception_024.phpt b/Zend/tests/exceptions/exception_024.phpt similarity index 100% rename from Zend/tests/exception_024.phpt rename to Zend/tests/exceptions/exception_024.phpt diff --git a/Zend/tests/exception_025.phpt b/Zend/tests/exceptions/exception_025.phpt similarity index 100% rename from Zend/tests/exception_025.phpt rename to Zend/tests/exceptions/exception_025.phpt diff --git a/Zend/tests/exception_026.phpt b/Zend/tests/exceptions/exception_026.phpt similarity index 100% rename from Zend/tests/exception_026.phpt rename to Zend/tests/exceptions/exception_026.phpt diff --git a/Zend/tests/exception_before_fatal.phpt b/Zend/tests/exceptions/exception_before_fatal.phpt similarity index 100% rename from Zend/tests/exception_before_fatal.phpt rename to Zend/tests/exceptions/exception_before_fatal.phpt diff --git a/Zend/tests/exception_delayed_message.phpt b/Zend/tests/exceptions/exception_delayed_message.phpt similarity index 100% rename from Zend/tests/exception_delayed_message.phpt rename to Zend/tests/exceptions/exception_delayed_message.phpt diff --git a/Zend/tests/exception_during_by_reference_magic_get.phpt b/Zend/tests/exceptions/exception_during_by_reference_magic_get.phpt similarity index 100% rename from Zend/tests/exception_during_by_reference_magic_get.phpt rename to Zend/tests/exceptions/exception_during_by_reference_magic_get.phpt diff --git a/Zend/tests/exception_during_include_stat.phpt b/Zend/tests/exceptions/exception_during_include_stat.phpt similarity index 100% rename from Zend/tests/exception_during_include_stat.phpt rename to Zend/tests/exceptions/exception_during_include_stat.phpt diff --git a/Zend/tests/exception_during_property_assign_op.phpt b/Zend/tests/exceptions/exception_during_property_assign_op.phpt similarity index 100% rename from Zend/tests/exception_during_property_assign_op.phpt rename to Zend/tests/exceptions/exception_during_property_assign_op.phpt diff --git a/Zend/tests/exception_during_variance_autoload.phpt b/Zend/tests/exceptions/exception_during_variance_autoload.phpt similarity index 100% rename from Zend/tests/exception_during_variance_autoload.phpt rename to Zend/tests/exceptions/exception_during_variance_autoload.phpt diff --git a/Zend/tests/exception_during_variance_autoload_2.phpt b/Zend/tests/exceptions/exception_during_variance_autoload_2.phpt similarity index 100% rename from Zend/tests/exception_during_variance_autoload_2.phpt rename to Zend/tests/exceptions/exception_during_variance_autoload_2.phpt diff --git a/Zend/tests/exception_from_toString.phpt b/Zend/tests/exceptions/exception_from_toString.phpt similarity index 100% rename from Zend/tests/exception_from_toString.phpt rename to Zend/tests/exceptions/exception_from_toString.phpt diff --git a/Zend/tests/exception_getters_with_ref_props.phpt b/Zend/tests/exceptions/exception_getters_with_ref_props.phpt similarity index 100% rename from Zend/tests/exception_getters_with_ref_props.phpt rename to Zend/tests/exceptions/exception_getters_with_ref_props.phpt diff --git a/Zend/tests/foreach.phpt b/Zend/tests/foreach/foreach.phpt similarity index 100% rename from Zend/tests/foreach.phpt rename to Zend/tests/foreach/foreach.phpt diff --git a/Zend/tests/foreach_002.phpt b/Zend/tests/foreach/foreach_002.phpt similarity index 100% rename from Zend/tests/foreach_002.phpt rename to Zend/tests/foreach/foreach_002.phpt diff --git a/Zend/tests/foreach_003.phpt b/Zend/tests/foreach/foreach_003.phpt similarity index 100% rename from Zend/tests/foreach_003.phpt rename to Zend/tests/foreach/foreach_003.phpt diff --git a/Zend/tests/foreach_005.phpt b/Zend/tests/foreach/foreach_005.phpt similarity index 100% rename from Zend/tests/foreach_005.phpt rename to Zend/tests/foreach/foreach_005.phpt diff --git a/Zend/tests/foreach_006.phpt b/Zend/tests/foreach/foreach_006.phpt similarity index 100% rename from Zend/tests/foreach_006.phpt rename to Zend/tests/foreach/foreach_006.phpt diff --git a/Zend/tests/foreach_007.phpt b/Zend/tests/foreach/foreach_007.phpt similarity index 100% rename from Zend/tests/foreach_007.phpt rename to Zend/tests/foreach/foreach_007.phpt diff --git a/Zend/tests/foreach_008.phpt b/Zend/tests/foreach/foreach_008.phpt similarity index 100% rename from Zend/tests/foreach_008.phpt rename to Zend/tests/foreach/foreach_008.phpt diff --git a/Zend/tests/foreach_009.phpt b/Zend/tests/foreach/foreach_009.phpt similarity index 100% rename from Zend/tests/foreach_009.phpt rename to Zend/tests/foreach/foreach_009.phpt diff --git a/Zend/tests/foreach_010.phpt b/Zend/tests/foreach/foreach_010.phpt similarity index 100% rename from Zend/tests/foreach_010.phpt rename to Zend/tests/foreach/foreach_010.phpt diff --git a/Zend/tests/foreach_011.phpt b/Zend/tests/foreach/foreach_011.phpt similarity index 100% rename from Zend/tests/foreach_011.phpt rename to Zend/tests/foreach/foreach_011.phpt diff --git a/Zend/tests/foreach_012.phpt b/Zend/tests/foreach/foreach_012.phpt similarity index 100% rename from Zend/tests/foreach_012.phpt rename to Zend/tests/foreach/foreach_012.phpt diff --git a/Zend/tests/foreach_013.phpt b/Zend/tests/foreach/foreach_013.phpt similarity index 100% rename from Zend/tests/foreach_013.phpt rename to Zend/tests/foreach/foreach_013.phpt diff --git a/Zend/tests/foreach_014.phpt b/Zend/tests/foreach/foreach_014.phpt similarity index 100% rename from Zend/tests/foreach_014.phpt rename to Zend/tests/foreach/foreach_014.phpt diff --git a/Zend/tests/foreach_015.phpt b/Zend/tests/foreach/foreach_015.phpt similarity index 100% rename from Zend/tests/foreach_015.phpt rename to Zend/tests/foreach/foreach_015.phpt diff --git a/Zend/tests/foreach_016.phpt b/Zend/tests/foreach/foreach_016.phpt similarity index 100% rename from Zend/tests/foreach_016.phpt rename to Zend/tests/foreach/foreach_016.phpt diff --git a/Zend/tests/foreach_017.phpt b/Zend/tests/foreach/foreach_017.phpt similarity index 100% rename from Zend/tests/foreach_017.phpt rename to Zend/tests/foreach/foreach_017.phpt diff --git a/Zend/tests/foreach_018.phpt b/Zend/tests/foreach/foreach_018.phpt similarity index 100% rename from Zend/tests/foreach_018.phpt rename to Zend/tests/foreach/foreach_018.phpt diff --git a/Zend/tests/foreach_by_ref_repacking_insert.phpt b/Zend/tests/foreach/foreach_by_ref_repacking_insert.phpt similarity index 100% rename from Zend/tests/foreach_by_ref_repacking_insert.phpt rename to Zend/tests/foreach/foreach_by_ref_repacking_insert.phpt diff --git a/Zend/tests/foreach_by_ref_to_property.phpt b/Zend/tests/foreach/foreach_by_ref_to_property.phpt similarity index 100% rename from Zend/tests/foreach_by_ref_to_property.phpt rename to Zend/tests/foreach/foreach_by_ref_to_property.phpt diff --git a/Zend/tests/foreach_empty_loop_leak.phpt b/Zend/tests/foreach/foreach_empty_loop_leak.phpt similarity index 100% rename from Zend/tests/foreach_empty_loop_leak.phpt rename to Zend/tests/foreach/foreach_empty_loop_leak.phpt diff --git a/Zend/tests/foreach_list_001.phpt b/Zend/tests/foreach/foreach_list_001.phpt similarity index 100% rename from Zend/tests/foreach_list_001.phpt rename to Zend/tests/foreach/foreach_list_001.phpt diff --git a/Zend/tests/foreach_list_002.phpt b/Zend/tests/foreach/foreach_list_002.phpt similarity index 100% rename from Zend/tests/foreach_list_002.phpt rename to Zend/tests/foreach/foreach_list_002.phpt diff --git a/Zend/tests/foreach_list_003.phpt b/Zend/tests/foreach/foreach_list_003.phpt similarity index 100% rename from Zend/tests/foreach_list_003.phpt rename to Zend/tests/foreach/foreach_list_003.phpt diff --git a/Zend/tests/foreach_list_004.phpt b/Zend/tests/foreach/foreach_list_004.phpt similarity index 100% rename from Zend/tests/foreach_list_004.phpt rename to Zend/tests/foreach/foreach_list_004.phpt diff --git a/Zend/tests/foreach_list_keyed.phpt b/Zend/tests/foreach/foreach_list_keyed.phpt similarity index 100% rename from Zend/tests/foreach_list_keyed.phpt rename to Zend/tests/foreach/foreach_list_keyed.phpt diff --git a/Zend/tests/foreach_over_null.phpt b/Zend/tests/foreach/foreach_over_null.phpt similarity index 100% rename from Zend/tests/foreach_over_null.phpt rename to Zend/tests/foreach/foreach_over_null.phpt diff --git a/Zend/tests/foreach_reference.phpt b/Zend/tests/foreach/foreach_reference.phpt similarity index 100% rename from Zend/tests/foreach_reference.phpt rename to Zend/tests/foreach/foreach_reference.phpt diff --git a/Zend/tests/foreach_shadowed_dyn_property.phpt b/Zend/tests/foreach/foreach_shadowed_dyn_property.phpt similarity index 100% rename from Zend/tests/foreach_shadowed_dyn_property.phpt rename to Zend/tests/foreach/foreach_shadowed_dyn_property.phpt diff --git a/Zend/tests/foreach_shadowed_property.phpt b/Zend/tests/foreach/foreach_shadowed_property.phpt similarity index 100% rename from Zend/tests/foreach_shadowed_property.phpt rename to Zend/tests/foreach/foreach_shadowed_property.phpt diff --git a/Zend/tests/foreach_temp_array_expr_with_refs.phpt b/Zend/tests/foreach/foreach_temp_array_expr_with_refs.phpt similarity index 100% rename from Zend/tests/foreach_temp_array_expr_with_refs.phpt rename to Zend/tests/foreach/foreach_temp_array_expr_with_refs.phpt diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach/foreach_undefined.phpt similarity index 100% rename from Zend/tests/foreach_undefined.phpt rename to Zend/tests/foreach/foreach_undefined.phpt diff --git a/Zend/tests/foreach_unset_globals.phpt b/Zend/tests/foreach/foreach_unset_globals.phpt similarity index 100% rename from Zend/tests/foreach_unset_globals.phpt rename to Zend/tests/foreach/foreach_unset_globals.phpt diff --git a/Zend/tests/this_in_foreach_001.phpt b/Zend/tests/foreach/this_in_foreach_001.phpt similarity index 100% rename from Zend/tests/this_in_foreach_001.phpt rename to Zend/tests/foreach/this_in_foreach_001.phpt diff --git a/Zend/tests/this_in_foreach_002.phpt b/Zend/tests/foreach/this_in_foreach_002.phpt similarity index 100% rename from Zend/tests/this_in_foreach_002.phpt rename to Zend/tests/foreach/this_in_foreach_002.phpt diff --git a/Zend/tests/this_in_foreach_003.phpt b/Zend/tests/foreach/this_in_foreach_003.phpt similarity index 100% rename from Zend/tests/this_in_foreach_003.phpt rename to Zend/tests/foreach/this_in_foreach_003.phpt diff --git a/Zend/tests/this_in_foreach_004.phpt b/Zend/tests/foreach/this_in_foreach_004.phpt similarity index 100% rename from Zend/tests/this_in_foreach_004.phpt rename to Zend/tests/foreach/this_in_foreach_004.phpt diff --git a/Zend/tests/gc_001.phpt b/Zend/tests/gc/gc_001.phpt similarity index 100% rename from Zend/tests/gc_001.phpt rename to Zend/tests/gc/gc_001.phpt diff --git a/Zend/tests/gc_002.phpt b/Zend/tests/gc/gc_002.phpt similarity index 100% rename from Zend/tests/gc_002.phpt rename to Zend/tests/gc/gc_002.phpt diff --git a/Zend/tests/gc_003.phpt b/Zend/tests/gc/gc_003.phpt similarity index 100% rename from Zend/tests/gc_003.phpt rename to Zend/tests/gc/gc_003.phpt diff --git a/Zend/tests/gc_004.phpt b/Zend/tests/gc/gc_004.phpt similarity index 100% rename from Zend/tests/gc_004.phpt rename to Zend/tests/gc/gc_004.phpt diff --git a/Zend/tests/gc_005.phpt b/Zend/tests/gc/gc_005.phpt similarity index 100% rename from Zend/tests/gc_005.phpt rename to Zend/tests/gc/gc_005.phpt diff --git a/Zend/tests/gc_006.phpt b/Zend/tests/gc/gc_006.phpt similarity index 100% rename from Zend/tests/gc_006.phpt rename to Zend/tests/gc/gc_006.phpt diff --git a/Zend/tests/gc_007.phpt b/Zend/tests/gc/gc_007.phpt similarity index 100% rename from Zend/tests/gc_007.phpt rename to Zend/tests/gc/gc_007.phpt diff --git a/Zend/tests/gc_008.phpt b/Zend/tests/gc/gc_008.phpt similarity index 100% rename from Zend/tests/gc_008.phpt rename to Zend/tests/gc/gc_008.phpt diff --git a/Zend/tests/gc_009.phpt b/Zend/tests/gc/gc_009.phpt similarity index 100% rename from Zend/tests/gc_009.phpt rename to Zend/tests/gc/gc_009.phpt diff --git a/Zend/tests/gc_011.phpt b/Zend/tests/gc/gc_011.phpt similarity index 100% rename from Zend/tests/gc_011.phpt rename to Zend/tests/gc/gc_011.phpt diff --git a/Zend/tests/gc_012.phpt b/Zend/tests/gc/gc_012.phpt similarity index 100% rename from Zend/tests/gc_012.phpt rename to Zend/tests/gc/gc_012.phpt diff --git a/Zend/tests/gc_013.phpt b/Zend/tests/gc/gc_013.phpt similarity index 100% rename from Zend/tests/gc_013.phpt rename to Zend/tests/gc/gc_013.phpt diff --git a/Zend/tests/gc_014.phpt b/Zend/tests/gc/gc_014.phpt similarity index 100% rename from Zend/tests/gc_014.phpt rename to Zend/tests/gc/gc_014.phpt diff --git a/Zend/tests/gc_015.phpt b/Zend/tests/gc/gc_015.phpt similarity index 100% rename from Zend/tests/gc_015.phpt rename to Zend/tests/gc/gc_015.phpt diff --git a/Zend/tests/gc_016.phpt b/Zend/tests/gc/gc_016.phpt similarity index 100% rename from Zend/tests/gc_016.phpt rename to Zend/tests/gc/gc_016.phpt diff --git a/Zend/tests/gc_017.phpt b/Zend/tests/gc/gc_017.phpt similarity index 100% rename from Zend/tests/gc_017.phpt rename to Zend/tests/gc/gc_017.phpt diff --git a/Zend/tests/gc_018.phpt b/Zend/tests/gc/gc_018.phpt similarity index 100% rename from Zend/tests/gc_018.phpt rename to Zend/tests/gc/gc_018.phpt diff --git a/Zend/tests/gc_019.phpt b/Zend/tests/gc/gc_019.phpt similarity index 100% rename from Zend/tests/gc_019.phpt rename to Zend/tests/gc/gc_019.phpt diff --git a/Zend/tests/gc_020.phpt b/Zend/tests/gc/gc_020.phpt similarity index 100% rename from Zend/tests/gc_020.phpt rename to Zend/tests/gc/gc_020.phpt diff --git a/Zend/tests/gc_021.phpt b/Zend/tests/gc/gc_021.phpt similarity index 100% rename from Zend/tests/gc_021.phpt rename to Zend/tests/gc/gc_021.phpt diff --git a/Zend/tests/gc_022.phpt b/Zend/tests/gc/gc_022.phpt similarity index 100% rename from Zend/tests/gc_022.phpt rename to Zend/tests/gc/gc_022.phpt diff --git a/Zend/tests/gc_023.phpt b/Zend/tests/gc/gc_023.phpt similarity index 100% rename from Zend/tests/gc_023.phpt rename to Zend/tests/gc/gc_023.phpt diff --git a/Zend/tests/gc_024.phpt b/Zend/tests/gc/gc_024.phpt similarity index 100% rename from Zend/tests/gc_024.phpt rename to Zend/tests/gc/gc_024.phpt diff --git a/Zend/tests/gc_025.phpt b/Zend/tests/gc/gc_025.phpt similarity index 100% rename from Zend/tests/gc_025.phpt rename to Zend/tests/gc/gc_025.phpt diff --git a/Zend/tests/gc_026.phpt b/Zend/tests/gc/gc_026.phpt similarity index 100% rename from Zend/tests/gc_026.phpt rename to Zend/tests/gc/gc_026.phpt diff --git a/Zend/tests/gc_027.phpt b/Zend/tests/gc/gc_027.phpt similarity index 100% rename from Zend/tests/gc_027.phpt rename to Zend/tests/gc/gc_027.phpt diff --git a/Zend/tests/gc_028.phpt b/Zend/tests/gc/gc_028.phpt similarity index 100% rename from Zend/tests/gc_028.phpt rename to Zend/tests/gc/gc_028.phpt diff --git a/Zend/tests/gc_029.phpt b/Zend/tests/gc/gc_029.phpt similarity index 100% rename from Zend/tests/gc_029.phpt rename to Zend/tests/gc/gc_029.phpt diff --git a/Zend/tests/gc_030.phpt b/Zend/tests/gc/gc_030.phpt similarity index 100% rename from Zend/tests/gc_030.phpt rename to Zend/tests/gc/gc_030.phpt diff --git a/Zend/tests/gc_031.phpt b/Zend/tests/gc/gc_031.phpt similarity index 100% rename from Zend/tests/gc_031.phpt rename to Zend/tests/gc/gc_031.phpt diff --git a/Zend/tests/gc_032.phpt b/Zend/tests/gc/gc_032.phpt similarity index 100% rename from Zend/tests/gc_032.phpt rename to Zend/tests/gc/gc_032.phpt diff --git a/Zend/tests/gc_033.phpt b/Zend/tests/gc/gc_033.phpt similarity index 100% rename from Zend/tests/gc_033.phpt rename to Zend/tests/gc/gc_033.phpt diff --git a/Zend/tests/gc_034.phpt b/Zend/tests/gc/gc_034.phpt similarity index 100% rename from Zend/tests/gc_034.phpt rename to Zend/tests/gc/gc_034.phpt diff --git a/Zend/tests/gc_035.phpt b/Zend/tests/gc/gc_035.phpt similarity index 100% rename from Zend/tests/gc_035.phpt rename to Zend/tests/gc/gc_035.phpt diff --git a/Zend/tests/gc_036.phpt b/Zend/tests/gc/gc_036.phpt similarity index 100% rename from Zend/tests/gc_036.phpt rename to Zend/tests/gc/gc_036.phpt diff --git a/Zend/tests/gc_037.phpt b/Zend/tests/gc/gc_037.phpt similarity index 100% rename from Zend/tests/gc_037.phpt rename to Zend/tests/gc/gc_037.phpt diff --git a/Zend/tests/gc_038.phpt b/Zend/tests/gc/gc_038.phpt similarity index 100% rename from Zend/tests/gc_038.phpt rename to Zend/tests/gc/gc_038.phpt diff --git a/Zend/tests/gc_039.phpt b/Zend/tests/gc/gc_039.phpt similarity index 100% rename from Zend/tests/gc_039.phpt rename to Zend/tests/gc/gc_039.phpt diff --git a/Zend/tests/gc_041.phpt b/Zend/tests/gc/gc_041.phpt similarity index 100% rename from Zend/tests/gc_041.phpt rename to Zend/tests/gc/gc_041.phpt diff --git a/Zend/tests/gc_042.phpt b/Zend/tests/gc/gc_042.phpt similarity index 100% rename from Zend/tests/gc_042.phpt rename to Zend/tests/gc/gc_042.phpt diff --git a/Zend/tests/gc_043.phpt b/Zend/tests/gc/gc_043.phpt similarity index 100% rename from Zend/tests/gc_043.phpt rename to Zend/tests/gc/gc_043.phpt diff --git a/Zend/tests/gc_044.phpt b/Zend/tests/gc/gc_044.phpt similarity index 100% rename from Zend/tests/gc_044.phpt rename to Zend/tests/gc/gc_044.phpt diff --git a/Zend/tests/gc_045.phpt b/Zend/tests/gc/gc_045.phpt similarity index 100% rename from Zend/tests/gc_045.phpt rename to Zend/tests/gc/gc_045.phpt diff --git a/Zend/tests/gc_046.phpt b/Zend/tests/gc/gc_046.phpt similarity index 100% rename from Zend/tests/gc_046.phpt rename to Zend/tests/gc/gc_046.phpt diff --git a/Zend/tests/gc_047.phpt b/Zend/tests/gc/gc_047.phpt similarity index 100% rename from Zend/tests/gc_047.phpt rename to Zend/tests/gc/gc_047.phpt diff --git a/Zend/tests/gc_048.phpt b/Zend/tests/gc/gc_048.phpt similarity index 100% rename from Zend/tests/gc_048.phpt rename to Zend/tests/gc/gc_048.phpt diff --git a/Zend/tests/gc_049.phpt b/Zend/tests/gc/gc_049.phpt similarity index 100% rename from Zend/tests/gc_049.phpt rename to Zend/tests/gc/gc_049.phpt diff --git a/Zend/tests/gc_050.phpt b/Zend/tests/gc/gc_050.phpt similarity index 100% rename from Zend/tests/gc_050.phpt rename to Zend/tests/gc/gc_050.phpt diff --git a/Zend/tests/ns_trailing_comma_01.phpt b/Zend/tests/group_use/ns_trailing_comma_01.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_01.phpt rename to Zend/tests/group_use/ns_trailing_comma_01.phpt diff --git a/Zend/tests/ns_trailing_comma_02.phpt b/Zend/tests/group_use/ns_trailing_comma_02.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_02.phpt rename to Zend/tests/group_use/ns_trailing_comma_02.phpt diff --git a/Zend/tests/ns_trailing_comma_error_01.phpt b/Zend/tests/group_use/ns_trailing_comma_error_01.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_01.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_01.phpt diff --git a/Zend/tests/ns_trailing_comma_error_02.phpt b/Zend/tests/group_use/ns_trailing_comma_error_02.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_02.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_02.phpt diff --git a/Zend/tests/ns_trailing_comma_error_03.phpt b/Zend/tests/group_use/ns_trailing_comma_error_03.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_03.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_03.phpt diff --git a/Zend/tests/ns_trailing_comma_error_04.phpt b/Zend/tests/group_use/ns_trailing_comma_error_04.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_04.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_04.phpt diff --git a/Zend/tests/ns_trailing_comma_error_05.phpt b/Zend/tests/group_use/ns_trailing_comma_error_05.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_05.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_05.phpt diff --git a/Zend/tests/ns_trailing_comma_error_06.phpt b/Zend/tests/group_use/ns_trailing_comma_error_06.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_06.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_06.phpt diff --git a/Zend/tests/ns_trailing_comma_error_07.phpt b/Zend/tests/group_use/ns_trailing_comma_error_07.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_07.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_07.phpt diff --git a/Zend/tests/ns_trailing_comma_error_08.phpt b/Zend/tests/group_use/ns_trailing_comma_error_08.phpt similarity index 100% rename from Zend/tests/ns_trailing_comma_error_08.phpt rename to Zend/tests/group_use/ns_trailing_comma_error_08.phpt diff --git a/Zend/tests/flexible-heredoc-complex-test1.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test1.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-complex-test1.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test1.phpt diff --git a/Zend/tests/flexible-heredoc-complex-test2.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test2.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-complex-test2.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test2.phpt diff --git a/Zend/tests/flexible-heredoc-complex-test3.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test3.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-complex-test3.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test3.phpt diff --git a/Zend/tests/flexible-heredoc-complex-test4.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test4.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-complex-test4.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-complex-test4.phpt diff --git a/Zend/tests/flexible-heredoc-error1.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error1.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error1.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error1.phpt diff --git a/Zend/tests/flexible-heredoc-error10.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error10.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error10.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error10.phpt diff --git a/Zend/tests/flexible-heredoc-error11.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error11.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error11.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error11.phpt diff --git a/Zend/tests/flexible-heredoc-error12.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error12.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error12.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error12.phpt diff --git a/Zend/tests/flexible-heredoc-error13.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error13.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error13.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error13.phpt diff --git a/Zend/tests/flexible-heredoc-error2.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error2.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error2.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error2.phpt diff --git a/Zend/tests/flexible-heredoc-error3.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error3.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error3.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error3.phpt diff --git a/Zend/tests/flexible-heredoc-error4.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error4.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error4.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error4.phpt diff --git a/Zend/tests/flexible-heredoc-error5.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error5.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error5.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error5.phpt diff --git a/Zend/tests/flexible-heredoc-error6.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error6.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error6.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error6.phpt diff --git a/Zend/tests/flexible-heredoc-error7.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error7.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error7.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error7.phpt diff --git a/Zend/tests/flexible-heredoc-error8.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error8.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error8.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error8.phpt diff --git a/Zend/tests/flexible-heredoc-error9.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-error9.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-error9.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-error9.phpt diff --git a/Zend/tests/flexible-heredoc-nowdoc-lineno.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-nowdoc-lineno.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-nowdoc-lineno.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-nowdoc-lineno.phpt diff --git a/Zend/tests/flexible-heredoc-nowdoc.phpt b/Zend/tests/heredoc_nowdoc/flexible-heredoc-nowdoc.phpt similarity index 100% rename from Zend/tests/flexible-heredoc-nowdoc.phpt rename to Zend/tests/heredoc_nowdoc/flexible-heredoc-nowdoc.phpt diff --git a/Zend/tests/flexible-nowdoc-error1.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error1.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error1.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error1.phpt diff --git a/Zend/tests/flexible-nowdoc-error2.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error2.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error2.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error2.phpt diff --git a/Zend/tests/flexible-nowdoc-error3.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error3.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error3.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error3.phpt diff --git a/Zend/tests/flexible-nowdoc-error4.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error4.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error4.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error4.phpt diff --git a/Zend/tests/flexible-nowdoc-error5.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error5.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error5.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error5.phpt diff --git a/Zend/tests/flexible-nowdoc-error6.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error6.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error6.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error6.phpt diff --git a/Zend/tests/flexible-nowdoc-error7.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error7.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error7.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error7.phpt diff --git a/Zend/tests/flexible-nowdoc-error8.phpt b/Zend/tests/heredoc_nowdoc/flexible-nowdoc-error8.phpt similarity index 100% rename from Zend/tests/flexible-nowdoc-error8.phpt rename to Zend/tests/heredoc_nowdoc/flexible-nowdoc-error8.phpt diff --git a/Zend/tests/heredoc_001.phpt b/Zend/tests/heredoc_nowdoc/heredoc_001.phpt similarity index 100% rename from Zend/tests/heredoc_001.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_001.phpt diff --git a/Zend/tests/heredoc_002.phpt b/Zend/tests/heredoc_nowdoc/heredoc_002.phpt similarity index 100% rename from Zend/tests/heredoc_002.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_002.phpt diff --git a/Zend/tests/heredoc_003.phpt b/Zend/tests/heredoc_nowdoc/heredoc_003.phpt similarity index 100% rename from Zend/tests/heredoc_003.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_003.phpt diff --git a/Zend/tests/heredoc_004.phpt b/Zend/tests/heredoc_nowdoc/heredoc_004.phpt similarity index 100% rename from Zend/tests/heredoc_004.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_004.phpt diff --git a/Zend/tests/heredoc_005.phpt b/Zend/tests/heredoc_nowdoc/heredoc_005.phpt similarity index 100% rename from Zend/tests/heredoc_005.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_005.phpt diff --git a/Zend/tests/heredoc_006.phpt b/Zend/tests/heredoc_nowdoc/heredoc_006.phpt similarity index 100% rename from Zend/tests/heredoc_006.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_006.phpt diff --git a/Zend/tests/heredoc_007.phpt b/Zend/tests/heredoc_nowdoc/heredoc_007.phpt similarity index 100% rename from Zend/tests/heredoc_007.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_007.phpt diff --git a/Zend/tests/heredoc_008.phpt b/Zend/tests/heredoc_nowdoc/heredoc_008.phpt similarity index 100% rename from Zend/tests/heredoc_008.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_008.phpt diff --git a/Zend/tests/heredoc_011.phpt b/Zend/tests/heredoc_nowdoc/heredoc_011.phpt similarity index 100% rename from Zend/tests/heredoc_011.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_011.phpt diff --git a/Zend/tests/heredoc_012.phpt b/Zend/tests/heredoc_nowdoc/heredoc_012.phpt similarity index 100% rename from Zend/tests/heredoc_012.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_012.phpt diff --git a/Zend/tests/heredoc_013.phpt b/Zend/tests/heredoc_nowdoc/heredoc_013.phpt similarity index 100% rename from Zend/tests/heredoc_013.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_013.phpt diff --git a/Zend/tests/heredoc_014.phpt b/Zend/tests/heredoc_nowdoc/heredoc_014.phpt similarity index 100% rename from Zend/tests/heredoc_014.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_014.phpt diff --git a/Zend/tests/heredoc_015.phpt b/Zend/tests/heredoc_nowdoc/heredoc_015.phpt similarity index 100% rename from Zend/tests/heredoc_015.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_015.phpt diff --git a/Zend/tests/heredoc_016.phpt b/Zend/tests/heredoc_nowdoc/heredoc_016.phpt similarity index 100% rename from Zend/tests/heredoc_016.phpt rename to Zend/tests/heredoc_nowdoc/heredoc_016.phpt diff --git a/Zend/tests/nowdoc.inc b/Zend/tests/heredoc_nowdoc/nowdoc.inc similarity index 100% rename from Zend/tests/nowdoc.inc rename to Zend/tests/heredoc_nowdoc/nowdoc.inc diff --git a/Zend/tests/nowdoc_001.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_001.phpt similarity index 100% rename from Zend/tests/nowdoc_001.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_001.phpt diff --git a/Zend/tests/nowdoc_002.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_002.phpt similarity index 100% rename from Zend/tests/nowdoc_002.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_002.phpt diff --git a/Zend/tests/nowdoc_003.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_003.phpt similarity index 100% rename from Zend/tests/nowdoc_003.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_003.phpt diff --git a/Zend/tests/nowdoc_004.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_004.phpt similarity index 100% rename from Zend/tests/nowdoc_004.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_004.phpt diff --git a/Zend/tests/nowdoc_005.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_005.phpt similarity index 100% rename from Zend/tests/nowdoc_005.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_005.phpt diff --git a/Zend/tests/nowdoc_006.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_006.phpt similarity index 100% rename from Zend/tests/nowdoc_006.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_006.phpt diff --git a/Zend/tests/nowdoc_007.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_007.phpt similarity index 100% rename from Zend/tests/nowdoc_007.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_007.phpt diff --git a/Zend/tests/nowdoc_008.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_008.phpt similarity index 100% rename from Zend/tests/nowdoc_008.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_008.phpt diff --git a/Zend/tests/nowdoc_011.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_011.phpt similarity index 100% rename from Zend/tests/nowdoc_011.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_011.phpt diff --git a/Zend/tests/nowdoc_012.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_012.phpt similarity index 100% rename from Zend/tests/nowdoc_012.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_012.phpt diff --git a/Zend/tests/nowdoc_013.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_013.phpt similarity index 100% rename from Zend/tests/nowdoc_013.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_013.phpt diff --git a/Zend/tests/nowdoc_014.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_014.phpt similarity index 100% rename from Zend/tests/nowdoc_014.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_014.phpt diff --git a/Zend/tests/nowdoc_015.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_015.phpt similarity index 100% rename from Zend/tests/nowdoc_015.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_015.phpt diff --git a/Zend/tests/nowdoc_016.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_016.phpt similarity index 100% rename from Zend/tests/nowdoc_016.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_016.phpt diff --git a/Zend/tests/nowdoc_017.phpt b/Zend/tests/heredoc_nowdoc/nowdoc_017.phpt similarity index 100% rename from Zend/tests/nowdoc_017.phpt rename to Zend/tests/heredoc_nowdoc/nowdoc_017.phpt diff --git a/Zend/tests/jump01.phpt b/Zend/tests/jump/jump01.phpt similarity index 100% rename from Zend/tests/jump01.phpt rename to Zend/tests/jump/jump01.phpt diff --git a/Zend/tests/jump02.phpt b/Zend/tests/jump/jump02.phpt similarity index 100% rename from Zend/tests/jump02.phpt rename to Zend/tests/jump/jump02.phpt diff --git a/Zend/tests/jump03.phpt b/Zend/tests/jump/jump03.phpt similarity index 100% rename from Zend/tests/jump03.phpt rename to Zend/tests/jump/jump03.phpt diff --git a/Zend/tests/jump04.phpt b/Zend/tests/jump/jump04.phpt similarity index 100% rename from Zend/tests/jump04.phpt rename to Zend/tests/jump/jump04.phpt diff --git a/Zend/tests/jump05.phpt b/Zend/tests/jump/jump05.phpt similarity index 100% rename from Zend/tests/jump05.phpt rename to Zend/tests/jump/jump05.phpt diff --git a/Zend/tests/jump06.phpt b/Zend/tests/jump/jump06.phpt similarity index 100% rename from Zend/tests/jump06.phpt rename to Zend/tests/jump/jump06.phpt diff --git a/Zend/tests/jump07.phpt b/Zend/tests/jump/jump07.phpt similarity index 100% rename from Zend/tests/jump07.phpt rename to Zend/tests/jump/jump07.phpt diff --git a/Zend/tests/jump08.phpt b/Zend/tests/jump/jump08.phpt similarity index 100% rename from Zend/tests/jump08.phpt rename to Zend/tests/jump/jump08.phpt diff --git a/Zend/tests/jump09.phpt b/Zend/tests/jump/jump09.phpt similarity index 100% rename from Zend/tests/jump09.phpt rename to Zend/tests/jump/jump09.phpt diff --git a/Zend/tests/jump10.phpt b/Zend/tests/jump/jump10.phpt similarity index 100% rename from Zend/tests/jump10.phpt rename to Zend/tests/jump/jump10.phpt diff --git a/Zend/tests/jump11.phpt b/Zend/tests/jump/jump11.phpt similarity index 89% rename from Zend/tests/jump11.phpt rename to Zend/tests/jump/jump11.phpt index 4c4c4f30a20..7b6b9170c72 100644 --- a/Zend/tests/jump11.phpt +++ b/Zend/tests/jump/jump11.phpt @@ -1,5 +1,5 @@ --TEST-- -jump 08: goto inside switch in constructor +jump 11: goto inside switch in constructor --FILE--