diff --git a/ext/spl/tests/SplFileObject_current_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_current_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_current_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_current_basic.phpt diff --git a/ext/spl/tests/SplFileObject_current_variation001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_current_variation001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_current_variation001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_current_variation001.phpt diff --git a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fflush_basic_001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fflush_basic_001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fflush_basic_001.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_basic.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_delimiter_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_delimiter_basic.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_delimiter_error.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_delimiter_error.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_enclosure_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_enclosure_basic.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_enclosure_error.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_enclosure_error.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_basic.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_default.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_default.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_empty.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_empty.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_escape_empty.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_empty.phpt diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_error.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_escape_error.phpt diff --git a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fpassthru_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fpassthru_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fpassthru_basic.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_002.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation1.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation1.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation1.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation10.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation10.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation10.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation11.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation11.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation11.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation12.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation12.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation12.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation13.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation13.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation13.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation14.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation14.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation14.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation15.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation15.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation15.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation15.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation16.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation16.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation16.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation16.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation5.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation5.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation5.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation6.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation6.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation6.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation7.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation7.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation7.phpt diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation8.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fputcsv_variation8.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fputcsv_variation8.phpt diff --git a/ext/spl/tests/SplFileObject_fscanf_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fscanf_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fscanf_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fscanf_basic.phpt diff --git a/ext/spl/tests/SplFileObject_fstat_with_basic_fstat_disabled.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fstat_with_basic_fstat_disabled.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fstat_with_basic_fstat_disabled.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fstat_with_basic_fstat_disabled.phpt diff --git a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_ftruncate_error_001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_ftruncate_error_001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_ftruncate_error_001.phpt diff --git a/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fwrite_variation_001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fwrite_variation_001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fwrite_variation_001.phpt diff --git a/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_fwrite_variation_002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_fwrite_variation_002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_fwrite_variation_002.phpt diff --git a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_getCsvControl_basic_001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_getCsvControl_basic_001.phpt diff --git a/ext/spl/tests/SplFileObject_getCurrentLine_invalid_override.phpt b/ext/spl/tests/SplFileObject/SplFileObject_getCurrentLine_invalid_override.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_getCurrentLine_invalid_override.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_getCurrentLine_invalid_override.phpt diff --git a/ext/spl/tests/SplFileObject_getchildren_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_getchildren_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_getchildren_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_getchildren_basic.phpt diff --git a/ext/spl/tests/SplFileObject_getflags_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_getflags_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_getflags_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_getflags_basic.phpt diff --git a/ext/spl/tests/SplFileObject_getflags_error001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_getflags_error001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_getflags_error001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_getflags_error001.phpt diff --git a/ext/spl/tests/SplFileObject_getflags_variation001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_getflags_variation001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_getflags_variation001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_getflags_variation001.phpt diff --git a/ext/spl/tests/SplFileObject_haschildren_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_haschildren_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_haschildren_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_haschildren_basic.phpt diff --git a/ext/spl/tests/SplFileObject_key_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_key_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_key_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_key_basic.phpt diff --git a/ext/spl/tests/SplFileObject_key_error001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_key_error001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_key_error001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_key_error001.phpt diff --git a/ext/spl/tests/SplFileObject_key_error002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_key_error002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_key_error002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_key_error002.phpt diff --git a/ext/spl/tests/SplFileObject_key_fgets_and seek.phpt b/ext/spl/tests/SplFileObject/SplFileObject_key_fgets_and seek.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_key_fgets_and seek.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_key_fgets_and seek.phpt diff --git a/ext/spl/tests/SplFileObject_next_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_next_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_next_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_next_basic.phpt diff --git a/ext/spl/tests/SplFileObject_next_variation001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_next_variation001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_next_variation001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_next_variation001.phpt diff --git a/ext/spl/tests/SplFileObject_next_variation002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_next_variation002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_next_variation002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_next_variation002.phpt diff --git a/ext/spl/tests/SplFileObject_rewind_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_rewind_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_rewind_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_rewind_basic.phpt diff --git a/ext/spl/tests/SplFileObject_rewind_variation001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_rewind_variation001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_rewind_variation001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_rewind_variation001.phpt diff --git a/ext/spl/tests/SplFileObject_seek_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_seek_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_seek_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_seek_basic.phpt diff --git a/ext/spl/tests/SplFileObject_seek_error002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_seek_error002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_seek_error002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_seek_error002.phpt diff --git a/ext/spl/tests/SplFileObject_seek_error_001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_seek_error_001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_seek_error_001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_seek_error_001.phpt diff --git a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt b/ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_basic.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_setCsvControl_basic.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_basic.phpt diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_error001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_setCsvControl_error001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_error001.phpt diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_error002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_setCsvControl_error002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_error002.phpt diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt b/ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_error003.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_setCsvControl_error003.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_error003.phpt diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt b/ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_variation001.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_variation001.phpt diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation002.phpt b/ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_variation002.phpt similarity index 100% rename from ext/spl/tests/SplFileObject_setCsvControl_variation002.phpt rename to ext/spl/tests/SplFileObject/SplFileObject_setCsvControl_variation002.phpt diff --git a/ext/spl/tests/SplFileObject_testinput.csv b/ext/spl/tests/SplFileObject/SplFileObject_testinput.csv similarity index 100% rename from ext/spl/tests/SplFileObject_testinput.csv rename to ext/spl/tests/SplFileObject/SplFileObject_testinput.csv diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/SplFileObject/bug36258.phpt similarity index 100% rename from ext/spl/tests/bug36258.phpt rename to ext/spl/tests/SplFileObject/bug36258.phpt diff --git a/ext/spl/tests/bug46053.phpt b/ext/spl/tests/SplFileObject/bug46053.phpt similarity index 100% rename from ext/spl/tests/bug46053.phpt rename to ext/spl/tests/SplFileObject/bug46053.phpt diff --git a/ext/spl/tests/bug46569.csv b/ext/spl/tests/SplFileObject/bug46569.csv similarity index 100% rename from ext/spl/tests/bug46569.csv rename to ext/spl/tests/SplFileObject/bug46569.csv diff --git a/ext/spl/tests/bug46569.phpt b/ext/spl/tests/SplFileObject/bug46569.phpt similarity index 100% rename from ext/spl/tests/bug46569.phpt rename to ext/spl/tests/SplFileObject/bug46569.phpt diff --git a/ext/spl/tests/bug51374.phpt b/ext/spl/tests/SplFileObject/bug51374.phpt similarity index 100% rename from ext/spl/tests/bug51374.phpt rename to ext/spl/tests/SplFileObject/bug51374.phpt diff --git a/ext/spl/tests/bug51532.phpt b/ext/spl/tests/SplFileObject/bug51532.phpt similarity index 100% rename from ext/spl/tests/bug51532.phpt rename to ext/spl/tests/SplFileObject/bug51532.phpt diff --git a/ext/spl/tests/bug52573.phpt b/ext/spl/tests/SplFileObject/bug52573.phpt similarity index 100% rename from ext/spl/tests/bug52573.phpt rename to ext/spl/tests/SplFileObject/bug52573.phpt diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/SplFileObject/bug54292.phpt similarity index 100% rename from ext/spl/tests/bug54292.phpt rename to ext/spl/tests/SplFileObject/bug54292.phpt diff --git a/ext/spl/tests/bug60201.phpt b/ext/spl/tests/SplFileObject/bug60201.phpt similarity index 100% rename from ext/spl/tests/bug60201.phpt rename to ext/spl/tests/SplFileObject/bug60201.phpt diff --git a/ext/spl/tests/bug62004.phpt b/ext/spl/tests/SplFileObject/bug62004.phpt similarity index 100% rename from ext/spl/tests/bug62004.phpt rename to ext/spl/tests/SplFileObject/bug62004.phpt diff --git a/ext/spl/tests/bug62004.txt b/ext/spl/tests/SplFileObject/bug62004.txt similarity index 100% rename from ext/spl/tests/bug62004.txt rename to ext/spl/tests/SplFileObject/bug62004.txt diff --git a/ext/spl/tests/bug64782.phpt b/ext/spl/tests/SplFileObject/bug64782.phpt similarity index 100% rename from ext/spl/tests/bug64782.phpt rename to ext/spl/tests/SplFileObject/bug64782.phpt diff --git a/ext/spl/tests/bug65545.phpt b/ext/spl/tests/SplFileObject/bug65545.phpt similarity index 100% rename from ext/spl/tests/bug65545.phpt rename to ext/spl/tests/SplFileObject/bug65545.phpt diff --git a/ext/spl/tests/bug67805.phpt b/ext/spl/tests/SplFileObject/bug67805.phpt similarity index 100% rename from ext/spl/tests/bug67805.phpt rename to ext/spl/tests/SplFileObject/bug67805.phpt diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/SplFileObject/bug68479.phpt similarity index 100% rename from ext/spl/tests/bug68479.phpt rename to ext/spl/tests/SplFileObject/bug68479.phpt diff --git a/ext/spl/tests/bug72884.phpt b/ext/spl/tests/SplFileObject/bug72884.phpt similarity index 100% rename from ext/spl/tests/bug72884.phpt rename to ext/spl/tests/SplFileObject/bug72884.phpt diff --git a/ext/spl/tests/bug75917.phpt b/ext/spl/tests/SplFileObject/bug75917.phpt similarity index 100% rename from ext/spl/tests/bug75917.phpt rename to ext/spl/tests/SplFileObject/bug75917.phpt diff --git a/ext/spl/tests/bug77024.phpt b/ext/spl/tests/SplFileObject/bug77024.phpt similarity index 100% rename from ext/spl/tests/bug77024.phpt rename to ext/spl/tests/SplFileObject/bug77024.phpt diff --git a/ext/spl/tests/bug78976.phpt b/ext/spl/tests/SplFileObject/bug78976.phpt similarity index 100% rename from ext/spl/tests/bug78976.phpt rename to ext/spl/tests/SplFileObject/bug78976.phpt diff --git a/ext/spl/tests/bug79710.phpt b/ext/spl/tests/SplFileObject/bug79710.phpt similarity index 100% rename from ext/spl/tests/bug79710.phpt rename to ext/spl/tests/SplFileObject/bug79710.phpt diff --git a/ext/spl/tests/bug80933.phpt b/ext/spl/tests/SplFileObject/bug80933.phpt similarity index 100% rename from ext/spl/tests/bug80933.phpt rename to ext/spl/tests/SplFileObject/bug80933.phpt diff --git a/ext/spl/tests/fileobject_001.phpt b/ext/spl/tests/SplFileObject/fileobject_001.phpt similarity index 100% rename from ext/spl/tests/fileobject_001.phpt rename to ext/spl/tests/SplFileObject/fileobject_001.phpt diff --git a/ext/spl/tests/fileobject_001a.txt b/ext/spl/tests/SplFileObject/fileobject_001a.txt similarity index 100% rename from ext/spl/tests/fileobject_001a.txt rename to ext/spl/tests/SplFileObject/fileobject_001a.txt diff --git a/ext/spl/tests/fileobject_001b.txt b/ext/spl/tests/SplFileObject/fileobject_001b.txt similarity index 100% rename from ext/spl/tests/fileobject_001b.txt rename to ext/spl/tests/SplFileObject/fileobject_001b.txt diff --git a/ext/spl/tests/fileobject_002.phpt b/ext/spl/tests/SplFileObject/fileobject_002.phpt similarity index 100% rename from ext/spl/tests/fileobject_002.phpt rename to ext/spl/tests/SplFileObject/fileobject_002.phpt diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/SplFileObject/fileobject_003.phpt similarity index 97% rename from ext/spl/tests/fileobject_003.phpt rename to ext/spl/tests/SplFileObject/fileobject_003.phpt index 4f33065d426..9758ec76341 100644 --- a/ext/spl/tests/fileobject_003.phpt +++ b/ext/spl/tests/SplFileObject/fileobject_003.phpt @@ -68,11 +68,11 @@ string(%d) "%sfileobject_001a.txt" bool(true) string(19) "fileobject_001a.txt" bool(true) -string(%d) "%stests" +string(%d) "%stests%eSplFileObject" bool(true) string(%d) "%sfileobject_001a.txt" string(19) "fileobject_001a.txt" -string(%d) "%stests" +string(%d) "%stests%eSplFileObject" ===1=== object(SplFileInfo)#%d (2) { ["pathName":"SplFileInfo":private]=> diff --git a/ext/spl/tests/fileobject_004.phpt b/ext/spl/tests/SplFileObject/fileobject_004.phpt similarity index 76% rename from ext/spl/tests/fileobject_004.phpt rename to ext/spl/tests/SplFileObject/fileobject_004.phpt index f446674dd88..36a558b676a 100644 --- a/ext/spl/tests/fileobject_004.phpt +++ b/ext/spl/tests/SplFileObject/fileobject_004.phpt @@ -15,6 +15,6 @@ var_dump($fo->getFilename()); var_dump($fo->getRealPath()); ?> --EXPECTF-- -string(%d) "%sspl%stests" +string(%d) "%sspl%etests%eSplFileObject" string(19) "fileobject_004.phpt" -string(%d) "%sspl%stests%sfileobject_004.phpt" +string(%d) "%sspl%etests%eSplFileObject%efileobject_004.phpt" diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/SplFileObject/fileobject_005.phpt similarity index 100% rename from ext/spl/tests/fileobject_005.phpt rename to ext/spl/tests/SplFileObject/fileobject_005.phpt diff --git a/ext/spl/tests/fileobject_checktype_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_checktype_basic.phpt similarity index 100% rename from ext/spl/tests/fileobject_checktype_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_checktype_basic.phpt diff --git a/ext/spl/tests/fileobject_getbasename_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_getbasename_basic.phpt similarity index 100% rename from ext/spl/tests/fileobject_getbasename_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_getbasename_basic.phpt diff --git a/ext/spl/tests/fileobject_getcurrentline_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_getcurrentline_basic.phpt similarity index 100% rename from ext/spl/tests/fileobject_getcurrentline_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_getcurrentline_basic.phpt diff --git a/ext/spl/tests/fileobject_getfileinfo_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_getfileinfo_basic.phpt similarity index 66% rename from ext/spl/tests/fileobject_getfileinfo_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_getfileinfo_basic.phpt index 97d0de2459d..dd75239ea2a 100644 --- a/ext/spl/tests/fileobject_getfileinfo_basic.phpt +++ b/ext/spl/tests/SplFileObject/fileobject_getfileinfo_basic.phpt @@ -21,24 +21,24 @@ var_dump($fi = $d->getFileInfo(), (string)$fi); --EXPECTF-- object(SplFileInfo)#%d (2) { ["pathName":"SplFileInfo":private]=> - string(%d) "%sext%espl%etests%efileobject_getfileinfo_basic.php" + string(%d) "%sext%espl%etests%eSplFileObject%efileobject_getfileinfo_basic.php" ["fileName":"SplFileInfo":private]=> string(%d) "fileobject_getfileinfo_basic.php" } -string(%d) "%sext%espl%etests%efileobject_getfileinfo_basic.php" +string(%d) "%sext%espl%etests%eSplFileObject%efileobject_getfileinfo_basic.php" object(SplFileInfo)#%d (2) { ["pathName":"SplFileInfo":private]=> - string(%d) "%sext%espl%etests" + string(%d) "%sext%e%spl%etests%eSplFileObject" ["fileName":"SplFileInfo":private]=> - string(%d) "tests" + string(%d) "SplFileObject" } -string(%d) "%sext%espl%etests" +string(%d) "%sext%espl%etests%eSplFileObject" object(SplFileInfo)#%d (2) { ["pathName":"SplFileInfo":private]=> - string(%d) "%sext%espl%etests" + string(%d) "%sext%espl%etests%eSplFileObject" ["fileName":"SplFileInfo":private]=> - string(%d) "tests" + string(%d) "SplFileObject" } -string(%d) "%sext%espl%etests" +string(%d) "%sext%espl%etests%eSplFileObject" diff --git a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_getmaxlinelen_basic.phpt similarity index 100% rename from ext/spl/tests/fileobject_getmaxlinelen_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_getmaxlinelen_basic.phpt diff --git a/ext/spl/tests/fileobject_getsize_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_getsize_basic.phpt similarity index 100% rename from ext/spl/tests/fileobject_getsize_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_getsize_basic.phpt diff --git a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt b/ext/spl/tests/SplFileObject/fileobject_setmaxlinelen_basic.phpt similarity index 100% rename from ext/spl/tests/fileobject_setmaxlinelen_basic.phpt rename to ext/spl/tests/SplFileObject/fileobject_setmaxlinelen_basic.phpt diff --git a/ext/spl/tests/fileobject_setmaxlinelen_error001.phpt b/ext/spl/tests/SplFileObject/fileobject_setmaxlinelen_error001.phpt similarity index 100% rename from ext/spl/tests/fileobject_setmaxlinelen_error001.phpt rename to ext/spl/tests/SplFileObject/fileobject_setmaxlinelen_error001.phpt diff --git a/ext/spl/tests/gh8121.csv b/ext/spl/tests/SplFileObject/gh8121.csv similarity index 100% rename from ext/spl/tests/gh8121.csv rename to ext/spl/tests/SplFileObject/gh8121.csv diff --git a/ext/spl/tests/gh8121.phpt b/ext/spl/tests/SplFileObject/gh8121.phpt similarity index 100% rename from ext/spl/tests/gh8121.phpt rename to ext/spl/tests/SplFileObject/gh8121.phpt diff --git a/ext/spl/tests/gh8273.phpt b/ext/spl/tests/SplFileObject/gh8273.phpt similarity index 100% rename from ext/spl/tests/gh8273.phpt rename to ext/spl/tests/SplFileObject/gh8273.phpt