diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt
index c88aee367fa..908f707e4b1 100644
--- a/ext/standard/tests/array/001.phpt
+++ b/ext/standard/tests/array/001.phpt
@@ -4,7 +4,7 @@ Test array_merge and array_walk
 precision=14
 --FILE--
 <?php
-require(__DIR__ . '/data.inc');
+require(__DIR__ . '/sort/data.inc');
 /*
 ** Create sample arrays
 ** Test alpha, numeric (decimal, hex, octal) and special data
diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/sort/array_multisort_basic1.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_basic1.phpt
rename to ext/standard/tests/array/sort/array_multisort_basic1.phpt
diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/sort/array_multisort_basic2.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_basic2.phpt
rename to ext/standard/tests/array/sort/array_multisort_basic2.phpt
diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/sort/array_multisort_case.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_case.phpt
rename to ext/standard/tests/array/sort/array_multisort_case.phpt
diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/sort/array_multisort_error.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_error.phpt
rename to ext/standard/tests/array/sort/array_multisort_error.phpt
diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/sort/array_multisort_incase.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_incase.phpt
rename to ext/standard/tests/array/sort/array_multisort_incase.phpt
diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/sort/array_multisort_natural.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_natural.phpt
rename to ext/standard/tests/array/sort/array_multisort_natural.phpt
diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/sort/array_multisort_natural_case.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_natural_case.phpt
rename to ext/standard/tests/array/sort/array_multisort_natural_case.phpt
diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/sort/array_multisort_natural_incase.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_natural_incase.phpt
rename to ext/standard/tests/array/sort/array_multisort_natural_incase.phpt
diff --git a/ext/standard/tests/array/array_multisort_stability.phpt b/ext/standard/tests/array/sort/array_multisort_stability.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_stability.phpt
rename to ext/standard/tests/array/sort/array_multisort_stability.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/sort/array_multisort_variation1.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation1.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation1.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/sort/array_multisort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation10.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation10.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/sort/array_multisort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation11.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation11.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/sort/array_multisort_variation2.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation2.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation2.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/sort/array_multisort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation3.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation3.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/sort/array_multisort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation4.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation4.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/sort/array_multisort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation5.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation5.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/sort/array_multisort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation6.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation6.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/sort/array_multisort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation7.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation7.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/sort/array_multisort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation8.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation8.phpt
diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/sort/array_multisort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/array_multisort_variation9.phpt
rename to ext/standard/tests/array/sort/array_multisort_variation9.phpt
diff --git a/ext/standard/tests/array/array_shuffle_basic.phpt b/ext/standard/tests/array/sort/array_shuffle_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/array_shuffle_basic.phpt
rename to ext/standard/tests/array/sort/array_shuffle_basic.phpt
diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/sort/arsort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_basic.phpt
rename to ext/standard/tests/array/sort/arsort_basic.phpt
diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/sort/arsort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_object1.phpt
rename to ext/standard/tests/array/sort/arsort_object1.phpt
diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/sort/arsort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_object2.phpt
rename to ext/standard/tests/array/sort/arsort_object2.phpt
diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/sort/arsort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation10.phpt
rename to ext/standard/tests/array/sort/arsort_variation10.phpt
diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/sort/arsort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation11.phpt
rename to ext/standard/tests/array/sort/arsort_variation11.phpt
diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/sort/arsort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation3.phpt
rename to ext/standard/tests/array/sort/arsort_variation3.phpt
diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/sort/arsort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation4.phpt
rename to ext/standard/tests/array/sort/arsort_variation4.phpt
diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/sort/arsort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation5.phpt
rename to ext/standard/tests/array/sort/arsort_variation5.phpt
diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/sort/arsort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation6.phpt
rename to ext/standard/tests/array/sort/arsort_variation6.phpt
diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/sort/arsort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation7.phpt
rename to ext/standard/tests/array/sort/arsort_variation7.phpt
diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/sort/arsort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation8.phpt
rename to ext/standard/tests/array/sort/arsort_variation8.phpt
diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/sort/arsort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/arsort_variation9.phpt
rename to ext/standard/tests/array/sort/arsort_variation9.phpt
diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/sort/asort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_basic.phpt
rename to ext/standard/tests/array/sort/asort_basic.phpt
diff --git a/ext/standard/tests/array/asort_object1.phpt b/ext/standard/tests/array/sort/asort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_object1.phpt
rename to ext/standard/tests/array/sort/asort_object1.phpt
diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/sort/asort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_object2.phpt
rename to ext/standard/tests/array/sort/asort_object2.phpt
diff --git a/ext/standard/tests/array/asort_stability.phpt b/ext/standard/tests/array/sort/asort_stability.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_stability.phpt
rename to ext/standard/tests/array/sort/asort_stability.phpt
diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/sort/asort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation10.phpt
rename to ext/standard/tests/array/sort/asort_variation10.phpt
diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/sort/asort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation11.phpt
rename to ext/standard/tests/array/sort/asort_variation11.phpt
diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/sort/asort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation3.phpt
rename to ext/standard/tests/array/sort/asort_variation3.phpt
diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/sort/asort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation4.phpt
rename to ext/standard/tests/array/sort/asort_variation4.phpt
diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/sort/asort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation5.phpt
rename to ext/standard/tests/array/sort/asort_variation5.phpt
diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/sort/asort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation6.phpt
rename to ext/standard/tests/array/sort/asort_variation6.phpt
diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/sort/asort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation7.phpt
rename to ext/standard/tests/array/sort/asort_variation7.phpt
diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/sort/asort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation8.phpt
rename to ext/standard/tests/array/sort/asort_variation8.phpt
diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/sort/asort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/asort_variation9.phpt
rename to ext/standard/tests/array/sort/asort_variation9.phpt
diff --git a/ext/standard/tests/array/bug24897.phpt b/ext/standard/tests/array/sort/bug24897.phpt
similarity index 100%
rename from ext/standard/tests/array/bug24897.phpt
rename to ext/standard/tests/array/sort/bug24897.phpt
diff --git a/ext/standard/tests/array/bug25359.phpt b/ext/standard/tests/array/sort/bug25359.phpt
similarity index 100%
rename from ext/standard/tests/array/bug25359.phpt
rename to ext/standard/tests/array/sort/bug25359.phpt
diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/sort/bug33382.phpt
similarity index 100%
rename from ext/standard/tests/array/bug33382.phpt
rename to ext/standard/tests/array/sort/bug33382.phpt
diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/sort/bug36975.phpt
similarity index 100%
rename from ext/standard/tests/array/bug36975.phpt
rename to ext/standard/tests/array/sort/bug36975.phpt
diff --git a/ext/standard/tests/array/bug44929.phpt b/ext/standard/tests/array/sort/bug44929.phpt
similarity index 100%
rename from ext/standard/tests/array/bug44929.phpt
rename to ext/standard/tests/array/sort/bug44929.phpt
diff --git a/ext/standard/tests/array/bug50006.phpt b/ext/standard/tests/array/sort/bug50006.phpt
similarity index 100%
rename from ext/standard/tests/array/bug50006.phpt
rename to ext/standard/tests/array/sort/bug50006.phpt
diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/sort/bug50006_1.phpt
similarity index 100%
rename from ext/standard/tests/array/bug50006_1.phpt
rename to ext/standard/tests/array/sort/bug50006_1.phpt
diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/sort/bug50006_2.phpt
similarity index 100%
rename from ext/standard/tests/array/bug50006_2.phpt
rename to ext/standard/tests/array/sort/bug50006_2.phpt
diff --git a/ext/standard/tests/array/bug71334.phpt b/ext/standard/tests/array/sort/bug71334.phpt
similarity index 100%
rename from ext/standard/tests/array/bug71334.phpt
rename to ext/standard/tests/array/sort/bug71334.phpt
diff --git a/ext/standard/tests/array/bug77395.phpt b/ext/standard/tests/array/sort/bug77395.phpt
similarity index 100%
rename from ext/standard/tests/array/bug77395.phpt
rename to ext/standard/tests/array/sort/bug77395.phpt
diff --git a/ext/standard/tests/array/data.inc b/ext/standard/tests/array/sort/data.inc
similarity index 100%
rename from ext/standard/tests/array/data.inc
rename to ext/standard/tests/array/sort/data.inc
diff --git a/ext/standard/tests/array/gh9296.phpt b/ext/standard/tests/array/sort/gh9296.phpt
similarity index 100%
rename from ext/standard/tests/array/gh9296.phpt
rename to ext/standard/tests/array/sort/gh9296.phpt
diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/sort/internal_sorts_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/002.phpt
rename to ext/standard/tests/array/sort/internal_sorts_basic.phpt
diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/sort/krsort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_basic.phpt
rename to ext/standard/tests/array/sort/krsort_basic.phpt
diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/sort/krsort_object.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_object.phpt
rename to ext/standard/tests/array/sort/krsort_object.phpt
diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/sort/krsort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation10.phpt
rename to ext/standard/tests/array/sort/krsort_variation10.phpt
diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/sort/krsort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation11.phpt
rename to ext/standard/tests/array/sort/krsort_variation11.phpt
diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/sort/krsort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation3.phpt
rename to ext/standard/tests/array/sort/krsort_variation3.phpt
diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/sort/krsort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation4.phpt
rename to ext/standard/tests/array/sort/krsort_variation4.phpt
diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/sort/krsort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation5.phpt
rename to ext/standard/tests/array/sort/krsort_variation5.phpt
diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/sort/krsort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation6.phpt
rename to ext/standard/tests/array/sort/krsort_variation6.phpt
diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/sort/krsort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation7.phpt
rename to ext/standard/tests/array/sort/krsort_variation7.phpt
diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/sort/krsort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation8.phpt
rename to ext/standard/tests/array/sort/krsort_variation8.phpt
diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/sort/krsort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/krsort_variation9.phpt
rename to ext/standard/tests/array/sort/krsort_variation9.phpt
diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/sort/ksort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_basic.phpt
rename to ext/standard/tests/array/sort/ksort_basic.phpt
diff --git a/ext/standard/tests/array/ksort_object.phpt b/ext/standard/tests/array/sort/ksort_object.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_object.phpt
rename to ext/standard/tests/array/sort/ksort_object.phpt
diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/sort/ksort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation10.phpt
rename to ext/standard/tests/array/sort/ksort_variation10.phpt
diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/sort/ksort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation11.phpt
rename to ext/standard/tests/array/sort/ksort_variation11.phpt
diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/sort/ksort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation3.phpt
rename to ext/standard/tests/array/sort/ksort_variation3.phpt
diff --git a/ext/standard/tests/array/ksort_variation4.phpt b/ext/standard/tests/array/sort/ksort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation4.phpt
rename to ext/standard/tests/array/sort/ksort_variation4.phpt
diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/sort/ksort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation5.phpt
rename to ext/standard/tests/array/sort/ksort_variation5.phpt
diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/sort/ksort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation6.phpt
rename to ext/standard/tests/array/sort/ksort_variation6.phpt
diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/sort/ksort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation7.phpt
rename to ext/standard/tests/array/sort/ksort_variation7.phpt
diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/sort/ksort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation8.phpt
rename to ext/standard/tests/array/sort/ksort_variation8.phpt
diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/sort/ksort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/ksort_variation9.phpt
rename to ext/standard/tests/array/sort/ksort_variation9.phpt
diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/sort/locale_sort.phpt
similarity index 100%
rename from ext/standard/tests/array/locale_sort.phpt
rename to ext/standard/tests/array/sort/locale_sort.phpt
diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/sort/natcasesort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_basic.phpt
rename to ext/standard/tests/array/sort/natcasesort_basic.phpt
diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/sort/natcasesort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_object1.phpt
rename to ext/standard/tests/array/sort/natcasesort_object1.phpt
diff --git a/ext/standard/tests/array/natcasesort_object2.phpt b/ext/standard/tests/array/sort/natcasesort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_object2.phpt
rename to ext/standard/tests/array/sort/natcasesort_object2.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/sort/natcasesort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation10.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation10.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/sort/natcasesort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation11.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation11.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/sort/natcasesort_variation2.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation2.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation2.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/sort/natcasesort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation3.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation3.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/sort/natcasesort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation4.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation4.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/sort/natcasesort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation5.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation5.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/sort/natcasesort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation6.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation6.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/sort/natcasesort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation7.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation7.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/sort/natcasesort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation8.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation8.phpt
diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/sort/natcasesort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/natcasesort_variation9.phpt
rename to ext/standard/tests/array/sort/natcasesort_variation9.phpt
diff --git a/ext/standard/tests/array/natsort_basic.phpt b/ext/standard/tests/array/sort/natsort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/natsort_basic.phpt
rename to ext/standard/tests/array/sort/natsort_basic.phpt
diff --git a/ext/standard/tests/array/004.phpt b/ext/standard/tests/array/sort/natsort_natcasesort_basics.phpt
similarity index 100%
rename from ext/standard/tests/array/004.phpt
rename to ext/standard/tests/array/sort/natsort_natcasesort_basics.phpt
diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/sort/rsort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_basic.phpt
rename to ext/standard/tests/array/sort/rsort_basic.phpt
diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/sort/rsort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_object1.phpt
rename to ext/standard/tests/array/sort/rsort_object1.phpt
diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/sort/rsort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_object2.phpt
rename to ext/standard/tests/array/sort/rsort_object2.phpt
diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/sort/rsort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation10.phpt
rename to ext/standard/tests/array/sort/rsort_variation10.phpt
diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/sort/rsort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation11.phpt
rename to ext/standard/tests/array/sort/rsort_variation11.phpt
diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/sort/rsort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation3.phpt
rename to ext/standard/tests/array/sort/rsort_variation3.phpt
diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/sort/rsort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation4.phpt
rename to ext/standard/tests/array/sort/rsort_variation4.phpt
diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/sort/rsort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation5.phpt
rename to ext/standard/tests/array/sort/rsort_variation5.phpt
diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/sort/rsort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation6.phpt
rename to ext/standard/tests/array/sort/rsort_variation6.phpt
diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/sort/rsort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation7.phpt
rename to ext/standard/tests/array/sort/rsort_variation7.phpt
diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/sort/rsort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation8.phpt
rename to ext/standard/tests/array/sort/rsort_variation8.phpt
diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/sort/rsort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/rsort_variation9.phpt
rename to ext/standard/tests/array/sort/rsort_variation9.phpt
diff --git a/ext/standard/tests/array/shuffle_basic1.phpt b/ext/standard/tests/array/sort/shuffle_basic1.phpt
similarity index 100%
rename from ext/standard/tests/array/shuffle_basic1.phpt
rename to ext/standard/tests/array/sort/shuffle_basic1.phpt
diff --git a/ext/standard/tests/array/shuffle_basic2.phpt b/ext/standard/tests/array/sort/shuffle_basic2.phpt
similarity index 100%
rename from ext/standard/tests/array/shuffle_basic2.phpt
rename to ext/standard/tests/array/sort/shuffle_basic2.phpt
diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/sort/shuffle_variation2.phpt
similarity index 100%
rename from ext/standard/tests/array/shuffle_variation2.phpt
rename to ext/standard/tests/array/sort/shuffle_variation2.phpt
diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/sort/shuffle_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/shuffle_variation3.phpt
rename to ext/standard/tests/array/sort/shuffle_variation3.phpt
diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/sort/shuffle_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/shuffle_variation4.phpt
rename to ext/standard/tests/array/sort/shuffle_variation4.phpt
diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/sort/shuffle_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/shuffle_variation5.phpt
rename to ext/standard/tests/array/sort/shuffle_variation5.phpt
diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort/sort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_basic.phpt
rename to ext/standard/tests/array/sort/sort_basic.phpt
diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort/sort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_object1.phpt
rename to ext/standard/tests/array/sort/sort_object1.phpt
diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort/sort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_object2.phpt
rename to ext/standard/tests/array/sort/sort_object2.phpt
diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort/sort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation10.phpt
rename to ext/standard/tests/array/sort/sort_variation10.phpt
diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort/sort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation11.phpt
rename to ext/standard/tests/array/sort/sort_variation11.phpt
diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort/sort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation3.phpt
rename to ext/standard/tests/array/sort/sort_variation3.phpt
diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort/sort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation4.phpt
rename to ext/standard/tests/array/sort/sort_variation4.phpt
diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort/sort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation5.phpt
rename to ext/standard/tests/array/sort/sort_variation5.phpt
diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort/sort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation6.phpt
rename to ext/standard/tests/array/sort/sort_variation6.phpt
diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort/sort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation7.phpt
rename to ext/standard/tests/array/sort/sort_variation7.phpt
diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort/sort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation8.phpt
rename to ext/standard/tests/array/sort/sort_variation8.phpt
diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort/sort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/sort_variation9.phpt
rename to ext/standard/tests/array/sort/sort_variation9.phpt
diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/sort/uasort_basic1.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_basic1.phpt
rename to ext/standard/tests/array/sort/uasort_basic1.phpt
diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/sort/uasort_basic2.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_basic2.phpt
rename to ext/standard/tests/array/sort/uasort_basic2.phpt
diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/sort/uasort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_object1.phpt
rename to ext/standard/tests/array/sort/uasort_object1.phpt
diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/sort/uasort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_object2.phpt
rename to ext/standard/tests/array/sort/uasort_object2.phpt
diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/sort/uasort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation10.phpt
rename to ext/standard/tests/array/sort/uasort_variation10.phpt
diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/sort/uasort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation11.phpt
rename to ext/standard/tests/array/sort/uasort_variation11.phpt
diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/sort/uasort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation3.phpt
rename to ext/standard/tests/array/sort/uasort_variation3.phpt
diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/sort/uasort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation4.phpt
rename to ext/standard/tests/array/sort/uasort_variation4.phpt
diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/sort/uasort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation5.phpt
rename to ext/standard/tests/array/sort/uasort_variation5.phpt
diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/sort/uasort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation6.phpt
rename to ext/standard/tests/array/sort/uasort_variation6.phpt
diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/sort/uasort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation7.phpt
rename to ext/standard/tests/array/sort/uasort_variation7.phpt
diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/sort/uasort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/uasort_variation8.phpt
rename to ext/standard/tests/array/sort/uasort_variation8.phpt
diff --git a/ext/standard/tests/array/uksort_basic.phpt b/ext/standard/tests/array/sort/uksort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/uksort_basic.phpt
rename to ext/standard/tests/array/sort/uksort_basic.phpt
diff --git a/ext/standard/tests/array/003.phpt b/ext/standard/tests/array/sort/user_sort_basics.phpt
similarity index 100%
rename from ext/standard/tests/array/003.phpt
rename to ext/standard/tests/array/sort/user_sort_basics.phpt
diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/sort/usort_basic.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_basic.phpt
rename to ext/standard/tests/array/sort/usort_basic.phpt
diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/sort/usort_object1.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_object1.phpt
rename to ext/standard/tests/array/sort/usort_object1.phpt
diff --git a/ext/standard/tests/array/usort_object2.phpt b/ext/standard/tests/array/sort/usort_object2.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_object2.phpt
rename to ext/standard/tests/array/sort/usort_object2.phpt
diff --git a/ext/standard/tests/array/usort_stability.phpt b/ext/standard/tests/array/sort/usort_stability.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_stability.phpt
rename to ext/standard/tests/array/sort/usort_stability.phpt
diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/sort/usort_variation10.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation10.phpt
rename to ext/standard/tests/array/sort/usort_variation10.phpt
diff --git a/ext/standard/tests/array/usort_variation11.phpt b/ext/standard/tests/array/sort/usort_variation11.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation11.phpt
rename to ext/standard/tests/array/sort/usort_variation11.phpt
diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/sort/usort_variation3.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation3.phpt
rename to ext/standard/tests/array/sort/usort_variation3.phpt
diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/sort/usort_variation4.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation4.phpt
rename to ext/standard/tests/array/sort/usort_variation4.phpt
diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/sort/usort_variation5.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation5.phpt
rename to ext/standard/tests/array/sort/usort_variation5.phpt
diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/sort/usort_variation6.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation6.phpt
rename to ext/standard/tests/array/sort/usort_variation6.phpt
diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/sort/usort_variation7.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation7.phpt
rename to ext/standard/tests/array/sort/usort_variation7.phpt
diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/sort/usort_variation8.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation8.phpt
rename to ext/standard/tests/array/sort/usort_variation8.phpt
diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/sort/usort_variation9.phpt
similarity index 100%
rename from ext/standard/tests/array/usort_variation9.phpt
rename to ext/standard/tests/array/sort/usort_variation9.phpt