diff --git a/tests/aot/README_TEST_COVERAGE.md b/tests/compiler/README_TEST_COVERAGE.md
similarity index 100%
rename from tests/aot/README_TEST_COVERAGE.md
rename to tests/compiler/README_TEST_COVERAGE.md
diff --git a/tests/aot/RUN_TESTS_GUIDE.md b/tests/compiler/RUN_TESTS_GUIDE.md
similarity index 100%
rename from tests/aot/RUN_TESTS_GUIDE.md
rename to tests/compiler/RUN_TESTS_GUIDE.md
diff --git a/tests/aot/SKIP_TESTS.md b/tests/compiler/SKIP_TESTS.md
similarity index 100%
rename from tests/aot/SKIP_TESTS.md
rename to tests/compiler/SKIP_TESTS.md
diff --git a/tests/aot/TEST_SUPPLEMENT_REPORT.md b/tests/compiler/TEST_SUPPLEMENT_REPORT.md
similarity index 100%
rename from tests/aot/TEST_SUPPLEMENT_REPORT.md
rename to tests/compiler/TEST_SUPPLEMENT_REPORT.md
diff --git a/tests/aot/anon_class/001.phpt b/tests/compiler/anon_class/001.phpt
similarity index 100%
rename from tests/aot/anon_class/001.phpt
rename to tests/compiler/anon_class/001.phpt
diff --git a/tests/aot/anon_class/002.phpt b/tests/compiler/anon_class/002.phpt
similarity index 100%
rename from tests/aot/anon_class/002.phpt
rename to tests/compiler/anon_class/002.phpt
diff --git a/tests/aot/anon_class/003.phpt b/tests/compiler/anon_class/003.phpt
similarity index 100%
rename from tests/aot/anon_class/003.phpt
rename to tests/compiler/anon_class/003.phpt
diff --git a/tests/aot/anon_class/004.phpt b/tests/compiler/anon_class/004.phpt
similarity index 100%
rename from tests/aot/anon_class/004.phpt
rename to tests/compiler/anon_class/004.phpt
diff --git a/tests/aot/anon_class/constructor-state-method.phpt b/tests/compiler/anon_class/constructor-state-method.phpt
similarity index 100%
rename from tests/aot/anon_class/constructor-state-method.phpt
rename to tests/compiler/anon_class/constructor-state-method.phpt
diff --git a/tests/aot/array/001.phpt b/tests/compiler/array/001.phpt
similarity index 100%
rename from tests/aot/array/001.phpt
rename to tests/compiler/array/001.phpt
diff --git a/tests/aot/array/002.phpt b/tests/compiler/array/002.phpt
similarity index 100%
rename from tests/aot/array/002.phpt
rename to tests/compiler/array/002.phpt
diff --git a/tests/aot/array/003.phpt b/tests/compiler/array/003.phpt
similarity index 100%
rename from tests/aot/array/003.phpt
rename to tests/compiler/array/003.phpt
diff --git a/tests/aot/array/004.phpt b/tests/compiler/array/004.phpt
similarity index 100%
rename from tests/aot/array/004.phpt
rename to tests/compiler/array/004.phpt
diff --git a/tests/aot/array/005.phpt b/tests/compiler/array/005.phpt
similarity index 100%
rename from tests/aot/array/005.phpt
rename to tests/compiler/array/005.phpt
diff --git a/tests/aot/array/006.phpt b/tests/compiler/array/006.phpt
similarity index 100%
rename from tests/aot/array/006.phpt
rename to tests/compiler/array/006.phpt
diff --git a/tests/aot/array/007.phpt b/tests/compiler/array/007.phpt
similarity index 100%
rename from tests/aot/array/007.phpt
rename to tests/compiler/array/007.phpt
diff --git a/tests/aot/array/008.phpt b/tests/compiler/array/008.phpt
similarity index 100%
rename from tests/aot/array/008.phpt
rename to tests/compiler/array/008.phpt
diff --git a/tests/aot/array/array-item-dec-inc.phpt b/tests/compiler/array/array-item-dec-inc.phpt
similarity index 100%
rename from tests/aot/array/array-item-dec-inc.phpt
rename to tests/compiler/array/array-item-dec-inc.phpt
diff --git a/tests/aot/array/array-merge-unpack.phpt b/tests/compiler/array/array-merge-unpack.phpt
similarity index 100%
rename from tests/aot/array/array-merge-unpack.phpt
rename to tests/compiler/array/array-merge-unpack.phpt
diff --git a/tests/aot/array/array-multisort.phpt b/tests/compiler/array/array-multisort.phpt
similarity index 100%
rename from tests/aot/array/array-multisort.phpt
rename to tests/compiler/array/array-multisort.phpt
diff --git a/tests/aot/array/array-spread.phpt b/tests/compiler/array/array-spread.phpt
similarity index 100%
rename from tests/aot/array/array-spread.phpt
rename to tests/compiler/array/array-spread.phpt
diff --git a/tests/aot/array/array_assignment_edge_cases.phpt b/tests/compiler/array/array_assignment_edge_cases.phpt
similarity index 100%
rename from tests/aot/array/array_assignment_edge_cases.phpt
rename to tests/compiler/array/array_assignment_edge_cases.phpt
diff --git a/tests/aot/array/array_assignment_operators.phpt b/tests/compiler/array/array_assignment_operators.phpt
similarity index 100%
rename from tests/aot/array/array_assignment_operators.phpt
rename to tests/compiler/array/array_assignment_operators.phpt
diff --git a/tests/aot/array/arrays.phpt b/tests/compiler/array/arrays.phpt
similarity index 100%
rename from tests/aot/array/arrays.phpt
rename to tests/compiler/array/arrays.phpt
diff --git a/tests/aot/array/complex_array_operations.phpt b/tests/compiler/array/complex_array_operations.phpt
similarity index 100%
rename from tests/aot/array/complex_array_operations.phpt
rename to tests/compiler/array/complex_array_operations.phpt
diff --git a/tests/aot/array/destructure-function-return.phpt b/tests/compiler/array/destructure-function-return.phpt
similarity index 100%
rename from tests/aot/array/destructure-function-return.phpt
rename to tests/compiler/array/destructure-function-return.phpt
diff --git a/tests/aot/array/destructure-keyed-write-targets.phpt b/tests/compiler/array/destructure-keyed-write-targets.phpt
similarity index 100%
rename from tests/aot/array/destructure-keyed-write-targets.phpt
rename to tests/compiler/array/destructure-keyed-write-targets.phpt
diff --git a/tests/aot/array/destructure-keyed.phpt b/tests/compiler/array/destructure-keyed.phpt
similarity index 100%
rename from tests/aot/array/destructure-keyed.phpt
rename to tests/compiler/array/destructure-keyed.phpt
diff --git a/tests/aot/array/foreach-list-nested-keyed.phpt b/tests/compiler/array/foreach-list-nested-keyed.phpt
similarity index 100%
rename from tests/aot/array/foreach-list-nested-keyed.phpt
rename to tests/compiler/array/foreach-list-nested-keyed.phpt
diff --git a/tests/aot/array/foreach-list-write-targets.phpt b/tests/compiler/array/foreach-list-write-targets.phpt
similarity index 100%
rename from tests/aot/array/foreach-list-write-targets.phpt
rename to tests/compiler/array/foreach-list-write-targets.phpt
diff --git a/tests/aot/array/foreach-list.phpt b/tests/compiler/array/foreach-list.phpt
similarity index 100%
rename from tests/aot/array/foreach-list.phpt
rename to tests/compiler/array/foreach-list.phpt
diff --git a/tests/aot/array/item-ref.phpt b/tests/compiler/array/item-ref.phpt
similarity index 100%
rename from tests/aot/array/item-ref.phpt
rename to tests/compiler/array/item-ref.phpt
diff --git a/tests/aot/array/list-nested.phpt b/tests/compiler/array/list-nested.phpt
similarity index 100%
rename from tests/aot/array/list-nested.phpt
rename to tests/compiler/array/list-nested.phpt
diff --git a/tests/aot/array/list-test.phpt b/tests/compiler/array/list-test.phpt
similarity index 100%
rename from tests/aot/array/list-test.phpt
rename to tests/compiler/array/list-test.phpt
diff --git a/tests/aot/array/null-as-key.phpt b/tests/compiler/array/null-as-key.phpt
similarity index 100%
rename from tests/aot/array/null-as-key.phpt
rename to tests/compiler/array/null-as-key.phpt
diff --git a/tests/aot/array_method/0.phpt b/tests/compiler/array_method/0.phpt
similarity index 100%
rename from tests/aot/array_method/0.phpt
rename to tests/compiler/array_method/0.phpt
diff --git a/tests/aot/array_method/1.phpt b/tests/compiler/array_method/1.phpt
similarity index 100%
rename from tests/aot/array_method/1.phpt
rename to tests/compiler/array_method/1.phpt
diff --git a/tests/aot/array_method/2.phpt b/tests/compiler/array_method/2.phpt
similarity index 100%
rename from tests/aot/array_method/2.phpt
rename to tests/compiler/array_method/2.phpt
diff --git a/tests/aot/array_method/3.phpt b/tests/compiler/array_method/3.phpt
similarity index 100%
rename from tests/aot/array_method/3.phpt
rename to tests/compiler/array_method/3.phpt
diff --git a/tests/aot/array_method/4.phpt b/tests/compiler/array_method/4.phpt
similarity index 100%
rename from tests/aot/array_method/4.phpt
rename to tests/compiler/array_method/4.phpt
diff --git a/tests/aot/array_method/method.phpt b/tests/compiler/array_method/method.phpt
similarity index 100%
rename from tests/aot/array_method/method.phpt
rename to tests/compiler/array_method/method.phpt
diff --git a/tests/aot/array_method/misc.phpt b/tests/compiler/array_method/misc.phpt
similarity index 100%
rename from tests/aot/array_method/misc.phpt
rename to tests/compiler/array_method/misc.phpt
diff --git a/tests/aot/arrow_fn/001.phpt b/tests/compiler/arrow_fn/001.phpt
similarity index 100%
rename from tests/aot/arrow_fn/001.phpt
rename to tests/compiler/arrow_fn/001.phpt
diff --git a/tests/aot/arrow_fn/002.phpt b/tests/compiler/arrow_fn/002.phpt
similarity index 100%
rename from tests/aot/arrow_fn/002.phpt
rename to tests/compiler/arrow_fn/002.phpt
diff --git a/tests/aot/arrow_fn/003.phpt b/tests/compiler/arrow_fn/003.phpt
similarity index 100%
rename from tests/aot/arrow_fn/003.phpt
rename to tests/compiler/arrow_fn/003.phpt
diff --git a/tests/aot/arrow_fn/004.phpt b/tests/compiler/arrow_fn/004.phpt
similarity index 100%
rename from tests/aot/arrow_fn/004.phpt
rename to tests/compiler/arrow_fn/004.phpt
diff --git a/tests/aot/arrow_fn/static-arrow-capture.phpt b/tests/compiler/arrow_fn/static-arrow-capture.phpt
similarity index 100%
rename from tests/aot/arrow_fn/static-arrow-capture.phpt
rename to tests/compiler/arrow_fn/static-arrow-capture.phpt
diff --git a/tests/aot/arrow_fn/static-arrow-clone-map.phpt b/tests/compiler/arrow_fn/static-arrow-clone-map.phpt
similarity index 100%
rename from tests/aot/arrow_fn/static-arrow-clone-map.phpt
rename to tests/compiler/arrow_fn/static-arrow-clone-map.phpt
diff --git a/tests/aot/attribute/001.phpt b/tests/compiler/attribute/001.phpt
similarity index 100%
rename from tests/aot/attribute/001.phpt
rename to tests/compiler/attribute/001.phpt
diff --git a/tests/aot/attribute/002.phpt b/tests/compiler/attribute/002.phpt
similarity index 100%
rename from tests/aot/attribute/002.phpt
rename to tests/compiler/attribute/002.phpt
diff --git a/tests/aot/attribute/003.phpt b/tests/compiler/attribute/003.phpt
similarity index 100%
rename from tests/aot/attribute/003.phpt
rename to tests/compiler/attribute/003.phpt
diff --git a/tests/aot/attribute/attr-ref.phpt b/tests/compiler/attribute/attr-ref.phpt
similarity index 100%
rename from tests/aot/attribute/attr-ref.phpt
rename to tests/compiler/attribute/attr-ref.phpt
diff --git a/tests/aot/attribute/attributes.phpt b/tests/compiler/attribute/attributes.phpt
similarity index 100%
rename from tests/aot/attribute/attributes.phpt
rename to tests/compiler/attribute/attributes.phpt
diff --git a/tests/aot/attribute/function-attributes.phpt b/tests/compiler/attribute/function-attributes.phpt
similarity index 100%
rename from tests/aot/attribute/function-attributes.phpt
rename to tests/compiler/attribute/function-attributes.phpt
diff --git a/tests/aot/attribute/parameter-property-attributes.phpt b/tests/compiler/attribute/parameter-property-attributes.phpt
similarity index 100%
rename from tests/aot/attribute/parameter-property-attributes.phpt
rename to tests/compiler/attribute/parameter-property-attributes.phpt
diff --git a/tests/aot/attribute/return-type-will-change.phpt b/tests/compiler/attribute/return-type-will-change.phpt
similarity index 100%
rename from tests/aot/attribute/return-type-will-change.phpt
rename to tests/compiler/attribute/return-type-will-change.phpt
diff --git a/tests/aot/basic/any-expression-positions.phpt b/tests/compiler/basic/any-expression-positions.phpt
similarity index 100%
rename from tests/aot/basic/any-expression-positions.phpt
rename to tests/compiler/basic/any-expression-positions.phpt
diff --git a/tests/aot/basic/any.phpt b/tests/compiler/basic/any.phpt
similarity index 100%
rename from tests/aot/basic/any.phpt
rename to tests/compiler/basic/any.phpt
diff --git a/tests/aot/basic/backtick.phpt b/tests/compiler/basic/backtick.phpt
similarity index 100%
rename from tests/aot/basic/backtick.phpt
rename to tests/compiler/basic/backtick.phpt
diff --git a/tests/aot/basic/basic_variables.phpt b/tests/compiler/basic/basic_variables.phpt
similarity index 100%
rename from tests/aot/basic/basic_variables.phpt
rename to tests/compiler/basic/basic_variables.phpt
diff --git a/tests/aot/basic/bool-001.phpt b/tests/compiler/basic/bool-001.phpt
similarity index 100%
rename from tests/aot/basic/bool-001.phpt
rename to tests/compiler/basic/bool-001.phpt
diff --git a/tests/aot/basic/clone-expression-side-effects.phpt b/tests/compiler/basic/clone-expression-side-effects.phpt
similarity index 100%
rename from tests/aot/basic/clone-expression-side-effects.phpt
rename to tests/compiler/basic/clone-expression-side-effects.phpt
diff --git a/tests/aot/basic/clone.phpt b/tests/compiler/basic/clone.phpt
similarity index 100%
rename from tests/aot/basic/clone.phpt
rename to tests/compiler/basic/clone.phpt
diff --git a/tests/aot/basic/condition-assign.phpt b/tests/compiler/basic/condition-assign.phpt
similarity index 100%
rename from tests/aot/basic/condition-assign.phpt
rename to tests/compiler/basic/condition-assign.phpt
diff --git a/tests/aot/basic/datetime_builtin_class.phpt b/tests/compiler/basic/datetime_builtin_class.phpt
similarity index 100%
rename from tests/aot/basic/datetime_builtin_class.phpt
rename to tests/compiler/basic/datetime_builtin_class.phpt
diff --git a/tests/aot/basic/declare-encoding-utf8.phpt b/tests/compiler/basic/declare-encoding-utf8.phpt
similarity index 100%
rename from tests/aot/basic/declare-encoding-utf8.phpt
rename to tests/compiler/basic/declare-encoding-utf8.phpt
diff --git a/tests/aot/basic/echo-assignment-expression.phpt b/tests/compiler/basic/echo-assignment-expression.phpt
similarity index 100%
rename from tests/aot/basic/echo-assignment-expression.phpt
rename to tests/compiler/basic/echo-assignment-expression.phpt
diff --git a/tests/aot/basic/embedded-null-string.phpt b/tests/compiler/basic/embedded-null-string.phpt
similarity index 100%
rename from tests/aot/basic/embedded-null-string.phpt
rename to tests/compiler/basic/embedded-null-string.phpt
diff --git a/tests/aot/basic/error-suppress-restore.phpt b/tests/compiler/basic/error-suppress-restore.phpt
similarity index 100%
rename from tests/aot/basic/error-suppress-restore.phpt
rename to tests/compiler/basic/error-suppress-restore.phpt
diff --git a/tests/aot/basic/error-suppress.phpt b/tests/compiler/basic/error-suppress.phpt
similarity index 100%
rename from tests/aot/basic/error-suppress.phpt
rename to tests/compiler/basic/error-suppress.phpt
diff --git a/tests/aot/basic/eval-test.phpt b/tests/compiler/basic/eval-test.phpt
similarity index 100%
rename from tests/aot/basic/eval-test.phpt
rename to tests/compiler/basic/eval-test.phpt
diff --git a/tests/aot/basic/exit-string.phpt b/tests/compiler/basic/exit-string.phpt
similarity index 100%
rename from tests/aot/basic/exit-string.phpt
rename to tests/compiler/basic/exit-string.phpt
diff --git a/tests/aot/basic/exit-test.phpt b/tests/compiler/basic/exit-test.phpt
similarity index 100%
rename from tests/aot/basic/exit-test.phpt
rename to tests/compiler/basic/exit-test.phpt
diff --git a/tests/aot/basic/exit-zero.phpt b/tests/compiler/basic/exit-zero.phpt
similarity index 100%
rename from tests/aot/basic/exit-zero.phpt
rename to tests/compiler/basic/exit-zero.phpt
diff --git a/tests/aot/basic/extends-redis.phpt b/tests/compiler/basic/extends-redis.phpt
similarity index 100%
rename from tests/aot/basic/extends-redis.phpt
rename to tests/compiler/basic/extends-redis.phpt
diff --git a/tests/aot/basic/fib.phpt b/tests/compiler/basic/fib.phpt
similarity index 100%
rename from tests/aot/basic/fib.phpt
rename to tests/compiler/basic/fib.phpt
diff --git a/tests/aot/basic/file_operations.phpt b/tests/compiler/basic/file_operations.phpt
similarity index 100%
rename from tests/aot/basic/file_operations.phpt
rename to tests/compiler/basic/file_operations.phpt
diff --git a/tests/aot/basic/global-003.phpt b/tests/compiler/basic/global-003.phpt
similarity index 100%
rename from tests/aot/basic/global-003.phpt
rename to tests/compiler/basic/global-003.phpt
diff --git a/tests/aot/basic/global-int.phpt b/tests/compiler/basic/global-int.phpt
similarity index 100%
rename from tests/aot/basic/global-int.phpt
rename to tests/compiler/basic/global-int.phpt
diff --git a/tests/aot/basic/global-vars-002.phpt b/tests/compiler/basic/global-vars-002.phpt
similarity index 100%
rename from tests/aot/basic/global-vars-002.phpt
rename to tests/compiler/basic/global-vars-002.phpt
diff --git a/tests/aot/basic/global-vars.phpt b/tests/compiler/basic/global-vars.phpt
similarity index 100%
rename from tests/aot/basic/global-vars.phpt
rename to tests/compiler/basic/global-vars.phpt
diff --git a/tests/aot/basic/globals-assign-ref.phpt b/tests/compiler/basic/globals-assign-ref.phpt
similarity index 100%
rename from tests/aot/basic/globals-assign-ref.phpt
rename to tests/compiler/basic/globals-assign-ref.phpt
diff --git a/tests/aot/basic/globals-ref-arg.phpt b/tests/compiler/basic/globals-ref-arg.phpt
similarity index 100%
rename from tests/aot/basic/globals-ref-arg.phpt
rename to tests/compiler/basic/globals-ref-arg.phpt
diff --git a/tests/aot/basic/heredoc.phpt b/tests/compiler/basic/heredoc.phpt
similarity index 100%
rename from tests/aot/basic/heredoc.phpt
rename to tests/compiler/basic/heredoc.phpt
diff --git a/tests/aot/basic/include-expression-side-effects.phpt b/tests/compiler/basic/include-expression-side-effects.phpt
similarity index 100%
rename from tests/aot/basic/include-expression-side-effects.phpt
rename to tests/compiler/basic/include-expression-side-effects.phpt
diff --git a/tests/aot/basic/include.phpt b/tests/compiler/basic/include.phpt
similarity index 100%
rename from tests/aot/basic/include.phpt
rename to tests/compiler/basic/include.phpt
diff --git a/tests/aot/basic/magic-constants.phpt b/tests/compiler/basic/magic-constants.phpt
similarity index 100%
rename from tests/aot/basic/magic-constants.phpt
rename to tests/compiler/basic/magic-constants.phpt
diff --git a/tests/aot/basic/main-func.phpt b/tests/compiler/basic/main-func.phpt
similarity index 100%
rename from tests/aot/basic/main-func.phpt
rename to tests/compiler/basic/main-func.phpt
diff --git a/tests/aot/basic/math_functions.phpt b/tests/compiler/basic/math_functions.phpt
similarity index 100%
rename from tests/aot/basic/math_functions.phpt
rename to tests/compiler/basic/math_functions.phpt
diff --git a/tests/aot/basic/method-call.phpt b/tests/compiler/basic/method-call.phpt
similarity index 100%
rename from tests/aot/basic/method-call.phpt
rename to tests/compiler/basic/method-call.phpt
diff --git a/tests/aot/basic/multi-var-assign-chained.phpt b/tests/compiler/basic/multi-var-assign-chained.phpt
similarity index 100%
rename from tests/aot/basic/multi-var-assign-chained.phpt
rename to tests/compiler/basic/multi-var-assign-chained.phpt
diff --git a/tests/aot/basic/multi-var-assign.phpt b/tests/compiler/basic/multi-var-assign.phpt
similarity index 100%
rename from tests/aot/basic/multi-var-assign.phpt
rename to tests/compiler/basic/multi-var-assign.phpt
diff --git a/tests/aot/basic/nullable-bool.phpt b/tests/compiler/basic/nullable-bool.phpt
similarity index 100%
rename from tests/aot/basic/nullable-bool.phpt
rename to tests/compiler/basic/nullable-bool.phpt
diff --git a/tests/aot/basic/object-arg.phpt b/tests/compiler/basic/object-arg.phpt
similarity index 100%
rename from tests/aot/basic/object-arg.phpt
rename to tests/compiler/basic/object-arg.phpt
diff --git a/tests/aot/basic/objval.phpt b/tests/compiler/basic/objval.phpt
similarity index 100%
rename from tests/aot/basic/objval.phpt
rename to tests/compiler/basic/objval.phpt
diff --git a/tests/aot/basic/pi.phpt b/tests/compiler/basic/pi.phpt
similarity index 100%
rename from tests/aot/basic/pi.phpt
rename to tests/compiler/basic/pi.phpt
diff --git a/tests/aot/basic/pipe-operator.phpt b/tests/compiler/basic/pipe-operator.phpt
similarity index 100%
rename from tests/aot/basic/pipe-operator.phpt
rename to tests/compiler/basic/pipe-operator.phpt
diff --git a/tests/aot/basic/pow-int-overflow-native-type.phpt b/tests/compiler/basic/pow-int-overflow-native-type.phpt
similarity index 100%
rename from tests/aot/basic/pow-int-overflow-native-type.phpt
rename to tests/compiler/basic/pow-int-overflow-native-type.phpt
diff --git a/tests/aot/basic/pow-int-overflow.phpt b/tests/compiler/basic/pow-int-overflow.phpt
similarity index 100%
rename from tests/aot/basic/pow-int-overflow.phpt
rename to tests/compiler/basic/pow-int-overflow.phpt
diff --git a/tests/aot/basic/return-assign-array-dim.phpt b/tests/compiler/basic/return-assign-array-dim.phpt
similarity index 100%
rename from tests/aot/basic/return-assign-array-dim.phpt
rename to tests/compiler/basic/return-assign-array-dim.phpt
diff --git a/tests/aot/basic/return-assign-set-prop-trait.phpt b/tests/compiler/basic/return-assign-set-prop-trait.phpt
similarity index 100%
rename from tests/aot/basic/return-assign-set-prop-trait.phpt
rename to tests/compiler/basic/return-assign-set-prop-trait.phpt
diff --git a/tests/aot/basic/return-assign-set-prop.phpt b/tests/compiler/basic/return-assign-set-prop.phpt
similarity index 100%
rename from tests/aot/basic/return-assign-set-prop.phpt
rename to tests/compiler/basic/return-assign-set-prop.phpt
diff --git a/tests/aot/basic/return-ternary.phpt b/tests/compiler/basic/return-ternary.phpt
similarity index 100%
rename from tests/aot/basic/return-ternary.phpt
rename to tests/compiler/basic/return-ternary.phpt
diff --git a/tests/aot/basic/return-void.phpt b/tests/compiler/basic/return-void.phpt
similarity index 100%
rename from tests/aot/basic/return-void.phpt
rename to tests/compiler/basic/return-void.phpt
diff --git a/tests/aot/basic/shell-exec.phpt b/tests/compiler/basic/shell-exec.phpt
similarity index 100%
rename from tests/aot/basic/shell-exec.phpt
rename to tests/compiler/basic/shell-exec.phpt
diff --git a/tests/aot/basic/static-prop.phpt b/tests/compiler/basic/static-prop.phpt
similarity index 100%
rename from tests/aot/basic/static-prop.phpt
rename to tests/compiler/basic/static-prop.phpt
diff --git a/tests/aot/basic/std_builtin.phpt b/tests/compiler/basic/std_builtin.phpt
similarity index 100%
rename from tests/aot/basic/std_builtin.phpt
rename to tests/compiler/basic/std_builtin.phpt
diff --git a/tests/aot/basic/string-item-isset.phpt b/tests/compiler/basic/string-item-isset.phpt
similarity index 100%
rename from tests/aot/basic/string-item-isset.phpt
rename to tests/compiler/basic/string-item-isset.phpt
diff --git a/tests/aot/basic/test_include.inc b/tests/compiler/basic/test_include.inc
similarity index 100%
rename from tests/aot/basic/test_include.inc
rename to tests/compiler/basic/test_include.inc
diff --git a/tests/aot/basic/test_include_return.inc b/tests/compiler/basic/test_include_return.inc
similarity index 100%
rename from tests/aot/basic/test_include_return.inc
rename to tests/compiler/basic/test_include_return.inc
diff --git a/tests/aot/basic/trait-private-property-write-inherited.phpt b/tests/compiler/basic/trait-private-property-write-inherited.phpt
similarity index 100%
rename from tests/aot/basic/trait-private-property-write-inherited.phpt
rename to tests/compiler/basic/trait-private-property-write-inherited.phpt
diff --git a/tests/aot/basic/unset-dim-side-effects.phpt b/tests/compiler/basic/unset-dim-side-effects.phpt
similarity index 100%
rename from tests/aot/basic/unset-dim-side-effects.phpt
rename to tests/compiler/basic/unset-dim-side-effects.phpt
diff --git a/tests/aot/basic/unset.phpt b/tests/compiler/basic/unset.phpt
similarity index 100%
rename from tests/aot/basic/unset.phpt
rename to tests/compiler/basic/unset.phpt
diff --git a/tests/aot/basic/variable-variables.phpt b/tests/compiler/basic/variable-variables.phpt
similarity index 100%
rename from tests/aot/basic/variable-variables.phpt
rename to tests/compiler/basic/variable-variables.phpt
diff --git a/tests/aot/basic/void-expression-null.phpt b/tests/compiler/basic/void-expression-null.phpt
similarity index 100%
rename from tests/aot/basic/void-expression-null.phpt
rename to tests/compiler/basic/void-expression-null.phpt
diff --git a/tests/aot/bigint/arithmetic.phpt b/tests/compiler/bigint/arithmetic.phpt
similarity index 100%
rename from tests/aot/bigint/arithmetic.phpt
rename to tests/compiler/bigint/arithmetic.phpt
diff --git a/tests/aot/bigint/assign_op.phpt b/tests/compiler/bigint/assign_op.phpt
similarity index 100%
rename from tests/aot/bigint/assign_op.phpt
rename to tests/compiler/bigint/assign_op.phpt
diff --git a/tests/aot/bigint/bigint_types.phpt b/tests/compiler/bigint/bigint_types.phpt
similarity index 100%
rename from tests/aot/bigint/bigint_types.phpt
rename to tests/compiler/bigint/bigint_types.phpt
diff --git a/tests/aot/bigint/bitwise.phpt b/tests/compiler/bigint/bitwise.phpt
similarity index 100%
rename from tests/aot/bigint/bitwise.phpt
rename to tests/compiler/bigint/bitwise.phpt
diff --git a/tests/aot/bigint/bitwise_shift.phpt b/tests/compiler/bigint/bitwise_shift.phpt
similarity index 100%
rename from tests/aot/bigint/bitwise_shift.phpt
rename to tests/compiler/bigint/bitwise_shift.phpt
diff --git a/tests/aot/bigint/both_types.phpt b/tests/compiler/bigint/both_types.phpt
similarity index 100%
rename from tests/aot/bigint/both_types.phpt
rename to tests/compiler/bigint/both_types.phpt
diff --git a/tests/aot/bigint/compare.phpt b/tests/compiler/bigint/compare.phpt
similarity index 100%
rename from tests/aot/bigint/compare.phpt
rename to tests/compiler/bigint/compare.phpt
diff --git a/tests/aot/bigint/divmod.phpt b/tests/compiler/bigint/divmod.phpt
similarity index 100%
rename from tests/aot/bigint/divmod.phpt
rename to tests/compiler/bigint/divmod.phpt
diff --git a/tests/aot/bigint/gcd.phpt b/tests/compiler/bigint/gcd.phpt
similarity index 100%
rename from tests/aot/bigint/gcd.phpt
rename to tests/compiler/bigint/gcd.phpt
diff --git a/tests/aot/bigint/literal.phpt b/tests/compiler/bigint/literal.phpt
similarity index 100%
rename from tests/aot/bigint/literal.phpt
rename to tests/compiler/bigint/literal.phpt
diff --git a/tests/aot/bigint/math_func_opt.phpt b/tests/compiler/bigint/math_func_opt.phpt
similarity index 100%
rename from tests/aot/bigint/math_func_opt.phpt
rename to tests/compiler/bigint/math_func_opt.phpt
diff --git a/tests/aot/bigint/mixed.phpt b/tests/compiler/bigint/mixed.phpt
similarity index 100%
rename from tests/aot/bigint/mixed.phpt
rename to tests/compiler/bigint/mixed.phpt
diff --git a/tests/aot/bigint/operator.phpt b/tests/compiler/bigint/operator.phpt
similarity index 100%
rename from tests/aot/bigint/operator.phpt
rename to tests/compiler/bigint/operator.phpt
diff --git a/tests/aot/bigint/pow-02.phpt b/tests/compiler/bigint/pow-02.phpt
similarity index 100%
rename from tests/aot/bigint/pow-02.phpt
rename to tests/compiler/bigint/pow-02.phpt
diff --git a/tests/aot/bigint/pow.phpt b/tests/compiler/bigint/pow.phpt
similarity index 100%
rename from tests/aot/bigint/pow.phpt
rename to tests/compiler/bigint/pow.phpt
diff --git a/tests/aot/bigint/powmod.phpt b/tests/compiler/bigint/powmod.phpt
similarity index 100%
rename from tests/aot/bigint/powmod.phpt
rename to tests/compiler/bigint/powmod.phpt
diff --git a/tests/aot/bigint/sqrt.phpt b/tests/compiler/bigint/sqrt.phpt
similarity index 100%
rename from tests/aot/bigint/sqrt.phpt
rename to tests/compiler/bigint/sqrt.phpt
diff --git a/tests/aot/bigint/toInt_toFloat.phpt b/tests/compiler/bigint/toInt_toFloat.phpt
similarity index 100%
rename from tests/aot/bigint/toInt_toFloat.phpt
rename to tests/compiler/bigint/toInt_toFloat.phpt
diff --git a/tests/aot/bigint/toString_cast.phpt b/tests/compiler/bigint/toString_cast.phpt
similarity index 100%
rename from tests/aot/bigint/toString_cast.phpt
rename to tests/compiler/bigint/toString_cast.phpt
diff --git a/tests/aot/bigint/use.phpt b/tests/compiler/bigint/use.phpt
similarity index 100%
rename from tests/aot/bigint/use.phpt
rename to tests/compiler/bigint/use.phpt
diff --git a/tests/aot/bignumber/big_number_operators.phpt b/tests/compiler/bignumber/big_number_operators.phpt
similarity index 100%
rename from tests/aot/bignumber/big_number_operators.phpt
rename to tests/compiler/bignumber/big_number_operators.phpt
diff --git a/tests/aot/bignumber/bigfloat_operators.phpt b/tests/compiler/bignumber/bigfloat_operators.phpt
similarity index 100%
rename from tests/aot/bignumber/bigfloat_operators.phpt
rename to tests/compiler/bignumber/bigfloat_operators.phpt
diff --git a/tests/aot/callable/arrow-fn.phpt b/tests/compiler/callable/arrow-fn.phpt
similarity index 100%
rename from tests/aot/callable/arrow-fn.phpt
rename to tests/compiler/callable/arrow-fn.phpt
diff --git a/tests/aot/callable/first-class-callable.phpt b/tests/compiler/callable/first-class-callable.phpt
similarity index 100%
rename from tests/aot/callable/first-class-callable.phpt
rename to tests/compiler/callable/first-class-callable.phpt
diff --git a/tests/aot/callable/is-callable-array.phpt b/tests/compiler/callable/is-callable-array.phpt
similarity index 100%
rename from tests/aot/callable/is-callable-array.phpt
rename to tests/compiler/callable/is-callable-array.phpt
diff --git a/tests/aot/callable/misc.phpt b/tests/compiler/callable/misc.phpt
similarity index 100%
rename from tests/aot/callable/misc.phpt
rename to tests/compiler/callable/misc.phpt
diff --git a/tests/aot/class/abstract-class-method.phpt b/tests/compiler/class/abstract-class-method.phpt
similarity index 100%
rename from tests/aot/class/abstract-class-method.phpt
rename to tests/compiler/class/abstract-class-method.phpt
diff --git a/tests/aot/class/abstract-class.inc b/tests/compiler/class/abstract-class.inc
similarity index 100%
rename from tests/aot/class/abstract-class.inc
rename to tests/compiler/class/abstract-class.inc
diff --git a/tests/aot/class/abstract-class.phpt b/tests/compiler/class/abstract-class.phpt
similarity index 100%
rename from tests/aot/class/abstract-class.phpt
rename to tests/compiler/class/abstract-class.phpt
diff --git a/tests/aot/class/abstract-method-byref-defined-var.phpt b/tests/compiler/class/abstract-method-byref-defined-var.phpt
similarity index 100%
rename from tests/aot/class/abstract-method-byref-defined-var.phpt
rename to tests/compiler/class/abstract-method-byref-defined-var.phpt
diff --git a/tests/aot/class/abstract-method-byref-interface.phpt b/tests/compiler/class/abstract-method-byref-interface.phpt
similarity index 100%
rename from tests/aot/class/abstract-method-byref-interface.phpt
rename to tests/compiler/class/abstract-method-byref-interface.phpt
diff --git a/tests/aot/class/abstract-method-byref-multi-param.phpt b/tests/compiler/class/abstract-method-byref-multi-param.phpt
similarity index 100%
rename from tests/aot/class/abstract-method-byref-multi-param.phpt
rename to tests/compiler/class/abstract-method-byref-multi-param.phpt
diff --git a/tests/aot/class/abstract-method-byref-multilevel.phpt b/tests/compiler/class/abstract-method-byref-multilevel.phpt
similarity index 100%
rename from tests/aot/class/abstract-method-byref-multilevel.phpt
rename to tests/compiler/class/abstract-method-byref-multilevel.phpt
diff --git a/tests/aot/class/abstract-method-byref-namespace.phpt b/tests/compiler/class/abstract-method-byref-namespace.phpt
similarity index 100%
rename from tests/aot/class/abstract-method-byref-namespace.phpt
rename to tests/compiler/class/abstract-method-byref-namespace.phpt
diff --git a/tests/aot/class/abstract-method-byref.phpt b/tests/compiler/class/abstract-method-byref.phpt
similarity index 100%
rename from tests/aot/class/abstract-method-byref.phpt
rename to tests/compiler/class/abstract-method-byref.phpt
diff --git a/tests/aot/class/abstract-return-typed-object.phpt b/tests/compiler/class/abstract-return-typed-object.phpt
similarity index 100%
rename from tests/aot/class/abstract-return-typed-object.phpt
rename to tests/compiler/class/abstract-return-typed-object.phpt
diff --git a/tests/aot/class/base-class-method.phpt b/tests/compiler/class/base-class-method.phpt
similarity index 100%
rename from tests/aot/class/base-class-method.phpt
rename to tests/compiler/class/base-class-method.phpt
diff --git a/tests/aot/class/class-alias-class-constant.phpt b/tests/compiler/class/class-alias-class-constant.phpt
similarity index 100%
rename from tests/aot/class/class-alias-class-constant.phpt
rename to tests/compiler/class/class-alias-class-constant.phpt
diff --git a/tests/aot/class/class-method-override.phpt b/tests/compiler/class/class-method-override.phpt
similarity index 100%
rename from tests/aot/class/class-method-override.phpt
rename to tests/compiler/class/class-method-override.phpt
diff --git a/tests/aot/class/class_args.phpt b/tests/compiler/class/class_args.phpt
similarity index 100%
rename from tests/aot/class/class_args.phpt
rename to tests/compiler/class/class_args.phpt
diff --git a/tests/aot/class/class_extends.phpt b/tests/compiler/class/class_extends.phpt
similarity index 100%
rename from tests/aot/class/class_extends.phpt
rename to tests/compiler/class/class_extends.phpt
diff --git a/tests/aot/class/dynamic-class-constant-fetch.phpt b/tests/compiler/class/dynamic-class-constant-fetch.phpt
similarity index 100%
rename from tests/aot/class/dynamic-class-constant-fetch.phpt
rename to tests/compiler/class/dynamic-class-constant-fetch.phpt
diff --git a/tests/aot/class/final-class.phpt b/tests/compiler/class/final-class.phpt
similarity index 100%
rename from tests/aot/class/final-class.phpt
rename to tests/compiler/class/final-class.phpt
diff --git a/tests/aot/class/get-object-class.phpt b/tests/compiler/class/get-object-class.phpt
similarity index 100%
rename from tests/aot/class/get-object-class.phpt
rename to tests/compiler/class/get-object-class.phpt
diff --git a/tests/aot/class/instanceof-dynamic-expression.phpt b/tests/compiler/class/instanceof-dynamic-expression.phpt
similarity index 100%
rename from tests/aot/class/instanceof-dynamic-expression.phpt
rename to tests/compiler/class/instanceof-dynamic-expression.phpt
diff --git a/tests/aot/class/instanceof-test.phpt b/tests/compiler/class/instanceof-test.phpt
similarity index 100%
rename from tests/aot/class/instanceof-test.phpt
rename to tests/compiler/class/instanceof-test.phpt
diff --git a/tests/aot/class/interface-declared-object-assign.phpt b/tests/compiler/class/interface-declared-object-assign.phpt
similarity index 100%
rename from tests/aot/class/interface-declared-object-assign.phpt
rename to tests/compiler/class/interface-declared-object-assign.phpt
diff --git a/tests/aot/class/interface-dynamic-call-zend-check.phpt b/tests/compiler/class/interface-dynamic-call-zend-check.phpt
similarity index 100%
rename from tests/aot/class/interface-dynamic-call-zend-check.phpt
rename to tests/compiler/class/interface-dynamic-call-zend-check.phpt
diff --git a/tests/aot/class/interface-method-byref-typed.phpt b/tests/compiler/class/interface-method-byref-typed.phpt
similarity index 100%
rename from tests/aot/class/interface-method-byref-typed.phpt
rename to tests/compiler/class/interface-method-byref-typed.phpt
diff --git a/tests/aot/class/interface-native-call-toobject-opt.phpt b/tests/compiler/class/interface-native-call-toobject-opt.phpt
similarity index 100%
rename from tests/aot/class/interface-native-call-toobject-opt.phpt
rename to tests/compiler/class/interface-native-call-toobject-opt.phpt
diff --git a/tests/aot/class/interface-param-return-check.phpt b/tests/compiler/class/interface-param-return-check.phpt
similarity index 100%
rename from tests/aot/class/interface-param-return-check.phpt
rename to tests/compiler/class/interface-param-return-check.phpt
diff --git a/tests/aot/class/interface.phpt b/tests/compiler/class/interface.phpt
similarity index 100%
rename from tests/aot/class/interface.phpt
rename to tests/compiler/class/interface.phpt
diff --git a/tests/aot/class/internal-class.phpt b/tests/compiler/class/internal-class.phpt
similarity index 100%
rename from tests/aot/class/internal-class.phpt
rename to tests/compiler/class/internal-class.phpt
diff --git a/tests/aot/class/new-and-call.phpt b/tests/compiler/class/new-and-call.phpt
similarity index 100%
rename from tests/aot/class/new-and-call.phpt
rename to tests/compiler/class/new-and-call.phpt
diff --git a/tests/aot/class/new-unpack-named.phpt b/tests/compiler/class/new-unpack-named.phpt
similarity index 100%
rename from tests/aot/class/new-unpack-named.phpt
rename to tests/compiler/class/new-unpack-named.phpt
diff --git a/tests/aot/class/objval-2.phpt b/tests/compiler/class/objval-2.phpt
similarity index 100%
rename from tests/aot/class/objval-2.phpt
rename to tests/compiler/class/objval-2.phpt
diff --git a/tests/aot/class/objval-parent.phpt b/tests/compiler/class/objval-parent.phpt
similarity index 100%
rename from tests/aot/class/objval-parent.phpt
rename to tests/compiler/class/objval-parent.phpt
diff --git a/tests/aot/class/objval.phpt b/tests/compiler/class/objval.phpt
similarity index 100%
rename from tests/aot/class/objval.phpt
rename to tests/compiler/class/objval.phpt
diff --git a/tests/aot/class/readonly-2.phpt b/tests/compiler/class/readonly-2.phpt
similarity index 100%
rename from tests/aot/class/readonly-2.phpt
rename to tests/compiler/class/readonly-2.phpt
diff --git a/tests/aot/class/readonly-class.phpt b/tests/compiler/class/readonly-class.phpt
similarity index 100%
rename from tests/aot/class/readonly-class.phpt
rename to tests/compiler/class/readonly-class.phpt
diff --git a/tests/aot/class/typed-object-assign-any.phpt b/tests/compiler/class/typed-object-assign-any.phpt
similarity index 100%
rename from tests/aot/class/typed-object-assign-any.phpt
rename to tests/compiler/class/typed-object-assign-any.phpt
diff --git a/tests/aot/class/unset-int-prop.phpt b/tests/compiler/class/unset-int-prop.phpt
similarity index 100%
rename from tests/aot/class/unset-int-prop.phpt
rename to tests/compiler/class/unset-int-prop.phpt
diff --git a/tests/aot/class/unset-ref-prop.phpt b/tests/compiler/class/unset-ref-prop.phpt
similarity index 100%
rename from tests/aot/class/unset-ref-prop.phpt
rename to tests/compiler/class/unset-ref-prop.phpt
diff --git a/tests/aot/closure/closure-001.phpt b/tests/compiler/closure/closure-001.phpt
similarity index 100%
rename from tests/aot/closure/closure-001.phpt
rename to tests/compiler/closure/closure-001.phpt
diff --git a/tests/aot/closure/closure-002.phpt b/tests/compiler/closure/closure-002.phpt
similarity index 100%
rename from tests/aot/closure/closure-002.phpt
rename to tests/compiler/closure/closure-002.phpt
diff --git a/tests/aot/closure/closure-composite-type-check.phpt b/tests/compiler/closure/closure-composite-type-check.phpt
similarity index 100%
rename from tests/aot/closure/closure-composite-type-check.phpt
rename to tests/compiler/closure/closure-composite-type-check.phpt
diff --git a/tests/aot/closure/closure-param-defaults.phpt b/tests/compiler/closure/closure-param-defaults.phpt
similarity index 100%
rename from tests/aot/closure/closure-param-defaults.phpt
rename to tests/compiler/closure/closure-param-defaults.phpt
diff --git a/tests/aot/closure/closure-use-ref-composed.phpt b/tests/compiler/closure/closure-use-ref-composed.phpt
similarity index 100%
rename from tests/aot/closure/closure-use-ref-composed.phpt
rename to tests/compiler/closure/closure-use-ref-composed.phpt
diff --git a/tests/aot/closure/closure-use-reference-callback.phpt b/tests/compiler/closure/closure-use-reference-callback.phpt
similarity index 100%
rename from tests/aot/closure/closure-use-reference-callback.phpt
rename to tests/compiler/closure/closure-use-reference-callback.phpt
diff --git a/tests/aot/closure/closure-use-reference-capture.phpt b/tests/compiler/closure/closure-use-reference-capture.phpt
similarity index 100%
rename from tests/aot/closure/closure-use-reference-capture.phpt
rename to tests/compiler/closure/closure-use-reference-capture.phpt
diff --git a/tests/aot/closure/closure-variadic-unpack-use-ref.phpt b/tests/compiler/closure/closure-variadic-unpack-use-ref.phpt
similarity index 100%
rename from tests/aot/closure/closure-variadic-unpack-use-ref.phpt
rename to tests/compiler/closure/closure-variadic-unpack-use-ref.phpt
diff --git a/tests/aot/closure/nested-closures.phpt b/tests/compiler/closure/nested-closures.phpt
similarity index 100%
rename from tests/aot/closure/nested-closures.phpt
rename to tests/compiler/closure/nested-closures.phpt
diff --git a/tests/aot/closure/read-private-prop-in-closure.phpt b/tests/compiler/closure/read-private-prop-in-closure.phpt
similarity index 100%
rename from tests/aot/closure/read-private-prop-in-closure.phpt
rename to tests/compiler/closure/read-private-prop-in-closure.phpt
diff --git a/tests/aot/closure/static-closure-use-ref-internal-callback.phpt b/tests/compiler/closure/static-closure-use-ref-internal-callback.phpt
similarity index 100%
rename from tests/aot/closure/static-closure-use-ref-internal-callback.phpt
rename to tests/compiler/closure/static-closure-use-ref-internal-callback.phpt
diff --git a/tests/aot/closure/static-closure-use-ref-typed-callback.phpt b/tests/compiler/closure/static-closure-use-ref-typed-callback.phpt
similarity index 100%
rename from tests/aot/closure/static-closure-use-ref-typed-callback.phpt
rename to tests/compiler/closure/static-closure-use-ref-typed-callback.phpt
diff --git a/tests/aot/closure/static-closure-use.phpt b/tests/compiler/closure/static-closure-use.phpt
similarity index 100%
rename from tests/aot/closure/static-closure-use.phpt
rename to tests/compiler/closure/static-closure-use.phpt
diff --git a/tests/aot/coalesce/001.phpt b/tests/compiler/coalesce/001.phpt
similarity index 100%
rename from tests/aot/coalesce/001.phpt
rename to tests/compiler/coalesce/001.phpt
diff --git a/tests/aot/coalesce/002.phpt b/tests/compiler/coalesce/002.phpt
similarity index 100%
rename from tests/aot/coalesce/002.phpt
rename to tests/compiler/coalesce/002.phpt
diff --git a/tests/aot/coalesce/003.phpt b/tests/compiler/coalesce/003.phpt
similarity index 100%
rename from tests/aot/coalesce/003.phpt
rename to tests/compiler/coalesce/003.phpt
diff --git a/tests/aot/coalesce/004.phpt b/tests/compiler/coalesce/004.phpt
similarity index 100%
rename from tests/aot/coalesce/004.phpt
rename to tests/compiler/coalesce/004.phpt
diff --git a/tests/aot/coalesce/005.phpt b/tests/compiler/coalesce/005.phpt
similarity index 100%
rename from tests/aot/coalesce/005.phpt
rename to tests/compiler/coalesce/005.phpt
diff --git a/tests/aot/coalesce/assign-coalesce-complex-targets.phpt b/tests/compiler/coalesce/assign-coalesce-complex-targets.phpt
similarity index 100%
rename from tests/aot/coalesce/assign-coalesce-complex-targets.phpt
rename to tests/compiler/coalesce/assign-coalesce-complex-targets.phpt
diff --git a/tests/aot/coalesce/assign-coalesce-instanceof-rhs.phpt b/tests/compiler/coalesce/assign-coalesce-instanceof-rhs.phpt
similarity index 100%
rename from tests/aot/coalesce/assign-coalesce-instanceof-rhs.phpt
rename to tests/compiler/coalesce/assign-coalesce-instanceof-rhs.phpt
diff --git a/tests/aot/coalesce/assign_coalesce_001.phpt b/tests/compiler/coalesce/assign_coalesce_001.phpt
similarity index 100%
rename from tests/aot/coalesce/assign_coalesce_001.phpt
rename to tests/compiler/coalesce/assign_coalesce_001.phpt
diff --git a/tests/aot/coalesce/assign_coalesce_002.phpt b/tests/compiler/coalesce/assign_coalesce_002.phpt
similarity index 100%
rename from tests/aot/coalesce/assign_coalesce_002.phpt
rename to tests/compiler/coalesce/assign_coalesce_002.phpt
diff --git a/tests/aot/coalesce/null-coalescing.phpt b/tests/compiler/coalesce/null-coalescing.phpt
similarity index 100%
rename from tests/aot/coalesce/null-coalescing.phpt
rename to tests/compiler/coalesce/null-coalescing.phpt
diff --git a/tests/aot/coalesce/unset-ref-coalesce.phpt b/tests/compiler/coalesce/unset-ref-coalesce.phpt
similarity index 100%
rename from tests/aot/coalesce/unset-ref-coalesce.phpt
rename to tests/compiler/coalesce/unset-ref-coalesce.phpt
diff --git a/tests/aot/coalesce/value-selection-lazy.phpt b/tests/compiler/coalesce/value-selection-lazy.phpt
similarity index 100%
rename from tests/aot/coalesce/value-selection-lazy.phpt
rename to tests/compiler/coalesce/value-selection-lazy.phpt
diff --git a/tests/aot/compiler/array-accessible-countable-iterable.phpt b/tests/compiler/compiler/array-accessible-countable-iterable.phpt
similarity index 100%
rename from tests/aot/compiler/array-accessible-countable-iterable.phpt
rename to tests/compiler/compiler/array-accessible-countable-iterable.phpt
diff --git a/tests/aot/compiler/array-diff-key-strict-dominators.phpt b/tests/compiler/compiler/array-diff-key-strict-dominators.phpt
similarity index 100%
rename from tests/aot/compiler/array-diff-key-strict-dominators.phpt
rename to tests/compiler/compiler/array-diff-key-strict-dominators.phpt
diff --git a/tests/aot/compiler/array-filter-keys-strict.phpt b/tests/compiler/compiler/array-filter-keys-strict.phpt
similarity index 100%
rename from tests/aot/compiler/array-filter-keys-strict.phpt
rename to tests/compiler/compiler/array-filter-keys-strict.phpt
diff --git a/tests/aot/compiler/array-keys-range-list-check.phpt b/tests/compiler/compiler/array-keys-range-list-check.phpt
similarity index 100%
rename from tests/aot/compiler/array-keys-range-list-check.phpt
rename to tests/compiler/compiler/array-keys-range-list-check.phpt
diff --git a/tests/aot/compiler/array-slice-reverse-preserve-keys.phpt b/tests/compiler/compiler/array-slice-reverse-preserve-keys.phpt
similarity index 100%
rename from tests/aot/compiler/array-slice-reverse-preserve-keys.phpt
rename to tests/compiler/compiler/array-slice-reverse-preserve-keys.phpt
diff --git a/tests/aot/compiler/array-unique-count-strict.phpt b/tests/compiler/compiler/array-unique-count-strict.phpt
similarity index 100%
rename from tests/aot/compiler/array-unique-count-strict.phpt
rename to tests/compiler/compiler/array-unique-count-strict.phpt
diff --git a/tests/aot/compiler/array-unique-values-reindex.phpt b/tests/compiler/compiler/array-unique-values-reindex.phpt
similarity index 100%
rename from tests/aot/compiler/array-unique-values-reindex.phpt
rename to tests/compiler/compiler/array-unique-values-reindex.phpt
diff --git a/tests/aot/compiler/camel-to-snake-regex.phpt b/tests/compiler/compiler/camel-to-snake-regex.phpt
similarity index 100%
rename from tests/aot/compiler/camel-to-snake-regex.phpt
rename to tests/compiler/compiler/camel-to-snake-regex.phpt
diff --git a/tests/aot/compiler/compiler-name-normalize.phpt b/tests/compiler/compiler/compiler-name-normalize.phpt
similarity index 100%
rename from tests/aot/compiler/compiler-name-normalize.phpt
rename to tests/compiler/compiler/compiler-name-normalize.phpt
diff --git a/tests/aot/compiler/cpp-signature-param-parser.phpt b/tests/compiler/compiler/cpp-signature-param-parser.phpt
similarity index 100%
rename from tests/aot/compiler/cpp-signature-param-parser.phpt
rename to tests/compiler/compiler/cpp-signature-param-parser.phpt
diff --git a/tests/aot/compiler/doc-comment-tags.phpt b/tests/compiler/compiler/doc-comment-tags.phpt
similarity index 100%
rename from tests/aot/compiler/doc-comment-tags.phpt
rename to tests/compiler/compiler/doc-comment-tags.phpt
diff --git a/tests/aot/compiler/docblock-param-regex.phpt b/tests/compiler/compiler/docblock-param-regex.phpt
similarity index 100%
rename from tests/aot/compiler/docblock-param-regex.phpt
rename to tests/compiler/compiler/docblock-param-regex.phpt
diff --git a/tests/aot/compiler/dynamic-subclass-interface-check.phpt b/tests/compiler/compiler/dynamic-subclass-interface-check.phpt
similarity index 100%
rename from tests/aot/compiler/dynamic-subclass-interface-check.phpt
rename to tests/compiler/compiler/dynamic-subclass-interface-check.phpt
diff --git a/tests/aot/compiler/file-extension-classifier.phpt b/tests/compiler/compiler/file-extension-classifier.phpt
similarity index 100%
rename from tests/aot/compiler/file-extension-classifier.phpt
rename to tests/compiler/compiler/file-extension-classifier.phpt
diff --git a/tests/aot/compiler/filter-var-ip-flags.phpt b/tests/compiler/compiler/filter-var-ip-flags.phpt
similarity index 100%
rename from tests/aot/compiler/filter-var-ip-flags.phpt
rename to tests/compiler/compiler/filter-var-ip-flags.phpt
diff --git a/tests/aot/compiler/negative-string-offset.phpt b/tests/compiler/compiler/negative-string-offset.phpt
similarity index 100%
rename from tests/aot/compiler/negative-string-offset.phpt
rename to tests/compiler/compiler/negative-string-offset.phpt
diff --git a/tests/aot/compiler/numeric-literal-classifier.phpt b/tests/compiler/compiler/numeric-literal-classifier.phpt
similarity index 100%
rename from tests/aot/compiler/numeric-literal-classifier.phpt
rename to tests/compiler/compiler/numeric-literal-classifier.phpt
diff --git a/tests/aot/compiler/preprocessor-condition-stack.phpt b/tests/compiler/compiler/preprocessor-condition-stack.phpt
similarity index 100%
rename from tests/aot/compiler/preprocessor-condition-stack.phpt
rename to tests/compiler/compiler/preprocessor-condition-stack.phpt
diff --git a/tests/aot/compiler/repeatable-argv-parser.phpt b/tests/compiler/compiler/repeatable-argv-parser.phpt
similarity index 100%
rename from tests/aot/compiler/repeatable-argv-parser.phpt
rename to tests/compiler/compiler/repeatable-argv-parser.phpt
diff --git a/tests/aot/compiler/resource-version-normalize.phpt b/tests/compiler/compiler/resource-version-normalize.phpt
similarity index 100%
rename from tests/aot/compiler/resource-version-normalize.phpt
rename to tests/compiler/compiler/resource-version-normalize.phpt
diff --git a/tests/aot/compiler/short-option-preprocess.phpt b/tests/compiler/compiler/short-option-preprocess.phpt
similarity index 100%
rename from tests/aot/compiler/short-option-preprocess.phpt
rename to tests/compiler/compiler/short-option-preprocess.phpt
diff --git a/tests/aot/compiler/target-name-normalize.phpt b/tests/compiler/compiler/target-name-normalize.phpt
similarity index 100%
rename from tests/aot/compiler/target-name-normalize.phpt
rename to tests/compiler/compiler/target-name-normalize.phpt
diff --git a/tests/aot/compiler/unix-link-lib-flags.phpt b/tests/compiler/compiler/unix-link-lib-flags.phpt
similarity index 100%
rename from tests/aot/compiler/unix-link-lib-flags.phpt
rename to tests/compiler/compiler/unix-link-lib-flags.phpt
diff --git a/tests/aot/concat_flatten.phpt b/tests/compiler/concat_flatten.phpt
similarity index 100%
rename from tests/aot/concat_flatten.phpt
rename to tests/compiler/concat_flatten.phpt
diff --git a/tests/aot/const/004.phpt b/tests/compiler/const/004.phpt
similarity index 100%
rename from tests/aot/const/004.phpt
rename to tests/compiler/const/004.phpt
diff --git a/tests/aot/const/class-const-001.phpt b/tests/compiler/const/class-const-001.phpt
similarity index 100%
rename from tests/aot/const/class-const-001.phpt
rename to tests/compiler/const/class-const-001.phpt
diff --git a/tests/aot/const/class-const-002.phpt b/tests/compiler/const/class-const-002.phpt
similarity index 100%
rename from tests/aot/const/class-const-002.phpt
rename to tests/compiler/const/class-const-002.phpt
diff --git a/tests/aot/const/class-const-003.phpt b/tests/compiler/const/class-const-003.phpt
similarity index 100%
rename from tests/aot/const/class-const-003.phpt
rename to tests/compiler/const/class-const-003.phpt
diff --git a/tests/aot/const/class-const-default-value.phpt b/tests/compiler/const/class-const-default-value.phpt
similarity index 100%
rename from tests/aot/const/class-const-default-value.phpt
rename to tests/compiler/const/class-const-default-value.phpt
diff --git a/tests/aot/const/const-same-name.phpt b/tests/compiler/const/const-same-name.phpt
similarity index 100%
rename from tests/aot/const/const-same-name.phpt
rename to tests/compiler/const/const-same-name.phpt
diff --git a/tests/aot/const/const-test.phpt b/tests/compiler/const/const-test.phpt
similarity index 100%
rename from tests/aot/const/const-test.phpt
rename to tests/compiler/const/const-test.phpt
diff --git a/tests/aot/const/const-var-same-name.phpt b/tests/compiler/const/const-var-same-name.phpt
similarity index 100%
rename from tests/aot/const/const-var-same-name.phpt
rename to tests/compiler/const/const-var-same-name.phpt
diff --git a/tests/aot/const/interface-array-const-001.phpt b/tests/compiler/const/interface-array-const-001.phpt
similarity index 100%
rename from tests/aot/const/interface-array-const-001.phpt
rename to tests/compiler/const/interface-array-const-001.phpt
diff --git a/tests/aot/const/zero-const.phpt b/tests/compiler/const/zero-const.phpt
similarity index 100%
rename from tests/aot/const/zero-const.phpt
rename to tests/compiler/const/zero-const.phpt
diff --git a/tests/aot/control_flow/break-continue-level.phpt b/tests/compiler/control_flow/break-continue-level.phpt
similarity index 100%
rename from tests/aot/control_flow/break-continue-level.phpt
rename to tests/compiler/control_flow/break-continue-level.phpt
diff --git a/tests/aot/control_flow/condition-side-effects.phpt b/tests/compiler/control_flow/condition-side-effects.phpt
similarity index 100%
rename from tests/aot/control_flow/condition-side-effects.phpt
rename to tests/compiler/control_flow/condition-side-effects.phpt
diff --git a/tests/aot/control_flow/control_structures.phpt b/tests/compiler/control_flow/control_structures.phpt
similarity index 100%
rename from tests/aot/control_flow/control_structures.phpt
rename to tests/compiler/control_flow/control_structures.phpt
diff --git a/tests/aot/control_flow/do-while-condition-side-effects.phpt b/tests/compiler/control_flow/do-while-condition-side-effects.phpt
similarity index 100%
rename from tests/aot/control_flow/do-while-condition-side-effects.phpt
rename to tests/compiler/control_flow/do-while-condition-side-effects.phpt
diff --git a/tests/aot/control_flow/empty-else.phpt b/tests/compiler/control_flow/empty-else.phpt
similarity index 100%
rename from tests/aot/control_flow/empty-else.phpt
rename to tests/compiler/control_flow/empty-else.phpt
diff --git a/tests/aot/control_flow/expression-side-effects-composed.phpt b/tests/compiler/control_flow/expression-side-effects-composed.phpt
similarity index 100%
rename from tests/aot/control_flow/expression-side-effects-composed.phpt
rename to tests/compiler/control_flow/expression-side-effects-composed.phpt
diff --git a/tests/aot/control_flow/for-condition-side-effects.phpt b/tests/compiler/control_flow/for-condition-side-effects.phpt
similarity index 100%
rename from tests/aot/control_flow/for-condition-side-effects.phpt
rename to tests/compiler/control_flow/for-condition-side-effects.phpt
diff --git a/tests/aot/control_flow/goto.phpt b/tests/compiler/control_flow/goto.phpt
similarity index 100%
rename from tests/aot/control_flow/goto.phpt
rename to tests/compiler/control_flow/goto.phpt
diff --git a/tests/aot/control_flow/match-expression.phpt b/tests/compiler/control_flow/match-expression.phpt
similarity index 100%
rename from tests/aot/control_flow/match-expression.phpt
rename to tests/compiler/control_flow/match-expression.phpt
diff --git a/tests/aot/control_flow/match-lazy-eval.phpt b/tests/compiler/control_flow/match-lazy-eval.phpt
similarity index 100%
rename from tests/aot/control_flow/match-lazy-eval.phpt
rename to tests/compiler/control_flow/match-lazy-eval.phpt
diff --git a/tests/aot/control_flow/match-true-instanceof.phpt b/tests/compiler/control_flow/match-true-instanceof.phpt
similarity index 100%
rename from tests/aot/control_flow/match-true-instanceof.phpt
rename to tests/compiler/control_flow/match-true-instanceof.phpt
diff --git a/tests/aot/decimal/arithmetic.phpt b/tests/compiler/decimal/arithmetic.phpt
similarity index 100%
rename from tests/aot/decimal/arithmetic.phpt
rename to tests/compiler/decimal/arithmetic.phpt
diff --git a/tests/aot/decimal/assign_op.phpt b/tests/compiler/decimal/assign_op.phpt
similarity index 100%
rename from tests/aot/decimal/assign_op.phpt
rename to tests/compiler/decimal/assign_op.phpt
diff --git a/tests/aot/decimal/ceil.phpt b/tests/compiler/decimal/ceil.phpt
similarity index 100%
rename from tests/aot/decimal/ceil.phpt
rename to tests/compiler/decimal/ceil.phpt
diff --git a/tests/aot/decimal/compare.phpt b/tests/compiler/decimal/compare.phpt
similarity index 100%
rename from tests/aot/decimal/compare.phpt
rename to tests/compiler/decimal/compare.phpt
diff --git a/tests/aot/decimal/decimal_types.phpt b/tests/compiler/decimal/decimal_types.phpt
similarity index 100%
rename from tests/aot/decimal/decimal_types.phpt
rename to tests/compiler/decimal/decimal_types.phpt
diff --git a/tests/aot/decimal/divmod.phpt b/tests/compiler/decimal/divmod.phpt
similarity index 100%
rename from tests/aot/decimal/divmod.phpt
rename to tests/compiler/decimal/divmod.phpt
diff --git a/tests/aot/decimal/floor-02.phpt b/tests/compiler/decimal/floor-02.phpt
similarity index 100%
rename from tests/aot/decimal/floor-02.phpt
rename to tests/compiler/decimal/floor-02.phpt
diff --git a/tests/aot/decimal/floor.phpt b/tests/compiler/decimal/floor.phpt
similarity index 100%
rename from tests/aot/decimal/floor.phpt
rename to tests/compiler/decimal/floor.phpt
diff --git a/tests/aot/decimal/literal.phpt b/tests/compiler/decimal/literal.phpt
similarity index 100%
rename from tests/aot/decimal/literal.phpt
rename to tests/compiler/decimal/literal.phpt
diff --git a/tests/aot/decimal/operator.phpt b/tests/compiler/decimal/operator.phpt
similarity index 100%
rename from tests/aot/decimal/operator.phpt
rename to tests/compiler/decimal/operator.phpt
diff --git a/tests/aot/decimal/pow.phpt b/tests/compiler/decimal/pow.phpt
similarity index 100%
rename from tests/aot/decimal/pow.phpt
rename to tests/compiler/decimal/pow.phpt
diff --git a/tests/aot/decimal/powmod.phpt b/tests/compiler/decimal/powmod.phpt
similarity index 100%
rename from tests/aot/decimal/powmod.phpt
rename to tests/compiler/decimal/powmod.phpt
diff --git a/tests/aot/decimal/round-02.phpt b/tests/compiler/decimal/round-02.phpt
similarity index 100%
rename from tests/aot/decimal/round-02.phpt
rename to tests/compiler/decimal/round-02.phpt
diff --git a/tests/aot/decimal/round.phpt b/tests/compiler/decimal/round.phpt
similarity index 100%
rename from tests/aot/decimal/round.phpt
rename to tests/compiler/decimal/round.phpt
diff --git a/tests/aot/decimal/sqrt.phpt b/tests/compiler/decimal/sqrt.phpt
similarity index 100%
rename from tests/aot/decimal/sqrt.phpt
rename to tests/compiler/decimal/sqrt.phpt
diff --git a/tests/aot/decimal/toFloat.phpt b/tests/compiler/decimal/toFloat.phpt
similarity index 100%
rename from tests/aot/decimal/toFloat.phpt
rename to tests/compiler/decimal/toFloat.phpt
diff --git a/tests/aot/decimal/toString.phpt b/tests/compiler/decimal/toString.phpt
similarity index 100%
rename from tests/aot/decimal/toString.phpt
rename to tests/compiler/decimal/toString.phpt
diff --git a/tests/aot/decimal/unary_minus.phpt b/tests/compiler/decimal/unary_minus.phpt
similarity index 100%
rename from tests/aot/decimal/unary_minus.phpt
rename to tests/compiler/decimal/unary_minus.phpt
diff --git a/tests/aot/decimal/use.phpt b/tests/compiler/decimal/use.phpt
similarity index 100%
rename from tests/aot/decimal/use.phpt
rename to tests/compiler/decimal/use.phpt
diff --git a/tests/aot/devirtualize/final-class.phpt b/tests/compiler/devirtualize/final-class.phpt
similarity index 100%
rename from tests/aot/devirtualize/final-class.phpt
rename to tests/compiler/devirtualize/final-class.phpt
diff --git a/tests/aot/devirtualize/final-method.phpt b/tests/compiler/devirtualize/final-method.phpt
similarity index 100%
rename from tests/aot/devirtualize/final-method.phpt
rename to tests/compiler/devirtualize/final-method.phpt
diff --git a/tests/aot/devirtualize/override-dynamic.phpt b/tests/compiler/devirtualize/override-dynamic.phpt
similarity index 100%
rename from tests/aot/devirtualize/override-dynamic.phpt
rename to tests/compiler/devirtualize/override-dynamic.phpt
diff --git a/tests/aot/devirtualize/private-method.phpt b/tests/compiler/devirtualize/private-method.phpt
similarity index 100%
rename from tests/aot/devirtualize/private-method.phpt
rename to tests/compiler/devirtualize/private-method.phpt
diff --git a/tests/aot/dynamic_call/call-abstract-method.phpt b/tests/compiler/dynamic_call/call-abstract-method.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-abstract-method.phpt
rename to tests/compiler/dynamic_call/call-abstract-method.phpt
diff --git a/tests/aot/dynamic_call/call-interface-method.phpt b/tests/compiler/dynamic_call/call-interface-method.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-interface-method.phpt
rename to tests/compiler/dynamic_call/call-interface-method.phpt
diff --git a/tests/aot/dynamic_call/call-magic-fallback-typed-object.phpt b/tests/compiler/dynamic_call/call-magic-fallback-typed-object.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-magic-fallback-typed-object.phpt
rename to tests/compiler/dynamic_call/call-magic-fallback-typed-object.phpt
diff --git a/tests/aot/dynamic_call/call-multilevel-override.phpt b/tests/compiler/dynamic_call/call-multilevel-override.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-multilevel-override.phpt
rename to tests/compiler/dynamic_call/call-multilevel-override.phpt
diff --git a/tests/aot/dynamic_call/call-namespaced-parent-override.phpt b/tests/compiler/dynamic_call/call-namespaced-parent-override.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-namespaced-parent-override.phpt
rename to tests/compiler/dynamic_call/call-namespaced-parent-override.phpt
diff --git a/tests/aot/dynamic_call/call-parent-return-override-no-native-types.phpt b/tests/compiler/dynamic_call/call-parent-return-override-no-native-types.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-parent-return-override-no-native-types.phpt
rename to tests/compiler/dynamic_call/call-parent-return-override-no-native-types.phpt
diff --git a/tests/aot/dynamic_call/call-parent-return-override.phpt b/tests/compiler/dynamic_call/call-parent-return-override.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-parent-return-override.phpt
rename to tests/compiler/dynamic_call/call-parent-return-override.phpt
diff --git a/tests/aot/dynamic_call/call-parent-sibling-dispatch.phpt b/tests/compiler/dynamic_call/call-parent-sibling-dispatch.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-parent-sibling-dispatch.phpt
rename to tests/compiler/dynamic_call/call-parent-sibling-dispatch.phpt
diff --git a/tests/aot/dynamic_call/call-protected-override.phpt b/tests/compiler/dynamic_call/call-protected-override.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-protected-override.phpt
rename to tests/compiler/dynamic_call/call-protected-override.phpt
diff --git a/tests/aot/dynamic_call/call-static-magic-forward.phpt b/tests/compiler/dynamic_call/call-static-magic-forward.phpt
similarity index 100%
rename from tests/aot/dynamic_call/call-static-magic-forward.phpt
rename to tests/compiler/dynamic_call/call-static-magic-forward.phpt
diff --git a/tests/aot/dynamic_call/functions.inc b/tests/compiler/dynamic_call/functions.inc
similarity index 100%
rename from tests/aot/dynamic_call/functions.inc
rename to tests/compiler/dynamic_call/functions.inc
diff --git a/tests/aot/dynamic_call/method-002.phpt b/tests/compiler/dynamic_call/method-002.phpt
similarity index 100%
rename from tests/aot/dynamic_call/method-002.phpt
rename to tests/compiler/dynamic_call/method-002.phpt
diff --git a/tests/aot/dynamic_call/method-call.phpt b/tests/compiler/dynamic_call/method-call.phpt
similarity index 100%
rename from tests/aot/dynamic_call/method-call.phpt
rename to tests/compiler/dynamic_call/method-call.phpt
diff --git a/tests/aot/dynamic_call/named-args.phpt b/tests/compiler/dynamic_call/named-args.phpt
similarity index 100%
rename from tests/aot/dynamic_call/named-args.phpt
rename to tests/compiler/dynamic_call/named-args.phpt
diff --git a/tests/aot/dynamic_call/new-dynamic-unpack-call-order.phpt b/tests/compiler/dynamic_call/new-dynamic-unpack-call-order.phpt
similarity index 100%
rename from tests/aot/dynamic_call/new-dynamic-unpack-call-order.phpt
rename to tests/compiler/dynamic_call/new-dynamic-unpack-call-order.phpt
diff --git a/tests/aot/dynamic_call/new-named-args.phpt b/tests/compiler/dynamic_call/new-named-args.phpt
similarity index 100%
rename from tests/aot/dynamic_call/new-named-args.phpt
rename to tests/compiler/dynamic_call/new-named-args.phpt
diff --git a/tests/aot/dynamic_call/return-abstract-class.phpt b/tests/compiler/dynamic_call/return-abstract-class.phpt
similarity index 100%
rename from tests/aot/dynamic_call/return-abstract-class.phpt
rename to tests/compiler/dynamic_call/return-abstract-class.phpt
diff --git a/tests/aot/dynamic_call/return-base-class-001.phpt b/tests/compiler/dynamic_call/return-base-class-001.phpt
similarity index 100%
rename from tests/aot/dynamic_call/return-base-class-001.phpt
rename to tests/compiler/dynamic_call/return-base-class-001.phpt
diff --git a/tests/aot/dynamic_call/return-base-class-002.phpt b/tests/compiler/dynamic_call/return-base-class-002.phpt
similarity index 100%
rename from tests/aot/dynamic_call/return-base-class-002.phpt
rename to tests/compiler/dynamic_call/return-base-class-002.phpt
diff --git a/tests/aot/dynamic_call/return-base-object.phpt b/tests/compiler/dynamic_call/return-base-object.phpt
similarity index 100%
rename from tests/aot/dynamic_call/return-base-object.phpt
rename to tests/compiler/dynamic_call/return-base-object.phpt
diff --git a/tests/aot/dynamic_call/runtime-fallback-unified.phpt b/tests/compiler/dynamic_call/runtime-fallback-unified.phpt
similarity index 100%
rename from tests/aot/dynamic_call/runtime-fallback-unified.phpt
rename to tests/compiler/dynamic_call/runtime-fallback-unified.phpt
diff --git a/tests/aot/dynamic_call/vargs.phpt b/tests/compiler/dynamic_call/vargs.phpt
similarity index 100%
rename from tests/aot/dynamic_call/vargs.phpt
rename to tests/compiler/dynamic_call/vargs.phpt
diff --git a/tests/aot/empty/001.phpt b/tests/compiler/empty/001.phpt
similarity index 100%
rename from tests/aot/empty/001.phpt
rename to tests/compiler/empty/001.phpt
diff --git a/tests/aot/empty/empty-2.phpt b/tests/compiler/empty/empty-2.phpt
similarity index 100%
rename from tests/aot/empty/empty-2.phpt
rename to tests/compiler/empty/empty-2.phpt
diff --git a/tests/aot/empty/empty-test.phpt b/tests/compiler/empty/empty-test.phpt
similarity index 100%
rename from tests/aot/empty/empty-test.phpt
rename to tests/compiler/empty/empty-test.phpt
diff --git a/tests/aot/empty/isset-002.phpt b/tests/compiler/empty/isset-002.phpt
similarity index 100%
rename from tests/aot/empty/isset-002.phpt
rename to tests/compiler/empty/isset-002.phpt
diff --git a/tests/aot/empty/isset-complex.phpt b/tests/compiler/empty/isset-complex.phpt
similarity index 100%
rename from tests/aot/empty/isset-complex.phpt
rename to tests/compiler/empty/isset-complex.phpt
diff --git a/tests/aot/empty/isset-empty-dim-side-effects.phpt b/tests/compiler/empty/isset-empty-dim-side-effects.phpt
similarity index 100%
rename from tests/aot/empty/isset-empty-dim-side-effects.phpt
rename to tests/compiler/empty/isset-empty-dim-side-effects.phpt
diff --git a/tests/aot/empty/isset-test.phpt b/tests/compiler/empty/isset-test.phpt
similarity index 100%
rename from tests/aot/empty/isset-test.phpt
rename to tests/compiler/empty/isset-test.phpt
diff --git a/tests/aot/enum/3.phpt b/tests/compiler/enum/3.phpt
similarity index 100%
rename from tests/aot/enum/3.phpt
rename to tests/compiler/enum/3.phpt
diff --git a/tests/aot/enum/4.phpt b/tests/compiler/enum/4.phpt
similarity index 100%
rename from tests/aot/enum/4.phpt
rename to tests/compiler/enum/4.phpt
diff --git a/tests/aot/enum/5.phpt b/tests/compiler/enum/5.phpt
similarity index 100%
rename from tests/aot/enum/5.phpt
rename to tests/compiler/enum/5.phpt
diff --git a/tests/aot/enum/backed-enum.phpt b/tests/compiler/enum/backed-enum.phpt
similarity index 100%
rename from tests/aot/enum/backed-enum.phpt
rename to tests/compiler/enum/backed-enum.phpt
diff --git a/tests/aot/enum/enum-backed-with-interface.phpt b/tests/compiler/enum/enum-backed-with-interface.phpt
similarity index 100%
rename from tests/aot/enum/enum-backed-with-interface.phpt
rename to tests/compiler/enum/enum-backed-with-interface.phpt
diff --git a/tests/aot/enum/enum1.phpt b/tests/compiler/enum/enum1.phpt
similarity index 100%
rename from tests/aot/enum/enum1.phpt
rename to tests/compiler/enum/enum1.phpt
diff --git a/tests/aot/enum/enum2.phpt b/tests/compiler/enum/enum2.phpt
similarity index 100%
rename from tests/aot/enum/enum2.phpt
rename to tests/compiler/enum/enum2.phpt
diff --git a/tests/aot/exception/001.phpt b/tests/compiler/exception/001.phpt
similarity index 100%
rename from tests/aot/exception/001.phpt
rename to tests/compiler/exception/001.phpt
diff --git a/tests/aot/exception/002.phpt b/tests/compiler/exception/002.phpt
similarity index 100%
rename from tests/aot/exception/002.phpt
rename to tests/compiler/exception/002.phpt
diff --git a/tests/aot/exception/003.phpt b/tests/compiler/exception/003.phpt
similarity index 100%
rename from tests/aot/exception/003.phpt
rename to tests/compiler/exception/003.phpt
diff --git a/tests/aot/exception/catch-exit.phpt b/tests/compiler/exception/catch-exit.phpt
similarity index 100%
rename from tests/aot/exception/catch-exit.phpt
rename to tests/compiler/exception/catch-exit.phpt
diff --git a/tests/aot/exception/closure-dynamic-throws.phpt b/tests/compiler/exception/closure-dynamic-throws.phpt
similarity index 100%
rename from tests/aot/exception/closure-dynamic-throws.phpt
rename to tests/compiler/exception/closure-dynamic-throws.phpt
diff --git a/tests/aot/exception/debug_exception.phpt b/tests/compiler/exception/debug_exception.phpt
similarity index 100%
rename from tests/aot/exception/debug_exception.phpt
rename to tests/compiler/exception/debug_exception.phpt
diff --git a/tests/aot/exception/finally-break-continue.phpt b/tests/compiler/exception/finally-break-continue.phpt
similarity index 100%
rename from tests/aot/exception/finally-break-continue.phpt
rename to tests/compiler/exception/finally-break-continue.phpt
diff --git a/tests/aot/exception/finally-catch-break.phpt b/tests/compiler/exception/finally-catch-break.phpt
similarity index 100%
rename from tests/aot/exception/finally-catch-break.phpt
rename to tests/compiler/exception/finally-catch-break.phpt
diff --git a/tests/aot/exception/finally-catch-goto.phpt b/tests/compiler/exception/finally-catch-goto.phpt
similarity index 100%
rename from tests/aot/exception/finally-catch-goto.phpt
rename to tests/compiler/exception/finally-catch-goto.phpt
diff --git a/tests/aot/exception/finally-catch-return.phpt b/tests/compiler/exception/finally-catch-return.phpt
similarity index 100%
rename from tests/aot/exception/finally-catch-return.phpt
rename to tests/compiler/exception/finally-catch-return.phpt
diff --git a/tests/aot/exception/finally-catch-throw-sibling.phpt b/tests/compiler/exception/finally-catch-throw-sibling.phpt
similarity index 100%
rename from tests/aot/exception/finally-catch-throw-sibling.phpt
rename to tests/compiler/exception/finally-catch-throw-sibling.phpt
diff --git a/tests/aot/exception/finally-exit.phpt b/tests/compiler/exception/finally-exit.phpt
similarity index 100%
rename from tests/aot/exception/finally-exit.phpt
rename to tests/compiler/exception/finally-exit.phpt
diff --git a/tests/aot/exception/finally-goto.phpt b/tests/compiler/exception/finally-goto.phpt
similarity index 100%
rename from tests/aot/exception/finally-goto.phpt
rename to tests/compiler/exception/finally-goto.phpt
diff --git a/tests/aot/exception/finally-nested-loop-break.phpt b/tests/compiler/exception/finally-nested-loop-break.phpt
similarity index 100%
rename from tests/aot/exception/finally-nested-loop-break.phpt
rename to tests/compiler/exception/finally-nested-loop-break.phpt
diff --git a/tests/aot/exception/finally-nested-return.phpt b/tests/compiler/exception/finally-nested-return.phpt
similarity index 100%
rename from tests/aot/exception/finally-nested-return.phpt
rename to tests/compiler/exception/finally-nested-return.phpt
diff --git a/tests/aot/exception/finally-return-throw-side-effects.phpt b/tests/compiler/exception/finally-return-throw-side-effects.phpt
similarity index 100%
rename from tests/aot/exception/finally-return-throw-side-effects.phpt
rename to tests/compiler/exception/finally-return-throw-side-effects.phpt
diff --git a/tests/aot/exception/finally-unmatched-catch-var.phpt b/tests/compiler/exception/finally-unmatched-catch-var.phpt
similarity index 100%
rename from tests/aot/exception/finally-unmatched-catch-var.phpt
rename to tests/compiler/exception/finally-unmatched-catch-var.phpt
diff --git a/tests/aot/exception/finally-use-var.phpt b/tests/compiler/exception/finally-use-var.phpt
similarity index 100%
rename from tests/aot/exception/finally-use-var.phpt
rename to tests/compiler/exception/finally-use-var.phpt
diff --git a/tests/aot/exception/finally-without-catch.phpt b/tests/compiler/exception/finally-without-catch.phpt
similarity index 100%
rename from tests/aot/exception/finally-without-catch.phpt
rename to tests/compiler/exception/finally-without-catch.phpt
diff --git a/tests/aot/exception/main-file-location.phpt b/tests/compiler/exception/main-file-location.phpt
similarity index 100%
rename from tests/aot/exception/main-file-location.phpt
rename to tests/compiler/exception/main-file-location.phpt
diff --git a/tests/aot/exception/multi-catch-finally-sibling.phpt b/tests/compiler/exception/multi-catch-finally-sibling.phpt
similarity index 100%
rename from tests/aot/exception/multi-catch-finally-sibling.phpt
rename to tests/compiler/exception/multi-catch-finally-sibling.phpt
diff --git a/tests/aot/exception/multi-catch.phpt b/tests/compiler/exception/multi-catch.phpt
similarity index 100%
rename from tests/aot/exception/multi-catch.phpt
rename to tests/compiler/exception/multi-catch.phpt
diff --git a/tests/aot/exception/throw-expression.phpt b/tests/compiler/exception/throw-expression.phpt
similarity index 100%
rename from tests/aot/exception/throw-expression.phpt
rename to tests/compiler/exception/throw-expression.phpt
diff --git a/tests/aot/exception/throw-in-php.phpt b/tests/compiler/exception/throw-in-php.phpt
similarity index 100%
rename from tests/aot/exception/throw-in-php.phpt
rename to tests/compiler/exception/throw-in-php.phpt
diff --git a/tests/aot/exception/throw-invalid.phpt b/tests/compiler/exception/throw-invalid.phpt
similarity index 100%
rename from tests/aot/exception/throw-invalid.phpt
rename to tests/compiler/exception/throw-invalid.phpt
diff --git a/tests/aot/ffi/addr-cast-sizeof.phpt b/tests/compiler/ffi/addr-cast-sizeof.phpt
similarity index 100%
rename from tests/aot/ffi/addr-cast-sizeof.phpt
rename to tests/compiler/ffi/addr-cast-sizeof.phpt
diff --git a/tests/aot/ffi/array-assignment.phpt b/tests/compiler/ffi/array-assignment.phpt
similarity index 100%
rename from tests/aot/ffi/array-assignment.phpt
rename to tests/compiler/ffi/array-assignment.phpt
diff --git a/tests/aot/ffi/array-compound-assignment.phpt b/tests/compiler/ffi/array-compound-assignment.phpt
similarity index 100%
rename from tests/aot/ffi/array-compound-assignment.phpt
rename to tests/compiler/ffi/array-compound-assignment.phpt
diff --git a/tests/aot/ffi/array-scalar-read.phpt b/tests/compiler/ffi/array-scalar-read.phpt
similarity index 100%
rename from tests/aot/ffi/array-scalar-read.phpt
rename to tests/compiler/ffi/array-scalar-read.phpt
diff --git a/tests/aot/ffi/basic.phpt b/tests/compiler/ffi/basic.phpt
similarity index 100%
rename from tests/aot/ffi/basic.phpt
rename to tests/compiler/ffi/basic.phpt
diff --git a/tests/aot/ffi/cdef-declarations.phpt b/tests/compiler/ffi/cdef-declarations.phpt
similarity index 100%
rename from tests/aot/ffi/cdef-declarations.phpt
rename to tests/compiler/ffi/cdef-declarations.phpt
diff --git a/tests/aot/ffi/struct-fields.phpt b/tests/compiler/ffi/struct-fields.phpt
similarity index 100%
rename from tests/aot/ffi/struct-fields.phpt
rename to tests/compiler/ffi/struct-fields.phpt
diff --git a/tests/aot/float_edge/edge-cases.phpt b/tests/compiler/float_edge/edge-cases.phpt
similarity index 100%
rename from tests/aot/float_edge/edge-cases.phpt
rename to tests/compiler/float_edge/edge-cases.phpt
diff --git a/tests/aot/functions/args-unpack.phpt b/tests/compiler/functions/args-unpack.phpt
similarity index 100%
rename from tests/aot/functions/args-unpack.phpt
rename to tests/compiler/functions/args-unpack.phpt
diff --git a/tests/aot/functions/array-push-unpack-side-effects.phpt b/tests/compiler/functions/array-push-unpack-side-effects.phpt
similarity index 100%
rename from tests/aot/functions/array-push-unpack-side-effects.phpt
rename to tests/compiler/functions/array-push-unpack-side-effects.phpt
diff --git a/tests/aot/functions/compact.phpt b/tests/compiler/functions/compact.phpt
similarity index 100%
rename from tests/aot/functions/compact.phpt
rename to tests/compiler/functions/compact.phpt
diff --git a/tests/aot/functions/deep-recursion.phpt b/tests/compiler/functions/deep-recursion.phpt
similarity index 100%
rename from tests/aot/functions/deep-recursion.phpt
rename to tests/compiler/functions/deep-recursion.phpt
diff --git a/tests/aot/functions/default-mixed-array.phpt b/tests/compiler/functions/default-mixed-array.phpt
similarity index 100%
rename from tests/aot/functions/default-mixed-array.phpt
rename to tests/compiler/functions/default-mixed-array.phpt
diff --git a/tests/aot/functions/fn-call-001.phpt b/tests/compiler/functions/fn-call-001.phpt
similarity index 100%
rename from tests/aot/functions/fn-call-001.phpt
rename to tests/compiler/functions/fn-call-001.phpt
diff --git a/tests/aot/functions/func-default-param.phpt b/tests/compiler/functions/func-default-param.phpt
similarity index 100%
rename from tests/aot/functions/func-default-param.phpt
rename to tests/compiler/functions/func-default-param.phpt
diff --git a/tests/aot/functions/func-return-type.phpt b/tests/compiler/functions/func-return-type.phpt
similarity index 100%
rename from tests/aot/functions/func-return-type.phpt
rename to tests/compiler/functions/func-return-type.phpt
diff --git a/tests/aot/functions/func-self-type.phpt b/tests/compiler/functions/func-self-type.phpt
similarity index 100%
rename from tests/aot/functions/func-self-type.phpt
rename to tests/compiler/functions/func-self-type.phpt
diff --git a/tests/aot/functions/func_get_arg.phpt b/tests/compiler/functions/func_get_arg.phpt
similarity index 100%
rename from tests/aot/functions/func_get_arg.phpt
rename to tests/compiler/functions/func_get_arg.phpt
diff --git a/tests/aot/functions/func_get_args.phpt b/tests/compiler/functions/func_get_args.phpt
similarity index 100%
rename from tests/aot/functions/func_get_args.phpt
rename to tests/compiler/functions/func_get_args.phpt
diff --git a/tests/aot/functions/func_num_args.phpt b/tests/compiler/functions/func_num_args.phpt
similarity index 100%
rename from tests/aot/functions/func_num_args.phpt
rename to tests/compiler/functions/func_num_args.phpt
diff --git a/tests/aot/functions/functions.phpt b/tests/compiler/functions/functions.phpt
similarity index 100%
rename from tests/aot/functions/functions.phpt
rename to tests/compiler/functions/functions.phpt
diff --git a/tests/aot/functions/get_class.phpt b/tests/compiler/functions/get_class.phpt
similarity index 100%
rename from tests/aot/functions/get_class.phpt
rename to tests/compiler/functions/get_class.phpt
diff --git a/tests/aot/functions/internal-named-args.phpt b/tests/compiler/functions/internal-named-args.phpt
similarity index 100%
rename from tests/aot/functions/internal-named-args.phpt
rename to tests/compiler/functions/internal-named-args.phpt
diff --git a/tests/aot/functions/internal-union-return-type.phpt b/tests/compiler/functions/internal-union-return-type.phpt
similarity index 100%
rename from tests/aot/functions/internal-union-return-type.phpt
rename to tests/compiler/functions/internal-union-return-type.phpt
diff --git a/tests/aot/functions/named-args-native.phpt b/tests/compiler/functions/named-args-native.phpt
similarity index 100%
rename from tests/aot/functions/named-args-native.phpt
rename to tests/compiler/functions/named-args-native.phpt
diff --git a/tests/aot/functions/named-variadic-native.phpt b/tests/compiler/functions/named-variadic-native.phpt
similarity index 100%
rename from tests/aot/functions/named-variadic-native.phpt
rename to tests/compiler/functions/named-variadic-native.phpt
diff --git a/tests/aot/functions/preg-match-output-ref-reuse.phpt b/tests/compiler/functions/preg-match-output-ref-reuse.phpt
similarity index 100%
rename from tests/aot/functions/preg-match-output-ref-reuse.phpt
rename to tests/compiler/functions/preg-match-output-ref-reuse.phpt
diff --git a/tests/aot/functions/preg_match.phpt b/tests/compiler/functions/preg_match.phpt
similarity index 100%
rename from tests/aot/functions/preg_match.phpt
rename to tests/compiler/functions/preg_match.phpt
diff --git a/tests/aot/functions/print-expression-return.phpt b/tests/compiler/functions/print-expression-return.phpt
similarity index 100%
rename from tests/aot/functions/print-expression-return.phpt
rename to tests/compiler/functions/print-expression-return.phpt
diff --git a/tests/aot/functions/print.phpt b/tests/compiler/functions/print.phpt
similarity index 100%
rename from tests/aot/functions/print.phpt
rename to tests/compiler/functions/print.phpt
diff --git a/tests/aot/functions/return-value.phpt b/tests/compiler/functions/return-value.phpt
similarity index 100%
rename from tests/aot/functions/return-value.phpt
rename to tests/compiler/functions/return-value.phpt
diff --git a/tests/aot/functions/unpack-before-named.phpt b/tests/compiler/functions/unpack-before-named.phpt
similarity index 100%
rename from tests/aot/functions/unpack-before-named.phpt
rename to tests/compiler/functions/unpack-before-named.phpt
diff --git a/tests/aot/functions/unpack-fixed-native.phpt b/tests/compiler/functions/unpack-fixed-native.phpt
similarity index 100%
rename from tests/aot/functions/unpack-fixed-native.phpt
rename to tests/compiler/functions/unpack-fixed-native.phpt
diff --git a/tests/aot/functions/unpack-followed-by-named-dynamic.phpt b/tests/compiler/functions/unpack-followed-by-named-dynamic.phpt
similarity index 100%
rename from tests/aot/functions/unpack-followed-by-named-dynamic.phpt
rename to tests/compiler/functions/unpack-followed-by-named-dynamic.phpt
diff --git a/tests/aot/functions/variable-functions.phpt b/tests/compiler/functions/variable-functions.phpt
similarity index 100%
rename from tests/aot/functions/variable-functions.phpt
rename to tests/compiler/functions/variable-functions.phpt
diff --git a/tests/aot/generator/basic-yield-fallback.phpt b/tests/compiler/generator/basic-yield-fallback.phpt
similarity index 100%
rename from tests/aot/generator/basic-yield-fallback.phpt
rename to tests/compiler/generator/basic-yield-fallback.phpt
diff --git a/tests/aot/generator/closed-throw.phpt b/tests/compiler/generator/closed-throw.phpt
similarity index 100%
rename from tests/aot/generator/closed-throw.phpt
rename to tests/compiler/generator/closed-throw.phpt
diff --git a/tests/aot/generator/constructor-property-promotion.phpt b/tests/compiler/generator/constructor-property-promotion.phpt
similarity index 100%
rename from tests/aot/generator/constructor-property-promotion.phpt
rename to tests/compiler/generator/constructor-property-promotion.phpt
diff --git a/tests/aot/generator/destructor-finally.phpt b/tests/compiler/generator/destructor-finally.phpt
similarity index 100%
rename from tests/aot/generator/destructor-finally.phpt
rename to tests/compiler/generator/destructor-finally.phpt
diff --git a/tests/aot/generator/dynamic-foreach-native-generator.phpt b/tests/compiler/generator/dynamic-foreach-native-generator.phpt
similarity index 100%
rename from tests/aot/generator/dynamic-foreach-native-generator.phpt
rename to tests/compiler/generator/dynamic-foreach-native-generator.phpt
diff --git a/tests/aot/generator/dynamic-generator-interop.inc b/tests/compiler/generator/dynamic-generator-interop.inc
similarity index 100%
rename from tests/aot/generator/dynamic-generator-interop.inc
rename to tests/compiler/generator/dynamic-generator-interop.inc
diff --git a/tests/aot/generator/fiber-generator-arginfo.phpt b/tests/compiler/generator/fiber-generator-arginfo.phpt
similarity index 100%
rename from tests/aot/generator/fiber-generator-arginfo.phpt
rename to tests/compiler/generator/fiber-generator-arginfo.phpt
diff --git a/tests/aot/generator/generators.phpt b/tests/compiler/generator/generators.phpt
similarity index 100%
rename from tests/aot/generator/generators.phpt
rename to tests/compiler/generator/generators.phpt
diff --git a/tests/aot/generator/method-private-property.phpt b/tests/compiler/generator/method-private-property.phpt
similarity index 100%
rename from tests/aot/generator/method-private-property.phpt
rename to tests/compiler/generator/method-private-property.phpt
diff --git a/tests/aot/generator/method-yield-fallback.phpt b/tests/compiler/generator/method-yield-fallback.phpt
similarity index 100%
rename from tests/aot/generator/method-yield-fallback.phpt
rename to tests/compiler/generator/method-yield-fallback.phpt
diff --git a/tests/aot/generator/native-foreach-dynamic-generator.phpt b/tests/compiler/generator/native-foreach-dynamic-generator.phpt
similarity index 100%
rename from tests/aot/generator/native-foreach-dynamic-generator.phpt
rename to tests/compiler/generator/native-foreach-dynamic-generator.phpt
diff --git a/tests/aot/generator/native-generator-foreach-combined.phpt b/tests/compiler/generator/native-generator-foreach-combined.phpt
similarity index 100%
rename from tests/aot/generator/native-generator-foreach-combined.phpt
rename to tests/compiler/generator/native-generator-foreach-combined.phpt
diff --git a/tests/aot/generator/send-value-lifetime.phpt b/tests/compiler/generator/send-value-lifetime.phpt
similarity index 100%
rename from tests/aot/generator/send-value-lifetime.phpt
rename to tests/compiler/generator/send-value-lifetime.phpt
diff --git a/tests/aot/generator/state-machine.phpt b/tests/compiler/generator/state-machine.phpt
similarity index 100%
rename from tests/aot/generator/state-machine.phpt
rename to tests/compiler/generator/state-machine.phpt
diff --git a/tests/aot/generator/uncaught-exception.phpt b/tests/compiler/generator/uncaught-exception.phpt
similarity index 100%
rename from tests/aot/generator/uncaught-exception.phpt
rename to tests/compiler/generator/uncaught-exception.phpt
diff --git a/tests/aot/generator/union-signatures.phpt b/tests/compiler/generator/union-signatures.phpt
similarity index 100%
rename from tests/aot/generator/union-signatures.phpt
rename to tests/compiler/generator/union-signatures.phpt
diff --git a/tests/aot/generator/yield-automatic-keys.phpt b/tests/compiler/generator/yield-automatic-keys.phpt
similarity index 100%
rename from tests/aot/generator/yield-automatic-keys.phpt
rename to tests/compiler/generator/yield-automatic-keys.phpt
diff --git a/tests/aot/generator/yield-from-array.phpt b/tests/compiler/generator/yield-from-array.phpt
similarity index 100%
rename from tests/aot/generator/yield-from-array.phpt
rename to tests/compiler/generator/yield-from-array.phpt
diff --git a/tests/aot/generator/yield-from-generator-return.phpt b/tests/compiler/generator/yield-from-generator-return.phpt
similarity index 100%
rename from tests/aot/generator/yield-from-generator-return.phpt
rename to tests/compiler/generator/yield-from-generator-return.phpt
diff --git a/tests/aot/generator/yield-from-iterator-aggregate-cycle.phpt b/tests/compiler/generator/yield-from-iterator-aggregate-cycle.phpt
similarity index 100%
rename from tests/aot/generator/yield-from-iterator-aggregate-cycle.phpt
rename to tests/compiler/generator/yield-from-iterator-aggregate-cycle.phpt
diff --git a/tests/aot/generator/yield-from-throw.phpt b/tests/compiler/generator/yield-from-throw.phpt
similarity index 100%
rename from tests/aot/generator/yield-from-throw.phpt
rename to tests/compiler/generator/yield-from-throw.phpt
diff --git a/tests/aot/generator/yield-send.phpt b/tests/compiler/generator/yield-send.phpt
similarity index 100%
rename from tests/aot/generator/yield-send.phpt
rename to tests/compiler/generator/yield-send.phpt
diff --git a/tests/aot/keyword_extension/001.phpt b/tests/compiler/keyword_extension/001.phpt
similarity index 100%
rename from tests/aot/keyword_extension/001.phpt
rename to tests/compiler/keyword_extension/001.phpt
diff --git a/tests/aot/keyword_extension/camel.phpt b/tests/compiler/keyword_extension/camel.phpt
similarity index 100%
rename from tests/aot/keyword_extension/camel.phpt
rename to tests/compiler/keyword_extension/camel.phpt
diff --git a/tests/aot/keyword_method/to-any-to-ref.phpt b/tests/compiler/keyword_method/to-any-to-ref.phpt
similarity index 100%
rename from tests/aot/keyword_method/to-any-to-ref.phpt
rename to tests/compiler/keyword_method/to-any-to-ref.phpt
diff --git a/tests/aot/loop/for-internal-constant-bound.phpt b/tests/compiler/loop/for-internal-constant-bound.phpt
similarity index 100%
rename from tests/aot/loop/for-internal-constant-bound.phpt
rename to tests/compiler/loop/for-internal-constant-bound.phpt
diff --git a/tests/aot/loop/for-test.phpt b/tests/compiler/loop/for-test.phpt
similarity index 100%
rename from tests/aot/loop/for-test.phpt
rename to tests/compiler/loop/for-test.phpt
diff --git a/tests/aot/loop/foreach-byref-dynamic-array.phpt b/tests/compiler/loop/foreach-byref-dynamic-array.phpt
similarity index 100%
rename from tests/aot/loop/foreach-byref-dynamic-array.phpt
rename to tests/compiler/loop/foreach-byref-dynamic-array.phpt
diff --git a/tests/aot/loop/foreach-complex.phpt b/tests/compiler/loop/foreach-complex.phpt
similarity index 100%
rename from tests/aot/loop/foreach-complex.phpt
rename to tests/compiler/loop/foreach-complex.phpt
diff --git a/tests/aot/loop/foreach-invalid-iteratoraggregate.phpt b/tests/compiler/loop/foreach-invalid-iteratoraggregate.phpt
similarity index 100%
rename from tests/aot/loop/foreach-invalid-iteratoraggregate.phpt
rename to tests/compiler/loop/foreach-invalid-iteratoraggregate.phpt
diff --git a/tests/aot/loop/foreach-iterable-objects.phpt b/tests/compiler/loop/foreach-iterable-objects.phpt
similarity index 100%
rename from tests/aot/loop/foreach-iterable-objects.phpt
rename to tests/compiler/loop/foreach-iterable-objects.phpt
diff --git a/tests/aot/loop/foreach-method-return-array.phpt b/tests/compiler/loop/foreach-method-return-array.phpt
similarity index 100%
rename from tests/aot/loop/foreach-method-return-array.phpt
rename to tests/compiler/loop/foreach-method-return-array.phpt
diff --git a/tests/aot/loop/foreach-ref.phpt b/tests/compiler/loop/foreach-ref.phpt
similarity index 100%
rename from tests/aot/loop/foreach-ref.phpt
rename to tests/compiler/loop/foreach-ref.phpt
diff --git a/tests/aot/loop/foreach-test.phpt b/tests/compiler/loop/foreach-test.phpt
similarity index 100%
rename from tests/aot/loop/foreach-test.phpt
rename to tests/compiler/loop/foreach-test.phpt
diff --git a/tests/aot/loop/iterator-list-nested-keyed.phpt b/tests/compiler/loop/iterator-list-nested-keyed.phpt
similarity index 100%
rename from tests/aot/loop/iterator-list-nested-keyed.phpt
rename to tests/compiler/loop/iterator-list-nested-keyed.phpt
diff --git a/tests/aot/loop/iterator-list.phpt b/tests/compiler/loop/iterator-list.phpt
similarity index 100%
rename from tests/aot/loop/iterator-list.phpt
rename to tests/compiler/loop/iterator-list.phpt
diff --git a/tests/aot/loop/iterators.phpt b/tests/compiler/loop/iterators.phpt
similarity index 100%
rename from tests/aot/loop/iterators.phpt
rename to tests/compiler/loop/iterators.phpt
diff --git a/tests/aot/magic_methods/call-static.phpt b/tests/compiler/magic_methods/call-static.phpt
similarity index 100%
rename from tests/aot/magic_methods/call-static.phpt
rename to tests/compiler/magic_methods/call-static.phpt
diff --git a/tests/aot/magic_methods/call.phpt b/tests/compiler/magic_methods/call.phpt
similarity index 100%
rename from tests/aot/magic_methods/call.phpt
rename to tests/compiler/magic_methods/call.phpt
diff --git a/tests/aot/magic_methods/get_set.phpt b/tests/compiler/magic_methods/get_set.phpt
similarity index 100%
rename from tests/aot/magic_methods/get_set.phpt
rename to tests/compiler/magic_methods/get_set.phpt
diff --git a/tests/aot/magic_methods/invoke-and-tostring.phpt b/tests/compiler/magic_methods/invoke-and-tostring.phpt
similarity index 100%
rename from tests/aot/magic_methods/invoke-and-tostring.phpt
rename to tests/compiler/magic_methods/invoke-and-tostring.phpt
diff --git a/tests/aot/magic_methods/misc.phpt b/tests/compiler/magic_methods/misc.phpt
similarity index 100%
rename from tests/aot/magic_methods/misc.phpt
rename to tests/compiler/magic_methods/misc.phpt
diff --git a/tests/aot/named_args/001.phpt b/tests/compiler/named_args/001.phpt
similarity index 100%
rename from tests/aot/named_args/001.phpt
rename to tests/compiler/named_args/001.phpt
diff --git a/tests/aot/named_args/002.phpt b/tests/compiler/named_args/002.phpt
similarity index 100%
rename from tests/aot/named_args/002.phpt
rename to tests/compiler/named_args/002.phpt
diff --git a/tests/aot/named_args/003.phpt b/tests/compiler/named_args/003.phpt
similarity index 100%
rename from tests/aot/named_args/003.phpt
rename to tests/compiler/named_args/003.phpt
diff --git a/tests/aot/named_args/004.phpt b/tests/compiler/named_args/004.phpt
similarity index 100%
rename from tests/aot/named_args/004.phpt
rename to tests/compiler/named_args/004.phpt
diff --git a/tests/aot/named_args/005.phpt b/tests/compiler/named_args/005.phpt
similarity index 100%
rename from tests/aot/named_args/005.phpt
rename to tests/compiler/named_args/005.phpt
diff --git a/tests/aot/named_args/006.phpt b/tests/compiler/named_args/006.phpt
similarity index 100%
rename from tests/aot/named_args/006.phpt
rename to tests/compiler/named_args/006.phpt
diff --git a/tests/aot/named_args/007.phpt b/tests/compiler/named_args/007.phpt
similarity index 100%
rename from tests/aot/named_args/007.phpt
rename to tests/compiler/named_args/007.phpt
diff --git a/tests/aot/namespace/anonymous-class-ns.phpt b/tests/compiler/namespace/anonymous-class-ns.phpt
similarity index 100%
rename from tests/aot/namespace/anonymous-class-ns.phpt
rename to tests/compiler/namespace/anonymous-class-ns.phpt
diff --git a/tests/aot/namespace/class-const-ref.phpt b/tests/compiler/namespace/class-const-ref.phpt
similarity index 100%
rename from tests/aot/namespace/class-const-ref.phpt
rename to tests/compiler/namespace/class-const-ref.phpt
diff --git a/tests/aot/namespace/class-const-use-in-property-default.phpt b/tests/compiler/namespace/class-const-use-in-property-default.phpt
similarity index 100%
rename from tests/aot/namespace/class-const-use-in-property-default.phpt
rename to tests/compiler/namespace/class-const-use-in-property-default.phpt
diff --git a/tests/aot/namespace/class-namespace.phpt b/tests/compiler/namespace/class-namespace.phpt
similarity index 100%
rename from tests/aot/namespace/class-namespace.phpt
rename to tests/compiler/namespace/class-namespace.phpt
diff --git a/tests/aot/namespace/cross-ns-inheritance.phpt b/tests/compiler/namespace/cross-ns-inheritance.phpt
similarity index 100%
rename from tests/aot/namespace/cross-ns-inheritance.phpt
rename to tests/compiler/namespace/cross-ns-inheritance.phpt
diff --git a/tests/aot/namespace/fully-qualified.phpt b/tests/compiler/namespace/fully-qualified.phpt
similarity index 100%
rename from tests/aot/namespace/fully-qualified.phpt
rename to tests/compiler/namespace/fully-qualified.phpt
diff --git a/tests/aot/namespace/group-use-mixed.phpt b/tests/compiler/namespace/group-use-mixed.phpt
similarity index 100%
rename from tests/aot/namespace/group-use-mixed.phpt
rename to tests/compiler/namespace/group-use-mixed.phpt
diff --git a/tests/aot/namespace/group-use.phpt b/tests/compiler/namespace/group-use.phpt
similarity index 100%
rename from tests/aot/namespace/group-use.phpt
rename to tests/compiler/namespace/group-use.phpt
diff --git a/tests/aot/namespace/interface-across-ns.phpt b/tests/compiler/namespace/interface-across-ns.phpt
similarity index 100%
rename from tests/aot/namespace/interface-across-ns.phpt
rename to tests/compiler/namespace/interface-across-ns.phpt
diff --git a/tests/aot/namespace/mixed-use-imports.phpt b/tests/compiler/namespace/mixed-use-imports.phpt
similarity index 100%
rename from tests/aot/namespace/mixed-use-imports.phpt
rename to tests/compiler/namespace/mixed-use-imports.phpt
diff --git a/tests/aot/namespace/namespace-constants.phpt b/tests/compiler/namespace/namespace-constants.phpt
similarity index 100%
rename from tests/aot/namespace/namespace-constants.phpt
rename to tests/compiler/namespace/namespace-constants.phpt
diff --git a/tests/aot/namespace/nested-namespace.phpt b/tests/compiler/namespace/nested-namespace.phpt
similarity index 100%
rename from tests/aot/namespace/nested-namespace.phpt
rename to tests/compiler/namespace/nested-namespace.phpt
diff --git a/tests/aot/namespace/new-ns-class.phpt b/tests/compiler/namespace/new-ns-class.phpt
similarity index 100%
rename from tests/aot/namespace/new-ns-class.phpt
rename to tests/compiler/namespace/new-ns-class.phpt
diff --git a/tests/aot/namespace/ns-const-01.phpt b/tests/compiler/namespace/ns-const-01.phpt
similarity index 100%
rename from tests/aot/namespace/ns-const-01.phpt
rename to tests/compiler/namespace/ns-const-01.phpt
diff --git a/tests/aot/namespace/ns-const-02.phpt b/tests/compiler/namespace/ns-const-02.phpt
similarity index 100%
rename from tests/aot/namespace/ns-const-02.phpt
rename to tests/compiler/namespace/ns-const-02.phpt
diff --git a/tests/aot/namespace/ns-const-03.phpt b/tests/compiler/namespace/ns-const-03.phpt
similarity index 100%
rename from tests/aot/namespace/ns-const-03.phpt
rename to tests/compiler/namespace/ns-const-03.phpt
diff --git a/tests/aot/namespace/ns-same-as-class.phpt b/tests/compiler/namespace/ns-same-as-class.phpt
similarity index 100%
rename from tests/aot/namespace/ns-same-as-class.phpt
rename to tests/compiler/namespace/ns-same-as-class.phpt
diff --git a/tests/aot/namespace/self-static-cross-ns.phpt b/tests/compiler/namespace/self-static-cross-ns.phpt
similarity index 100%
rename from tests/aot/namespace/self-static-cross-ns.phpt
rename to tests/compiler/namespace/self-static-cross-ns.phpt
diff --git a/tests/aot/namespace/trait-across-ns.phpt b/tests/compiler/namespace/trait-across-ns.phpt
similarity index 100%
rename from tests/aot/namespace/trait-across-ns.phpt
rename to tests/compiler/namespace/trait-across-ns.phpt
diff --git a/tests/aot/namespace/use-alias.phpt b/tests/compiler/namespace/use-alias.phpt
similarity index 100%
rename from tests/aot/namespace/use-alias.phpt
rename to tests/compiler/namespace/use-alias.phpt
diff --git a/tests/aot/namespace/use-const-alias.phpt b/tests/compiler/namespace/use-const-alias.phpt
similarity index 100%
rename from tests/aot/namespace/use-const-alias.phpt
rename to tests/compiler/namespace/use-const-alias.phpt
diff --git a/tests/aot/namespace/use-const.phpt b/tests/compiler/namespace/use-const.phpt
similarity index 100%
rename from tests/aot/namespace/use-const.phpt
rename to tests/compiler/namespace/use-const.phpt
diff --git a/tests/aot/namespace/use-func.phpt b/tests/compiler/namespace/use-func.phpt
similarity index 100%
rename from tests/aot/namespace/use-func.phpt
rename to tests/compiler/namespace/use-func.phpt
diff --git a/tests/aot/namespace/use-function-alias.phpt b/tests/compiler/namespace/use-function-alias.phpt
similarity index 100%
rename from tests/aot/namespace/use-function-alias.phpt
rename to tests/compiler/namespace/use-function-alias.phpt
diff --git a/tests/aot/nullsafe/nullsafe-001.phpt b/tests/compiler/nullsafe/nullsafe-001.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-001.phpt
rename to tests/compiler/nullsafe/nullsafe-001.phpt
diff --git a/tests/aot/nullsafe/nullsafe-002.phpt b/tests/compiler/nullsafe/nullsafe-002.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-002.phpt
rename to tests/compiler/nullsafe/nullsafe-002.phpt
diff --git a/tests/aot/nullsafe/nullsafe-003.phpt b/tests/compiler/nullsafe/nullsafe-003.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-003.phpt
rename to tests/compiler/nullsafe/nullsafe-003.phpt
diff --git a/tests/aot/nullsafe/nullsafe-004.phpt b/tests/compiler/nullsafe/nullsafe-004.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-004.phpt
rename to tests/compiler/nullsafe/nullsafe-004.phpt
diff --git a/tests/aot/nullsafe/nullsafe-args-lazy.phpt b/tests/compiler/nullsafe/nullsafe-args-lazy.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-args-lazy.phpt
rename to tests/compiler/nullsafe/nullsafe-args-lazy.phpt
diff --git a/tests/aot/nullsafe/nullsafe-chain-middle-null-lazy.phpt b/tests/compiler/nullsafe/nullsafe-chain-middle-null-lazy.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-chain-middle-null-lazy.phpt
rename to tests/compiler/nullsafe/nullsafe-chain-middle-null-lazy.phpt
diff --git a/tests/aot/nullsafe/nullsafe-normal-method-after-null-return.phpt b/tests/compiler/nullsafe/nullsafe-normal-method-after-null-return.phpt
similarity index 100%
rename from tests/aot/nullsafe/nullsafe-normal-method-after-null-return.phpt
rename to tests/compiler/nullsafe/nullsafe-normal-method-after-null-return.phpt
diff --git a/tests/aot/object_ctor/001.phpt b/tests/compiler/object_ctor/001.phpt
similarity index 100%
rename from tests/aot/object_ctor/001.phpt
rename to tests/compiler/object_ctor/001.phpt
diff --git a/tests/aot/object_ctor/constructor-promotion.phpt b/tests/compiler/object_ctor/constructor-promotion.phpt
similarity index 100%
rename from tests/aot/object_ctor/constructor-promotion.phpt
rename to tests/compiler/object_ctor/constructor-promotion.phpt
diff --git a/tests/aot/object_ctor/ctor-throw-dtor.phpt b/tests/compiler/object_ctor/ctor-throw-dtor.phpt
similarity index 100%
rename from tests/aot/object_ctor/ctor-throw-dtor.phpt
rename to tests/compiler/object_ctor/ctor-throw-dtor.phpt
diff --git a/tests/aot/object_ctor/ctor.phpt b/tests/compiler/object_ctor/ctor.phpt
similarity index 100%
rename from tests/aot/object_ctor/ctor.phpt
rename to tests/compiler/object_ctor/ctor.phpt
diff --git a/tests/aot/object_ctor/promotion-type-edge-cases.phpt b/tests/compiler/object_ctor/promotion-type-edge-cases.phpt
similarity index 100%
rename from tests/aot/object_ctor/promotion-type-edge-cases.phpt
rename to tests/compiler/object_ctor/promotion-type-edge-cases.phpt
diff --git a/tests/aot/object_ctor/promotion-union-param-check.phpt b/tests/compiler/object_ctor/promotion-union-param-check.phpt
similarity index 100%
rename from tests/aot/object_ctor/promotion-union-param-check.phpt
rename to tests/compiler/object_ctor/promotion-union-param-check.phpt
diff --git a/tests/aot/object_property/001.phpt b/tests/compiler/object_property/001.phpt
similarity index 100%
rename from tests/aot/object_property/001.phpt
rename to tests/compiler/object_property/001.phpt
diff --git a/tests/aot/object_property/002.phpt b/tests/compiler/object_property/002.phpt
similarity index 100%
rename from tests/aot/object_property/002.phpt
rename to tests/compiler/object_property/002.phpt
diff --git a/tests/aot/object_property/003.phpt b/tests/compiler/object_property/003.phpt
similarity index 100%
rename from tests/aot/object_property/003.phpt
rename to tests/compiler/object_property/003.phpt
diff --git a/tests/aot/object_property/004.phpt b/tests/compiler/object_property/004.phpt
similarity index 100%
rename from tests/aot/object_property/004.phpt
rename to tests/compiler/object_property/004.phpt
diff --git a/tests/aot/object_property/005.phpt b/tests/compiler/object_property/005.phpt
similarity index 100%
rename from tests/aot/object_property/005.phpt
rename to tests/compiler/object_property/005.phpt
diff --git a/tests/aot/object_property/006.phpt b/tests/compiler/object_property/006.phpt
similarity index 100%
rename from tests/aot/object_property/006.phpt
rename to tests/compiler/object_property/006.phpt
diff --git a/tests/aot/object_property/007.phpt b/tests/compiler/object_property/007.phpt
similarity index 100%
rename from tests/aot/object_property/007.phpt
rename to tests/compiler/object_property/007.phpt
diff --git a/tests/aot/object_property/asymmetric-set-visibility.phpt b/tests/compiler/object_property/asymmetric-set-visibility.phpt
similarity index 100%
rename from tests/aot/object_property/asymmetric-set-visibility.phpt
rename to tests/compiler/object_property/asymmetric-set-visibility.phpt
diff --git a/tests/aot/object_property/default-array-001.phpt b/tests/compiler/object_property/default-array-001.phpt
similarity index 100%
rename from tests/aot/object_property/default-array-001.phpt
rename to tests/compiler/object_property/default-array-001.phpt
diff --git a/tests/aot/object_property/default-array-002.phpt b/tests/compiler/object_property/default-array-002.phpt
similarity index 100%
rename from tests/aot/object_property/default-array-002.phpt
rename to tests/compiler/object_property/default-array-002.phpt
diff --git a/tests/aot/object_property/native-int-property-assign-op-var.phpt b/tests/compiler/object_property/native-int-property-assign-op-var.phpt
similarity index 100%
rename from tests/aot/object_property/native-int-property-assign-op-var.phpt
rename to tests/compiler/object_property/native-int-property-assign-op-var.phpt
diff --git a/tests/aot/object_property/native-int-property-assign.phpt b/tests/compiler/object_property/native-int-property-assign.phpt
similarity index 100%
rename from tests/aot/object_property/native-int-property-assign.phpt
rename to tests/compiler/object_property/native-int-property-assign.phpt
diff --git a/tests/aot/object_property/native-int-property-string-var.phpt b/tests/compiler/object_property/native-int-property-string-var.phpt
similarity index 100%
rename from tests/aot/object_property/native-int-property-string-var.phpt
rename to tests/compiler/object_property/native-int-property-string-var.phpt
diff --git a/tests/aot/object_property/native-scalar-property-assign-op-var.phpt b/tests/compiler/object_property/native-scalar-property-assign-op-var.phpt
similarity index 100%
rename from tests/aot/object_property/native-scalar-property-assign-op-var.phpt
rename to tests/compiler/object_property/native-scalar-property-assign-op-var.phpt
diff --git a/tests/aot/object_property/native-scalar-property-assign-var.phpt b/tests/compiler/object_property/native-scalar-property-assign-var.phpt
similarity index 100%
rename from tests/aot/object_property/native-scalar-property-assign-var.phpt
rename to tests/compiler/object_property/native-scalar-property-assign-var.phpt
diff --git a/tests/aot/object_property/native-typed-read-in-loop.phpt b/tests/compiler/object_property/native-typed-read-in-loop.phpt
similarity index 100%
rename from tests/aot/object_property/native-typed-read-in-loop.phpt
rename to tests/compiler/object_property/native-typed-read-in-loop.phpt
diff --git a/tests/aot/object_property/nested-property-array-write.phpt b/tests/compiler/object_property/nested-property-array-write.phpt
similarity index 100%
rename from tests/aot/object_property/nested-property-array-write.phpt
rename to tests/compiler/object_property/nested-property-array-write.phpt
diff --git a/tests/aot/object_property/null-unset-false.phpt b/tests/compiler/object_property/null-unset-false.phpt
similarity index 100%
rename from tests/aot/object_property/null-unset-false.phpt
rename to tests/compiler/object_property/null-unset-false.phpt
diff --git a/tests/aot/object_property/object-cast.phpt b/tests/compiler/object_property/object-cast.phpt
similarity index 100%
rename from tests/aot/object_property/object-cast.phpt
rename to tests/compiler/object_property/object-cast.phpt
diff --git a/tests/aot/object_property/object-link-002.phpt b/tests/compiler/object_property/object-link-002.phpt
similarity index 100%
rename from tests/aot/object_property/object-link-002.phpt
rename to tests/compiler/object_property/object-link-002.phpt
diff --git a/tests/aot/object_property/object-link-003.phpt b/tests/compiler/object_property/object-link-003.phpt
similarity index 100%
rename from tests/aot/object_property/object-link-003.phpt
rename to tests/compiler/object_property/object-link-003.phpt
diff --git a/tests/aot/object_property/object-link.phpt b/tests/compiler/object_property/object-link.phpt
similarity index 100%
rename from tests/aot/object_property/object-link.phpt
rename to tests/compiler/object_property/object-link.phpt
diff --git a/tests/aot/object_property/private-prop-001.phpt b/tests/compiler/object_property/private-prop-001.phpt
similarity index 100%
rename from tests/aot/object_property/private-prop-001.phpt
rename to tests/compiler/object_property/private-prop-001.phpt
diff --git a/tests/aot/object_property/private-prop-002.phpt b/tests/compiler/object_property/private-prop-002.phpt
similarity index 100%
rename from tests/aot/object_property/private-prop-002.phpt
rename to tests/compiler/object_property/private-prop-002.phpt
diff --git a/tests/aot/object_property/prop-001.phpt b/tests/compiler/object_property/prop-001.phpt
similarity index 100%
rename from tests/aot/object_property/prop-001.phpt
rename to tests/compiler/object_property/prop-001.phpt
diff --git a/tests/aot/object_property/prop-002.phpt b/tests/compiler/object_property/prop-002.phpt
similarity index 100%
rename from tests/aot/object_property/prop-002.phpt
rename to tests/compiler/object_property/prop-002.phpt
diff --git a/tests/aot/object_property/prop-003.phpt b/tests/compiler/object_property/prop-003.phpt
similarity index 100%
rename from tests/aot/object_property/prop-003.phpt
rename to tests/compiler/object_property/prop-003.phpt
diff --git a/tests/aot/object_property/prop-004.phpt b/tests/compiler/object_property/prop-004.phpt
similarity index 100%
rename from tests/aot/object_property/prop-004.phpt
rename to tests/compiler/object_property/prop-004.phpt
diff --git a/tests/aot/object_property/prop-005.phpt b/tests/compiler/object_property/prop-005.phpt
similarity index 100%
rename from tests/aot/object_property/prop-005.phpt
rename to tests/compiler/object_property/prop-005.phpt
diff --git a/tests/aot/object_property/prop-dec-inc.phpt b/tests/compiler/object_property/prop-dec-inc.phpt
similarity index 100%
rename from tests/aot/object_property/prop-dec-inc.phpt
rename to tests/compiler/object_property/prop-dec-inc.phpt
diff --git a/tests/aot/object_property/prop-ref.phpt b/tests/compiler/object_property/prop-ref.phpt
similarity index 100%
rename from tests/aot/object_property/prop-ref.phpt
rename to tests/compiler/object_property/prop-ref.phpt
diff --git a/tests/aot/object_property/property-array-write-composed-expr.phpt b/tests/compiler/object_property/property-array-write-composed-expr.phpt
similarity index 100%
rename from tests/aot/object_property/property-array-write-composed-expr.phpt
rename to tests/compiler/object_property/property-array-write-composed-expr.phpt
diff --git a/tests/aot/object_property/property-array-write.phpt b/tests/compiler/object_property/property-array-write.phpt
similarity index 100%
rename from tests/aot/object_property/property-array-write.phpt
rename to tests/compiler/object_property/property-array-write.phpt
diff --git a/tests/aot/object_property/property-hooks-operations.phpt b/tests/compiler/object_property/property-hooks-operations.phpt
similarity index 100%
rename from tests/aot/object_property/property-hooks-operations.phpt
rename to tests/compiler/object_property/property-hooks-operations.phpt
diff --git a/tests/aot/object_property/property-hooks.phpt b/tests/compiler/object_property/property-hooks.phpt
similarity index 100%
rename from tests/aot/object_property/property-hooks.phpt
rename to tests/compiler/object_property/property-hooks.phpt
diff --git a/tests/aot/object_property/readonly-cross-class-direct.phpt b/tests/compiler/object_property/readonly-cross-class-direct.phpt
similarity index 100%
rename from tests/aot/object_property/readonly-cross-class-direct.phpt
rename to tests/compiler/object_property/readonly-cross-class-direct.phpt
diff --git a/tests/aot/object_property/static-array-prop.phpt b/tests/compiler/object_property/static-array-prop.phpt
similarity index 100%
rename from tests/aot/object_property/static-array-prop.phpt
rename to tests/compiler/object_property/static-array-prop.phpt
diff --git a/tests/aot/object_property/toarray-method.phpt b/tests/compiler/object_property/toarray-method.phpt
similarity index 100%
rename from tests/aot/object_property/toarray-method.phpt
rename to tests/compiler/object_property/toarray-method.phpt
diff --git a/tests/aot/operator/arithmetic_operators.phpt b/tests/compiler/operator/arithmetic_operators.phpt
similarity index 100%
rename from tests/aot/operator/arithmetic_operators.phpt
rename to tests/compiler/operator/arithmetic_operators.phpt
diff --git a/tests/aot/operator/assign-compare.phpt b/tests/compiler/operator/assign-compare.phpt
similarity index 100%
rename from tests/aot/operator/assign-compare.phpt
rename to tests/compiler/operator/assign-compare.phpt
diff --git a/tests/aot/operator/assign-op-extra.phpt b/tests/compiler/operator/assign-op-extra.phpt
similarity index 100%
rename from tests/aot/operator/assign-op-extra.phpt
rename to tests/compiler/operator/assign-op-extra.phpt
diff --git a/tests/aot/operator/assign-op-mixed-types.phpt b/tests/compiler/operator/assign-op-mixed-types.phpt
similarity index 100%
rename from tests/aot/operator/assign-op-mixed-types.phpt
rename to tests/compiler/operator/assign-op-mixed-types.phpt
diff --git a/tests/aot/operator/assignment_operators.phpt b/tests/compiler/operator/assignment_operators.phpt
similarity index 100%
rename from tests/aot/operator/assignment_operators.phpt
rename to tests/compiler/operator/assignment_operators.phpt
diff --git a/tests/aot/operator/assignop_bitwiseor.phpt b/tests/compiler/operator/assignop_bitwiseor.phpt
similarity index 100%
rename from tests/aot/operator/assignop_bitwiseor.phpt
rename to tests/compiler/operator/assignop_bitwiseor.phpt
diff --git a/tests/aot/operator/binary-eval-order.phpt b/tests/compiler/operator/binary-eval-order.phpt
similarity index 100%
rename from tests/aot/operator/binary-eval-order.phpt
rename to tests/compiler/operator/binary-eval-order.phpt
diff --git a/tests/aot/operator/cast-expression-side-effects.phpt b/tests/compiler/operator/cast-expression-side-effects.phpt
similarity index 100%
rename from tests/aot/operator/cast-expression-side-effects.phpt
rename to tests/compiler/operator/cast-expression-side-effects.phpt
diff --git a/tests/aot/operator/casts.phpt b/tests/compiler/operator/casts.phpt
similarity index 100%
rename from tests/aot/operator/casts.phpt
rename to tests/compiler/operator/casts.phpt
diff --git a/tests/aot/operator/comparison_operators.phpt b/tests/compiler/operator/comparison_operators.phpt
similarity index 100%
rename from tests/aot/operator/comparison_operators.phpt
rename to tests/compiler/operator/comparison_operators.phpt
diff --git a/tests/aot/operator/compound-assign.phpt b/tests/compiler/operator/compound-assign.phpt
similarity index 100%
rename from tests/aot/operator/compound-assign.phpt
rename to tests/compiler/operator/compound-assign.phpt
diff --git a/tests/aot/operator/concat-assign-null.phpt b/tests/compiler/operator/concat-assign-null.phpt
similarity index 100%
rename from tests/aot/operator/concat-assign-null.phpt
rename to tests/compiler/operator/concat-assign-null.phpt
diff --git a/tests/aot/operator/logical-short-circuit-lazy.phpt b/tests/compiler/operator/logical-short-circuit-lazy.phpt
similarity index 100%
rename from tests/aot/operator/logical-short-circuit-lazy.phpt
rename to tests/compiler/operator/logical-short-circuit-lazy.phpt
diff --git a/tests/aot/operator/logical_operators.phpt b/tests/compiler/operator/logical_operators.phpt
similarity index 100%
rename from tests/aot/operator/logical_operators.phpt
rename to tests/compiler/operator/logical_operators.phpt
diff --git a/tests/aot/operator/postincdec.phpt b/tests/compiler/operator/postincdec.phpt
similarity index 100%
rename from tests/aot/operator/postincdec.phpt
rename to tests/compiler/operator/postincdec.phpt
diff --git a/tests/aot/operator/pow-assign-op.phpt b/tests/compiler/operator/pow-assign-op.phpt
similarity index 100%
rename from tests/aot/operator/pow-assign-op.phpt
rename to tests/compiler/operator/pow-assign-op.phpt
diff --git a/tests/aot/operator/property-assign-op.phpt b/tests/compiler/operator/property-assign-op.phpt
similarity index 100%
rename from tests/aot/operator/property-assign-op.phpt
rename to tests/compiler/operator/property-assign-op.phpt
diff --git a/tests/aot/operator/right-associative.phpt b/tests/compiler/operator/right-associative.phpt
similarity index 100%
rename from tests/aot/operator/right-associative.phpt
rename to tests/compiler/operator/right-associative.phpt
diff --git a/tests/aot/operator/spaceship.phpt b/tests/compiler/operator/spaceship.phpt
similarity index 100%
rename from tests/aot/operator/spaceship.phpt
rename to tests/compiler/operator/spaceship.phpt
diff --git a/tests/aot/operator/ternary-lazy-eval.phpt b/tests/compiler/operator/ternary-lazy-eval.phpt
similarity index 100%
rename from tests/aot/operator/ternary-lazy-eval.phpt
rename to tests/compiler/operator/ternary-lazy-eval.phpt
diff --git a/tests/aot/operator/ternary-shorthand.phpt b/tests/compiler/operator/ternary-shorthand.phpt
similarity index 100%
rename from tests/aot/operator/ternary-shorthand.phpt
rename to tests/compiler/operator/ternary-shorthand.phpt
diff --git a/tests/aot/optimizations/float-bitwise-mod.phpt b/tests/compiler/optimizations/float-bitwise-mod.phpt
similarity index 100%
rename from tests/aot/optimizations/float-bitwise-mod.phpt
rename to tests/compiler/optimizations/float-bitwise-mod.phpt
diff --git a/tests/aot/optimizations/float-narrow-basic.phpt b/tests/compiler/optimizations/float-narrow-basic.phpt
similarity index 100%
rename from tests/aot/optimizations/float-narrow-basic.phpt
rename to tests/compiler/optimizations/float-narrow-basic.phpt
diff --git a/tests/aot/optimizations/float-narrow-mixed.phpt b/tests/compiler/optimizations/float-narrow-mixed.phpt
similarity index 100%
rename from tests/aot/optimizations/float-narrow-mixed.phpt
rename to tests/compiler/optimizations/float-narrow-mixed.phpt
diff --git a/tests/aot/optimizations/float-narrow-nested-int-ops.phpt b/tests/compiler/optimizations/float-narrow-nested-int-ops.phpt
similarity index 100%
rename from tests/aot/optimizations/float-narrow-nested-int-ops.phpt
rename to tests/compiler/optimizations/float-narrow-nested-int-ops.phpt
diff --git a/tests/aot/optimizations/int-calculation.phpt b/tests/compiler/optimizations/int-calculation.phpt
similarity index 100%
rename from tests/aot/optimizations/int-calculation.phpt
rename to tests/compiler/optimizations/int-calculation.phpt
diff --git a/tests/aot/optimizations/int-narrow-basic.phpt b/tests/compiler/optimizations/int-narrow-basic.phpt
similarity index 100%
rename from tests/aot/optimizations/int-narrow-basic.phpt
rename to tests/compiler/optimizations/int-narrow-basic.phpt
diff --git a/tests/aot/optimizations/int-narrow-overflow.phpt b/tests/compiler/optimizations/int-narrow-overflow.phpt
similarity index 100%
rename from tests/aot/optimizations/int-narrow-overflow.phpt
rename to tests/compiler/optimizations/int-narrow-overflow.phpt
diff --git a/tests/aot/optimizations/loop-var-for-const-bound.phpt b/tests/compiler/optimizations/loop-var-for-const-bound.phpt
similarity index 100%
rename from tests/aot/optimizations/loop-var-for-const-bound.phpt
rename to tests/compiler/optimizations/loop-var-for-const-bound.phpt
diff --git a/tests/aot/optimizations/loop-var-for-int-function-bound.phpt b/tests/compiler/optimizations/loop-var-for-int-function-bound.phpt
similarity index 100%
rename from tests/aot/optimizations/loop-var-for-int-function-bound.phpt
rename to tests/compiler/optimizations/loop-var-for-int-function-bound.phpt
diff --git a/tests/aot/optimizations/loop-var-for-int-function-desc.phpt b/tests/compiler/optimizations/loop-var-for-int-function-desc.phpt
similarity index 100%
rename from tests/aot/optimizations/loop-var-for-int-function-desc.phpt
rename to tests/compiler/optimizations/loop-var-for-int-function-desc.phpt
diff --git a/tests/aot/optimizations/loop-var-for-strlen-bound.phpt b/tests/compiler/optimizations/loop-var-for-strlen-bound.phpt
similarity index 100%
rename from tests/aot/optimizations/loop-var-for-strlen-bound.phpt
rename to tests/compiler/optimizations/loop-var-for-strlen-bound.phpt
diff --git a/tests/aot/optimizations/loop-var-while-postdec.phpt b/tests/compiler/optimizations/loop-var-while-postdec.phpt
similarity index 100%
rename from tests/aot/optimizations/loop-var-while-postdec.phpt
rename to tests/compiler/optimizations/loop-var-while-postdec.phpt
diff --git a/tests/aot/optimizations/narrow-div-pow.phpt b/tests/compiler/optimizations/narrow-div-pow.phpt
similarity index 100%
rename from tests/aot/optimizations/narrow-div-pow.phpt
rename to tests/compiler/optimizations/narrow-div-pow.phpt
diff --git a/tests/aot/optimizations/narrow-ref-prevent.phpt b/tests/compiler/optimizations/narrow-ref-prevent.phpt
similarity index 100%
rename from tests/aot/optimizations/narrow-ref-prevent.phpt
rename to tests/compiler/optimizations/narrow-ref-prevent.phpt
diff --git a/tests/aot/optimizations/object-int-prop-02.phpt b/tests/compiler/optimizations/object-int-prop-02.phpt
similarity index 100%
rename from tests/aot/optimizations/object-int-prop-02.phpt
rename to tests/compiler/optimizations/object-int-prop-02.phpt
diff --git a/tests/aot/optimizations/object-int-prop.phpt b/tests/compiler/optimizations/object-int-prop.phpt
similarity index 100%
rename from tests/aot/optimizations/object-int-prop.phpt
rename to tests/compiler/optimizations/object-int-prop.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-array-var-ref.phpt b/tests/compiler/optimizations/objprop-hoist-array-var-ref.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-array-var-ref.phpt
rename to tests/compiler/optimizations/objprop-hoist-array-var-ref.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-float.phpt b/tests/compiler/optimizations/objprop-hoist-float.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-float.phpt
rename to tests/compiler/optimizations/objprop-hoist-float.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-int.phpt b/tests/compiler/optimizations/objprop-hoist-int.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-int.phpt
rename to tests/compiler/optimizations/objprop-hoist-int.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-loop-redef.phpt b/tests/compiler/optimizations/objprop-hoist-loop-redef.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-loop-redef.phpt
rename to tests/compiler/optimizations/objprop-hoist-loop-redef.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-magic.phpt b/tests/compiler/optimizations/objprop-hoist-magic.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-magic.phpt
rename to tests/compiler/optimizations/objprop-hoist-magic.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-multi-def.phpt b/tests/compiler/optimizations/objprop-hoist-multi-def.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-multi-def.phpt
rename to tests/compiler/optimizations/objprop-hoist-multi-def.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-nested-refval.phpt b/tests/compiler/optimizations/objprop-hoist-nested-refval.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-nested-refval.phpt
rename to tests/compiler/optimizations/objprop-hoist-nested-refval.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-object-alias-escape.phpt b/tests/compiler/optimizations/objprop-hoist-object-alias-escape.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-object-alias-escape.phpt
rename to tests/compiler/optimizations/objprop-hoist-object-alias-escape.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-object-arg-escape.phpt b/tests/compiler/optimizations/objprop-hoist-object-arg-escape.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-object-arg-escape.phpt
rename to tests/compiler/optimizations/objprop-hoist-object-arg-escape.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-object-arg-reference-slot.phpt b/tests/compiler/optimizations/objprop-hoist-object-arg-reference-slot.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-object-arg-reference-slot.phpt
rename to tests/compiler/optimizations/objprop-hoist-object-arg-reference-slot.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-ref-capture.phpt b/tests/compiler/optimizations/objprop-hoist-ref-capture.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-ref-capture.phpt
rename to tests/compiler/optimizations/objprop-hoist-ref-capture.phpt
diff --git a/tests/aot/optimizations/objprop-hoist-this-object-arg-escape.phpt b/tests/compiler/optimizations/objprop-hoist-this-object-arg-escape.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-hoist-this-object-arg-escape.phpt
rename to tests/compiler/optimizations/objprop-hoist-this-object-arg-escape.phpt
diff --git a/tests/aot/optimizations/objprop-nullable-union-default-null.phpt b/tests/compiler/optimizations/objprop-nullable-union-default-null.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-nullable-union-default-null.phpt
rename to tests/compiler/optimizations/objprop-nullable-union-default-null.phpt
diff --git a/tests/aot/optimizations/objprop-typed-object-null-unset.phpt b/tests/compiler/optimizations/objprop-typed-object-null-unset.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-typed-object-null-unset.phpt
rename to tests/compiler/optimizations/objprop-typed-object-null-unset.phpt
diff --git a/tests/aot/optimizations/objprop-unset-fixed-defaults.phpt b/tests/compiler/optimizations/objprop-unset-fixed-defaults.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-unset-fixed-defaults.phpt
rename to tests/compiler/optimizations/objprop-unset-fixed-defaults.phpt
diff --git a/tests/aot/optimizations/objprop-unset-this-typed.phpt b/tests/compiler/optimizations/objprop-unset-this-typed.phpt
similarity index 100%
rename from tests/aot/optimizations/objprop-unset-this-typed.phpt
rename to tests/compiler/optimizations/objprop-unset-this-typed.phpt
diff --git a/tests/aot/optimizations/reserved-param-ssa.phpt b/tests/compiler/optimizations/reserved-param-ssa.phpt
similarity index 100%
rename from tests/aot/optimizations/reserved-param-ssa.phpt
rename to tests/compiler/optimizations/reserved-param-ssa.phpt
diff --git a/tests/aot/optimizations/strlen-const.phpt b/tests/compiler/optimizations/strlen-const.phpt
similarity index 100%
rename from tests/aot/optimizations/strlen-const.phpt
rename to tests/compiler/optimizations/strlen-const.phpt
diff --git a/tests/aot/parent_call/parent-dynamic-method-call.phpt b/tests/compiler/parent_call/parent-dynamic-method-call.phpt
similarity index 100%
rename from tests/aot/parent_call/parent-dynamic-method-call.phpt
rename to tests/compiler/parent_call/parent-dynamic-method-call.phpt
diff --git a/tests/aot/parent_call/parent-method-call.phpt b/tests/compiler/parent_call/parent-method-call.phpt
similarity index 100%
rename from tests/aot/parent_call/parent-method-call.phpt
rename to tests/compiler/parent_call/parent-method-call.phpt
diff --git a/tests/aot/parent_call/parent-unpack-named.phpt b/tests/compiler/parent_call/parent-unpack-named.phpt
similarity index 100%
rename from tests/aot/parent_call/parent-unpack-named.phpt
rename to tests/compiler/parent_call/parent-unpack-named.phpt
diff --git a/tests/aot/place-holder/001.phpt b/tests/compiler/place-holder/001.phpt
similarity index 100%
rename from tests/aot/place-holder/001.phpt
rename to tests/compiler/place-holder/001.phpt
diff --git a/tests/aot/place-holder/002.phpt b/tests/compiler/place-holder/002.phpt
similarity index 100%
rename from tests/aot/place-holder/002.phpt
rename to tests/compiler/place-holder/002.phpt
diff --git a/tests/aot/place-holder/003.phpt b/tests/compiler/place-holder/003.phpt
similarity index 100%
rename from tests/aot/place-holder/003.phpt
rename to tests/compiler/place-holder/003.phpt
diff --git a/tests/aot/place-holder/globals-null-arithmetic.phpt b/tests/compiler/place-holder/globals-null-arithmetic.phpt
similarity index 100%
rename from tests/aot/place-holder/globals-null-arithmetic.phpt
rename to tests/compiler/place-holder/globals-null-arithmetic.phpt
diff --git a/tests/aot/ref/001.phpt b/tests/compiler/ref/001.phpt
similarity index 100%
rename from tests/aot/ref/001.phpt
rename to tests/compiler/ref/001.phpt
diff --git a/tests/aot/ref/002.phpt b/tests/compiler/ref/002.phpt
similarity index 100%
rename from tests/aot/ref/002.phpt
rename to tests/compiler/ref/002.phpt
diff --git a/tests/aot/ref/003.phpt b/tests/compiler/ref/003.phpt
similarity index 100%
rename from tests/aot/ref/003.phpt
rename to tests/compiler/ref/003.phpt
diff --git a/tests/aot/ref/004.phpt b/tests/compiler/ref/004.phpt
similarity index 100%
rename from tests/aot/ref/004.phpt
rename to tests/compiler/ref/004.phpt
diff --git a/tests/aot/ref/005.phpt b/tests/compiler/ref/005.phpt
similarity index 100%
rename from tests/aot/ref/005.phpt
rename to tests/compiler/ref/005.phpt
diff --git a/tests/aot/ref/006.phpt b/tests/compiler/ref/006.phpt
similarity index 100%
rename from tests/aot/ref/006.phpt
rename to tests/compiler/ref/006.phpt
diff --git a/tests/aot/ref/007.phpt b/tests/compiler/ref/007.phpt
similarity index 100%
rename from tests/aot/ref/007.phpt
rename to tests/compiler/ref/007.phpt
diff --git a/tests/aot/ref/008.phpt b/tests/compiler/ref/008.phpt
similarity index 100%
rename from tests/aot/ref/008.phpt
rename to tests/compiler/ref/008.phpt
diff --git a/tests/aot/ref/009.phpt b/tests/compiler/ref/009.phpt
similarity index 100%
rename from tests/aot/ref/009.phpt
rename to tests/compiler/ref/009.phpt
diff --git a/tests/aot/ref/basic.phpt b/tests/compiler/ref/basic.phpt
similarity index 100%
rename from tests/aot/ref/basic.phpt
rename to tests/compiler/ref/basic.phpt
diff --git a/tests/aot/ref/default-array.phpt b/tests/compiler/ref/default-array.phpt
similarity index 100%
rename from tests/aot/ref/default-array.phpt
rename to tests/compiler/ref/default-array.phpt
diff --git a/tests/aot/ref/function-return-reference-require.inc b/tests/compiler/ref/function-return-reference-require.inc
similarity index 100%
rename from tests/aot/ref/function-return-reference-require.inc
rename to tests/compiler/ref/function-return-reference-require.inc
diff --git a/tests/aot/ref/function-return-reference.phpt b/tests/compiler/ref/function-return-reference.phpt
similarity index 100%
rename from tests/aot/ref/function-return-reference.phpt
rename to tests/compiler/ref/function-return-reference.phpt
diff --git a/tests/aot/ref/method-return-reference-require.inc b/tests/compiler/ref/method-return-reference-require.inc
similarity index 100%
rename from tests/aot/ref/method-return-reference-require.inc
rename to tests/compiler/ref/method-return-reference-require.inc
diff --git a/tests/aot/ref/method-return-reference.phpt b/tests/compiler/ref/method-return-reference.phpt
similarity index 100%
rename from tests/aot/ref/method-return-reference.phpt
rename to tests/compiler/ref/method-return-reference.phpt
diff --git a/tests/aot/ref/ref-call-arg.phpt b/tests/compiler/ref/ref-call-arg.phpt
similarity index 100%
rename from tests/aot/ref/ref-call-arg.phpt
rename to tests/compiler/ref/ref-call-arg.phpt
diff --git a/tests/aot/ref/ref-closure-param.phpt b/tests/compiler/ref/ref-closure-param.phpt
similarity index 100%
rename from tests/aot/ref/ref-closure-param.phpt
rename to tests/compiler/ref/ref-closure-param.phpt
diff --git a/tests/aot/ref/ref-func-param.phpt b/tests/compiler/ref/ref-func-param.phpt
similarity index 100%
rename from tests/aot/ref/ref-func-param.phpt
rename to tests/compiler/ref/ref-func-param.phpt
diff --git a/tests/aot/ref/ref-new-var.phpt b/tests/compiler/ref/ref-new-var.phpt
similarity index 100%
rename from tests/aot/ref/ref-new-var.phpt
rename to tests/compiler/ref/ref-new-var.phpt
diff --git a/tests/aot/ref/ref-object.phpt b/tests/compiler/ref/ref-object.phpt
similarity index 100%
rename from tests/aot/ref/ref-object.phpt
rename to tests/compiler/ref/ref-object.phpt
diff --git a/tests/aot/ref/ref-static-prop.phpt b/tests/compiler/ref/ref-static-prop.phpt
similarity index 100%
rename from tests/aot/ref/ref-static-prop.phpt
rename to tests/compiler/ref/ref-static-prop.phpt
diff --git a/tests/aot/ref/ref.phpt b/tests/compiler/ref/ref.phpt
similarity index 100%
rename from tests/aot/ref/ref.phpt
rename to tests/compiler/ref/ref.phpt
diff --git a/tests/aot/ref/refval-array.phpt b/tests/compiler/ref/refval-array.phpt
similarity index 100%
rename from tests/aot/ref/refval-array.phpt
rename to tests/compiler/ref/refval-array.phpt
diff --git a/tests/aot/ref/refval-object.phpt b/tests/compiler/ref/refval-object.phpt
similarity index 100%
rename from tests/aot/ref/refval-object.phpt
rename to tests/compiler/ref/refval-object.phpt
diff --git a/tests/aot/ref/refval1.phpt b/tests/compiler/ref/refval1.phpt
similarity index 100%
rename from tests/aot/ref/refval1.phpt
rename to tests/compiler/ref/refval1.phpt
diff --git a/tests/aot/ref/refval2.phpt b/tests/compiler/ref/refval2.phpt
similarity index 100%
rename from tests/aot/ref/refval2.phpt
rename to tests/compiler/ref/refval2.phpt
diff --git a/tests/aot/ref/return-by-ref-method.phpt b/tests/compiler/ref/return-by-ref-method.phpt
similarity index 100%
rename from tests/aot/ref/return-by-ref-method.phpt
rename to tests/compiler/ref/return-by-ref-method.phpt
diff --git a/tests/aot/ref/return-by-ref-trait-method.phpt b/tests/compiler/ref/return-by-ref-trait-method.phpt
similarity index 100%
rename from tests/aot/ref/return-by-ref-trait-method.phpt
rename to tests/compiler/ref/return-by-ref-trait-method.phpt
diff --git a/tests/aot/ref/reuse.phpt b/tests/compiler/ref/reuse.phpt
similarity index 100%
rename from tests/aot/ref/reuse.phpt
rename to tests/compiler/ref/reuse.phpt
diff --git a/tests/aot/ref/static-byref-call.phpt b/tests/compiler/ref/static-byref-call.phpt
similarity index 100%
rename from tests/aot/ref/static-byref-call.phpt
rename to tests/compiler/ref/static-byref-call.phpt
diff --git a/tests/aot/ref/unset.phpt b/tests/compiler/ref/unset.phpt
similarity index 100%
rename from tests/aot/ref/unset.phpt
rename to tests/compiler/ref/unset.phpt
diff --git a/tests/aot/self-class/001.phpt b/tests/compiler/self-class/001.phpt
similarity index 100%
rename from tests/aot/self-class/001.phpt
rename to tests/compiler/self-class/001.phpt
diff --git a/tests/aot/self-class/002.phpt b/tests/compiler/self-class/002.phpt
similarity index 100%
rename from tests/aot/self-class/002.phpt
rename to tests/compiler/self-class/002.phpt
diff --git a/tests/aot/static/class-static-001.phpt b/tests/compiler/static/class-static-001.phpt
similarity index 100%
rename from tests/aot/static/class-static-001.phpt
rename to tests/compiler/static/class-static-001.phpt
diff --git a/tests/aot/static/class-static-002.phpt b/tests/compiler/static/class-static-002.phpt
similarity index 100%
rename from tests/aot/static/class-static-002.phpt
rename to tests/compiler/static/class-static-002.phpt
diff --git a/tests/aot/static/class-static-003.phpt b/tests/compiler/static/class-static-003.phpt
similarity index 100%
rename from tests/aot/static/class-static-003.phpt
rename to tests/compiler/static/class-static-003.phpt
diff --git a/tests/aot/static/class-static-004.phpt b/tests/compiler/static/class-static-004.phpt
similarity index 100%
rename from tests/aot/static/class-static-004.phpt
rename to tests/compiler/static/class-static-004.phpt
diff --git a/tests/aot/static/class-static-005.phpt b/tests/compiler/static/class-static-005.phpt
similarity index 100%
rename from tests/aot/static/class-static-005.phpt
rename to tests/compiler/static/class-static-005.phpt
diff --git a/tests/aot/static/late-static-binding.phpt b/tests/compiler/static/late-static-binding.phpt
similarity index 100%
rename from tests/aot/static/late-static-binding.phpt
rename to tests/compiler/static/late-static-binding.phpt
diff --git a/tests/aot/static/static-call-dynamic-method.phpt b/tests/compiler/static/static-call-dynamic-method.phpt
similarity index 100%
rename from tests/aot/static/static-call-dynamic-method.phpt
rename to tests/compiler/static/static-call-dynamic-method.phpt
diff --git a/tests/aot/static/static-call.phpt b/tests/compiler/static/static-call.phpt
similarity index 100%
rename from tests/aot/static/static-call.phpt
rename to tests/compiler/static/static-call.phpt
diff --git a/tests/aot/static/static-method-001.phpt b/tests/compiler/static/static-method-001.phpt
similarity index 100%
rename from tests/aot/static/static-method-001.phpt
rename to tests/compiler/static/static-method-001.phpt
diff --git a/tests/aot/static/static-prop-dynamic-call-stable.phpt b/tests/compiler/static/static-prop-dynamic-call-stable.phpt
similarity index 100%
rename from tests/aot/static/static-prop-dynamic-call-stable.phpt
rename to tests/compiler/static/static-prop-dynamic-call-stable.phpt
diff --git a/tests/aot/static/static-prop-expr.phpt b/tests/compiler/static/static-prop-expr.phpt
similarity index 100%
rename from tests/aot/static/static-prop-expr.phpt
rename to tests/compiler/static/static-prop-expr.phpt
diff --git a/tests/aot/static/static-prop-inherited-isolated.phpt b/tests/compiler/static/static-prop-inherited-isolated.phpt
similarity index 100%
rename from tests/aot/static/static-prop-inherited-isolated.phpt
rename to tests/compiler/static/static-prop-inherited-isolated.phpt
diff --git a/tests/aot/static/static-prop-late-static-binding.phpt b/tests/compiler/static/static-prop-late-static-binding.phpt
similarity index 100%
rename from tests/aot/static/static-prop-late-static-binding.phpt
rename to tests/compiler/static/static-prop-late-static-binding.phpt
diff --git a/tests/aot/static/static-prop-native-defaults.phpt b/tests/compiler/static/static-prop-native-defaults.phpt
similarity index 100%
rename from tests/aot/static/static-prop-native-defaults.phpt
rename to tests/compiler/static/static-prop-native-defaults.phpt
diff --git a/tests/aot/static/static-prop-ref-slot-crash.phpt b/tests/compiler/static/static-prop-ref-slot-crash.phpt
similarity index 100%
rename from tests/aot/static/static-prop-ref-slot-crash.phpt
rename to tests/compiler/static/static-prop-ref-slot-crash.phpt
diff --git a/tests/aot/static/static-prop-ref-slot-float-crash.phpt b/tests/compiler/static/static-prop-ref-slot-float-crash.phpt
similarity index 100%
rename from tests/aot/static/static-prop-ref-slot-float-crash.phpt
rename to tests/compiler/static/static-prop-ref-slot-float-crash.phpt
diff --git a/tests/aot/static/static-property-dynamic-name.phpt b/tests/compiler/static/static-property-dynamic-name.phpt
similarity index 100%
rename from tests/aot/static/static-property-dynamic-name.phpt
rename to tests/compiler/static/static-property-dynamic-name.phpt
diff --git a/tests/aot/static/static-vars-02.phpt b/tests/compiler/static/static-vars-02.phpt
similarity index 100%
rename from tests/aot/static/static-vars-02.phpt
rename to tests/compiler/static/static-vars-02.phpt
diff --git a/tests/aot/static/static-vars-dynamic-init-once.phpt b/tests/compiler/static/static-vars-dynamic-init-once.phpt
similarity index 100%
rename from tests/aot/static/static-vars-dynamic-init-once.phpt
rename to tests/compiler/static/static-vars-dynamic-init-once.phpt
diff --git a/tests/aot/static/static-vars-multiple-init.phpt b/tests/compiler/static/static-vars-multiple-init.phpt
similarity index 100%
rename from tests/aot/static/static-vars-multiple-init.phpt
rename to tests/compiler/static/static-vars-multiple-init.phpt
diff --git a/tests/aot/static/static-vars.phpt b/tests/compiler/static/static-vars.phpt
similarity index 100%
rename from tests/aot/static/static-vars.phpt
rename to tests/compiler/static/static-vars.phpt
diff --git a/tests/aot/static/static_class_property_read_write.phpt b/tests/compiler/static/static_class_property_read_write.phpt
similarity index 100%
rename from tests/aot/static/static_class_property_read_write.phpt
rename to tests/compiler/static/static_class_property_read_write.phpt
diff --git a/tests/aot/static/static_prop_write.phpt b/tests/compiler/static/static_prop_write.phpt
similarity index 100%
rename from tests/aot/static/static_prop_write.phpt
rename to tests/compiler/static/static_prop_write.phpt
diff --git a/tests/aot/static/static_prop_write_2.phpt b/tests/compiler/static/static_prop_write_2.phpt
similarity index 100%
rename from tests/aot/static/static_prop_write_2.phpt
rename to tests/compiler/static/static_prop_write_2.phpt
diff --git a/tests/aot/static_property_test.inc b/tests/compiler/static_property_test.inc
similarity index 100%
rename from tests/aot/static_property_test.inc
rename to tests/compiler/static_property_test.inc
diff --git a/tests/aot/std-array/001.phpt b/tests/compiler/std-array/001.phpt
similarity index 100%
rename from tests/aot/std-array/001.phpt
rename to tests/compiler/std-array/001.phpt
diff --git a/tests/aot/std-array/002.phpt b/tests/compiler/std-array/002.phpt
similarity index 100%
rename from tests/aot/std-array/002.phpt
rename to tests/compiler/std-array/002.phpt
diff --git a/tests/aot/std-array/003.phpt b/tests/compiler/std-array/003.phpt
similarity index 100%
rename from tests/aot/std-array/003.phpt
rename to tests/compiler/std-array/003.phpt
diff --git a/tests/aot/std-array/004.phpt b/tests/compiler/std-array/004.phpt
similarity index 100%
rename from tests/aot/std-array/004.phpt
rename to tests/compiler/std-array/004.phpt
diff --git a/tests/aot/std-array/005.phpt b/tests/compiler/std-array/005.phpt
similarity index 100%
rename from tests/aot/std-array/005.phpt
rename to tests/compiler/std-array/005.phpt
diff --git a/tests/aot/std-array/006.phpt b/tests/compiler/std-array/006.phpt
similarity index 100%
rename from tests/aot/std-array/006.phpt
rename to tests/compiler/std-array/006.phpt
diff --git a/tests/aot/std-array/007.phpt b/tests/compiler/std-array/007.phpt
similarity index 100%
rename from tests/aot/std-array/007.phpt
rename to tests/compiler/std-array/007.phpt
diff --git a/tests/aot/std-array/008.phpt b/tests/compiler/std-array/008.phpt
similarity index 100%
rename from tests/aot/std-array/008.phpt
rename to tests/compiler/std-array/008.phpt
diff --git a/tests/aot/std-array/009.phpt b/tests/compiler/std-array/009.phpt
similarity index 100%
rename from tests/aot/std-array/009.phpt
rename to tests/compiler/std-array/009.phpt
diff --git a/tests/aot/std-array/010.phpt b/tests/compiler/std-array/010.phpt
similarity index 100%
rename from tests/aot/std-array/010.phpt
rename to tests/compiler/std-array/010.phpt
diff --git a/tests/aot/std-array/011.phpt b/tests/compiler/std-array/011.phpt
similarity index 100%
rename from tests/aot/std-array/011.phpt
rename to tests/compiler/std-array/011.phpt
diff --git a/tests/aot/std-array/012.phpt b/tests/compiler/std-array/012.phpt
similarity index 100%
rename from tests/aot/std-array/012.phpt
rename to tests/compiler/std-array/012.phpt
diff --git a/tests/aot/std-bigfloat/001.phpt b/tests/compiler/std-bigfloat/001.phpt
similarity index 100%
rename from tests/aot/std-bigfloat/001.phpt
rename to tests/compiler/std-bigfloat/001.phpt
diff --git a/tests/aot/std-bigint/001.phpt b/tests/compiler/std-bigint/001.phpt
similarity index 100%
rename from tests/aot/std-bigint/001.phpt
rename to tests/compiler/std-bigint/001.phpt
diff --git a/tests/aot/std-bigint/002.phpt b/tests/compiler/std-bigint/002.phpt
similarity index 100%
rename from tests/aot/std-bigint/002.phpt
rename to tests/compiler/std-bigint/002.phpt
diff --git a/tests/aot/std-bigint/003.phpt b/tests/compiler/std-bigint/003.phpt
similarity index 100%
rename from tests/aot/std-bigint/003.phpt
rename to tests/compiler/std-bigint/003.phpt
diff --git a/tests/aot/std-bigint/004.phpt b/tests/compiler/std-bigint/004.phpt
similarity index 100%
rename from tests/aot/std-bigint/004.phpt
rename to tests/compiler/std-bigint/004.phpt
diff --git a/tests/aot/std-decimal/001.phpt b/tests/compiler/std-decimal/001.phpt
similarity index 100%
rename from tests/aot/std-decimal/001.phpt
rename to tests/compiler/std-decimal/001.phpt
diff --git a/tests/aot/std-map/001.phpt b/tests/compiler/std-map/001.phpt
similarity index 100%
rename from tests/aot/std-map/001.phpt
rename to tests/compiler/std-map/001.phpt
diff --git a/tests/aot/std-map/002.phpt b/tests/compiler/std-map/002.phpt
similarity index 100%
rename from tests/aot/std-map/002.phpt
rename to tests/compiler/std-map/002.phpt
diff --git a/tests/aot/std-map/003.phpt b/tests/compiler/std-map/003.phpt
similarity index 100%
rename from tests/aot/std-map/003.phpt
rename to tests/compiler/std-map/003.phpt
diff --git a/tests/aot/std-map/004.phpt b/tests/compiler/std-map/004.phpt
similarity index 100%
rename from tests/aot/std-map/004.phpt
rename to tests/compiler/std-map/004.phpt
diff --git a/tests/aot/std-map/005.phpt b/tests/compiler/std-map/005.phpt
similarity index 100%
rename from tests/aot/std-map/005.phpt
rename to tests/compiler/std-map/005.phpt
diff --git a/tests/aot/std-map/006.phpt b/tests/compiler/std-map/006.phpt
similarity index 100%
rename from tests/aot/std-map/006.phpt
rename to tests/compiler/std-map/006.phpt
diff --git a/tests/aot/std-map/007.phpt b/tests/compiler/std-map/007.phpt
similarity index 100%
rename from tests/aot/std-map/007.phpt
rename to tests/compiler/std-map/007.phpt
diff --git a/tests/aot/std-map/008.phpt b/tests/compiler/std-map/008.phpt
similarity index 100%
rename from tests/aot/std-map/008.phpt
rename to tests/compiler/std-map/008.phpt
diff --git a/tests/aot/std-map/009.phpt b/tests/compiler/std-map/009.phpt
similarity index 100%
rename from tests/aot/std-map/009.phpt
rename to tests/compiler/std-map/009.phpt
diff --git a/tests/aot/std-map/010.phpt b/tests/compiler/std-map/010.phpt
similarity index 100%
rename from tests/aot/std-map/010.phpt
rename to tests/compiler/std-map/010.phpt
diff --git a/tests/aot/std-ordered-map/001.phpt b/tests/compiler/std-ordered-map/001.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/001.phpt
rename to tests/compiler/std-ordered-map/001.phpt
diff --git a/tests/aot/std-ordered-map/002.phpt b/tests/compiler/std-ordered-map/002.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/002.phpt
rename to tests/compiler/std-ordered-map/002.phpt
diff --git a/tests/aot/std-ordered-map/003.phpt b/tests/compiler/std-ordered-map/003.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/003.phpt
rename to tests/compiler/std-ordered-map/003.phpt
diff --git a/tests/aot/std-ordered-map/004.phpt b/tests/compiler/std-ordered-map/004.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/004.phpt
rename to tests/compiler/std-ordered-map/004.phpt
diff --git a/tests/aot/std-ordered-map/005.phpt b/tests/compiler/std-ordered-map/005.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/005.phpt
rename to tests/compiler/std-ordered-map/005.phpt
diff --git a/tests/aot/std-ordered-map/006.phpt b/tests/compiler/std-ordered-map/006.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/006.phpt
rename to tests/compiler/std-ordered-map/006.phpt
diff --git a/tests/aot/std-ordered-map/007.phpt b/tests/compiler/std-ordered-map/007.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/007.phpt
rename to tests/compiler/std-ordered-map/007.phpt
diff --git a/tests/aot/std-ordered-map/008.phpt b/tests/compiler/std-ordered-map/008.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/008.phpt
rename to tests/compiler/std-ordered-map/008.phpt
diff --git a/tests/aot/std-ordered-map/009.phpt b/tests/compiler/std-ordered-map/009.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/009.phpt
rename to tests/compiler/std-ordered-map/009.phpt
diff --git a/tests/aot/std-ordered-map/010.phpt b/tests/compiler/std-ordered-map/010.phpt
similarity index 100%
rename from tests/aot/std-ordered-map/010.phpt
rename to tests/compiler/std-ordered-map/010.phpt
diff --git a/tests/aot/std-stream/001.phpt b/tests/compiler/std-stream/001.phpt
similarity index 100%
rename from tests/aot/std-stream/001.phpt
rename to tests/compiler/std-stream/001.phpt
diff --git a/tests/aot/std-vector/001.phpt b/tests/compiler/std-vector/001.phpt
similarity index 100%
rename from tests/aot/std-vector/001.phpt
rename to tests/compiler/std-vector/001.phpt
diff --git a/tests/aot/std-vector/002.phpt b/tests/compiler/std-vector/002.phpt
similarity index 100%
rename from tests/aot/std-vector/002.phpt
rename to tests/compiler/std-vector/002.phpt
diff --git a/tests/aot/std-vector/003.phpt b/tests/compiler/std-vector/003.phpt
similarity index 100%
rename from tests/aot/std-vector/003.phpt
rename to tests/compiler/std-vector/003.phpt
diff --git a/tests/aot/std-vector/004.phpt b/tests/compiler/std-vector/004.phpt
similarity index 100%
rename from tests/aot/std-vector/004.phpt
rename to tests/compiler/std-vector/004.phpt
diff --git a/tests/aot/std-vector/005.phpt b/tests/compiler/std-vector/005.phpt
similarity index 100%
rename from tests/aot/std-vector/005.phpt
rename to tests/compiler/std-vector/005.phpt
diff --git a/tests/aot/std-vector/006.phpt b/tests/compiler/std-vector/006.phpt
similarity index 100%
rename from tests/aot/std-vector/006.phpt
rename to tests/compiler/std-vector/006.phpt
diff --git a/tests/aot/std-vector/007.phpt b/tests/compiler/std-vector/007.phpt
similarity index 100%
rename from tests/aot/std-vector/007.phpt
rename to tests/compiler/std-vector/007.phpt
diff --git a/tests/aot/std-vector/008.phpt b/tests/compiler/std-vector/008.phpt
similarity index 100%
rename from tests/aot/std-vector/008.phpt
rename to tests/compiler/std-vector/008.phpt
diff --git a/tests/aot/std-vector/009.phpt b/tests/compiler/std-vector/009.phpt
similarity index 100%
rename from tests/aot/std-vector/009.phpt
rename to tests/compiler/std-vector/009.phpt
diff --git a/tests/aot/std-vector/010.phpt b/tests/compiler/std-vector/010.phpt
similarity index 100%
rename from tests/aot/std-vector/010.phpt
rename to tests/compiler/std-vector/010.phpt
diff --git a/tests/aot/std-vector/011.phpt b/tests/compiler/std-vector/011.phpt
similarity index 100%
rename from tests/aot/std-vector/011.phpt
rename to tests/compiler/std-vector/011.phpt
diff --git a/tests/aot/std-vector/012.phpt b/tests/compiler/std-vector/012.phpt
similarity index 100%
rename from tests/aot/std-vector/012.phpt
rename to tests/compiler/std-vector/012.phpt
diff --git a/tests/aot/std-vector/013.phpt b/tests/compiler/std-vector/013.phpt
similarity index 100%
rename from tests/aot/std-vector/013.phpt
rename to tests/compiler/std-vector/013.phpt
diff --git a/tests/aot/std-vector/014.phpt b/tests/compiler/std-vector/014.phpt
similarity index 100%
rename from tests/aot/std-vector/014.phpt
rename to tests/compiler/std-vector/014.phpt
diff --git a/tests/aot/std-vector/015.phpt b/tests/compiler/std-vector/015.phpt
similarity index 100%
rename from tests/aot/std-vector/015.phpt
rename to tests/compiler/std-vector/015.phpt
diff --git a/tests/aot/stdlib/abs_edge.phpt b/tests/compiler/stdlib/abs_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/abs_edge.phpt
rename to tests/compiler/stdlib/abs_edge.phpt
diff --git a/tests/aot/stdlib/array_fill_edge.phpt b/tests/compiler/stdlib/array_fill_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/array_fill_edge.phpt
rename to tests/compiler/stdlib/array_fill_edge.phpt
diff --git a/tests/aot/stdlib/array_merge.phpt b/tests/compiler/stdlib/array_merge.phpt
similarity index 100%
rename from tests/aot/stdlib/array_merge.phpt
rename to tests/compiler/stdlib/array_merge.phpt
diff --git a/tests/aot/stdlib/array_search.phpt b/tests/compiler/stdlib/array_search.phpt
similarity index 100%
rename from tests/aot/stdlib/array_search.phpt
rename to tests/compiler/stdlib/array_search.phpt
diff --git a/tests/aot/stdlib/base64_edge.phpt b/tests/compiler/stdlib/base64_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/base64_edge.phpt
rename to tests/compiler/stdlib/base64_edge.phpt
diff --git a/tests/aot/stdlib/base_convert_edge.phpt b/tests/compiler/stdlib/base_convert_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/base_convert_edge.phpt
rename to tests/compiler/stdlib/base_convert_edge.phpt
diff --git a/tests/aot/stdlib/bindec_edge.phpt b/tests/compiler/stdlib/bindec_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/bindec_edge.phpt
rename to tests/compiler/stdlib/bindec_edge.phpt
diff --git a/tests/aot/stdlib/chr_ord_edge.phpt b/tests/compiler/stdlib/chr_ord_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/chr_ord_edge.phpt
rename to tests/compiler/stdlib/chr_ord_edge.phpt
diff --git a/tests/aot/stdlib/class-exists-class-constant.phpt b/tests/compiler/stdlib/class-exists-class-constant.phpt
similarity index 100%
rename from tests/aot/stdlib/class-exists-class-constant.phpt
rename to tests/compiler/stdlib/class-exists-class-constant.phpt
diff --git a/tests/aot/stdlib/class_exists.phpt b/tests/compiler/stdlib/class_exists.phpt
similarity index 100%
rename from tests/aot/stdlib/class_exists.phpt
rename to tests/compiler/stdlib/class_exists.phpt
diff --git a/tests/aot/stdlib/count_countable.phpt b/tests/compiler/stdlib/count_countable.phpt
similarity index 100%
rename from tests/aot/stdlib/count_countable.phpt
rename to tests/compiler/stdlib/count_countable.phpt
diff --git a/tests/aot/stdlib/count_type_error.phpt b/tests/compiler/stdlib/count_type_error.phpt
similarity index 100%
rename from tests/aot/stdlib/count_type_error.phpt
rename to tests/compiler/stdlib/count_type_error.phpt
diff --git a/tests/aot/stdlib/countable.phpt b/tests/compiler/stdlib/countable.phpt
similarity index 100%
rename from tests/aot/stdlib/countable.phpt
rename to tests/compiler/stdlib/countable.phpt
diff --git a/tests/aot/stdlib/dirname_basename.phpt b/tests/compiler/stdlib/dirname_basename.phpt
similarity index 100%
rename from tests/aot/stdlib/dirname_basename.phpt
rename to tests/compiler/stdlib/dirname_basename.phpt
diff --git a/tests/aot/stdlib/explode_edge.phpt b/tests/compiler/stdlib/explode_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/explode_edge.phpt
rename to tests/compiler/stdlib/explode_edge.phpt
diff --git a/tests/aot/stdlib/intdiv_edge.phpt b/tests/compiler/stdlib/intdiv_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/intdiv_edge.phpt
rename to tests/compiler/stdlib/intdiv_edge.phpt
diff --git a/tests/aot/stdlib/is_type_check.phpt b/tests/compiler/stdlib/is_type_check.phpt
similarity index 100%
rename from tests/aot/stdlib/is_type_check.phpt
rename to tests/compiler/stdlib/is_type_check.phpt
diff --git a/tests/aot/stdlib/log_edge.phpt b/tests/compiler/stdlib/log_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/log_edge.phpt
rename to tests/compiler/stdlib/log_edge.phpt
diff --git a/tests/aot/stdlib/math_base_is.phpt b/tests/compiler/stdlib/math_base_is.phpt
similarity index 100%
rename from tests/aot/stdlib/math_base_is.phpt
rename to tests/compiler/stdlib/math_base_is.phpt
diff --git a/tests/aot/stdlib/math_exp_log.phpt b/tests/compiler/stdlib/math_exp_log.phpt
similarity index 100%
rename from tests/aot/stdlib/math_exp_log.phpt
rename to tests/compiler/stdlib/math_exp_log.phpt
diff --git a/tests/aot/stdlib/math_trig.phpt b/tests/compiler/stdlib/math_trig.phpt
similarity index 100%
rename from tests/aot/stdlib/math_trig.phpt
rename to tests/compiler/stdlib/math_trig.phpt
diff --git a/tests/aot/stdlib/method-property-exists-dynamic.phpt b/tests/compiler/stdlib/method-property-exists-dynamic.phpt
similarity index 100%
rename from tests/aot/stdlib/method-property-exists-dynamic.phpt
rename to tests/compiler/stdlib/method-property-exists-dynamic.phpt
diff --git a/tests/aot/stdlib/misc_stdlib.phpt b/tests/compiler/stdlib/misc_stdlib.phpt
similarity index 100%
rename from tests/aot/stdlib/misc_stdlib.phpt
rename to tests/compiler/stdlib/misc_stdlib.phpt
diff --git a/tests/aot/stdlib/native-arg-eval-order.phpt b/tests/compiler/stdlib/native-arg-eval-order.phpt
similarity index 100%
rename from tests/aot/stdlib/native-arg-eval-order.phpt
rename to tests/compiler/stdlib/native-arg-eval-order.phpt
diff --git a/tests/aot/stdlib/null_optional_arg.phpt b/tests/compiler/stdlib/null_optional_arg.phpt
similarity index 100%
rename from tests/aot/stdlib/null_optional_arg.phpt
rename to tests/compiler/stdlib/null_optional_arg.phpt
diff --git a/tests/aot/stdlib/number_format_edge.phpt b/tests/compiler/stdlib/number_format_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/number_format_edge.phpt
rename to tests/compiler/stdlib/number_format_edge.phpt
diff --git a/tests/aot/stdlib/round_type_error.phpt b/tests/compiler/stdlib/round_type_error.phpt
similarity index 100%
rename from tests/aot/stdlib/round_type_error.phpt
rename to tests/compiler/stdlib/round_type_error.phpt
diff --git a/tests/aot/stdlib/str_repeat_edge.phpt b/tests/compiler/stdlib/str_repeat_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/str_repeat_edge.phpt
rename to tests/compiler/stdlib/str_repeat_edge.phpt
diff --git a/tests/aot/stdlib/string_case.phpt b/tests/compiler/stdlib/string_case.phpt
similarity index 100%
rename from tests/aot/stdlib/string_case.phpt
rename to tests/compiler/stdlib/string_case.phpt
diff --git a/tests/aot/stdlib/string_check.phpt b/tests/compiler/stdlib/string_check.phpt
similarity index 100%
rename from tests/aot/stdlib/string_check.phpt
rename to tests/compiler/stdlib/string_check.phpt
diff --git a/tests/aot/stdlib/string_cmp.phpt b/tests/compiler/stdlib/string_cmp.phpt
similarity index 100%
rename from tests/aot/stdlib/string_cmp.phpt
rename to tests/compiler/stdlib/string_cmp.phpt
diff --git a/tests/aot/stdlib/string_search.phpt b/tests/compiler/stdlib/string_search.phpt
similarity index 100%
rename from tests/aot/stdlib/string_search.phpt
rename to tests/compiler/stdlib/string_search.phpt
diff --git a/tests/aot/stdlib/strtotime_epoch.phpt b/tests/compiler/stdlib/strtotime_epoch.phpt
similarity index 100%
rename from tests/aot/stdlib/strtotime_epoch.phpt
rename to tests/compiler/stdlib/strtotime_epoch.phpt
diff --git a/tests/aot/stdlib/substr_edge.phpt b/tests/compiler/stdlib/substr_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/substr_edge.phpt
rename to tests/compiler/stdlib/substr_edge.phpt
diff --git a/tests/aot/stdlib/type_check.phpt b/tests/compiler/stdlib/type_check.phpt
similarity index 100%
rename from tests/aot/stdlib/type_check.phpt
rename to tests/compiler/stdlib/type_check.phpt
diff --git a/tests/aot/stdlib/type_conv.phpt b/tests/compiler/stdlib/type_conv.phpt
similarity index 100%
rename from tests/aot/stdlib/type_conv.phpt
rename to tests/compiler/stdlib/type_conv.phpt
diff --git a/tests/aot/stdlib/url_edge.phpt b/tests/compiler/stdlib/url_edge.phpt
similarity index 100%
rename from tests/aot/stdlib/url_edge.phpt
rename to tests/compiler/stdlib/url_edge.phpt
diff --git a/tests/aot/stdlib/version_compare_operator.phpt b/tests/compiler/stdlib/version_compare_operator.phpt
similarity index 100%
rename from tests/aot/stdlib/version_compare_operator.phpt
rename to tests/compiler/stdlib/version_compare_operator.phpt
diff --git a/tests/aot/stream_method/0.phpt b/tests/compiler/stream_method/0.phpt
similarity index 100%
rename from tests/aot/stream_method/0.phpt
rename to tests/compiler/stream_method/0.phpt
diff --git a/tests/aot/stream_method/1.phpt b/tests/compiler/stream_method/1.phpt
similarity index 100%
rename from tests/aot/stream_method/1.phpt
rename to tests/compiler/stream_method/1.phpt
diff --git a/tests/aot/stream_method/extension.phpt b/tests/compiler/stream_method/extension.phpt
similarity index 100%
rename from tests/aot/stream_method/extension.phpt
rename to tests/compiler/stream_method/extension.phpt
diff --git a/tests/aot/stream_method/stream_cast.phpt b/tests/compiler/stream_method/stream_cast.phpt
similarity index 100%
rename from tests/aot/stream_method/stream_cast.phpt
rename to tests/compiler/stream_method/stream_cast.phpt
diff --git a/tests/aot/strict_types/strict_types.phpt b/tests/compiler/strict_types/strict_types.phpt
similarity index 100%
rename from tests/aot/strict_types/strict_types.phpt
rename to tests/compiler/strict_types/strict_types.phpt
diff --git a/tests/aot/string_method/0.phpt b/tests/compiler/string_method/0.phpt
similarity index 100%
rename from tests/aot/string_method/0.phpt
rename to tests/compiler/string_method/0.phpt
diff --git a/tests/aot/string_method/1.phpt b/tests/compiler/string_method/1.phpt
similarity index 100%
rename from tests/aot/string_method/1.phpt
rename to tests/compiler/string_method/1.phpt
diff --git a/tests/aot/string_method/heredoc-nowdoc.phpt b/tests/compiler/string_method/heredoc-nowdoc.phpt
similarity index 100%
rename from tests/aot/string_method/heredoc-nowdoc.phpt
rename to tests/compiler/string_method/heredoc-nowdoc.phpt
diff --git a/tests/aot/string_method/json.phpt b/tests/compiler/string_method/json.phpt
similarity index 100%
rename from tests/aot/string_method/json.phpt
rename to tests/compiler/string_method/json.phpt
diff --git a/tests/aot/string_method/marshal.phpt b/tests/compiler/string_method/marshal.phpt
similarity index 100%
rename from tests/aot/string_method/marshal.phpt
rename to tests/compiler/string_method/marshal.phpt
diff --git a/tests/aot/string_method/match.phpt b/tests/compiler/string_method/match.phpt
similarity index 100%
rename from tests/aot/string_method/match.phpt
rename to tests/compiler/string_method/match.phpt
diff --git a/tests/aot/string_method/mbstring.phpt b/tests/compiler/string_method/mbstring.phpt
similarity index 100%
rename from tests/aot/string_method/mbstring.phpt
rename to tests/compiler/string_method/mbstring.phpt
diff --git a/tests/aot/string_method/method.phpt b/tests/compiler/string_method/method.phpt
similarity index 100%
rename from tests/aot/string_method/method.phpt
rename to tests/compiler/string_method/method.phpt
diff --git a/tests/aot/string_method/misc.phpt b/tests/compiler/string_method/misc.phpt
similarity index 100%
rename from tests/aot/string_method/misc.phpt
rename to tests/compiler/string_method/misc.phpt
diff --git a/tests/aot/string_method/str-offset-set.phpt b/tests/compiler/string_method/str-offset-set.phpt
similarity index 100%
rename from tests/aot/string_method/str-offset-set.phpt
rename to tests/compiler/string_method/str-offset-set.phpt
diff --git a/tests/aot/string_method/string-interpolation.phpt b/tests/compiler/string_method/string-interpolation.phpt
similarity index 100%
rename from tests/aot/string_method/string-interpolation.phpt
rename to tests/compiler/string_method/string-interpolation.phpt
diff --git a/tests/aot/string_method/string_functions.phpt b/tests/compiler/string_method/string_functions.phpt
similarity index 100%
rename from tests/aot/string_method/string_functions.phpt
rename to tests/compiler/string_method/string_functions.phpt
diff --git a/tests/aot/string_method/strlen.phpt b/tests/compiler/string_method/strlen.phpt
similarity index 100%
rename from tests/aot/string_method/strlen.phpt
rename to tests/compiler/string_method/strlen.phpt
diff --git a/tests/aot/string_method/to-str.phpt b/tests/compiler/string_method/to-str.phpt
similarity index 100%
rename from tests/aot/string_method/to-str.phpt
rename to tests/compiler/string_method/to-str.phpt
diff --git a/tests/aot/switch/001.phpt b/tests/compiler/switch/001.phpt
similarity index 100%
rename from tests/aot/switch/001.phpt
rename to tests/compiler/switch/001.phpt
diff --git a/tests/aot/switch/002.phpt b/tests/compiler/switch/002.phpt
similarity index 100%
rename from tests/aot/switch/002.phpt
rename to tests/compiler/switch/002.phpt
diff --git a/tests/aot/switch/003.phpt b/tests/compiler/switch/003.phpt
similarity index 100%
rename from tests/aot/switch/003.phpt
rename to tests/compiler/switch/003.phpt
diff --git a/tests/aot/switch/004.phpt b/tests/compiler/switch/004.phpt
similarity index 100%
rename from tests/aot/switch/004.phpt
rename to tests/compiler/switch/004.phpt
diff --git a/tests/aot/switch/default-before-matching-case.phpt b/tests/compiler/switch/default-before-matching-case.phpt
similarity index 100%
rename from tests/aot/switch/default-before-matching-case.phpt
rename to tests/compiler/switch/default-before-matching-case.phpt
diff --git a/tests/aot/switch/switch-side-effects.phpt b/tests/compiler/switch/switch-side-effects.phpt
similarity index 100%
rename from tests/aot/switch/switch-side-effects.phpt
rename to tests/compiler/switch/switch-side-effects.phpt
diff --git a/tests/aot/trait/001.phpt b/tests/compiler/trait/001.phpt
similarity index 100%
rename from tests/aot/trait/001.phpt
rename to tests/compiler/trait/001.phpt
diff --git a/tests/aot/trait/002.phpt b/tests/compiler/trait/002.phpt
similarity index 100%
rename from tests/aot/trait/002.phpt
rename to tests/compiler/trait/002.phpt
diff --git a/tests/aot/trait/003.phpt b/tests/compiler/trait/003.phpt
similarity index 100%
rename from tests/aot/trait/003.phpt
rename to tests/compiler/trait/003.phpt
diff --git a/tests/aot/trait/004.phpt b/tests/compiler/trait/004.phpt
similarity index 100%
rename from tests/aot/trait/004.phpt
rename to tests/compiler/trait/004.phpt
diff --git a/tests/aot/trait/005.phpt b/tests/compiler/trait/005.phpt
similarity index 100%
rename from tests/aot/trait/005.phpt
rename to tests/compiler/trait/005.phpt
diff --git a/tests/aot/trait/006.phpt b/tests/compiler/trait/006.phpt
similarity index 100%
rename from tests/aot/trait/006.phpt
rename to tests/compiler/trait/006.phpt
diff --git a/tests/aot/trait/007.phpt b/tests/compiler/trait/007.phpt
similarity index 100%
rename from tests/aot/trait/007.phpt
rename to tests/compiler/trait/007.phpt
diff --git a/tests/aot/trait/008.phpt b/tests/compiler/trait/008.phpt
similarity index 100%
rename from tests/aot/trait/008.phpt
rename to tests/compiler/trait/008.phpt
diff --git a/tests/aot/trait/009.phpt b/tests/compiler/trait/009.phpt
similarity index 100%
rename from tests/aot/trait/009.phpt
rename to tests/compiler/trait/009.phpt
diff --git a/tests/aot/trait/010.phpt b/tests/compiler/trait/010.phpt
similarity index 100%
rename from tests/aot/trait/010.phpt
rename to tests/compiler/trait/010.phpt
diff --git a/tests/aot/trait/011.phpt b/tests/compiler/trait/011.phpt
similarity index 100%
rename from tests/aot/trait/011.phpt
rename to tests/compiler/trait/011.phpt
diff --git a/tests/aot/trait/012.phpt b/tests/compiler/trait/012.phpt
similarity index 100%
rename from tests/aot/trait/012.phpt
rename to tests/compiler/trait/012.phpt
diff --git a/tests/aot/trait/013.phpt b/tests/compiler/trait/013.phpt
similarity index 100%
rename from tests/aot/trait/013.phpt
rename to tests/compiler/trait/013.phpt
diff --git a/tests/aot/trait/014.phpt b/tests/compiler/trait/014.phpt
similarity index 100%
rename from tests/aot/trait/014.phpt
rename to tests/compiler/trait/014.phpt
diff --git a/tests/aot/trait/015.phpt b/tests/compiler/trait/015.phpt
similarity index 100%
rename from tests/aot/trait/015.phpt
rename to tests/compiler/trait/015.phpt
diff --git a/tests/aot/trait/016.phpt b/tests/compiler/trait/016.phpt
similarity index 100%
rename from tests/aot/trait/016.phpt
rename to tests/compiler/trait/016.phpt
diff --git a/tests/aot/trait/017.phpt b/tests/compiler/trait/017.phpt
similarity index 100%
rename from tests/aot/trait/017.phpt
rename to tests/compiler/trait/017.phpt
diff --git a/tests/aot/trait/class-param.phpt b/tests/compiler/trait/class-param.phpt
similarity index 100%
rename from tests/aot/trait/class-param.phpt
rename to tests/compiler/trait/class-param.phpt
diff --git a/tests/aot/trait/magic-const.phpt b/tests/compiler/trait/magic-const.phpt
similarity index 100%
rename from tests/aot/trait/magic-const.phpt
rename to tests/compiler/trait/magic-const.phpt
diff --git a/tests/aot/trait/nullable-class-param.phpt b/tests/compiler/trait/nullable-class-param.phpt
similarity index 100%
rename from tests/aot/trait/nullable-class-param.phpt
rename to tests/compiler/trait/nullable-class-param.phpt
diff --git a/tests/aot/trait/trait-basic.phpt b/tests/compiler/trait/trait-basic.phpt
similarity index 100%
rename from tests/aot/trait/trait-basic.phpt
rename to tests/compiler/trait/trait-basic.phpt
diff --git a/tests/aot/type_decl/001.phpt b/tests/compiler/type_decl/001.phpt
similarity index 100%
rename from tests/aot/type_decl/001.phpt
rename to tests/compiler/type_decl/001.phpt
diff --git a/tests/aot/type_decl/002.phpt b/tests/compiler/type_decl/002.phpt
similarity index 100%
rename from tests/aot/type_decl/002.phpt
rename to tests/compiler/type_decl/002.phpt
diff --git a/tests/aot/type_decl/003.phpt b/tests/compiler/type_decl/003.phpt
similarity index 100%
rename from tests/aot/type_decl/003.phpt
rename to tests/compiler/type_decl/003.phpt
diff --git a/tests/aot/type_decl/004.phpt b/tests/compiler/type_decl/004.phpt
similarity index 100%
rename from tests/aot/type_decl/004.phpt
rename to tests/compiler/type_decl/004.phpt
diff --git a/tests/aot/type_decl/005.phpt b/tests/compiler/type_decl/005.phpt
similarity index 100%
rename from tests/aot/type_decl/005.phpt
rename to tests/compiler/type_decl/005.phpt
diff --git a/tests/aot/type_decl/006.phpt b/tests/compiler/type_decl/006.phpt
similarity index 100%
rename from tests/aot/type_decl/006.phpt
rename to tests/compiler/type_decl/006.phpt
diff --git a/tests/aot/type_decl/007.phpt b/tests/compiler/type_decl/007.phpt
similarity index 100%
rename from tests/aot/type_decl/007.phpt
rename to tests/compiler/type_decl/007.phpt
diff --git a/tests/aot/type_decl/008.phpt b/tests/compiler/type_decl/008.phpt
similarity index 100%
rename from tests/aot/type_decl/008.phpt
rename to tests/compiler/type_decl/008.phpt
diff --git a/tests/aot/type_decl/009.phpt b/tests/compiler/type_decl/009.phpt
similarity index 100%
rename from tests/aot/type_decl/009.phpt
rename to tests/compiler/type_decl/009.phpt
diff --git a/tests/aot/type_decl/010.phpt b/tests/compiler/type_decl/010.phpt
similarity index 100%
rename from tests/aot/type_decl/010.phpt
rename to tests/compiler/type_decl/010.phpt
diff --git a/tests/aot/type_decl/011.phpt b/tests/compiler/type_decl/011.phpt
similarity index 100%
rename from tests/aot/type_decl/011.phpt
rename to tests/compiler/type_decl/011.phpt
diff --git a/tests/aot/type_decl/012.phpt b/tests/compiler/type_decl/012.phpt
similarity index 100%
rename from tests/aot/type_decl/012.phpt
rename to tests/compiler/type_decl/012.phpt
diff --git a/tests/aot/type_decl/013.phpt b/tests/compiler/type_decl/013.phpt
similarity index 100%
rename from tests/aot/type_decl/013.phpt
rename to tests/compiler/type_decl/013.phpt
diff --git a/tests/aot/type_decl/014.phpt b/tests/compiler/type_decl/014.phpt
similarity index 100%
rename from tests/aot/type_decl/014.phpt
rename to tests/compiler/type_decl/014.phpt
diff --git a/tests/aot/type_decl/composite-static-edge-cases.phpt b/tests/compiler/type_decl/composite-static-edge-cases.phpt
similarity index 100%
rename from tests/aot/type_decl/composite-static-edge-cases.phpt
rename to tests/compiler/type_decl/composite-static-edge-cases.phpt
diff --git a/tests/aot/type_decl/intersection-param-check.phpt b/tests/compiler/type_decl/intersection-param-check.phpt
similarity index 100%
rename from tests/aot/type_decl/intersection-param-check.phpt
rename to tests/compiler/type_decl/intersection-param-check.phpt
diff --git a/tests/aot/type_decl/intersection-return-check.phpt b/tests/compiler/type_decl/intersection-return-check.phpt
similarity index 100%
rename from tests/aot/type_decl/intersection-return-check.phpt
rename to tests/compiler/type_decl/intersection-return-check.phpt
diff --git a/tests/aot/type_decl/nullable-required-param-check.phpt b/tests/compiler/type_decl/nullable-required-param-check.phpt
similarity index 100%
rename from tests/aot/type_decl/nullable-required-param-check.phpt
rename to tests/compiler/type_decl/nullable-required-param-check.phpt
diff --git a/tests/aot/type_decl/union-intersection-types.phpt b/tests/compiler/type_decl/union-intersection-types.phpt
similarity index 100%
rename from tests/aot/type_decl/union-intersection-types.phpt
rename to tests/compiler/type_decl/union-intersection-types.phpt
diff --git a/tests/aot/type_decl/union-param-check.phpt b/tests/compiler/type_decl/union-param-check.phpt
similarity index 100%
rename from tests/aot/type_decl/union-param-check.phpt
rename to tests/compiler/type_decl/union-param-check.phpt
diff --git a/tests/aot/type_decl/union-return-check.phpt b/tests/compiler/type_decl/union-return-check.phpt
similarity index 100%
rename from tests/aot/type_decl/union-return-check.phpt
rename to tests/compiler/type_decl/union-return-check.phpt
diff --git a/tests/aot/type_decl/variadic-union-param-check.phpt b/tests/compiler/type_decl/variadic-union-param-check.phpt
similarity index 100%
rename from tests/aot/type_decl/variadic-union-param-check.phpt
rename to tests/compiler/type_decl/variadic-union-param-check.phpt
diff --git a/tests/aot/type_hits/001.phpt b/tests/compiler/type_hits/001.phpt
similarity index 100%
rename from tests/aot/type_hits/001.phpt
rename to tests/compiler/type_hits/001.phpt
diff --git a/tests/aot/type_hits/002.phpt b/tests/compiler/type_hits/002.phpt
similarity index 100%
rename from tests/aot/type_hits/002.phpt
rename to tests/compiler/type_hits/002.phpt
diff --git a/tests/aot/type_hits/003.phpt b/tests/compiler/type_hits/003.phpt
similarity index 100%
rename from tests/aot/type_hits/003.phpt
rename to tests/compiler/type_hits/003.phpt
diff --git a/tests/aot/type_hits/004.phpt b/tests/compiler/type_hits/004.phpt
similarity index 100%
rename from tests/aot/type_hits/004.phpt
rename to tests/compiler/type_hits/004.phpt
diff --git a/tests/aot/type_hits/005.phpt b/tests/compiler/type_hits/005.phpt
similarity index 100%
rename from tests/aot/type_hits/005.phpt
rename to tests/compiler/type_hits/005.phpt
diff --git a/tests/aot/type_hits/006.phpt b/tests/compiler/type_hits/006.phpt
similarity index 100%
rename from tests/aot/type_hits/006.phpt
rename to tests/compiler/type_hits/006.phpt
diff --git a/tests/aot/type_hits/007.phpt b/tests/compiler/type_hits/007.phpt
similarity index 100%
rename from tests/aot/type_hits/007.phpt
rename to tests/compiler/type_hits/007.phpt
diff --git a/tests/aot/type_hits/008.phpt b/tests/compiler/type_hits/008.phpt
similarity index 100%
rename from tests/aot/type_hits/008.phpt
rename to tests/compiler/type_hits/008.phpt
diff --git a/tests/aot/type_hits/009.phpt b/tests/compiler/type_hits/009.phpt
similarity index 100%
rename from tests/aot/type_hits/009.phpt
rename to tests/compiler/type_hits/009.phpt
diff --git a/tests/aot/type_hits/010.phpt b/tests/compiler/type_hits/010.phpt
similarity index 100%
rename from tests/aot/type_hits/010.phpt
rename to tests/compiler/type_hits/010.phpt
diff --git a/tests/aot/type_hits/011.phpt b/tests/compiler/type_hits/011.phpt
similarity index 100%
rename from tests/aot/type_hits/011.phpt
rename to tests/compiler/type_hits/011.phpt
diff --git a/tests/aot/type_hits/interface.phpt b/tests/compiler/type_hits/interface.phpt
similarity index 100%
rename from tests/aot/type_hits/interface.phpt
rename to tests/compiler/type_hits/interface.phpt
diff --git a/tests/aot/type_hits/native-type.phpt b/tests/compiler/type_hits/native-type.phpt
similarity index 100%
rename from tests/aot/type_hits/native-type.phpt
rename to tests/compiler/type_hits/native-type.phpt
diff --git a/tests/aot/universal_method/object_extension.phpt b/tests/compiler/universal_method/object_extension.phpt
similarity index 100%
rename from tests/aot/universal_method/object_extension.phpt
rename to tests/compiler/universal_method/object_extension.phpt
diff --git a/tests/aot/universal_method/object_extension_exact_name.phpt b/tests/compiler/universal_method/object_extension_exact_name.phpt
similarity index 100%
rename from tests/aot/universal_method/object_extension_exact_name.phpt
rename to tests/compiler/universal_method/object_extension_exact_name.phpt
diff --git a/tests/aot/universal_method/universal_method_call.phpt b/tests/compiler/universal_method/universal_method_call.phpt
similarity index 100%
rename from tests/aot/universal_method/universal_method_call.phpt
rename to tests/compiler/universal_method/universal_method_call.phpt
diff --git a/tests/aot/universal_method/universal_method_expr.phpt b/tests/compiler/universal_method/universal_method_expr.phpt
similarity index 100%
rename from tests/aot/universal_method/universal_method_expr.phpt
rename to tests/compiler/universal_method/universal_method_expr.phpt
diff --git a/tests/aot/universal_method/universal_method_extension.phpt b/tests/compiler/universal_method/universal_method_extension.phpt
similarity index 100%
rename from tests/aot/universal_method/universal_method_extension.phpt
rename to tests/compiler/universal_method/universal_method_extension.phpt
diff --git a/tests/aot/universal_method/universal_method_extension_camel.phpt b/tests/compiler/universal_method/universal_method_extension_camel.phpt
similarity index 100%
rename from tests/aot/universal_method/universal_method_extension_camel.phpt
rename to tests/compiler/universal_method/universal_method_extension_camel.phpt
diff --git a/tests/aot/universal_method/universal_method_extension_chain.phpt b/tests/compiler/universal_method/universal_method_extension_chain.phpt
similarity index 100%
rename from tests/aot/universal_method/universal_method_extension_chain.phpt
rename to tests/compiler/universal_method/universal_method_extension_chain.phpt
diff --git a/tests/aot/universal_method/universal_method_internal.phpt b/tests/compiler/universal_method/universal_method_internal.phpt
similarity index 100%
rename from tests/aot/universal_method/universal_method_internal.phpt
rename to tests/compiler/universal_method/universal_method_internal.phpt
diff --git a/tests/aot/var_convert/001.phpt b/tests/compiler/var_convert/001.phpt
similarity index 100%
rename from tests/aot/var_convert/001.phpt
rename to tests/compiler/var_convert/001.phpt
diff --git a/tests/aot/var_convert/002.phpt b/tests/compiler/var_convert/002.phpt
similarity index 100%
rename from tests/aot/var_convert/002.phpt
rename to tests/compiler/var_convert/002.phpt
diff --git a/tests/aot/var_convert/003.phpt b/tests/compiler/var_convert/003.phpt
similarity index 100%
rename from tests/aot/var_convert/003.phpt
rename to tests/compiler/var_convert/003.phpt
diff --git a/tests/aot/variadic/calculator.phpt b/tests/compiler/variadic/calculator.phpt
similarity index 100%
rename from tests/aot/variadic/calculator.phpt
rename to tests/compiler/variadic/calculator.phpt
diff --git a/tests/aot/variadic/misc.phpt b/tests/compiler/variadic/misc.phpt
similarity index 100%
rename from tests/aot/variadic/misc.phpt
rename to tests/compiler/variadic/misc.phpt
diff --git a/tests/aot/variadic/multiply.phpt b/tests/compiler/variadic/multiply.phpt
similarity index 100%
rename from tests/aot/variadic/multiply.phpt
rename to tests/compiler/variadic/multiply.phpt
diff --git a/tests/aot/variadic/sum.phpt b/tests/compiler/variadic/sum.phpt
similarity index 100%
rename from tests/aot/variadic/sum.phpt
rename to tests/compiler/variadic/sum.phpt
diff --git a/tests/aot/variadic/variadic-args.phpt b/tests/compiler/variadic/variadic-args.phpt
similarity index 100%
rename from tests/aot/variadic/variadic-args.phpt
rename to tests/compiler/variadic/variadic-args.phpt
diff --git a/tests/aot/symfony/anonymous-class-service-locator.phpt b/tests/project/symfony/anonymous-class-service-locator.phpt
similarity index 100%
rename from tests/aot/symfony/anonymous-class-service-locator.phpt
rename to tests/project/symfony/anonymous-class-service-locator.phpt
diff --git a/tests/aot/symfony/anonymous-exception-interface.phpt b/tests/project/symfony/anonymous-exception-interface.phpt
similarity index 100%
rename from tests/aot/symfony/anonymous-exception-interface.phpt
rename to tests/project/symfony/anonymous-exception-interface.phpt
diff --git a/tests/aot/symfony/anonymous-iteratoraggregate-cache.phpt b/tests/project/symfony/anonymous-iteratoraggregate-cache.phpt
similarity index 100%
rename from tests/aot/symfony/anonymous-iteratoraggregate-cache.phpt
rename to tests/project/symfony/anonymous-iteratoraggregate-cache.phpt
diff --git a/tests/aot/symfony/array-map-first-class-builtin.phpt b/tests/project/symfony/array-map-first-class-builtin.phpt
similarity index 100%
rename from tests/aot/symfony/array-map-first-class-builtin.phpt
rename to tests/project/symfony/array-map-first-class-builtin.phpt
diff --git a/tests/aot/symfony/array-map-first-class-object-method.phpt b/tests/project/symfony/array-map-first-class-object-method.phpt
similarity index 100%
rename from tests/aot/symfony/array-map-first-class-object-method.phpt
rename to tests/project/symfony/array-map-first-class-object-method.phpt
diff --git a/tests/aot/symfony/array-map-first-class-static-method.phpt b/tests/project/symfony/array-map-first-class-static-method.phpt
similarity index 100%
rename from tests/aot/symfony/array-map-first-class-static-method.phpt
rename to tests/project/symfony/array-map-first-class-static-method.phpt
diff --git a/tests/aot/symfony/array-push-unpack-static-recursion.phpt b/tests/project/symfony/array-push-unpack-static-recursion.phpt
similarity index 100%
rename from tests/aot/symfony/array-push-unpack-static-recursion.phpt
rename to tests/project/symfony/array-push-unpack-static-recursion.phpt
diff --git a/tests/aot/symfony/array-reduce-directive-string.phpt b/tests/project/symfony/array-reduce-directive-string.phpt
similarity index 100%
rename from tests/aot/symfony/array-reduce-directive-string.phpt
rename to tests/project/symfony/array-reduce-directive-string.phpt
diff --git a/tests/aot/symfony/array-spread-coalesce-precedence.phpt b/tests/project/symfony/array-spread-coalesce-precedence.phpt
similarity index 100%
rename from tests/aot/symfony/array-spread-coalesce-precedence.phpt
rename to tests/project/symfony/array-spread-coalesce-precedence.phpt
diff --git a/tests/aot/symfony/array-uintersect-spaceship.phpt b/tests/project/symfony/array-uintersect-spaceship.phpt
similarity index 100%
rename from tests/aot/symfony/array-uintersect-spaceship.phpt
rename to tests/project/symfony/array-uintersect-spaceship.phpt
diff --git a/tests/aot/symfony/arrow-throw-expression.phpt b/tests/project/symfony/arrow-throw-expression.phpt
similarity index 100%
rename from tests/aot/symfony/arrow-throw-expression.phpt
rename to tests/project/symfony/arrow-throw-expression.phpt
diff --git a/tests/aot/symfony/assetmapper-match-statement-side-effects.phpt b/tests/project/symfony/assetmapper-match-statement-side-effects.phpt
similarity index 100%
rename from tests/aot/symfony/assetmapper-match-statement-side-effects.phpt
rename to tests/project/symfony/assetmapper-match-statement-side-effects.phpt
diff --git a/tests/aot/symfony/assetmapper-uasort-array-spread-compare.phpt b/tests/project/symfony/assetmapper-uasort-array-spread-compare.phpt
similarity index 100%
rename from tests/aot/symfony/assetmapper-uasort-array-spread-compare.phpt
rename to tests/project/symfony/assetmapper-uasort-array-spread-compare.phpt
diff --git a/tests/aot/symfony/attribute-class-constant-args.phpt b/tests/project/symfony/attribute-class-constant-args.phpt
similarity index 100%
rename from tests/aot/symfony/attribute-class-constant-args.phpt
rename to tests/project/symfony/attribute-class-constant-args.phpt
diff --git a/tests/aot/symfony/attribute-loader-match-true-side-effects.phpt b/tests/project/symfony/attribute-loader-match-true-side-effects.phpt
similarity index 100%
rename from tests/aot/symfony/attribute-loader-match-true-side-effects.phpt
rename to tests/project/symfony/attribute-loader-match-true-side-effects.phpt
diff --git a/tests/aot/symfony/attribute-named-args-reflection.phpt b/tests/project/symfony/attribute-named-args-reflection.phpt
similarity index 100%
rename from tests/aot/symfony/attribute-named-args-reflection.phpt
rename to tests/project/symfony/attribute-named-args-reflection.phpt
diff --git a/tests/aot/symfony/autowire-target-nullsafe-coalesce-assign.phpt b/tests/project/symfony/autowire-target-nullsafe-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/autowire-target-nullsafe-coalesce-assign.phpt
rename to tests/project/symfony/autowire-target-nullsafe-coalesce-assign.phpt
diff --git a/tests/aot/symfony/bluesky-media-associative-destructuring.phpt b/tests/project/symfony/bluesky-media-associative-destructuring.phpt
similarity index 100%
rename from tests/aot/symfony/bluesky-media-associative-destructuring.phpt
rename to tests/project/symfony/bluesky-media-associative-destructuring.phpt
diff --git a/tests/aot/symfony/cache-static-coalesce-negation-precedence.phpt b/tests/project/symfony/cache-static-coalesce-negation-precedence.phpt
similarity index 100%
rename from tests/aot/symfony/cache-static-coalesce-negation-precedence.phpt
rename to tests/project/symfony/cache-static-coalesce-negation-precedence.phpt
diff --git a/tests/aot/symfony/callable-variable-first-class.phpt b/tests/project/symfony/callable-variable-first-class.phpt
similarity index 100%
rename from tests/aot/symfony/callable-variable-first-class.phpt
rename to tests/project/symfony/callable-variable-first-class.phpt
diff --git a/tests/aot/symfony/clock-timezone-coalesce-clone.phpt b/tests/project/symfony/clock-timezone-coalesce-clone.phpt
similarity index 100%
rename from tests/aot/symfony/clock-timezone-coalesce-clone.phpt
rename to tests/project/symfony/clock-timezone-coalesce-clone.phpt
diff --git a/tests/aot/symfony/closure-bind-private-access.phpt b/tests/project/symfony/closure-bind-private-access.phpt
similarity index 100%
rename from tests/aot/symfony/closure-bind-private-access.phpt
rename to tests/project/symfony/closure-bind-private-access.phpt
diff --git a/tests/aot/symfony/closure-bind-reference-property.phpt b/tests/project/symfony/closure-bind-reference-property.phpt
similarity index 100%
rename from tests/aot/symfony/closure-bind-reference-property.phpt
rename to tests/project/symfony/closure-bind-reference-property.phpt
diff --git a/tests/aot/symfony/coalesce-assign-comparison-precedence.phpt b/tests/project/symfony/coalesce-assign-comparison-precedence.phpt
similarity index 100%
rename from tests/aot/symfony/coalesce-assign-comparison-precedence.phpt
rename to tests/project/symfony/coalesce-assign-comparison-precedence.phpt
diff --git a/tests/aot/symfony/coalesce-assign-union-static-return.phpt b/tests/project/symfony/coalesce-assign-union-static-return.phpt
similarity index 100%
rename from tests/aot/symfony/coalesce-assign-union-static-return.phpt
rename to tests/project/symfony/coalesce-assign-union-static-return.phpt
diff --git a/tests/aot/symfony/conditional-first-class-callable-property.phpt b/tests/project/symfony/conditional-first-class-callable-property.phpt
similarity index 100%
rename from tests/aot/symfony/conditional-first-class-callable-property.phpt
rename to tests/project/symfony/conditional-first-class-callable-property.phpt
diff --git a/tests/aot/symfony/config-glob-recursive-callback-filter.phpt b/tests/project/symfony/config-glob-recursive-callback-filter.phpt
similarity index 100%
rename from tests/aot/symfony/config-glob-recursive-callback-filter.phpt
rename to tests/project/symfony/config-glob-recursive-callback-filter.phpt
diff --git a/tests/aot/symfony/config-loader-resource-message.phpt b/tests/project/symfony/config-loader-resource-message.phpt
similarity index 100%
rename from tests/aot/symfony/config-loader-resource-message.phpt
rename to tests/project/symfony/config-loader-resource-message.phpt
diff --git a/tests/aot/symfony/config-resource-iterator-cache.phpt b/tests/project/symfony/config-resource-iterator-cache.phpt
similarity index 100%
rename from tests/aot/symfony/config-resource-iterator-cache.phpt
rename to tests/project/symfony/config-resource-iterator-cache.phpt
diff --git a/tests/aot/symfony/configurator-magic-call-dynamic-setter.phpt b/tests/project/symfony/configurator-magic-call-dynamic-setter.phpt
similarity index 100%
rename from tests/aot/symfony/configurator-magic-call-dynamic-setter.phpt
rename to tests/project/symfony/configurator-magic-call-dynamic-setter.phpt
diff --git a/tests/aot/symfony/console-attribute-nullsafe-coalesce-assign.phpt b/tests/project/symfony/console-attribute-nullsafe-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/console-attribute-nullsafe-coalesce-assign.phpt
rename to tests/project/symfony/console-attribute-nullsafe-coalesce-assign.phpt
diff --git a/tests/aot/symfony/console-input-unparse-match-array-map.phpt b/tests/project/symfony/console-input-unparse-match-array-map.phpt
similarity index 100%
rename from tests/aot/symfony/console-input-unparse-match-array-map.phpt
rename to tests/project/symfony/console-input-unparse-match-array-map.phpt
diff --git a/tests/aot/symfony/console-question-iterable-cache-closure.phpt b/tests/project/symfony/console-question-iterable-cache-closure.phpt
similarity index 100%
rename from tests/aot/symfony/console-question-iterable-cache-closure.phpt
rename to tests/project/symfony/console-question-iterable-cache-closure.phpt
diff --git a/tests/aot/symfony/console-tree-node-from-values.phpt b/tests/project/symfony/console-tree-node-from-values.phpt
similarity index 100%
rename from tests/aot/symfony/console-tree-node-from-values.phpt
rename to tests/project/symfony/console-tree-node-from-values.phpt
diff --git a/tests/aot/symfony/container-arguments-array-combine-normalize.phpt b/tests/project/symfony/container-arguments-array-combine-normalize.phpt
similarity index 100%
rename from tests/aot/symfony/container-arguments-array-combine-normalize.phpt
rename to tests/project/symfony/container-arguments-array-combine-normalize.phpt
diff --git a/tests/aot/symfony/container-dynamic-registry-coalesce.phpt b/tests/project/symfony/container-dynamic-registry-coalesce.phpt
similarity index 100%
rename from tests/aot/symfony/container-dynamic-registry-coalesce.phpt
rename to tests/project/symfony/container-dynamic-registry-coalesce.phpt
diff --git a/tests/aot/symfony/container-first-class-method-cache.phpt b/tests/project/symfony/container-first-class-method-cache.phpt
similarity index 100%
rename from tests/aot/symfony/container-first-class-method-cache.phpt
rename to tests/project/symfony/container-first-class-method-cache.phpt
diff --git a/tests/aot/symfony/container-static-first-class-fallback.phpt b/tests/project/symfony/container-static-first-class-fallback.phpt
similarity index 100%
rename from tests/aot/symfony/container-static-first-class-fallback.phpt
rename to tests/project/symfony/container-static-first-class-fallback.phpt
diff --git a/tests/aot/symfony/context-array-union.phpt b/tests/project/symfony/context-array-union.phpt
similarity index 100%
rename from tests/aot/symfony/context-array-union.phpt
rename to tests/project/symfony/context-array-union.phpt
diff --git a/tests/aot/symfony/contracts-reflection-type-string-fallback.phpt b/tests/project/symfony/contracts-reflection-type-string-fallback.phpt
similarity index 100%
rename from tests/aot/symfony/contracts-reflection-type-string-fallback.phpt
rename to tests/project/symfony/contracts-reflection-type-string-fallback.phpt
diff --git a/tests/aot/symfony/controller-reflector-match-unpack.phpt b/tests/project/symfony/controller-reflector-match-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/controller-reflector-match-unpack.phpt
rename to tests/project/symfony/controller-reflector-match-unpack.phpt
diff --git a/tests/aot/symfony/countable-object-count.phpt b/tests/project/symfony/countable-object-count.phpt
similarity index 100%
rename from tests/aot/symfony/countable-object-count.phpt
rename to tests/project/symfony/countable-object-count.phpt
diff --git a/tests/aot/symfony/cssselector-unicode-escape-callback.phpt b/tests/project/symfony/cssselector-unicode-escape-callback.phpt
similarity index 100%
rename from tests/aot/symfony/cssselector-unicode-escape-callback.phpt
rename to tests/project/symfony/cssselector-unicode-escape-callback.phpt
diff --git a/tests/aot/symfony/current-find-with-static-filter.phpt b/tests/project/symfony/current-find-with-static-filter.phpt
similarity index 100%
rename from tests/aot/symfony/current-find-with-static-filter.phpt
rename to tests/project/symfony/current-find-with-static-filter.phpt
diff --git a/tests/aot/symfony/doctrine-manager-match-assignment-condition.phpt b/tests/project/symfony/doctrine-manager-match-assignment-condition.phpt
similarity index 100%
rename from tests/aot/symfony/doctrine-manager-match-assignment-condition.phpt
rename to tests/project/symfony/doctrine-manager-match-assignment-condition.phpt
diff --git a/tests/aot/symfony/doctrine-mapentity-clone-defaults.phpt b/tests/project/symfony/doctrine-mapentity-clone-defaults.phpt
similarity index 100%
rename from tests/aot/symfony/doctrine-mapentity-clone-defaults.phpt
rename to tests/project/symfony/doctrine-mapentity-clone-defaults.phpt
diff --git a/tests/aot/symfony/domcrawler-form-php-values.phpt b/tests/project/symfony/domcrawler-form-php-values.phpt
similarity index 100%
rename from tests/aot/symfony/domcrawler-form-php-values.phpt
rename to tests/project/symfony/domcrawler-form-php-values.phpt
diff --git a/tests/aot/symfony/dotenv-protect-escaped-dollars.phpt b/tests/project/symfony/dotenv-protect-escaped-dollars.phpt
similarity index 100%
rename from tests/aot/symfony/dotenv-protect-escaped-dollars.phpt
rename to tests/project/symfony/dotenv-protect-escaped-dollars.phpt
diff --git a/tests/aot/symfony/dynamic-class-new-with-null-coalesce.phpt b/tests/project/symfony/dynamic-class-new-with-null-coalesce.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-class-new-with-null-coalesce.phpt
rename to tests/project/symfony/dynamic-class-new-with-null-coalesce.phpt
diff --git a/tests/aot/symfony/dynamic-constant-enum-case.phpt b/tests/project/symfony/dynamic-constant-enum-case.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-constant-enum-case.phpt
rename to tests/project/symfony/dynamic-constant-enum-case.phpt
diff --git a/tests/aot/symfony/dynamic-enum-tryfrom-throw.phpt b/tests/project/symfony/dynamic-enum-tryfrom-throw.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-enum-tryfrom-throw.phpt
rename to tests/project/symfony/dynamic-enum-tryfrom-throw.phpt
diff --git a/tests/aot/symfony/dynamic-first-class-callable-branch.phpt b/tests/project/symfony/dynamic-first-class-callable-branch.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-first-class-callable-branch.phpt
rename to tests/project/symfony/dynamic-first-class-callable-branch.phpt
diff --git a/tests/aot/symfony/dynamic-instanceof-filter.phpt b/tests/project/symfony/dynamic-instanceof-filter.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-instanceof-filter.phpt
rename to tests/project/symfony/dynamic-instanceof-filter.phpt
diff --git a/tests/aot/symfony/dynamic-method-forward-unpack.phpt b/tests/project/symfony/dynamic-method-forward-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-method-forward-unpack.phpt
rename to tests/project/symfony/dynamic-method-forward-unpack.phpt
diff --git a/tests/aot/symfony/dynamic-static-property-multidim-isset.phpt b/tests/project/symfony/dynamic-static-property-multidim-isset.phpt
similarity index 100%
rename from tests/aot/symfony/dynamic-static-property-multidim-isset.phpt
rename to tests/project/symfony/dynamic-static-property-multidim-isset.phpt
diff --git a/tests/aot/symfony/enum-case-class-coalesce.phpt b/tests/project/symfony/enum-case-class-coalesce.phpt
similarity index 100%
rename from tests/aot/symfony/enum-case-class-coalesce.phpt
rename to tests/project/symfony/enum-case-class-coalesce.phpt
diff --git a/tests/aot/symfony/enum-match-throw.phpt b/tests/project/symfony/enum-match-throw.phpt
similarity index 100%
rename from tests/aot/symfony/enum-match-throw.phpt
rename to tests/project/symfony/enum-match-throw.phpt
diff --git a/tests/aot/symfony/env-array-diff-ukey-union.phpt b/tests/project/symfony/env-array-diff-ukey-union.phpt
similarity index 100%
rename from tests/aot/symfony/env-array-diff-ukey-union.phpt
rename to tests/project/symfony/env-array-diff-ukey-union.phpt
diff --git a/tests/aot/symfony/error-handler-arrow-throw.phpt b/tests/project/symfony/error-handler-arrow-throw.phpt
similarity index 100%
rename from tests/aot/symfony/error-handler-arrow-throw.phpt
rename to tests/project/symfony/error-handler-arrow-throw.phpt
diff --git a/tests/aot/symfony/error-handler-finally-first-class.phpt b/tests/project/symfony/error-handler-finally-first-class.phpt
similarity index 100%
rename from tests/aot/symfony/error-handler-finally-first-class.phpt
rename to tests/project/symfony/error-handler-finally-first-class.phpt
diff --git a/tests/aot/symfony/error-handler-ternary-throw.phpt b/tests/project/symfony/error-handler-ternary-throw.phpt
similarity index 100%
rename from tests/aot/symfony/error-handler-ternary-throw.phpt
rename to tests/project/symfony/error-handler-ternary-throw.phpt
diff --git a/tests/aot/symfony/errorhandler-coalesce-assign-negated-condition.phpt b/tests/project/symfony/errorhandler-coalesce-assign-negated-condition.phpt
similarity index 100%
rename from tests/aot/symfony/errorhandler-coalesce-assign-negated-condition.phpt
rename to tests/project/symfony/errorhandler-coalesce-assign-negated-condition.phpt
diff --git a/tests/aot/symfony/errorhandler-stringable-context.phpt b/tests/project/symfony/errorhandler-stringable-context.phpt
similarity index 100%
rename from tests/aot/symfony/errorhandler-stringable-context.phpt
rename to tests/project/symfony/errorhandler-stringable-context.phpt
diff --git a/tests/aot/symfony/event-class-coalesce-assign.phpt b/tests/project/symfony/event-class-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/event-class-coalesce-assign.phpt
rename to tests/project/symfony/event-class-coalesce-assign.phpt
diff --git a/tests/aot/symfony/event-listener-array-coalesce-assign.phpt b/tests/project/symfony/event-listener-array-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/event-listener-array-coalesce-assign.phpt
rename to tests/project/symfony/event-listener-array-coalesce-assign.phpt
diff --git a/tests/aot/symfony/eventdispatcher-wrapped-listener-cache.phpt b/tests/project/symfony/eventdispatcher-wrapped-listener-cache.phpt
similarity index 100%
rename from tests/aot/symfony/eventdispatcher-wrapped-listener-cache.phpt
rename to tests/project/symfony/eventdispatcher-wrapped-listener-cache.phpt
diff --git a/tests/aot/symfony/expressionlanguage-dynamic-call-unpack.phpt b/tests/project/symfony/expressionlanguage-dynamic-call-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/expressionlanguage-dynamic-call-unpack.phpt
rename to tests/project/symfony/expressionlanguage-dynamic-call-unpack.phpt
diff --git a/tests/aot/symfony/filesystem-box-dynamic-call-error-handler.phpt b/tests/project/symfony/filesystem-box-dynamic-call-error-handler.phpt
similarity index 100%
rename from tests/aot/symfony/filesystem-box-dynamic-call-error-handler.phpt
rename to tests/project/symfony/filesystem-box-dynamic-call-error-handler.phpt
diff --git a/tests/aot/symfony/filter-coalesce-throw.phpt b/tests/project/symfony/filter-coalesce-throw.phpt
similarity index 100%
rename from tests/aot/symfony/filter-coalesce-throw.phpt
rename to tests/project/symfony/filter-coalesce-throw.phpt
diff --git a/tests/aot/symfony/finder-gitignore-preg-replace-callback.phpt b/tests/project/symfony/finder-gitignore-preg-replace-callback.phpt
similarity index 100%
rename from tests/aot/symfony/finder-gitignore-preg-replace-callback.phpt
rename to tests/project/symfony/finder-gitignore-preg-replace-callback.phpt
diff --git a/tests/aot/symfony/finder-lazy-iterator-yield-from-callable.phpt b/tests/project/symfony/finder-lazy-iterator-yield-from-callable.phpt
similarity index 100%
rename from tests/aot/symfony/finder-lazy-iterator-yield-from-callable.phpt
rename to tests/project/symfony/finder-lazy-iterator-yield-from-callable.phpt
diff --git a/tests/aot/symfony/finder-normalize-dir-map-merge-unpack.phpt b/tests/project/symfony/finder-normalize-dir-map-merge-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/finder-normalize-dir-map-merge-unpack.phpt
rename to tests/project/symfony/finder-normalize-dir-map-merge-unpack.phpt
diff --git a/tests/aot/symfony/foreach-array-destructuring.phpt b/tests/project/symfony/foreach-array-destructuring.phpt
similarity index 100%
rename from tests/aot/symfony/foreach-array-destructuring.phpt
rename to tests/project/symfony/foreach-array-destructuring.phpt
diff --git a/tests/aot/symfony/foreach-traversable-method-result.phpt b/tests/project/symfony/foreach-traversable-method-result.phpt
similarity index 100%
rename from tests/aot/symfony/foreach-traversable-method-result.phpt
rename to tests/project/symfony/foreach-traversable-method-result.phpt
diff --git a/tests/aot/symfony/htmlsanitizer-clone-unset-nested-attrs.phpt b/tests/project/symfony/htmlsanitizer-clone-unset-nested-attrs.phpt
similarity index 100%
rename from tests/aot/symfony/htmlsanitizer-clone-unset-nested-attrs.phpt
rename to tests/project/symfony/htmlsanitizer-clone-unset-nested-attrs.phpt
diff --git a/tests/aot/symfony/htmlsanitizer-nullsafe-render-fallback.phpt b/tests/project/symfony/htmlsanitizer-nullsafe-render-fallback.phpt
similarity index 100%
rename from tests/aot/symfony/htmlsanitizer-nullsafe-render-fallback.phpt
rename to tests/project/symfony/htmlsanitizer-nullsafe-render-fallback.phpt
diff --git a/tests/aot/symfony/httpclient-splobjectstorage-promise-pool.phpt b/tests/project/symfony/httpclient-splobjectstorage-promise-pool.phpt
similarity index 100%
rename from tests/aot/symfony/httpclient-splobjectstorage-promise-pool.phpt
rename to tests/project/symfony/httpclient-splobjectstorage-promise-pool.phpt
diff --git a/tests/aot/symfony/httpfoundation-accept-header-specificity.phpt b/tests/project/symfony/httpfoundation-accept-header-specificity.phpt
similarity index 100%
rename from tests/aot/symfony/httpfoundation-accept-header-specificity.phpt
rename to tests/project/symfony/httpfoundation-accept-header-specificity.phpt
diff --git a/tests/aot/symfony/httpfoundation-json-response-static-factory.phpt b/tests/project/symfony/httpfoundation-json-response-static-factory.phpt
similarity index 100%
rename from tests/aot/symfony/httpfoundation-json-response-static-factory.phpt
rename to tests/project/symfony/httpfoundation-json-response-static-factory.phpt
diff --git a/tests/aot/symfony/httpfoundation-reflection-cache-coalesce-assign.phpt b/tests/project/symfony/httpfoundation-reflection-cache-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/httpfoundation-reflection-cache-coalesce-assign.phpt
rename to tests/project/symfony/httpfoundation-reflection-cache-coalesce-assign.phpt
diff --git a/tests/aot/symfony/importmap-filter-use-key.phpt b/tests/project/symfony/importmap-filter-use-key.phpt
similarity index 100%
rename from tests/aot/symfony/importmap-filter-use-key.phpt
rename to tests/project/symfony/importmap-filter-use-key.phpt
diff --git a/tests/aot/symfony/intl-env-filter-static-cache.phpt b/tests/project/symfony/intl-env-filter-static-cache.phpt
similarity index 100%
rename from tests/aot/symfony/intl-env-filter-static-cache.phpt
rename to tests/project/symfony/intl-env-filter-static-cache.phpt
diff --git a/tests/aot/symfony/late-static-new-static-return.phpt b/tests/project/symfony/late-static-new-static-return.phpt
similarity index 100%
rename from tests/aot/symfony/late-static-new-static-return.phpt
rename to tests/project/symfony/late-static-new-static-return.phpt
diff --git a/tests/aot/symfony/lazy-listener-self-replacing-closure.phpt b/tests/project/symfony/lazy-listener-self-replacing-closure.phpt
similarity index 100%
rename from tests/aot/symfony/lazy-listener-self-replacing-closure.phpt
rename to tests/project/symfony/lazy-listener-self-replacing-closure.phpt
diff --git a/tests/aot/symfony/lazy-string-array-callable.phpt b/tests/project/symfony/lazy-string-array-callable.phpt
similarity index 100%
rename from tests/aot/symfony/lazy-string-array-callable.phpt
rename to tests/project/symfony/lazy-string-array-callable.phpt
diff --git a/tests/aot/symfony/ldap-collection-iterator-cache.phpt b/tests/project/symfony/ldap-collection-iterator-cache.phpt
similarity index 100%
rename from tests/aot/symfony/ldap-collection-iterator-cache.phpt
rename to tests/project/symfony/ldap-collection-iterator-cache.phpt
diff --git a/tests/aot/symfony/local-variable-type-widening.phpt b/tests/project/symfony/local-variable-type-widening.phpt
similarity index 100%
rename from tests/aot/symfony/local-variable-type-widening.phpt
rename to tests/project/symfony/local-variable-type-widening.phpt
diff --git a/tests/aot/symfony/mailer-first-class-static-method-array-map.phpt b/tests/project/symfony/mailer-first-class-static-method-array-map.phpt
similarity index 100%
rename from tests/aot/symfony/mailer-first-class-static-method-array-map.phpt
rename to tests/project/symfony/mailer-first-class-static-method-array-map.phpt
diff --git a/tests/aot/symfony/match-array-filter-union.phpt b/tests/project/symfony/match-array-filter-union.phpt
similarity index 100%
rename from tests/aot/symfony/match-array-filter-union.phpt
rename to tests/project/symfony/match-array-filter-union.phpt
diff --git a/tests/aot/symfony/match-expression-array-key.phpt b/tests/project/symfony/match-expression-array-key.phpt
similarity index 100%
rename from tests/aot/symfony/match-expression-array-key.phpt
rename to tests/project/symfony/match-expression-array-key.phpt
diff --git a/tests/aot/symfony/match-true-assignment-condition.phpt b/tests/project/symfony/match-true-assignment-condition.phpt
similarity index 100%
rename from tests/aot/symfony/match-true-assignment-condition.phpt
rename to tests/project/symfony/match-true-assignment-condition.phpt
diff --git a/tests/aot/symfony/match-true-throw-debug-type.phpt b/tests/project/symfony/match-true-throw-debug-type.phpt
similarity index 100%
rename from tests/aot/symfony/match-true-throw-debug-type.phpt
rename to tests/project/symfony/match-true-throw-debug-type.phpt
diff --git a/tests/aot/symfony/messenger-envelope-clone-stamps.phpt b/tests/project/symfony/messenger-envelope-clone-stamps.phpt
similarity index 100%
rename from tests/aot/symfony/messenger-envelope-clone-stamps.phpt
rename to tests/project/symfony/messenger-envelope-clone-stamps.phpt
diff --git a/tests/aot/symfony/messenger-nullsafe-coalesce-throw-chain.phpt b/tests/project/symfony/messenger-nullsafe-coalesce-throw-chain.phpt
similarity index 100%
rename from tests/aot/symfony/messenger-nullsafe-coalesce-throw-chain.phpt
rename to tests/project/symfony/messenger-nullsafe-coalesce-throw-chain.phpt
diff --git a/tests/aot/symfony/messenger-nullsafe-merge-unpack.phpt b/tests/project/symfony/messenger-nullsafe-merge-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/messenger-nullsafe-merge-unpack.phpt
rename to tests/project/symfony/messenger-nullsafe-merge-unpack.phpt
diff --git a/tests/aot/symfony/messenger-nullsafe-transport-fallback.phpt b/tests/project/symfony/messenger-nullsafe-transport-fallback.phpt
similarity index 100%
rename from tests/aot/symfony/messenger-nullsafe-transport-fallback.phpt
rename to tests/project/symfony/messenger-nullsafe-transport-fallback.phpt
diff --git a/tests/aot/symfony/mime-serialize-parent-state-destructuring.phpt b/tests/project/symfony/mime-serialize-parent-state-destructuring.phpt
similarity index 100%
rename from tests/aot/symfony/mime-serialize-parent-state-destructuring.phpt
rename to tests/project/symfony/mime-serialize-parent-state-destructuring.phpt
diff --git a/tests/aot/symfony/nested-array-merge-unpack-method-call.phpt b/tests/project/symfony/nested-array-merge-unpack-method-call.phpt
similarity index 100%
rename from tests/aot/symfony/nested-array-merge-unpack-method-call.phpt
rename to tests/project/symfony/nested-array-merge-unpack-method-call.phpt
diff --git a/tests/aot/symfony/nested-static-closure-normalizer.phpt b/tests/project/symfony/nested-static-closure-normalizer.phpt
similarity index 100%
rename from tests/aot/symfony/nested-static-closure-normalizer.phpt
rename to tests/project/symfony/nested-static-closure-normalizer.phpt
diff --git a/tests/aot/symfony/new-expression-constructor-default.phpt b/tests/project/symfony/new-expression-constructor-default.phpt
similarity index 100%
rename from tests/aot/symfony/new-expression-constructor-default.phpt
rename to tests/project/symfony/new-expression-constructor-default.phpt
diff --git a/tests/aot/symfony/notifier-array-key-first-exception.phpt b/tests/project/symfony/notifier-array-key-first-exception.phpt
similarity index 100%
rename from tests/aot/symfony/notifier-array-key-first-exception.phpt
rename to tests/project/symfony/notifier-array-key-first-exception.phpt
diff --git a/tests/aot/symfony/notifier-options-nullsafe-coalesce-assign.phpt b/tests/project/symfony/notifier-options-nullsafe-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/notifier-options-nullsafe-coalesce-assign.phpt
rename to tests/project/symfony/notifier-options-nullsafe-coalesce-assign.phpt
diff --git a/tests/aot/symfony/nullable-first-class-callable.phpt b/tests/project/symfony/nullable-first-class-callable.phpt
similarity index 100%
rename from tests/aot/symfony/nullable-first-class-callable.phpt
rename to tests/project/symfony/nullable-first-class-callable.phpt
diff --git a/tests/aot/symfony/nullsafe-array-dim-short-circuit.phpt b/tests/project/symfony/nullsafe-array-dim-short-circuit.phpt
similarity index 100%
rename from tests/aot/symfony/nullsafe-array-dim-short-circuit.phpt
rename to tests/project/symfony/nullsafe-array-dim-short-circuit.phpt
diff --git a/tests/aot/symfony/nullsafe-array-offset-coalesce.phpt b/tests/project/symfony/nullsafe-array-offset-coalesce.phpt
similarity index 100%
rename from tests/aot/symfony/nullsafe-array-offset-coalesce.phpt
rename to tests/project/symfony/nullsafe-array-offset-coalesce.phpt
diff --git a/tests/aot/symfony/nullsafe-attribute-newinstance-chain.phpt b/tests/project/symfony/nullsafe-attribute-newinstance-chain.phpt
similarity index 100%
rename from tests/aot/symfony/nullsafe-attribute-newinstance-chain.phpt
rename to tests/project/symfony/nullsafe-attribute-newinstance-chain.phpt
diff --git a/tests/aot/symfony/nullsafe-coalesce-throw.phpt b/tests/project/symfony/nullsafe-coalesce-throw.phpt
similarity index 100%
rename from tests/aot/symfony/nullsafe-coalesce-throw.phpt
rename to tests/project/symfony/nullsafe-coalesce-throw.phpt
diff --git a/tests/aot/symfony/nullsafe-invoke-disabled-callback.phpt b/tests/project/symfony/nullsafe-invoke-disabled-callback.phpt
similarity index 100%
rename from tests/aot/symfony/nullsafe-invoke-disabled-callback.phpt
rename to tests/project/symfony/nullsafe-invoke-disabled-callback.phpt
diff --git a/tests/aot/symfony/object-class-in-arrow-map.phpt b/tests/project/symfony/object-class-in-arrow-map.phpt
similarity index 100%
rename from tests/aot/symfony/object-class-in-arrow-map.phpt
rename to tests/project/symfony/object-class-in-arrow-map.phpt
diff --git a/tests/aot/symfony/objectmapper-weakmap-cache.phpt b/tests/project/symfony/objectmapper-weakmap-cache.phpt
similarity index 100%
rename from tests/aot/symfony/objectmapper-weakmap-cache.phpt
rename to tests/project/symfony/objectmapper-weakmap-cache.phpt
diff --git a/tests/aot/symfony/parameter-bag-filter-callback.phpt b/tests/project/symfony/parameter-bag-filter-callback.phpt
similarity index 100%
rename from tests/aot/symfony/parameter-bag-filter-callback.phpt
rename to tests/project/symfony/parameter-bag-filter-callback.phpt
diff --git a/tests/aot/symfony/php-dumper-indent-lines.phpt b/tests/project/symfony/php-dumper-indent-lines.phpt
similarity index 100%
rename from tests/aot/symfony/php-dumper-indent-lines.phpt
rename to tests/project/symfony/php-dumper-indent-lines.phpt
diff --git a/tests/aot/symfony/process-env-union-commandline-strval.phpt b/tests/project/symfony/process-env-union-commandline-strval.phpt
similarity index 100%
rename from tests/aot/symfony/process-env-union-commandline-strval.phpt
rename to tests/project/symfony/process-env-union-commandline-strval.phpt
diff --git a/tests/aot/symfony/process-string-offset-commandline.phpt b/tests/project/symfony/process-string-offset-commandline.phpt
similarity index 100%
rename from tests/aot/symfony/process-string-offset-commandline.phpt
rename to tests/project/symfony/process-string-offset-commandline.phpt
diff --git a/tests/aot/symfony/property-hooks-php84.phpt b/tests/project/symfony/property-hooks-php84.phpt
similarity index 100%
rename from tests/aot/symfony/property-hooks-php84.phpt
rename to tests/project/symfony/property-hooks-php84.phpt
diff --git a/tests/aot/symfony/recursive-array-iterator-leaves.phpt b/tests/project/symfony/recursive-array-iterator-leaves.phpt
similarity index 100%
rename from tests/aot/symfony/recursive-array-iterator-leaves.phpt
rename to tests/project/symfony/recursive-array-iterator-leaves.phpt
diff --git a/tests/aot/symfony/reflection-method-first-class-invoke.phpt b/tests/project/symfony/reflection-method-first-class-invoke.phpt
similarity index 100%
rename from tests/aot/symfony/reflection-method-first-class-invoke.phpt
rename to tests/project/symfony/reflection-method-first-class-invoke.phpt
diff --git a/tests/aot/symfony/rememberme-details-new-static-unpack.phpt b/tests/project/symfony/rememberme-details-new-static-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/rememberme-details-new-static-unpack.phpt
rename to tests/project/symfony/rememberme-details-new-static-unpack.phpt
diff --git a/tests/aot/symfony/route-collection-clone-iterator.phpt b/tests/project/symfony/route-collection-clone-iterator.phpt
similarity index 100%
rename from tests/aot/symfony/route-collection-clone-iterator.phpt
rename to tests/project/symfony/route-collection-clone-iterator.phpt
diff --git a/tests/aot/symfony/routing-enum-requirement-cases.phpt b/tests/project/symfony/routing-enum-requirement-cases.phpt
similarity index 100%
rename from tests/aot/symfony/routing-enum-requirement-cases.phpt
rename to tests/project/symfony/routing-enum-requirement-cases.phpt
diff --git a/tests/aot/symfony/routing-expression-provider-dynamic-callable.phpt b/tests/project/symfony/routing-expression-provider-dynamic-callable.phpt
similarity index 100%
rename from tests/aot/symfony/routing-expression-provider-dynamic-callable.phpt
rename to tests/project/symfony/routing-expression-provider-dynamic-callable.phpt
diff --git a/tests/aot/symfony/routing-extra-parameters-recursive-caster.phpt b/tests/project/symfony/routing-extra-parameters-recursive-caster.phpt
similarity index 100%
rename from tests/aot/symfony/routing-extra-parameters-recursive-caster.phpt
rename to tests/project/symfony/routing-extra-parameters-recursive-caster.phpt
diff --git a/tests/aot/symfony/routing-extra-query-udiff-replace.phpt b/tests/project/symfony/routing-extra-query-udiff-replace.phpt
similarity index 100%
rename from tests/aot/symfony/routing-extra-query-udiff-replace.phpt
rename to tests/project/symfony/routing-extra-query-udiff-replace.phpt
diff --git a/tests/aot/symfony/routing-null-coalesce-assign-comparison.phpt b/tests/project/symfony/routing-null-coalesce-assign-comparison.phpt
similarity index 100%
rename from tests/aot/symfony/routing-null-coalesce-assign-comparison.phpt
rename to tests/project/symfony/routing-null-coalesce-assign-comparison.phpt
diff --git a/tests/aot/symfony/routing-object-vars-json-tail.phpt b/tests/project/symfony/routing-object-vars-json-tail.phpt
similarity index 100%
rename from tests/aot/symfony/routing-object-vars-json-tail.phpt
rename to tests/project/symfony/routing-object-vars-json-tail.phpt
diff --git a/tests/aot/symfony/routing-route-coalesce-assign-condition.phpt b/tests/project/symfony/routing-route-coalesce-assign-condition.phpt
similarity index 100%
rename from tests/aot/symfony/routing-route-coalesce-assign-condition.phpt
rename to tests/project/symfony/routing-route-coalesce-assign-condition.phpt
diff --git a/tests/aot/symfony/runtime-options-global-coalesce.phpt b/tests/project/symfony/runtime-options-global-coalesce.phpt
similarity index 100%
rename from tests/aot/symfony/runtime-options-global-coalesce.phpt
rename to tests/project/symfony/runtime-options-global-coalesce.phpt
diff --git a/tests/aot/symfony/security-badge-dynamic-class-key.phpt b/tests/project/symfony/security-badge-dynamic-class-key.phpt
similarity index 100%
rename from tests/aot/symfony/security-badge-dynamic-class-key.phpt
rename to tests/project/symfony/security-badge-dynamic-class-key.phpt
diff --git a/tests/aot/symfony/security-dynamic-instanceof-union-string.phpt b/tests/project/symfony/security-dynamic-instanceof-union-string.phpt
similarity index 100%
rename from tests/aot/symfony/security-dynamic-instanceof-union-string.phpt
rename to tests/project/symfony/security-dynamic-instanceof-union-string.phpt
diff --git a/tests/aot/symfony/semaphore-negated-coalesce-assign.phpt b/tests/project/symfony/semaphore-negated-coalesce-assign.phpt
similarity index 100%
rename from tests/aot/symfony/semaphore-negated-coalesce-assign.phpt
rename to tests/project/symfony/semaphore-negated-coalesce-assign.phpt
diff --git a/tests/aot/symfony/sensitive-promoted-readonly.phpt b/tests/project/symfony/sensitive-promoted-readonly.phpt
similarity index 100%
rename from tests/aot/symfony/sensitive-promoted-readonly.phpt
rename to tests/project/symfony/sensitive-promoted-readonly.phpt
diff --git a/tests/aot/symfony/serialize-unserialize-private-state.phpt b/tests/project/symfony/serialize-unserialize-private-state.phpt
similarity index 100%
rename from tests/aot/symfony/serialize-unserialize-private-state.phpt
rename to tests/project/symfony/serialize-unserialize-private-state.phpt
diff --git a/tests/aot/symfony/serializer-array-map-strval-first-class.phpt b/tests/project/symfony/serializer-array-map-strval-first-class.phpt
similarity index 100%
rename from tests/aot/symfony/serializer-array-map-strval-first-class.phpt
rename to tests/project/symfony/serializer-array-map-strval-first-class.phpt
diff --git a/tests/aot/symfony/serializer-cache-key-rawurlencode-strtr.phpt b/tests/project/symfony/serializer-cache-key-rawurlencode-strtr.phpt
similarity index 100%
rename from tests/aot/symfony/serializer-cache-key-rawurlencode-strtr.phpt
rename to tests/project/symfony/serializer-cache-key-rawurlencode-strtr.phpt
diff --git a/tests/aot/symfony/serializer-context-group-merge-unpack.phpt b/tests/project/symfony/serializer-context-group-merge-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/serializer-context-group-merge-unpack.phpt
rename to tests/project/symfony/serializer-context-group-merge-unpack.phpt
diff --git a/tests/aot/symfony/serializer-debug-compact-trace.phpt b/tests/project/symfony/serializer-debug-compact-trace.phpt
similarity index 100%
rename from tests/aot/symfony/serializer-debug-compact-trace.phpt
rename to tests/project/symfony/serializer-debug-compact-trace.phpt
diff --git a/tests/aot/symfony/serializer-reflection-property-initialized.phpt b/tests/project/symfony/serializer-reflection-property-initialized.phpt
similarity index 100%
rename from tests/aot/symfony/serializer-reflection-property-initialized.phpt
rename to tests/project/symfony/serializer-reflection-property-initialized.phpt
diff --git a/tests/aot/symfony/serializer-supported-type-collection.phpt b/tests/project/symfony/serializer-supported-type-collection.phpt
similarity index 100%
rename from tests/aot/symfony/serializer-supported-type-collection.phpt
rename to tests/project/symfony/serializer-supported-type-collection.phpt
diff --git a/tests/aot/symfony/service-locator-match-count-unpack.phpt b/tests/project/symfony/service-locator-match-count-unpack.phpt
similarity index 100%
rename from tests/aot/symfony/service-locator-match-count-unpack.phpt
rename to tests/project/symfony/service-locator-match-count-unpack.phpt
diff --git a/tests/aot/symfony/static-local-coalesce-assign-ternary-object.phpt b/tests/project/symfony/static-local-coalesce-assign-ternary-object.phpt
similarity index 100%
rename from tests/aot/symfony/static-local-coalesce-assign-ternary-object.phpt
rename to tests/project/symfony/static-local-coalesce-assign-ternary-object.phpt
diff --git a/tests/aot/symfony/static-property-array-spread-merge.phpt b/tests/project/symfony/static-property-array-spread-merge.phpt
similarity index 100%
rename from tests/aot/symfony/static-property-array-spread-merge.phpt
rename to tests/project/symfony/static-property-array-spread-merge.phpt
diff --git a/tests/aot/symfony/string-coalesce-assign-comparison-precedence.phpt b/tests/project/symfony/string-coalesce-assign-comparison-precedence.phpt
similarity index 100%
rename from tests/aot/symfony/string-coalesce-assign-comparison-precedence.phpt
rename to tests/project/symfony/string-coalesce-assign-comparison-precedence.phpt
diff --git a/tests/aot/symfony/translation-plural-locale-match.phpt b/tests/project/symfony/translation-plural-locale-match.phpt
similarity index 100%
rename from tests/aot/symfony/translation-plural-locale-match.phpt
rename to tests/project/symfony/translation-plural-locale-match.phpt
diff --git a/tests/aot/symfony/typecontext-nested-cache-coalesce-object.phpt b/tests/project/symfony/typecontext-nested-cache-coalesce-object.phpt
similarity index 100%
rename from tests/aot/symfony/typecontext-nested-cache-coalesce-object.phpt
rename to tests/project/symfony/typecontext-nested-cache-coalesce-object.phpt
diff --git a/tests/aot/symfony/uasort-spaceship-elvis.phpt b/tests/project/symfony/uasort-spaceship-elvis.phpt
similarity index 100%
rename from tests/aot/symfony/uasort-spaceship-elvis.phpt
rename to tests/project/symfony/uasort-spaceship-elvis.phpt
diff --git a/tests/aot/symfony/uid-binary-string-carry.phpt b/tests/project/symfony/uid-binary-string-carry.phpt
similarity index 100%
rename from tests/aot/symfony/uid-binary-string-carry.phpt
rename to tests/project/symfony/uid-binary-string-carry.phpt
diff --git a/tests/aot/symfony/uksort-priority-fallback.phpt b/tests/project/symfony/uksort-priority-fallback.phpt
similarity index 100%
rename from tests/aot/symfony/uksort-priority-fallback.phpt
rename to tests/project/symfony/uksort-priority-fallback.phpt
diff --git a/tests/aot/symfony/validator-constraint-serialize-private-keys.phpt b/tests/project/symfony/validator-constraint-serialize-private-keys.phpt
similarity index 100%
rename from tests/aot/symfony/validator-constraint-serialize-private-keys.phpt
rename to tests/project/symfony/validator-constraint-serialize-private-keys.phpt
diff --git a/tests/aot/symfony/validator-serializer-array-callbacks.phpt b/tests/project/symfony/validator-serializer-array-callbacks.phpt
similarity index 100%
rename from tests/aot/symfony/validator-serializer-array-callbacks.phpt
rename to tests/project/symfony/validator-serializer-array-callbacks.phpt
diff --git a/tests/aot/symfony/validator-word-count-trim-filter.phpt b/tests/project/symfony/validator-word-count-trim-filter.phpt
similarity index 100%
rename from tests/aot/symfony/validator-word-count-trim-filter.phpt
rename to tests/project/symfony/validator-word-count-trim-filter.phpt
diff --git a/tests/aot/symfony/var-exporter-clone-cache.phpt b/tests/project/symfony/var-exporter-clone-cache.phpt
similarity index 100%
rename from tests/aot/symfony/var-exporter-clone-cache.phpt
rename to tests/project/symfony/var-exporter-clone-cache.phpt
diff --git a/tests/aot/symfony/var-exporter-reference-clone-cache.phpt b/tests/project/symfony/var-exporter-reference-clone-cache.phpt
similarity index 100%
rename from tests/aot/symfony/var-exporter-reference-clone-cache.phpt
rename to tests/project/symfony/var-exporter-reference-clone-cache.phpt
diff --git a/tests/aot/symfony/vardumper-static-property-default-cache.phpt b/tests/project/symfony/vardumper-static-property-default-cache.phpt
similarity index 100%
rename from tests/aot/symfony/vardumper-static-property-default-cache.phpt
rename to tests/project/symfony/vardumper-static-property-default-cache.phpt
diff --git a/tests/aot/symfony/weblink-header-parser-repeat-attrs.phpt b/tests/project/symfony/weblink-header-parser-repeat-attrs.phpt
similarity index 100%
rename from tests/aot/symfony/weblink-header-parser-repeat-attrs.phpt
rename to tests/project/symfony/weblink-header-parser-repeat-attrs.phpt
diff --git a/tests/aot/symfony/workflow-array-dim-coalesce-assign-op.phpt b/tests/project/symfony/workflow-array-dim-coalesce-assign-op.phpt
similarity index 100%
rename from tests/aot/symfony/workflow-array-dim-coalesce-assign-op.phpt
rename to tests/project/symfony/workflow-array-dim-coalesce-assign-op.phpt
diff --git a/tests/aot/symfony/yaml-match-condition-assignment.phpt b/tests/project/symfony/yaml-match-condition-assignment.phpt
similarity index 100%
rename from tests/aot/symfony/yaml-match-condition-assignment.phpt
rename to tests/project/symfony/yaml-match-condition-assignment.phpt
diff --git a/tests/aot/thinkphp/app-service-filter-dynamic-instanceof.phpt b/tests/project/thinkphp/app-service-filter-dynamic-instanceof.phpt
similarity index 100%
rename from tests/aot/thinkphp/app-service-filter-dynamic-instanceof.phpt
rename to tests/project/thinkphp/app-service-filter-dynamic-instanceof.phpt
diff --git a/tests/aot/thinkphp/config-lazy-hook-fallback.phpt b/tests/project/thinkphp/config-lazy-hook-fallback.phpt
similarity index 100%
rename from tests/aot/thinkphp/config-lazy-hook-fallback.phpt
rename to tests/project/thinkphp/config-lazy-hook-fallback.phpt
diff --git a/tests/aot/thinkphp/cookie-destructure-options-save.phpt b/tests/project/thinkphp/cookie-destructure-options-save.phpt
similarity index 100%
rename from tests/aot/thinkphp/cookie-destructure-options-save.phpt
rename to tests/project/thinkphp/cookie-destructure-options-save.phpt
diff --git a/tests/aot/thinkphp/env-arrayaccess-magic-convert.phpt b/tests/project/thinkphp/env-arrayaccess-magic-convert.phpt
similarity index 100%
rename from tests/aot/thinkphp/env-arrayaccess-magic-convert.phpt
rename to tests/project/thinkphp/env-arrayaccess-magic-convert.phpt
diff --git a/tests/aot/thinkphp/event-observer-reflection-prefix.phpt b/tests/project/thinkphp/event-observer-reflection-prefix.phpt
similarity index 100%
rename from tests/aot/thinkphp/event-observer-reflection-prefix.phpt
rename to tests/project/thinkphp/event-observer-reflection-prefix.phpt
diff --git a/tests/aot/thinkphp/file-hashname-match-callable.phpt b/tests/project/thinkphp/file-hashname-match-callable.phpt
similarity index 100%
rename from tests/aot/thinkphp/file-hashname-match-callable.phpt
rename to tests/project/thinkphp/file-hashname-match-callable.phpt
diff --git a/tests/aot/thinkphp/middleware-array-map-unpack-callable.phpt b/tests/project/thinkphp/middleware-array-map-unpack-callable.phpt
similarity index 100%
rename from tests/aot/thinkphp/middleware-array-map-unpack-callable.phpt
rename to tests/project/thinkphp/middleware-array-map-unpack-callable.phpt
diff --git a/tests/aot/thinkphp/pipeline-array-reduce-exception-handler.phpt b/tests/project/thinkphp/pipeline-array-reduce-exception-handler.phpt
similarity index 100%
rename from tests/aot/thinkphp/pipeline-array-reduce-exception-handler.phpt
rename to tests/project/thinkphp/pipeline-array-reduce-exception-handler.phpt
diff --git a/tests/aot/thinkphp/request-dynamic-property-cache.phpt b/tests/project/thinkphp/request-dynamic-property-cache.phpt
similarity index 100%
rename from tests/aot/thinkphp/request-dynamic-property-cache.phpt
rename to tests/project/thinkphp/request-dynamic-property-cache.phpt
diff --git a/tests/aot/thinkphp/request-filter-walk-recursive-match-throw.phpt b/tests/project/thinkphp/request-filter-walk-recursive-match-throw.phpt
similarity index 100%
rename from tests/aot/thinkphp/request-filter-walk-recursive-match-throw.phpt
rename to tests/project/thinkphp/request-filter-walk-recursive-match-throw.phpt
diff --git a/tests/aot/thinkphp/route-magic-call-forward.phpt b/tests/project/thinkphp/route-magic-call-forward.phpt
similarity index 100%
rename from tests/aot/thinkphp/route-magic-call-forward.phpt
rename to tests/project/thinkphp/route-magic-call-forward.phpt
diff --git a/tests/aot/thinkphp/route-parse-rule-callback-foreach-ref.phpt b/tests/project/thinkphp/route-parse-rule-callback-foreach-ref.phpt
similarity index 100%
rename from tests/aot/thinkphp/route-parse-rule-callback-foreach-ref.phpt
rename to tests/project/thinkphp/route-parse-rule-callback-foreach-ref.phpt