diff --git a/Zend/tests/gh13097_a.phpt b/Zend/tests/anon/gh13097_a.phpt
similarity index 100%
rename from Zend/tests/gh13097_a.phpt
rename to Zend/tests/anon/gh13097_a.phpt
diff --git a/Zend/tests/gh13097_b.phpt b/Zend/tests/anon/gh13097_b.phpt
similarity index 100%
rename from Zend/tests/gh13097_b.phpt
rename to Zend/tests/anon/gh13097_b.phpt
diff --git a/Zend/tests/gh7900.phpt b/Zend/tests/arrow_functions/gh7900.phpt
similarity index 100%
rename from Zend/tests/gh7900.phpt
rename to Zend/tests/arrow_functions/gh7900.phpt
diff --git a/Zend/tests/gh11580.phpt b/Zend/tests/assert/gh11580.phpt
similarity index 100%
rename from Zend/tests/gh11580.phpt
rename to Zend/tests/assert/gh11580.phpt
diff --git a/Zend/tests/gh16293_001.phpt b/Zend/tests/assert/gh16293_001.phpt
similarity index 100%
rename from Zend/tests/gh16293_001.phpt
rename to Zend/tests/assert/gh16293_001.phpt
diff --git a/Zend/tests/gh16293_002.phpt b/Zend/tests/assert/gh16293_002.phpt
similarity index 100%
rename from Zend/tests/gh16293_002.phpt
rename to Zend/tests/assert/gh16293_002.phpt
diff --git a/Zend/tests/gh16665_1.phpt b/Zend/tests/class_alias/gh16665_1.phpt
similarity index 100%
rename from Zend/tests/gh16665_1.phpt
rename to Zend/tests/class_alias/gh16665_1.phpt
diff --git a/Zend/tests/gh16665_2.phpt b/Zend/tests/class_alias/gh16665_2.phpt
similarity index 100%
rename from Zend/tests/gh16665_2.phpt
rename to Zend/tests/class_alias/gh16665_2.phpt
diff --git a/Zend/tests/gh12073.phpt b/Zend/tests/closures/gh12073.phpt
similarity index 100%
rename from Zend/tests/gh12073.phpt
rename to Zend/tests/closures/gh12073.phpt
diff --git a/Zend/tests/gh8083.phpt b/Zend/tests/closures/gh8083.phpt
similarity index 100%
rename from Zend/tests/gh8083.phpt
rename to Zend/tests/closures/gh8083.phpt
diff --git a/Zend/tests/gh10014.phpt b/Zend/tests/constant_expressions/gh10014.phpt
similarity index 100%
rename from Zend/tests/gh10014.phpt
rename to Zend/tests/constant_expressions/gh10014.phpt
diff --git a/Zend/tests/gh10356.phpt b/Zend/tests/constant_expressions/gh10356.phpt
similarity index 100%
rename from Zend/tests/gh10356.phpt
rename to Zend/tests/constant_expressions/gh10356.phpt
diff --git a/Zend/tests/gh7771_1.phpt b/Zend/tests/constant_expressions/gh7771_1.phpt
similarity index 100%
rename from Zend/tests/gh7771_1.phpt
rename to Zend/tests/constant_expressions/gh7771_1.phpt
diff --git a/Zend/tests/gh7771_1_definition.inc b/Zend/tests/constant_expressions/gh7771_1_definition.inc
similarity index 100%
rename from Zend/tests/gh7771_1_definition.inc
rename to Zend/tests/constant_expressions/gh7771_1_definition.inc
diff --git a/Zend/tests/gh7771_2.phpt b/Zend/tests/constant_expressions/gh7771_2.phpt
similarity index 100%
rename from Zend/tests/gh7771_2.phpt
rename to Zend/tests/constant_expressions/gh7771_2.phpt
diff --git a/Zend/tests/gh7771_2_definition.inc b/Zend/tests/constant_expressions/gh7771_2_definition.inc
similarity index 100%
rename from Zend/tests/gh7771_2_definition.inc
rename to Zend/tests/constant_expressions/gh7771_2_definition.inc
diff --git a/Zend/tests/gh7771_3.phpt b/Zend/tests/constant_expressions/gh7771_3.phpt
similarity index 100%
rename from Zend/tests/gh7771_3.phpt
rename to Zend/tests/constant_expressions/gh7771_3.phpt
diff --git a/Zend/tests/gh9136.phpt b/Zend/tests/constant_expressions/gh9136.phpt
similarity index 100%
rename from Zend/tests/gh9136.phpt
rename to Zend/tests/constant_expressions/gh9136.phpt
diff --git a/Zend/tests/gh9136_2.phpt b/Zend/tests/constant_expressions/gh9136_2.phpt
similarity index 100%
rename from Zend/tests/gh9136_2.phpt
rename to Zend/tests/constant_expressions/gh9136_2.phpt
diff --git a/Zend/tests/gh9138.phpt b/Zend/tests/constant_expressions/gh9138.phpt
similarity index 100%
rename from Zend/tests/gh9138.phpt
rename to Zend/tests/constant_expressions/gh9138.phpt
diff --git a/Zend/tests/gh9138_2.phpt b/Zend/tests/constant_expressions/gh9138_2.phpt
similarity index 100%
rename from Zend/tests/gh9138_2.phpt
rename to Zend/tests/constant_expressions/gh9138_2.phpt
diff --git a/Zend/tests/gh10346.phpt b/Zend/tests/enum/gh10346.phpt
similarity index 100%
rename from Zend/tests/gh10346.phpt
rename to Zend/tests/enum/gh10346.phpt
diff --git a/Zend/tests/gh16954.phpt b/Zend/tests/enum/gh16954.phpt
similarity index 100%
rename from Zend/tests/gh16954.phpt
rename to Zend/tests/enum/gh16954.phpt
diff --git a/Zend/tests/gh7792_1.phpt b/Zend/tests/enum/gh7792_1.phpt
similarity index 100%
rename from Zend/tests/gh7792_1.phpt
rename to Zend/tests/enum/gh7792_1.phpt
diff --git a/Zend/tests/gh7792_2.phpt b/Zend/tests/enum/gh7792_2.phpt
similarity index 100%
rename from Zend/tests/gh7792_2.phpt
rename to Zend/tests/enum/gh7792_2.phpt
diff --git a/Zend/tests/gh7792_3.phpt b/Zend/tests/enum/gh7792_3.phpt
similarity index 100%
rename from Zend/tests/gh7792_3.phpt
rename to Zend/tests/enum/gh7792_3.phpt
diff --git a/Zend/tests/gh7792_4.phpt b/Zend/tests/enum/gh7792_4.phpt
similarity index 100%
rename from Zend/tests/gh7792_4.phpt
rename to Zend/tests/enum/gh7792_4.phpt
diff --git a/Zend/tests/gh7792_5.phpt b/Zend/tests/enum/gh7792_5.phpt
similarity index 100%
rename from Zend/tests/gh7792_5.phpt
rename to Zend/tests/enum/gh7792_5.phpt
diff --git a/Zend/tests/gh9775_1.phpt b/Zend/tests/enum/gh9775_1.phpt
similarity index 100%
rename from Zend/tests/gh9775_1.phpt
rename to Zend/tests/enum/gh9775_1.phpt
diff --git a/Zend/tests/gh9775_2.phpt b/Zend/tests/enum/gh9775_2.phpt
similarity index 100%
rename from Zend/tests/gh9775_2.phpt
rename to Zend/tests/enum/gh9775_2.phpt
diff --git a/Zend/tests/gh10695_1.phpt b/Zend/tests/exceptions/gh10695_1.phpt
similarity index 100%
rename from Zend/tests/gh10695_1.phpt
rename to Zend/tests/exceptions/gh10695_1.phpt
diff --git a/Zend/tests/gh10695_2.phpt b/Zend/tests/exceptions/gh10695_2.phpt
similarity index 100%
rename from Zend/tests/gh10695_2.phpt
rename to Zend/tests/exceptions/gh10695_2.phpt
diff --git a/Zend/tests/gh10695_3.phpt b/Zend/tests/exceptions/gh10695_3.phpt
similarity index 100%
rename from Zend/tests/gh10695_3.phpt
rename to Zend/tests/exceptions/gh10695_3.phpt
diff --git a/Zend/tests/gh10695_4.phpt b/Zend/tests/exceptions/gh10695_4.phpt
similarity index 100%
rename from Zend/tests/gh10695_4.phpt
rename to Zend/tests/exceptions/gh10695_4.phpt
diff --git a/Zend/tests/gh10695_5.phpt b/Zend/tests/exceptions/gh10695_5.phpt
similarity index 100%
rename from Zend/tests/gh10695_5.phpt
rename to Zend/tests/exceptions/gh10695_5.phpt
diff --git a/Zend/tests/gh10695_6.phpt b/Zend/tests/exceptions/gh10695_6.phpt
similarity index 100%
rename from Zend/tests/gh10695_6.phpt
rename to Zend/tests/exceptions/gh10695_6.phpt
diff --git a/Zend/tests/gh10695_7.phpt b/Zend/tests/exceptions/gh10695_7.phpt
similarity index 100%
rename from Zend/tests/gh10695_7.phpt
rename to Zend/tests/exceptions/gh10695_7.phpt
diff --git a/Zend/tests/gh10810.phpt b/Zend/tests/exceptions/gh10810.phpt
similarity index 100%
rename from Zend/tests/gh10810.phpt
rename to Zend/tests/exceptions/gh10810.phpt
diff --git a/Zend/tests/gh13446_1.phpt b/Zend/tests/exceptions/gh13446_1.phpt
similarity index 100%
rename from Zend/tests/gh13446_1.phpt
rename to Zend/tests/exceptions/gh13446_1.phpt
diff --git a/Zend/tests/gh13446_2.phpt b/Zend/tests/exceptions/gh13446_2.phpt
similarity index 100%
rename from Zend/tests/gh13446_2.phpt
rename to Zend/tests/exceptions/gh13446_2.phpt
diff --git a/Zend/tests/gh13446_3.phpt b/Zend/tests/exceptions/gh13446_3.phpt
similarity index 100%
rename from Zend/tests/gh13446_3.phpt
rename to Zend/tests/exceptions/gh13446_3.phpt
diff --git a/Zend/tests/gh13446_4.phpt b/Zend/tests/exceptions/gh13446_4.phpt
similarity index 100%
rename from Zend/tests/gh13446_4.phpt
rename to Zend/tests/exceptions/gh13446_4.phpt
diff --git a/Zend/tests/gh16188.phpt b/Zend/tests/exceptions/gh16188.phpt
similarity index 100%
rename from Zend/tests/gh16188.phpt
rename to Zend/tests/exceptions/gh16188.phpt
diff --git a/Zend/tests/gh15108-001.phpt b/Zend/tests/fibers/gh15108-001.phpt
similarity index 100%
rename from Zend/tests/gh15108-001.phpt
rename to Zend/tests/fibers/gh15108-001.phpt
diff --git a/Zend/tests/gh15108-002.phpt b/Zend/tests/fibers/gh15108-002.phpt
similarity index 100%
rename from Zend/tests/gh15108-002.phpt
rename to Zend/tests/fibers/gh15108-002.phpt
diff --git a/Zend/tests/gh15108-003.phpt b/Zend/tests/fibers/gh15108-003.phpt
similarity index 100%
rename from Zend/tests/gh15108-003.phpt
rename to Zend/tests/fibers/gh15108-003.phpt
diff --git a/Zend/tests/gh15108-004.phpt b/Zend/tests/fibers/gh15108-004.phpt
similarity index 100%
rename from Zend/tests/gh15108-004.phpt
rename to Zend/tests/fibers/gh15108-004.phpt
diff --git a/Zend/tests/gh15108-005.phpt b/Zend/tests/fibers/gh15108-005.phpt
similarity index 100%
rename from Zend/tests/gh15108-005.phpt
rename to Zend/tests/fibers/gh15108-005.phpt
diff --git a/Zend/tests/gh15108-006.phpt b/Zend/tests/fibers/gh15108-006.phpt
similarity index 100%
rename from Zend/tests/gh15108-006.phpt
rename to Zend/tests/fibers/gh15108-006.phpt
diff --git a/Zend/tests/gh15108-007.phpt b/Zend/tests/fibers/gh15108-007.phpt
similarity index 100%
rename from Zend/tests/gh15108-007.phpt
rename to Zend/tests/fibers/gh15108-007.phpt
diff --git a/Zend/tests/gh9916-001.phpt b/Zend/tests/fibers/gh9916-001.phpt
similarity index 100%
rename from Zend/tests/gh9916-001.phpt
rename to Zend/tests/fibers/gh9916-001.phpt
diff --git a/Zend/tests/gh9916-002.phpt b/Zend/tests/fibers/gh9916-002.phpt
similarity index 100%
rename from Zend/tests/gh9916-002.phpt
rename to Zend/tests/fibers/gh9916-002.phpt
diff --git a/Zend/tests/gh9916-003.phpt b/Zend/tests/fibers/gh9916-003.phpt
similarity index 100%
rename from Zend/tests/gh9916-003.phpt
rename to Zend/tests/fibers/gh9916-003.phpt
diff --git a/Zend/tests/gh9916-004.phpt b/Zend/tests/fibers/gh9916-004.phpt
similarity index 100%
rename from Zend/tests/gh9916-004.phpt
rename to Zend/tests/fibers/gh9916-004.phpt
diff --git a/Zend/tests/gh9916-005.phpt b/Zend/tests/fibers/gh9916-005.phpt
similarity index 100%
rename from Zend/tests/gh9916-005.phpt
rename to Zend/tests/fibers/gh9916-005.phpt
diff --git a/Zend/tests/gh9916-006.phpt b/Zend/tests/fibers/gh9916-006.phpt
similarity index 100%
rename from Zend/tests/gh9916-006.phpt
rename to Zend/tests/fibers/gh9916-006.phpt
diff --git a/Zend/tests/gh9916-007.phpt b/Zend/tests/fibers/gh9916-007.phpt
similarity index 100%
rename from Zend/tests/gh9916-007.phpt
rename to Zend/tests/fibers/gh9916-007.phpt
diff --git a/Zend/tests/gh9916-008.phpt b/Zend/tests/fibers/gh9916-008.phpt
similarity index 100%
rename from Zend/tests/gh9916-008.phpt
rename to Zend/tests/fibers/gh9916-008.phpt
diff --git a/Zend/tests/gh9916-009.phpt b/Zend/tests/fibers/gh9916-009.phpt
similarity index 100%
rename from Zend/tests/gh9916-009.phpt
rename to Zend/tests/fibers/gh9916-009.phpt
diff --git a/Zend/tests/gh9916-010.phpt b/Zend/tests/fibers/gh9916-010.phpt
similarity index 100%
rename from Zend/tests/gh9916-010.phpt
rename to Zend/tests/fibers/gh9916-010.phpt
diff --git a/Zend/tests/gh9916-011.phpt b/Zend/tests/fibers/gh9916-011.phpt
similarity index 100%
rename from Zend/tests/gh9916-011.phpt
rename to Zend/tests/fibers/gh9916-011.phpt
diff --git a/Zend/tests/gh9916-012.phpt b/Zend/tests/fibers/gh9916-012.phpt
similarity index 100%
rename from Zend/tests/gh9916-012.phpt
rename to Zend/tests/fibers/gh9916-012.phpt
diff --git a/Zend/tests/gh11222.phpt b/Zend/tests/foreach/gh11222.phpt
similarity index 100%
rename from Zend/tests/gh11222.phpt
rename to Zend/tests/foreach/gh11222.phpt
diff --git a/Zend/tests/gh15275-001.phpt b/Zend/tests/generators/gh15275-001.phpt
similarity index 100%
rename from Zend/tests/gh15275-001.phpt
rename to Zend/tests/generators/gh15275-001.phpt
diff --git a/Zend/tests/gh15275-002.phpt b/Zend/tests/generators/gh15275-002.phpt
similarity index 100%
rename from Zend/tests/gh15275-002.phpt
rename to Zend/tests/generators/gh15275-002.phpt
diff --git a/Zend/tests/gh15275-003.phpt b/Zend/tests/generators/gh15275-003.phpt
similarity index 100%
rename from Zend/tests/gh15275-003.phpt
rename to Zend/tests/generators/gh15275-003.phpt
diff --git a/Zend/tests/gh15275-004.phpt b/Zend/tests/generators/gh15275-004.phpt
similarity index 100%
rename from Zend/tests/gh15275-004.phpt
rename to Zend/tests/generators/gh15275-004.phpt
diff --git a/Zend/tests/gh15275-005.phpt b/Zend/tests/generators/gh15275-005.phpt
similarity index 100%
rename from Zend/tests/gh15275-005.phpt
rename to Zend/tests/generators/gh15275-005.phpt
diff --git a/Zend/tests/gh15275-006.phpt b/Zend/tests/generators/gh15275-006.phpt
similarity index 100%
rename from Zend/tests/gh15275-006.phpt
rename to Zend/tests/generators/gh15275-006.phpt
diff --git a/Zend/tests/gh15330-001.phpt b/Zend/tests/generators/gh15330-001.phpt
similarity index 100%
rename from Zend/tests/gh15330-001.phpt
rename to Zend/tests/generators/gh15330-001.phpt
diff --git a/Zend/tests/gh15330-002.phpt b/Zend/tests/generators/gh15330-002.phpt
similarity index 100%
rename from Zend/tests/gh15330-002.phpt
rename to Zend/tests/generators/gh15330-002.phpt
diff --git a/Zend/tests/gh15330-003.phpt b/Zend/tests/generators/gh15330-003.phpt
similarity index 100%
rename from Zend/tests/gh15330-003.phpt
rename to Zend/tests/generators/gh15330-003.phpt
diff --git a/Zend/tests/gh15330-004.phpt b/Zend/tests/generators/gh15330-004.phpt
similarity index 100%
rename from Zend/tests/gh15330-004.phpt
rename to Zend/tests/generators/gh15330-004.phpt
diff --git a/Zend/tests/gh15330-005.phpt b/Zend/tests/generators/gh15330-005.phpt
similarity index 100%
rename from Zend/tests/gh15330-005.phpt
rename to Zend/tests/generators/gh15330-005.phpt
diff --git a/Zend/tests/gh15330-006.phpt b/Zend/tests/generators/gh15330-006.phpt
similarity index 100%
rename from Zend/tests/gh15330-006.phpt
rename to Zend/tests/generators/gh15330-006.phpt
diff --git a/Zend/tests/gh15866.phpt b/Zend/tests/generators/gh15866.phpt
similarity index 100%
rename from Zend/tests/gh15866.phpt
rename to Zend/tests/generators/gh15866.phpt
diff --git a/Zend/tests/gh16630.phpt b/Zend/tests/heredoc_nowdoc/gh16630.phpt
similarity index 100%
rename from Zend/tests/gh16630.phpt
rename to Zend/tests/heredoc_nowdoc/gh16630.phpt
diff --git a/Zend/tests/gh11320_1.phpt b/Zend/tests/list/gh11320_1.phpt
similarity index 100%
rename from Zend/tests/gh11320_1.phpt
rename to Zend/tests/list/gh11320_1.phpt
diff --git a/Zend/tests/gh11320_2.phpt b/Zend/tests/list/gh11320_2.phpt
similarity index 100%
rename from Zend/tests/gh11320_2.phpt
rename to Zend/tests/list/gh11320_2.phpt
diff --git a/Zend/tests/gh11320_3.phpt b/Zend/tests/list/gh11320_3.phpt
similarity index 100%
rename from Zend/tests/gh11320_3.phpt
rename to Zend/tests/list/gh11320_3.phpt
diff --git a/Zend/tests/gh11152.phpt b/Zend/tests/namespaces/gh11152.phpt
similarity index 100%
rename from Zend/tests/gh11152.phpt
rename to Zend/tests/namespaces/gh11152.phpt
diff --git a/Zend/tests/gh15240.phpt b/Zend/tests/property_hooks/gh15240.phpt
similarity index 100%
rename from Zend/tests/gh15240.phpt
rename to Zend/tests/property_hooks/gh15240.phpt
diff --git a/Zend/tests/gh16615_001.phpt b/Zend/tests/property_hooks/gh16615_001.phpt
similarity index 100%
rename from Zend/tests/gh16615_001.phpt
rename to Zend/tests/property_hooks/gh16615_001.phpt
diff --git a/Zend/tests/gh16615_002.phpt b/Zend/tests/property_hooks/gh16615_002.phpt
similarity index 100%
rename from Zend/tests/gh16615_002.phpt
rename to Zend/tests/property_hooks/gh16615_002.phpt
diff --git a/Zend/tests/gh16725.phpt b/Zend/tests/property_hooks/gh16725.phpt
similarity index 100%
rename from Zend/tests/gh16725.phpt
rename to Zend/tests/property_hooks/gh16725.phpt
diff --git a/Zend/tests/gh10377.phpt b/Zend/tests/readonly_classes/gh10377.phpt
similarity index 100%
rename from Zend/tests/gh10377.phpt
rename to Zend/tests/readonly_classes/gh10377.phpt
diff --git a/Zend/tests/gh10377_1.phpt b/Zend/tests/readonly_classes/gh10377_1.phpt
similarity index 100%
rename from Zend/tests/gh10377_1.phpt
rename to Zend/tests/readonly_classes/gh10377_1.phpt
diff --git a/Zend/tests/gh10377_2.phpt b/Zend/tests/readonly_classes/gh10377_2.phpt
similarity index 100%
rename from Zend/tests/gh10377_2.phpt
rename to Zend/tests/readonly_classes/gh10377_2.phpt
diff --git a/Zend/tests/gh10377_3.phpt b/Zend/tests/readonly_classes/gh10377_3.phpt
similarity index 100%
rename from Zend/tests/gh10377_3.phpt
rename to Zend/tests/readonly_classes/gh10377_3.phpt
diff --git a/Zend/tests/gh10377_4.phpt b/Zend/tests/readonly_classes/gh10377_4.phpt
similarity index 100%
rename from Zend/tests/gh10377_4.phpt
rename to Zend/tests/readonly_classes/gh10377_4.phpt
diff --git a/Zend/tests/gh10935.phpt b/Zend/tests/traits/gh10935.phpt
similarity index 100%
rename from Zend/tests/gh10935.phpt
rename to Zend/tests/traits/gh10935.phpt
diff --git a/Zend/tests/gh12468_1.phpt b/Zend/tests/traits/gh12468_1.phpt
similarity index 100%
rename from Zend/tests/gh12468_1.phpt
rename to Zend/tests/traits/gh12468_1.phpt
diff --git a/Zend/tests/gh12468_2.phpt b/Zend/tests/traits/gh12468_2.phpt
similarity index 100%
rename from Zend/tests/gh12468_2.phpt
rename to Zend/tests/traits/gh12468_2.phpt
diff --git a/Zend/tests/gh14009_001.phpt b/Zend/tests/traits/gh14009_001.phpt
similarity index 100%
rename from Zend/tests/gh14009_001.phpt
rename to Zend/tests/traits/gh14009_001.phpt
diff --git a/Zend/tests/gh14009_002.phpt b/Zend/tests/traits/gh14009_002.phpt
similarity index 100%
rename from Zend/tests/gh14009_002.phpt
rename to Zend/tests/traits/gh14009_002.phpt
diff --git a/Zend/tests/gh14009_003.phpt b/Zend/tests/traits/gh14009_003.phpt
similarity index 100%
rename from Zend/tests/gh14009_003.phpt
rename to Zend/tests/traits/gh14009_003.phpt
diff --git a/Zend/tests/gh14009_004.phpt b/Zend/tests/traits/gh14009_004.phpt
similarity index 100%
rename from Zend/tests/gh14009_004.phpt
rename to Zend/tests/traits/gh14009_004.phpt
diff --git a/Zend/tests/gh14009_005.phpt b/Zend/tests/traits/gh14009_005.phpt
similarity index 100%
rename from Zend/tests/gh14009_005.phpt
rename to Zend/tests/traits/gh14009_005.phpt
diff --git a/Zend/tests/gh14480.phpt b/Zend/tests/traits/gh14480.phpt
similarity index 100%
rename from Zend/tests/gh14480.phpt
rename to Zend/tests/traits/gh14480.phpt
diff --git a/Zend/tests/gh17214.phpt b/Zend/tests/traits/gh17214.phpt
similarity index 100%
rename from Zend/tests/gh17214.phpt
rename to Zend/tests/traits/gh17214.phpt
diff --git a/Zend/tests/gh_17728.phpt b/Zend/tests/traits/gh_17728.phpt
similarity index 100%
rename from Zend/tests/gh_17728.phpt
rename to Zend/tests/traits/gh_17728.phpt
diff --git a/Zend/tests/gh9500.phpt b/Zend/tests/type_declarations/dnf_types/gh9500.phpt
similarity index 100%
rename from Zend/tests/gh9500.phpt
rename to Zend/tests/type_declarations/dnf_types/gh9500.phpt
diff --git a/build/gen_stub.php b/build/gen_stub.php
index 679f8a9824179..4205360d9a64f 100755
--- a/build/gen_stub.php
+++ b/build/gen_stub.php
@@ -25,6 +25,7 @@
 const PHP_82_VERSION_ID = 80200;
 const PHP_83_VERSION_ID = 80300;
 const PHP_84_VERSION_ID = 80400;
+const PHP_85_VERSION_ID = 80500;
 const ALL_PHP_VERSION_IDS = [
     PHP_70_VERSION_ID,
     PHP_80_VERSION_ID,
@@ -32,6 +33,7 @@
     PHP_82_VERSION_ID,
     PHP_83_VERSION_ID,
     PHP_84_VERSION_ID,
+    PHP_85_VERSION_ID,
 ];
 
 /**
@@ -1541,6 +1543,7 @@ private function getArginfoFlagsByPhpVersions(): array
             PHP_82_VERSION_ID => $php82AndAboveFlags,
             PHP_83_VERSION_ID => $php82AndAboveFlags,
             PHP_84_VERSION_ID => $php82AndAboveFlags,
+            PHP_85_VERSION_ID => $php82AndAboveFlags,
         ];
     }
 
@@ -2342,6 +2345,7 @@ protected function getFlagsByPhpVersion(): array
             PHP_82_VERSION_ID => [$flags],
             PHP_83_VERSION_ID => [$flags],
             PHP_84_VERSION_ID => [$flags],
+            PHP_85_VERSION_ID => [$flags],
         ];
     }
 
@@ -2925,6 +2929,12 @@ class PropertyInfo extends VariableLike
         "set" => "ZEND_STR_SET",
     ];
 
+    // NEW in 8.5
+    private const PHP_85_KNOWN = [
+        "self" => "ZEND_STR_SELF",
+        "parent" => "ZEND_STR_PARENT",
+    ];
+
     /**
      * @var AttributeInfo[] $attributes
      */
@@ -3068,6 +3078,10 @@ private function getString(string $propName): array {
         }
         $include = self::PHP_80_KNOWN;
         switch ($minPhp) {
+            case PHP_85_VERSION_ID:
+                $include = array_merge($include, self::PHP_85_KNOWN);
+                // Intentional fall through
+
             case PHP_84_VERSION_ID:
                 $include = array_merge($include, self::PHP_84_KNOWN);
                 // Intentional fall through
@@ -3546,6 +3560,7 @@ private function getFlagsByPhpVersion(): array
 
         $php83Flags = $php82Flags;
         $php84Flags = $php83Flags;
+        $php85Flags = $php84Flags;
 
         return [
             PHP_70_VERSION_ID => $php70Flags,
@@ -3554,6 +3569,7 @@ private function getFlagsByPhpVersion(): array
             PHP_82_VERSION_ID => $php82Flags,
             PHP_83_VERSION_ID => $php83Flags,
             PHP_84_VERSION_ID => $php84Flags,
+            PHP_85_VERSION_ID => $php85Flags,
         ];
     }
 
@@ -4930,7 +4946,7 @@ protected function pName_FullyQualified(Name\FullyQualified $node): string {
                     throw new Exception(
                         "Legacy PHP version must be one of: \"" . PHP_70_VERSION_ID . "\" (PHP 7.0), \"" . PHP_80_VERSION_ID . "\" (PHP 8.0), " .
                         "\"" . PHP_81_VERSION_ID . "\" (PHP 8.1), \"" . PHP_82_VERSION_ID . "\" (PHP 8.2), \"" . PHP_83_VERSION_ID . "\" (PHP 8.3), " .
-                        "\"" . PHP_84_VERSION_ID . "\" (PHP 8.4), \"" . $tag->value . "\" provided"
+                        "\"" . PHP_84_VERSION_ID . "\" (PHP 8.4), \"" . PHP_85_VERSION_ID . "\" (PHP 8.5), \"" . $tag->value . "\" provided"
                     );
                 }
 
diff --git a/main/debug_gdb_scripts.c b/main/debug_gdb_scripts.c
index eef618bd03301..6368b403d5cd2 100644
--- a/main/debug_gdb_scripts.c
+++ b/main/debug_gdb_scripts.c
@@ -849,12 +849,10 @@ asm(
     ".ascii \"                    if int(c) != 0:\\n\"\n"
     ".ascii \"                        c = c.dereference()\\n\"\n"
     ".ascii \"                    yield ('child[%d]' % i, c)\\n\"\n"
-    ".ascii \"            elif field.name == 'name':\\n\"\n"
-    ".ascii \"                yield (field.name, format_zstr(val[field.name]))\\n\"\n"
     ".ascii \"            elif field.name == 'val':\\n\"\n"
     ".ascii \"                yield (field.name, ZvalPrettyPrinter(val[field.name]).to_string())\\n\"\n"
     ".ascii \"            else:\\n\"\n"
-    ".ascii \"                yield (field.name, format_nested(self.val[field.name]))\\n\"\n"
+    ".ascii \"                yield (field.name, format_nested(val[field.name]))\\n\"\n"
     ".ascii \"\\n\"\n"
     ".ascii \"    def is_special(self):\\n\"\n"
     ".ascii \"        special_shift = 6 # ZEND_AST_SPECIAL_SHIFT\\n\"\n"
diff --git a/run-tests.php b/run-tests.php
index ce658eec1311a..0db6937c7a848 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -49,7 +49,7 @@ function show_usage(): void
 
     -w <file>   Write a list of all failed tests to <file>.
 
-    -a <file>   Same as -w but append rather then truncating <file>.
+    -a <file>   Same as -w but append rather than truncating <file>.
 
     -W <file>   Write a list of all tests and their result status to <file>.
 
@@ -90,7 +90,7 @@ function show_usage(): void
     --temp-source <sdir>  --temp-target <tdir> [--temp-urlbase <url>]
                 Write temporary files to <tdir> by replacing <sdir> from the
                 filenames to generate with <tdir>. In general you want to make
-                <sdir> the path to your source files and <tdir> some patch in
+                <sdir> the path to your source files and <tdir> some path in
                 your web page hierarchy with <url> pointing to <tdir>.
 
     --keep-[all|php|skip|clean]
diff --git a/scripts/gdb/php_gdb.py b/scripts/gdb/php_gdb.py
index 3bd66c8d88fb8..8841833a32e43 100644
--- a/scripts/gdb/php_gdb.py
+++ b/scripts/gdb/php_gdb.py
@@ -179,12 +179,10 @@ def children(self):
                     if int(c) != 0:
                         c = c.dereference()
                     yield ('child[%d]' % i, c)
-            elif field.name == 'name':
-                yield (field.name, format_zstr(val[field.name]))
             elif field.name == 'val':
                 yield (field.name, ZvalPrettyPrinter(val[field.name]).to_string())
             else:
-                yield (field.name, format_nested(self.val[field.name]))
+                yield (field.name, format_nested(val[field.name]))
 
     def is_special(self):
         special_shift = 6 # ZEND_AST_SPECIAL_SHIFT