wudi · pull · Feb 24, 2025 · Feb 21, 2025 · Feb 21, 2025 · Feb 21, 2025
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -520,7 +520,7 @@ jobs:
       - name: Test Laravel
         if: ${{ !cancelled() }}
         run: |
-          git clone https://github.com/laravel/framework.git --branch=master --depth=1
+          git clone https://github.com/laravel/framework.git --depth=1
           cd framework
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-reqs

diff --git a/Zend/tests/bug28377.phpt → Zend/tests/backtrace/bug28377.phpt b/Zend/tests/bug28377.phpt → Zend/tests/backtrace/bug28377.phpt
diff --git a/Zend/tests/bug30828.phpt → Zend/tests/backtrace/bug30828.phpt b/Zend/tests/bug30828.phpt → Zend/tests/backtrace/bug30828.phpt
diff --git a/Zend/tests/bug39445.phpt → Zend/tests/backtrace/bug39445.phpt b/Zend/tests/bug39445.phpt → Zend/tests/backtrace/bug39445.phpt
diff --git a/Zend/tests/bug64239_2.phpt → Zend/tests/backtrace/bug64239_2.phpt b/Zend/tests/bug64239_2.phpt → Zend/tests/backtrace/bug64239_2.phpt
diff --git a/Zend/tests/bug64239_3.phpt → Zend/tests/backtrace/bug64239_3.phpt b/Zend/tests/bug64239_3.phpt → Zend/tests/backtrace/bug64239_3.phpt
diff --git a/Zend/tests/bug64239_4.phpt → Zend/tests/backtrace/bug64239_4.phpt b/Zend/tests/bug64239_4.phpt → Zend/tests/backtrace/bug64239_4.phpt
diff --git a/Zend/tests/bug69180-backtrace.phpt → Zend/tests/backtrace/bug69180-backtrace.phpt b/Zend/tests/bug69180-backtrace.phpt → Zend/tests/backtrace/bug69180-backtrace.phpt
diff --git a/Zend/tests/bug70547.phpt → Zend/tests/backtrace/bug70547.phpt b/Zend/tests/bug70547.phpt → Zend/tests/backtrace/bug70547.phpt
diff --git a/Zend/tests/bug76047.phpt → Zend/tests/backtrace/bug76047.phpt b/Zend/tests/bug76047.phpt → Zend/tests/backtrace/bug76047.phpt
diff --git a/Zend/tests/bug79108.phpt → Zend/tests/backtrace/bug79108.phpt b/Zend/tests/bug79108.phpt → Zend/tests/backtrace/bug79108.phpt
diff --git a/Zend/tests/bug_debug_backtrace.phpt → .../tests/backtrace/bug_debug_backtrace.phpt b/Zend/tests/bug_debug_backtrace.phpt → .../tests/backtrace/bug_debug_backtrace.phpt
diff --git a/...ug_backtrace_replace_zend_execute_ex.phpt → ...ug_backtrace_replace_zend_execute_ex.phpt b/...ug_backtrace_replace_zend_execute_ex.phpt → ...ug_backtrace_replace_zend_execute_ex.phpt
diff --git a/Zend/tests/debug_backtrace_limit.phpt → ...ests/backtrace/debug_backtrace_limit.phpt b/Zend/tests/debug_backtrace_limit.phpt → ...ests/backtrace/debug_backtrace_limit.phpt
diff --git a/Zend/tests/debug_backtrace_options.phpt → ...ts/backtrace/debug_backtrace_options.phpt b/Zend/tests/debug_backtrace_options.phpt → ...ts/backtrace/debug_backtrace_options.phpt
diff --git a/...ebug_backtrace_with_include_and_this.phpt → ...ebug_backtrace_with_include_and_this.phpt b/...ebug_backtrace_with_include_and_this.phpt → ...ebug_backtrace_with_include_and_this.phpt
diff --git a/...ests/debug_print_backtrace_from_main.phpt → ...race/debug_print_backtrace_from_main.phpt b/...ests/debug_print_backtrace_from_main.phpt → ...race/debug_print_backtrace_from_main.phpt
diff --git a/Zend/tests/debug_print_backtrace_limit.phpt → ...acktrace/debug_print_backtrace_limit.phpt b/Zend/tests/debug_print_backtrace_limit.phpt → ...acktrace/debug_print_backtrace_limit.phpt
diff --git a/Zend/tests/fatal_error_backtraces_001.phpt → ...backtrace/fatal_error_backtraces_001.phpt b/Zend/tests/fatal_error_backtraces_001.phpt → ...backtrace/fatal_error_backtraces_001.phpt
diff --git a/Zend/tests/fatal_error_backtraces_002.phpt → ...backtrace/fatal_error_backtraces_002.phpt b/Zend/tests/fatal_error_backtraces_002.phpt → ...backtrace/fatal_error_backtraces_002.phpt
diff --git a/Zend/tests/fatal_error_backtraces_003.phpt → ...backtrace/fatal_error_backtraces_003.phpt b/Zend/tests/fatal_error_backtraces_003.phpt → ...backtrace/fatal_error_backtraces_003.phpt
diff --git a/Zend/tests/bug32290.phpt → Zend/tests/call_user_functions/bug32290.phpt b/Zend/tests/bug32290.phpt → Zend/tests/call_user_functions/bug32290.phpt
diff --git a/Zend/tests/bug43426.phpt → Zend/tests/call_user_functions/bug43426.phpt b/Zend/tests/bug43426.phpt → Zend/tests/call_user_functions/bug43426.phpt
diff --git a/Zend/tests/bug66719.phpt → Zend/tests/call_user_functions/bug66719.phpt b/Zend/tests/bug66719.phpt → Zend/tests/call_user_functions/bug66719.phpt
diff --git a/Zend/tests/call_user_func_001.phpt → ...ll_user_functions/call_user_func_001.phpt b/Zend/tests/call_user_func_001.phpt → ...ll_user_functions/call_user_func_001.phpt
diff --git a/Zend/tests/call_user_func_002.phpt → ...ll_user_functions/call_user_func_002.phpt b/Zend/tests/call_user_func_002.phpt → ...ll_user_functions/call_user_func_002.phpt
diff --git a/Zend/tests/call_user_func_003.phpt → ...ll_user_functions/call_user_func_003.phpt b/Zend/tests/call_user_func_003.phpt → ...ll_user_functions/call_user_func_003.phpt
diff --git a/Zend/tests/call_user_func_005.phpt → ...ll_user_functions/call_user_func_005.phpt b/Zend/tests/call_user_func_005.phpt → ...ll_user_functions/call_user_func_005.phpt
diff --git a/Zend/tests/call_user_func_006.phpt → ...ll_user_functions/call_user_func_006.phpt b/Zend/tests/call_user_func_006.phpt → ...ll_user_functions/call_user_func_006.phpt
diff --git a/Zend/tests/call_user_func_007.phpt → ...ll_user_functions/call_user_func_007.phpt b/Zend/tests/call_user_func_007.phpt → ...ll_user_functions/call_user_func_007.phpt
diff --git a/Zend/tests/call_user_func_008.phpt → ...ll_user_functions/call_user_func_008.phpt b/Zend/tests/call_user_func_008.phpt → ...ll_user_functions/call_user_func_008.phpt
diff --git a/Zend/tests/call_user_func_009.phpt → ...ll_user_functions/call_user_func_009.phpt b/Zend/tests/call_user_func_009.phpt → ...ll_user_functions/call_user_func_009.phpt
diff --git a/...er_func_array_array_slice_named_args.phpt → ...er_func_array_array_slice_named_args.phpt b/...er_func_array_array_slice_named_args.phpt → ...er_func_array_array_slice_named_args.phpt
diff --git a/...all_user_func_array_array_slice_type.phpt → ...all_user_func_array_array_slice_type.phpt b/...all_user_func_array_array_slice_type.phpt → ...all_user_func_array_array_slice_type.phpt
diff --git a/...r_func_array_array_slice_type_strict.phpt → ...r_func_array_array_slice_type_strict.phpt b/...r_func_array_array_slice_type_strict.phpt → ...r_func_array_array_slice_type_strict.phpt
diff --git a/...ts/call_user_func_array_invalid_type.phpt → ...ns/call_user_func_array_invalid_type.phpt b/...ts/call_user_func_array_invalid_type.phpt → ...ns/call_user_func_array_invalid_type.phpt
diff --git a/...ests/call_user_func_array_prefer_ref.phpt → ...ions/call_user_func_array_prefer_ref.phpt b/...ests/call_user_func_array_prefer_ref.phpt → ...ions/call_user_func_array_prefer_ref.phpt
diff --git a/Zend/tests/call_user_func_by_ref.phpt → ...user_functions/call_user_func_by_ref.phpt b/Zend/tests/call_user_func_by_ref.phpt → ...user_functions/call_user_func_by_ref.phpt
diff --git a/...user_func_closure_from_static_method.phpt → ...user_func_closure_from_static_method.phpt b/...user_func_closure_from_static_method.phpt → ...user_func_closure_from_static_method.phpt
diff --git a/.../call_user_func_strict_arginfo_check.phpt → .../call_user_func_strict_arginfo_check.phpt b/.../call_user_func_strict_arginfo_check.phpt → .../call_user_func_strict_arginfo_check.phpt
diff --git a/Zend/tests/class_name_as_scalar.phpt → ...ests/class_name/class_name_as_scalar.phpt b/Zend/tests/class_name_as_scalar.phpt → ...ests/class_name/class_name_as_scalar.phpt
diff --git a/...tests/class_name_as_scalar_error_001.phpt → ..._name/class_name_as_scalar_error_001.phpt b/...tests/class_name_as_scalar_error_001.phpt → ..._name/class_name_as_scalar_error_001.phpt
diff --git a/...tests/class_name_as_scalar_error_002.phpt → ..._name/class_name_as_scalar_error_002.phpt b/...tests/class_name_as_scalar_error_002.phpt → ..._name/class_name_as_scalar_error_002.phpt
diff --git a/...tests/class_name_as_scalar_error_003.phpt → ..._name/class_name_as_scalar_error_003.phpt b/...tests/class_name_as_scalar_error_003.phpt → ..._name/class_name_as_scalar_error_003.phpt
diff --git a/...tests/class_name_as_scalar_error_004.phpt → ..._name/class_name_as_scalar_error_004.phpt b/...tests/class_name_as_scalar_error_004.phpt → ..._name/class_name_as_scalar_error_004.phpt
diff --git a/...tests/class_name_as_scalar_error_005.phpt → ..._name/class_name_as_scalar_error_005.phpt b/...tests/class_name_as_scalar_error_005.phpt → ..._name/class_name_as_scalar_error_005.phpt
diff --git a/...tests/class_name_as_scalar_error_006.phpt → ..._name/class_name_as_scalar_error_006.phpt b/...tests/class_name_as_scalar_error_006.phpt → ..._name/class_name_as_scalar_error_006.phpt
diff --git a/...tests/class_name_as_scalar_error_007.phpt → ..._name/class_name_as_scalar_error_007.phpt b/...tests/class_name_as_scalar_error_007.phpt → ..._name/class_name_as_scalar_error_007.phpt
diff --git a/...ass_on_constant_evaluated_expression.phpt → ...ass_on_constant_evaluated_expression.phpt b/...ass_on_constant_evaluated_expression.phpt → ...ass_on_constant_evaluated_expression.phpt
diff --git a/Zend/tests/class_on_object.phpt → Zend/tests/class_name/class_on_object.phpt b/Zend/tests/class_on_object.phpt → Zend/tests/class_name/class_on_object.phpt
diff --git a/...sts/parent_class_name_without_parent.phpt → ...ame/parent_class_name_without_parent.phpt b/...sts/parent_class_name_without_parent.phpt → ...ame/parent_class_name_without_parent.phpt
diff --git a/...ts/self_class_const_in_unknown_scope.phpt → ...me/self_class_const_in_unknown_scope.phpt b/...ts/self_class_const_in_unknown_scope.phpt → ...me/self_class_const_in_unknown_scope.phpt
diff --git a/Zend/tests/assign_coalesce_001.phpt → Zend/tests/coalesce/assign_coalesce_001.phpt b/Zend/tests/assign_coalesce_001.phpt → Zend/tests/coalesce/assign_coalesce_001.phpt
diff --git a/Zend/tests/assign_coalesce_002.phpt → Zend/tests/coalesce/assign_coalesce_002.phpt b/Zend/tests/assign_coalesce_002.phpt → Zend/tests/coalesce/assign_coalesce_002.phpt
diff --git a/Zend/tests/assign_coalesce_003.phpt → Zend/tests/coalesce/assign_coalesce_003.phpt b/Zend/tests/assign_coalesce_003.phpt → Zend/tests/coalesce/assign_coalesce_003.phpt
diff --git a/Zend/tests/assign_coalesce_004.phpt → Zend/tests/coalesce/assign_coalesce_004.phpt b/Zend/tests/assign_coalesce_004.phpt → Zend/tests/coalesce/assign_coalesce_004.phpt
diff --git a/Zend/tests/assign_coalesce_005.phpt → Zend/tests/coalesce/assign_coalesce_005.phpt b/Zend/tests/assign_coalesce_005.phpt → Zend/tests/coalesce/assign_coalesce_005.phpt
diff --git a/Zend/tests/assign_coalesce_006.phpt → Zend/tests/coalesce/assign_coalesce_006.phpt b/Zend/tests/assign_coalesce_006.phpt → Zend/tests/coalesce/assign_coalesce_006.phpt
diff --git a/Zend/tests/assign_coalesce_007.phpt → Zend/tests/coalesce/assign_coalesce_007.phpt b/Zend/tests/assign_coalesce_007.phpt → Zend/tests/coalesce/assign_coalesce_007.phpt
diff --git a/Zend/tests/assign_coalesce_008.phpt → Zend/tests/coalesce/assign_coalesce_008.phpt b/Zend/tests/assign_coalesce_008.phpt → Zend/tests/coalesce/assign_coalesce_008.phpt
diff --git a/Zend/tests/assign_coalesce_009.phpt → Zend/tests/coalesce/assign_coalesce_009.phpt b/Zend/tests/assign_coalesce_009.phpt → Zend/tests/coalesce/assign_coalesce_009.phpt
diff --git a/Zend/tests/bug69889.phpt → Zend/tests/coalesce/bug69889.phpt b/Zend/tests/bug69889.phpt → Zend/tests/coalesce/bug69889.phpt
diff --git a/Zend/tests/bug81684.phpt → Zend/tests/coalesce/bug81684.phpt b/Zend/tests/bug81684.phpt → Zend/tests/coalesce/bug81684.phpt
diff --git a/Zend/tests/coalesce_assign_optimization.phpt → ...oalesce/coalesce_assign_optimization.phpt b/Zend/tests/coalesce_assign_optimization.phpt → ...oalesce/coalesce_assign_optimization.phpt
diff --git a/Zend/tests/gh11108.phpt → Zend/tests/coalesce/gh11108.phpt b/Zend/tests/gh11108.phpt → Zend/tests/coalesce/gh11108.phpt
diff --git a/Zend/tests/gh11108_shutdown.inc → Zend/tests/coalesce/gh11108_shutdown.inc b/Zend/tests/gh11108_shutdown.inc → Zend/tests/coalesce/gh11108_shutdown.inc
diff --git a/Zend/tests/gh11108_test.inc → Zend/tests/coalesce/gh11108_test.inc b/Zend/tests/gh11108_test.inc → Zend/tests/coalesce/gh11108_test.inc
diff --git a/...sts/assign_concat_array_empty_string.phpt → ...cat/assign_concat_array_empty_string.phpt b/...sts/assign_concat_array_empty_string.phpt → ...cat/assign_concat_array_empty_string.phpt
diff --git a/Zend/tests/bug32833.phpt → Zend/tests/concat/bug32833.phpt b/Zend/tests/bug32833.phpt → Zend/tests/concat/bug32833.phpt
diff --git a/Zend/tests/bug40809.phpt → Zend/tests/concat/bug40809.phpt b/Zend/tests/bug40809.phpt → Zend/tests/concat/bug40809.phpt
diff --git a/Zend/tests/bug44069.phpt → Zend/tests/concat/bug44069.phpt b/Zend/tests/bug44069.phpt → Zend/tests/concat/bug44069.phpt
diff --git a/Zend/tests/bug68118.phpt → Zend/tests/concat/bug68118.phpt b/Zend/tests/bug68118.phpt → Zend/tests/concat/bug68118.phpt
diff --git a/Zend/tests/bug79836.phpt → Zend/tests/concat/bug79836.phpt b/Zend/tests/bug79836.phpt → Zend/tests/concat/bug79836.phpt
diff --git a/Zend/tests/bug79836_1.phpt → Zend/tests/concat/bug79836_1.phpt b/Zend/tests/bug79836_1.phpt → Zend/tests/concat/bug79836_1.phpt
diff --git a/Zend/tests/bug79836_2.phpt → Zend/tests/concat/bug79836_2.phpt b/Zend/tests/bug79836_2.phpt → Zend/tests/concat/bug79836_2.phpt
diff --git a/Zend/tests/bug79836_3.phpt → Zend/tests/concat/bug79836_3.phpt b/Zend/tests/bug79836_3.phpt → Zend/tests/concat/bug79836_3.phpt
diff --git a/Zend/tests/bug79836_4.phpt → Zend/tests/concat/bug79836_4.phpt b/Zend/tests/bug79836_4.phpt → Zend/tests/concat/bug79836_4.phpt
diff --git a/Zend/tests/bug81705.phpt → Zend/tests/concat/bug81705.phpt b/Zend/tests/bug81705.phpt → Zend/tests/concat/bug81705.phpt
diff --git a/Zend/tests/concat_001.phpt → Zend/tests/concat/concat_001.phpt b/Zend/tests/concat_001.phpt → Zend/tests/concat/concat_001.phpt
diff --git a/Zend/tests/concat_002.phpt → Zend/tests/concat/concat_002.phpt b/Zend/tests/concat_002.phpt → Zend/tests/concat/concat_002.phpt
diff --git a/Zend/tests/concat_003.phpt → Zend/tests/concat/concat_003.phpt b/Zend/tests/concat_003.phpt → Zend/tests/concat/concat_003.phpt
diff --git a/Zend/tests/008.phpt → Zend/tests/constants/008.phpt b/Zend/tests/008.phpt → Zend/tests/constants/008.phpt
diff --git a/Zend/tests/018.phpt → Zend/tests/constants/018.phpt b/Zend/tests/018.phpt → Zend/tests/constants/018.phpt
diff --git a/Zend/tests/bug42820.phpt → Zend/tests/constants/bug42820.phpt b/Zend/tests/bug42820.phpt → Zend/tests/constants/bug42820.phpt
diff --git a/Zend/tests/bug76430.phpt → Zend/tests/constants/bug76430.phpt b/Zend/tests/bug76430.phpt → Zend/tests/constants/bug76430.phpt
diff --git a/Zend/tests/const_deprecation.phpt → Zend/tests/constants/const_deprecation.phpt b/Zend/tests/const_deprecation.phpt → Zend/tests/constants/const_deprecation.phpt
diff --git a/Zend/tests/defined_fn_no_ns_fallback.phpt → .../constants/defined_fn_no_ns_fallback.phpt b/Zend/tests/defined_fn_no_ns_fallback.phpt → .../constants/defined_fn_no_ns_fallback.phpt
diff --git a/Zend/tests/gh17222.phpt → Zend/tests/constants/gh17222.phpt b/Zend/tests/gh17222.phpt → Zend/tests/constants/gh17222.phpt
diff --git a/Zend/tests/oss_fuzz_57821.phpt → Zend/tests/constants/oss_fuzz_57821.phpt b/Zend/tests/oss_fuzz_57821.phpt → Zend/tests/constants/oss_fuzz_57821.phpt
diff --git a/Zend/tests/selfParent_001.phpt → Zend/tests/constants/selfParent_001.phpt b/Zend/tests/selfParent_001.phpt → Zend/tests/constants/selfParent_001.phpt
diff --git a/Zend/tests/selfParent_002.phpt → Zend/tests/constants/selfParent_002.phpt b/Zend/tests/selfParent_002.phpt → Zend/tests/constants/selfParent_002.phpt
diff --git a/...on_expression_in_constant_expression.phpt → ...on_expression_in_constant_expression.phpt b/...on_expression_in_constant_expression.phpt → ...on_expression_in_constant_expression.phpt
diff --git a/...tests/const_expr_dim_on_null_warning.phpt → ...texpr/const_expr_dim_on_null_warning.phpt b/...tests/const_expr_dim_on_null_warning.phpt → ...texpr/const_expr_dim_on_null_warning.phpt
diff --git a/...ant_expressions/constant_expressions.phpt → ...tests/constexpr/constant_expressions.phpt b/...ant_expressions/constant_expressions.phpt → ...tests/constexpr/constant_expressions.phpt
diff --git a/...ressions/constant_expressions_arrays.phpt → ...onstexpr/constant_expressions_arrays.phpt b/...ressions/constant_expressions_arrays.phpt → ...onstexpr/constant_expressions_arrays.phpt
diff --git a/...essions/constant_expressions_classes.phpt → ...nstexpr/constant_expressions_classes.phpt b/...essions/constant_expressions_classes.phpt → ...nstexpr/constant_expressions_classes.phpt
diff --git a/...ssions/constant_expressions_coalesce.phpt → ...stexpr/constant_expressions_coalesce.phpt b/...ssions/constant_expressions_coalesce.phpt → ...stexpr/constant_expressions_coalesce.phpt
diff --git a/...stant_expressions_coalesce_empty_dim.phpt → ...stant_expressions_coalesce_empty_dim.phpt b/...stant_expressions_coalesce_empty_dim.phpt → ...stant_expressions_coalesce_empty_dim.phpt
diff --git a/...essions/constant_expressions_dynamic.phpt → ...nstexpr/constant_expressions_dynamic.phpt b/...essions/constant_expressions_dynamic.phpt → ...nstexpr/constant_expressions_dynamic.phpt
diff --git a/...expressions_dynamic_class_name_error.phpt → ...expressions_dynamic_class_name_error.phpt b/...expressions_dynamic_class_name_error.phpt → ...expressions_dynamic_class_name_error.phpt
diff --git a/...sions/constant_expressions_exceptions.inc → ...texpr/constant_expressions_exceptions.inc b/...sions/constant_expressions_exceptions.inc → ...texpr/constant_expressions_exceptions.inc
diff --git a/.../constant_expressions_exceptions_001.phpt → .../constant_expressions_exceptions_001.phpt b/.../constant_expressions_exceptions_001.phpt → .../constant_expressions_exceptions_001.phpt
diff --git a/.../constant_expressions_exceptions_002.phpt → .../constant_expressions_exceptions_002.phpt b/.../constant_expressions_exceptions_002.phpt → .../constant_expressions_exceptions_002.phpt
diff --git a/...xpressions_invalid_offset_type_error.phpt → ...xpressions_invalid_offset_type_error.phpt b/...xpressions_invalid_offset_type_error.phpt → ...xpressions_invalid_offset_type_error.phpt
diff --git a/...t_expressions_self_referencing_array.phpt → ...t_expressions_self_referencing_array.phpt b/...t_expressions_self_referencing_array.phpt → ...t_expressions_self_referencing_array.phpt
diff --git a/..._expressions_static_class_name_error.phpt → ..._expressions_static_class_name_error.phpt b/..._expressions_static_class_name_error.phpt → ..._expressions_static_class_name_error.phpt
diff --git a/Zend/tests/constant_expressions/gh10014.phpt → Zend/tests/constexpr/gh10014.phpt b/Zend/tests/constant_expressions/gh10014.phpt → Zend/tests/constexpr/gh10014.phpt
diff --git a/Zend/tests/constant_expressions/gh10356.phpt → Zend/tests/constexpr/gh10356.phpt b/Zend/tests/constant_expressions/gh10356.phpt → Zend/tests/constexpr/gh10356.phpt
diff --git a/.../tests/constant_expressions/gh7771_1.phpt → Zend/tests/constexpr/gh7771_1.phpt b/.../tests/constant_expressions/gh7771_1.phpt → Zend/tests/constexpr/gh7771_1.phpt
diff --git a/...stant_expressions/gh7771_1_definition.inc → Zend/tests/constexpr/gh7771_1_definition.inc b/...stant_expressions/gh7771_1_definition.inc → Zend/tests/constexpr/gh7771_1_definition.inc
diff --git a/.../tests/constant_expressions/gh7771_2.phpt → Zend/tests/constexpr/gh7771_2.phpt b/.../tests/constant_expressions/gh7771_2.phpt → Zend/tests/constexpr/gh7771_2.phpt
diff --git a/...stant_expressions/gh7771_2_definition.inc → Zend/tests/constexpr/gh7771_2_definition.inc b/...stant_expressions/gh7771_2_definition.inc → Zend/tests/constexpr/gh7771_2_definition.inc
diff --git a/.../tests/constant_expressions/gh7771_3.phpt → Zend/tests/constexpr/gh7771_3.phpt b/.../tests/constant_expressions/gh7771_3.phpt → Zend/tests/constexpr/gh7771_3.phpt
diff --git a/Zend/tests/constant_expressions/gh9136.phpt → Zend/tests/constexpr/gh9136.phpt b/Zend/tests/constant_expressions/gh9136.phpt → Zend/tests/constexpr/gh9136.phpt
diff --git a/.../tests/constant_expressions/gh9136_2.phpt → Zend/tests/constexpr/gh9136_2.phpt b/.../tests/constant_expressions/gh9136_2.phpt → Zend/tests/constexpr/gh9136_2.phpt
diff --git a/Zend/tests/constant_expressions/gh9138.phpt → Zend/tests/constexpr/gh9138.phpt b/Zend/tests/constant_expressions/gh9138.phpt → Zend/tests/constexpr/gh9138.phpt
diff --git a/.../tests/constant_expressions/gh9138_2.phpt → Zend/tests/constexpr/gh9138_2.phpt b/.../tests/constant_expressions/gh9138_2.phpt → Zend/tests/constexpr/gh9138_2.phpt
diff --git a/Zend/tests/constexpr/new_dynamic_class_name.phpt b/Zend/tests/constexpr/new_dynamic_class_name.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Dynamic class name in new is not supported
+Dynamic class name in new is supported
 --FILE--
 <?php
 

diff --git a/Zend/tests/constexpr/new_invalid_operation_in_arg.phpt b/Zend/tests/constexpr/new_invalid_operation_in_arg.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Invalid operation in new arg in const expr
+Valid operation in new arg in const expr
 --FILE--
 <?php
 

diff --git a/Zend/tests/constexpr/new_static.phpt b/Zend/tests/constexpr/new_static.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Static in new is not supported
+Static in new is supported
 --FILE--
 <?php
 

diff --git a/Zend/tests/recursive_debug_info.phpt → ...ests/debug_info/recursive_debug_info.phpt b/Zend/tests/recursive_debug_info.phpt → ...ests/debug_info/recursive_debug_info.phpt
diff --git a/Zend/tests/enum_in_stack_trace.phpt → Zend/tests/enum/enum_in_stack_trace.phpt b/Zend/tests/enum_in_stack_trace.phpt → Zend/tests/enum/enum_in_stack_trace.phpt
diff --git a/Zend/tests/bug30519.phpt → Zend/tests/errmsg/bug30519.phpt b/Zend/tests/bug30519.phpt → Zend/tests/errmsg/bug30519.phpt
diff --git a/Zend/tests/bug54043.phpt → Zend/tests/exceptions/bug54043.phpt b/Zend/tests/bug54043.phpt → Zend/tests/exceptions/bug54043.phpt
diff --git a/...ests/function_default_argument_cache.phpt → ...ents/function_default_argument_cache.phpt b/...ests/function_default_argument_cache.phpt → ...ents/function_default_argument_cache.phpt
diff --git a/...t_syntax_compile_error_in_const_expr.phpt → ...t_syntax_compile_error_in_const_expr.phpt b/...t_syntax_compile_error_in_const_expr.phpt → ...t_syntax_compile_error_in_const_expr.phpt
diff --git a/...tax_compile_error_outside_const_expr.phpt → ...tax_compile_error_outside_const_expr.phpt b/...tax_compile_error_outside_const_expr.phpt → ...tax_compile_error_outside_const_expr.phpt
diff --git a/...ative_offset_syntax_in_encaps_string.phpt → ...ative_offset_syntax_in_encaps_string.phpt b/...ative_offset_syntax_in_encaps_string.phpt → ...ative_offset_syntax_in_encaps_string.phpt
diff --git a/Zend/tests/bug31341.phpt → Zend/tests/grammar/bug31341.phpt b/Zend/tests/bug31341.phpt → Zend/tests/grammar/bug31341.phpt
diff --git a/Zend/tests/bug35411.phpt → Zend/tests/grammar/bug35411.phpt b/Zend/tests/bug35411.phpt → Zend/tests/grammar/bug35411.phpt
diff --git a/Zend/tests/bug41401.phpt → Zend/tests/grammar/bug41401.phpt b/Zend/tests/bug41401.phpt → Zend/tests/grammar/bug41401.phpt
diff --git a/Zend/tests/bug45147.phpt → Zend/tests/grammar/bug45147.phpt b/Zend/tests/bug45147.phpt → Zend/tests/grammar/bug45147.phpt
diff --git a/Zend/tests/bug55445.phpt → Zend/tests/grammar/bug55445.phpt b/Zend/tests/bug55445.phpt → Zend/tests/grammar/bug55445.phpt
diff --git a/Zend/tests/bug60099.phpt → Zend/tests/grammar/bug60099.phpt b/Zend/tests/bug60099.phpt → Zend/tests/grammar/bug60099.phpt
diff --git a/Zend/tests/bug61095.phpt → Zend/tests/grammar/bug61095.phpt b/Zend/tests/bug61095.phpt → Zend/tests/grammar/bug61095.phpt
diff --git a/Zend/tests/bug61225.phpt → Zend/tests/grammar/bug61225.phpt b/Zend/tests/bug61225.phpt → Zend/tests/grammar/bug61225.phpt
diff --git a/Zend/tests/bug61681.phpt → Zend/tests/grammar/bug61681.phpt b/Zend/tests/bug61681.phpt → Zend/tests/grammar/bug61681.phpt
diff --git a/Zend/tests/bug70430.phpt → Zend/tests/grammar/bug70430.phpt b/Zend/tests/bug70430.phpt → Zend/tests/grammar/bug70430.phpt
diff --git a/Zend/tests/bug77993.phpt → Zend/tests/grammar/bug77993.phpt b/Zend/tests/bug77993.phpt → Zend/tests/grammar/bug77993.phpt
diff --git a/Zend/tests/gh14961.phpt → Zend/tests/grammar/gh14961.phpt b/Zend/tests/gh14961.phpt → Zend/tests/grammar/gh14961.phpt
diff --git a/Zend/tests/readonly_function.phpt → Zend/tests/grammar/readonly_function.phpt b/Zend/tests/readonly_function.phpt → Zend/tests/grammar/readonly_function.phpt
diff --git a/Zend/tests/bug76439.phpt → Zend/tests/heredoc_nowdoc/bug76439.phpt b/Zend/tests/bug76439.phpt → Zend/tests/heredoc_nowdoc/bug76439.phpt
diff --git a/Zend/tests/bug76439_2.phpt → Zend/tests/heredoc_nowdoc/bug76439_2.phpt b/Zend/tests/bug76439_2.phpt → Zend/tests/heredoc_nowdoc/bug76439_2.phpt
diff --git a/...ts/warning_during_heredoc_scan_ahead.phpt → ...oc/warning_during_heredoc_scan_ahead.phpt b/...ts/warning_during_heredoc_scan_ahead.phpt → ...oc/warning_during_heredoc_scan_ahead.phpt
diff --git a/Zend/tests/oss_fuzz_63802.phpt → Zend/tests/in-de-crement/oss_fuzz_63802.phpt b/Zend/tests/oss_fuzz_63802.phpt → Zend/tests/in-de-crement/oss_fuzz_63802.phpt
diff --git a/Zend/tests/post_inc_without_use.phpt → ...s/in-de-crement/post_inc_without_use.phpt b/Zend/tests/post_inc_without_use.phpt → ...s/in-de-crement/post_inc_without_use.phpt
diff --git a/Zend/tests/indirect_call_array_001.phpt → ...unction_call/indirect_call_array_001.phpt b/Zend/tests/indirect_call_array_001.phpt → ...unction_call/indirect_call_array_001.phpt
diff --git a/Zend/tests/indirect_call_array_002.phpt → ...unction_call/indirect_call_array_002.phpt b/Zend/tests/indirect_call_array_002.phpt → ...unction_call/indirect_call_array_002.phpt
diff --git a/Zend/tests/indirect_call_array_003.phpt → ...unction_call/indirect_call_array_003.phpt b/Zend/tests/indirect_call_array_003.phpt → ...unction_call/indirect_call_array_003.phpt
diff --git a/Zend/tests/indirect_call_array_004.phpt → ...unction_call/indirect_call_array_004.phpt b/Zend/tests/indirect_call_array_004.phpt → ...unction_call/indirect_call_array_004.phpt
diff --git a/Zend/tests/indirect_call_array_005.phpt → ...unction_call/indirect_call_array_005.phpt b/Zend/tests/indirect_call_array_005.phpt → ...unction_call/indirect_call_array_005.phpt
diff --git a/Zend/tests/indirect_call_from_constant.phpt → ...ion_call/indirect_call_from_constant.phpt b/Zend/tests/indirect_call_from_constant.phpt → ...ion_call/indirect_call_from_constant.phpt
diff --git a/Zend/tests/indirect_call_string_001.phpt → ...nction_call/indirect_call_string_001.phpt b/Zend/tests/indirect_call_string_001.phpt → ...nction_call/indirect_call_string_001.phpt
diff --git a/Zend/tests/indirect_call_string_002.phpt → ...nction_call/indirect_call_string_002.phpt b/Zend/tests/indirect_call_string_002.phpt → ...nction_call/indirect_call_string_002.phpt
diff --git a/Zend/tests/indirect_call_string_003.phpt → ...nction_call/indirect_call_string_003.phpt b/Zend/tests/indirect_call_string_003.phpt → ...nction_call/indirect_call_string_003.phpt
diff --git a/Zend/tests/indirect_method_call_001.phpt → ...nction_call/indirect_method_call_001.phpt b/Zend/tests/indirect_method_call_001.phpt → ...nction_call/indirect_method_call_001.phpt
diff --git a/Zend/tests/indirect_method_call_002.phpt → ...nction_call/indirect_method_call_002.phpt b/Zend/tests/indirect_method_call_002.phpt → ...nction_call/indirect_method_call_002.phpt
diff --git a/Zend/tests/indirect_method_call_003.phpt → ...nction_call/indirect_method_call_003.phpt b/Zend/tests/indirect_method_call_003.phpt → ...nction_call/indirect_method_call_003.phpt
diff --git a/Zend/tests/indirect_method_call_004.phpt → ...nction_call/indirect_method_call_004.phpt b/Zend/tests/indirect_method_call_004.phpt → ...nction_call/indirect_method_call_004.phpt
diff --git a/Zend/tests/indirect_method_call_005.phpt → ...nction_call/indirect_method_call_005.phpt b/Zend/tests/indirect_method_call_005.phpt → ...nction_call/indirect_method_call_005.phpt
diff --git a/...tion_to_exception_during_inheritance.phpt → ...tion_to_exception_during_inheritance.phpt b/...tion_to_exception_during_inheritance.phpt → ...tion_to_exception_during_inheritance.phpt
diff --git a/Zend/tests/bug81631.phpt → Zend/tests/line_numbers/bug81631.phpt b/Zend/tests/bug81631.phpt → Zend/tests/line_numbers/bug81631.phpt
diff --git a/Zend/tests/gh16509.inc → Zend/tests/line_numbers/gh16509.inc b/Zend/tests/gh16509.inc → Zend/tests/line_numbers/gh16509.inc
diff --git a/Zend/tests/gh16509.phpt → Zend/tests/line_numbers/gh16509.phpt b/Zend/tests/gh16509.phpt → Zend/tests/line_numbers/gh16509.phpt
diff --git a/Zend/tests/gh8810_1.phpt → Zend/tests/line_numbers/gh8810_1.phpt b/Zend/tests/gh8810_1.phpt → Zend/tests/line_numbers/gh8810_1.phpt
diff --git a/Zend/tests/gh8810_2.phpt → Zend/tests/line_numbers/gh8810_2.phpt b/Zend/tests/gh8810_2.phpt → Zend/tests/line_numbers/gh8810_2.phpt
diff --git a/Zend/tests/gh8810_3.phpt → Zend/tests/line_numbers/gh8810_3.phpt b/Zend/tests/gh8810_3.phpt → Zend/tests/line_numbers/gh8810_3.phpt
diff --git a/Zend/tests/gh8810_4.phpt → Zend/tests/line_numbers/gh8810_4.phpt b/Zend/tests/gh8810_4.phpt → Zend/tests/line_numbers/gh8810_4.phpt
diff --git a/Zend/tests/gh8810_5.phpt → Zend/tests/line_numbers/gh8810_5.phpt b/Zend/tests/gh8810_5.phpt → Zend/tests/line_numbers/gh8810_5.phpt
diff --git a/Zend/tests/gh8810_6.phpt → Zend/tests/line_numbers/gh8810_6.phpt b/Zend/tests/gh8810_6.phpt → Zend/tests/line_numbers/gh8810_6.phpt
diff --git a/Zend/tests/gh8810_7.phpt → Zend/tests/line_numbers/gh8810_7.phpt b/Zend/tests/gh8810_7.phpt → Zend/tests/line_numbers/gh8810_7.phpt
diff --git a/Zend/tests/gh8821.phpt → Zend/tests/line_numbers/gh8821.phpt b/Zend/tests/gh8821.phpt → Zend/tests/line_numbers/gh8821.phpt
diff --git a/Zend/tests/bug28444.phpt → Zend/tests/magic_methods/bug28444.phpt b/Zend/tests/bug28444.phpt → Zend/tests/magic_methods/bug28444.phpt
diff --git a/Zend/tests/bug34893.phpt → Zend/tests/magic_methods/bug34893.phpt b/Zend/tests/bug34893.phpt → Zend/tests/magic_methods/bug34893.phpt
diff --git a/Zend/tests/bug39449.phpt → Zend/tests/magic_methods/bug39449.phpt b/Zend/tests/bug39449.phpt → Zend/tests/magic_methods/bug39449.phpt
diff --git a/Zend/tests/bug39775.phpt → Zend/tests/magic_methods/bug39775.phpt b/Zend/tests/bug39775.phpt → Zend/tests/magic_methods/bug39775.phpt
diff --git a/Zend/tests/bug71359.phpt → Zend/tests/magic_methods/bug71359.phpt b/Zend/tests/bug71359.phpt → Zend/tests/magic_methods/bug71359.phpt
diff --git a/Zend/tests/call_static.phpt → Zend/tests/magic_methods/call_static.phpt b/Zend/tests/call_static.phpt → Zend/tests/magic_methods/call_static.phpt
diff --git a/Zend/tests/call_static_002.phpt → .../tests/magic_methods/call_static_002.phpt b/Zend/tests/call_static_002.phpt → .../tests/magic_methods/call_static_002.phpt
diff --git a/Zend/tests/call_static_003.phpt → .../tests/magic_methods/call_static_003.phpt b/Zend/tests/call_static_003.phpt → .../tests/magic_methods/call_static_003.phpt
diff --git a/Zend/tests/call_static_004.phpt → .../tests/magic_methods/call_static_004.phpt b/Zend/tests/call_static_004.phpt → .../tests/magic_methods/call_static_004.phpt
diff --git a/Zend/tests/call_static_006.phpt → .../tests/magic_methods/call_static_006.phpt b/Zend/tests/call_static_006.phpt → .../tests/magic_methods/call_static_006.phpt
diff --git a/Zend/tests/call_static_007.phpt → .../tests/magic_methods/call_static_007.phpt b/Zend/tests/call_static_007.phpt → .../tests/magic_methods/call_static_007.phpt
diff --git a/...tests/overloaded_prop_assign_op_refs.phpt → ...thods/overloaded_prop_assign_op_refs.phpt b/...tests/overloaded_prop_assign_op_refs.phpt → ...thods/overloaded_prop_assign_op_refs.phpt
diff --git a/.../stringable_automatic_implementation.phpt → .../stringable_automatic_implementation.phpt b/.../stringable_automatic_implementation.phpt → .../stringable_automatic_implementation.phpt
diff --git a/Zend/tests/stringable_internal_class.phpt → ...ic_methods/stringable_internal_class.phpt b/Zend/tests/stringable_internal_class.phpt → ...ic_methods/stringable_internal_class.phpt
diff --git a/Zend/tests/stringable_trait.phpt → ...tests/magic_methods/stringable_trait.phpt b/Zend/tests/stringable_trait.phpt → ...tests/magic_methods/stringable_trait.phpt
diff --git a/Zend/tests/stringable_trait_invalid.phpt → ...gic_methods/stringable_trait_invalid.phpt b/Zend/tests/stringable_trait_invalid.phpt → ...gic_methods/stringable_trait_invalid.phpt
diff --git a/...s/trampoline_closure_named_arguments.phpt → ...s/trampoline_closure_named_arguments.phpt b/...s/trampoline_closure_named_arguments.phpt → ...s/trampoline_closure_named_arguments.phpt
diff --git a/Zend/tests/oss-fuzz-69765.phpt → ...sts/nullsafe_operator/oss-fuzz-69765.phpt b/Zend/tests/oss-fuzz-69765.phpt → ...sts/nullsafe_operator/oss-fuzz-69765.phpt
diff --git a/Zend/tests/oss_fuzz_60011_1.phpt → ...s/nullsafe_operator/oss_fuzz_60011_1.phpt b/Zend/tests/oss_fuzz_60011_1.phpt → ...s/nullsafe_operator/oss_fuzz_60011_1.phpt
diff --git a/Zend/tests/oss_fuzz_60011_2.phpt → ...s/nullsafe_operator/oss_fuzz_60011_2.phpt b/Zend/tests/oss_fuzz_60011_2.phpt → ...s/nullsafe_operator/oss_fuzz_60011_2.phpt
diff --git a/Zend/tests/oss-fuzz-391975641.phpt → ...ts/property_hooks/oss-fuzz-391975641.phpt b/Zend/tests/oss-fuzz-391975641.phpt → ...ts/property_hooks/oss-fuzz-391975641.phpt
diff --git a/Zend/tests/serializable_deprecation.phpt → ...s/serialize/serializable_deprecation.phpt b/Zend/tests/serializable_deprecation.phpt → ...s/serialize/serializable_deprecation.phpt
diff --git a/Zend/tests/static_variable.phpt → ...sts/static_variables/static_variable.phpt b/Zend/tests/static_variable.phpt → ...sts/static_variables/static_variable.phpt
diff --git a/Zend/tests/static_variable_func_call.phpt → ..._variables/static_variable_func_call.phpt b/Zend/tests/static_variable_func_call.phpt → ..._variables/static_variable_func_call.phpt
diff --git a/.../static_variable_in_dynamic_function.phpt → .../static_variable_in_dynamic_function.phpt b/.../static_variable_in_dynamic_function.phpt → .../static_variable_in_dynamic_function.phpt
diff --git a/...tatic_variable_in_dynamic_function_2.phpt → ...tatic_variable_in_dynamic_function_2.phpt b/...tatic_variable_in_dynamic_function_2.phpt → ...tatic_variable_in_dynamic_function_2.phpt
diff --git a/...ts/static_variable_in_private_method.phpt → ...es/static_variable_in_private_method.phpt b/...ts/static_variable_in_private_method.phpt → ...es/static_variable_in_private_method.phpt
diff --git a/...tic_variable_in_private_trait_method.phpt → ...tic_variable_in_private_trait_method.phpt b/...tic_variable_in_private_trait_method.phpt → ...tic_variable_in_private_trait_method.phpt
diff --git a/.../tests/static_variables_closure_bind.phpt → ...iables/static_variables_closure_bind.phpt b/.../tests/static_variables_closure_bind.phpt → ...iables/static_variables_closure_bind.phpt
diff --git a/Zend/tests/static_variables_destructor.phpt → ...ariables/static_variables_destructor.phpt b/Zend/tests/static_variables_destructor.phpt → ...ariables/static_variables_destructor.phpt
diff --git a/Zend/tests/static_variables_global.phpt → ...ic_variables/static_variables_global.phpt b/Zend/tests/static_variables_global.phpt → ...ic_variables/static_variables_global.phpt
diff --git a/Zend/tests/static_variables_global_2.phpt → ..._variables/static_variables_global_2.phpt b/Zend/tests/static_variables_global_2.phpt → ..._variables/static_variables_global_2.phpt
diff --git a/Zend/tests/static_variables_recursive.phpt → ...variables/static_variables_recursive.phpt b/Zend/tests/static_variables_recursive.phpt → ...variables/static_variables_recursive.phpt
diff --git a/...tatic_variables_throwing_initializer.phpt → ...tatic_variables_throwing_initializer.phpt b/...tatic_variables_throwing_initializer.phpt → ...tatic_variables_throwing_initializer.phpt
diff --git a/Zend/tests/static_variables_traits.phpt → ...ic_variables/static_variables_traits.phpt b/Zend/tests/static_variables_traits.phpt → ...ic_variables/static_variables_traits.phpt
diff --git a/Zend/tests/034.phpt → Zend/tests/switch/034.phpt b/Zend/tests/034.phpt → Zend/tests/switch/034.phpt
diff --git a/Zend/tests/bug80046.phpt → Zend/tests/switch/bug80046.phpt b/Zend/tests/bug80046.phpt → Zend/tests/switch/bug80046.phpt
diff --git a/Zend/tests/switch_on_numeric_strings.phpt → ...sts/switch/switch_on_numeric_strings.phpt b/Zend/tests/switch_on_numeric_strings.phpt → ...sts/switch/switch_on_numeric_strings.phpt
diff --git a/Zend/tests/030.phpt → Zend/tests/this-reserved/030.phpt b/Zend/tests/030.phpt → Zend/tests/this-reserved/030.phpt
diff --git a/Zend/tests/bug34358.phpt → Zend/tests/this-reserved/bug34358.phpt b/Zend/tests/bug34358.phpt → Zend/tests/this-reserved/bug34358.phpt
diff --git a/Zend/tests/bug41117_1.phpt → Zend/tests/this-reserved/bug41117_1.phpt b/Zend/tests/bug41117_1.phpt → Zend/tests/this-reserved/bug41117_1.phpt
diff --git a/Zend/tests/bug71737.phpt → Zend/tests/this-reserved/bug71737.phpt b/Zend/tests/bug71737.phpt → Zend/tests/this-reserved/bug71737.phpt
diff --git a/Zend/tests/this_as_global.phpt → Zend/tests/this-reserved/this_as_global.phpt b/Zend/tests/this_as_global.phpt → Zend/tests/this-reserved/this_as_global.phpt
diff --git a/Zend/tests/this_as_lexical_var_error.phpt → ...s-reserved/this_as_lexical_var_error.phpt b/Zend/tests/this_as_lexical_var_error.phpt → ...s-reserved/this_as_lexical_var_error.phpt
diff --git a/Zend/tests/this_as_parameter.phpt → ...ests/this-reserved/this_as_parameter.phpt b/Zend/tests/this_as_parameter.phpt → ...ests/this-reserved/this_as_parameter.phpt
diff --git a/Zend/tests/this_as_static.phpt → Zend/tests/this-reserved/this_as_static.phpt b/Zend/tests/this_as_static.phpt → Zend/tests/this-reserved/this_as_static.phpt
diff --git a/Zend/tests/this_in_catch.phpt → Zend/tests/this-reserved/this_in_catch.phpt b/Zend/tests/this_in_catch.phpt → Zend/tests/this-reserved/this_in_catch.phpt
diff --git a/Zend/tests/this_in_extract.phpt → .../tests/this-reserved/this_in_extract.phpt b/Zend/tests/this_in_extract.phpt → .../tests/this-reserved/this_in_extract.phpt
diff --git a/Zend/tests/this_reassign.phpt → Zend/tests/this-reserved/this_reassign.phpt b/Zend/tests/this_reassign.phpt → Zend/tests/this-reserved/this_reassign.phpt
diff --git a/Zend/tests/class_uses_static.phpt → Zend/tests/traits/class_uses_static.phpt b/Zend/tests/class_uses_static.phpt → Zend/tests/traits/class_uses_static.phpt
diff --git a/Zend/tests/cast_to_array.phpt → Zend/tests/type_casts/cast_to_array.phpt b/Zend/tests/cast_to_array.phpt → Zend/tests/type_casts/cast_to_array.phpt
diff --git a/Zend/tests/cast_to_bool.phpt → Zend/tests/type_casts/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt → Zend/tests/type_casts/cast_to_bool.phpt
diff --git a/Zend/tests/cast_to_double.phpt → Zend/tests/type_casts/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt → Zend/tests/type_casts/cast_to_double.phpt
diff --git a/Zend/tests/cast_to_int.phpt → Zend/tests/type_casts/cast_to_int.phpt b/Zend/tests/cast_to_int.phpt → Zend/tests/type_casts/cast_to_int.phpt
diff --git a/Zend/tests/cast_to_object.phpt → Zend/tests/type_casts/cast_to_object.phpt b/Zend/tests/cast_to_object.phpt → Zend/tests/type_casts/cast_to_object.phpt
diff --git a/Zend/tests/cast_to_string.phpt → Zend/tests/type_casts/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt → Zend/tests/type_casts/cast_to_string.phpt
diff --git a/Zend/tests/real_cast.phpt → Zend/tests/type_casts/real_cast.phpt b/Zend/tests/real_cast.phpt → Zend/tests/type_casts/real_cast.phpt
diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
@@ -418,7 +418,10 @@ static void zend_enum_register_func(zend_class_entry *ce, zend_known_string_id n
 	zif->module = EG(current_module);
 	zif->scope = ce;
 	zif->T = ZEND_OBSERVER_ENABLED;
-    if (EG(active)) { // at run-time
+	if (EG(active)) { // at run-time
+		if (CG(compiler_options) & ZEND_COMPILE_PRELOAD) {
+			zif->fn_flags |= ZEND_ACC_PRELOADED;
+		}
 		ZEND_MAP_PTR_INIT(zif->run_time_cache, zend_arena_calloc(&CG(arena), 1, zend_internal_run_time_cache_reserved_size()));
 	} else {
 #ifdef ZTS

diff --git a/Zend/zend_map_ptr.h b/Zend/zend_map_ptr.h
@@ -70,6 +70,9 @@ typedef struct _zend_string zend_string;
 	} while (0)
 # define ZEND_MAP_PTR_BIASED_BASE(real_base) \
 	((void*)(((uintptr_t)(real_base)) + zend_map_ptr_static_size * sizeof(void *) - 1))
+/* Note: chunked like: [8192..12287][4096..8191][0..4095] */
+#define ZEND_MAP_PTR_STATIC_NUM_TO_PTR(num) \
+	((void **)CG(map_ptr_real_base) + zend_map_ptr_static_size - ZEND_MM_ALIGNED_SIZE_EX((num) + 1, 4096) + ((num) & 4095))
 #else
 # error "Unknown ZEND_MAP_PTR_KIND"
 #endif

diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
@@ -50,12 +50,12 @@ typedef struct _php_bz2_filter_data {
 
 static void *php_bz2_alloc(void *opaque, int items, int size)
 {
-	return (void *)safe_pemalloc(items, size, 0, ((php_bz2_filter_data*)opaque)->persistent);
+	return safe_pemalloc(items, size, 0, ((php_bz2_filter_data*)opaque)->persistent);
 }
 
 static void php_bz2_free(void *opaque, void *address)
 {
-	pefree((void *)address, ((php_bz2_filter_data*)opaque)->persistent);
+	pefree(address, ((php_bz2_filter_data*)opaque)->persistent);
 }
 /* }}} */
 

diff --git a/ext/dom/document.c b/ext/dom/document.c
@@ -194,13 +194,12 @@ zend_result dom_document_version_write(dom_object *obj, zval *newval)
 {
 	DOM_PROP_NODE(xmlDocPtr, docp, obj);
 
-	/* Cannot fail because the type is either null or a string. */
-	zend_string *str = zval_get_string(newval);
+	/* Type is ?string */
+	zend_string *str = Z_TYPE_P(newval) == IS_NULL ? ZSTR_EMPTY_ALLOC() : Z_STR_P(newval);
 
 	if (php_dom_follow_spec_intern(obj)) {
 		if (!zend_string_equals_literal(str, "1.0") && !zend_string_equals_literal(str, "1.1")) {
 			zend_value_error("Invalid XML version");
-			zend_string_release_ex(str, 0);
 			return FAILURE;
 		}
 	}
@@ -211,7 +210,6 @@ zend_result dom_document_version_write(dom_object *obj, zval *newval)
 
 	docp->version = xmlStrdup((const xmlChar *) ZSTR_VAL(str));
 
-	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
@@ -394,16 +392,15 @@ zend_result dom_document_document_uri_write(dom_object *obj, zval *newval)
 {
 	DOM_PROP_NODE(xmlDocPtr, docp, obj);
 
-	/* Cannot fail because the type is either null or a string. */
-	zend_string *str = zval_get_string(newval);
+	/* Type is ?string */
+	zend_string *str = Z_TYPE_P(newval) == IS_NULL ? ZSTR_EMPTY_ALLOC() : Z_STR_P(newval);
 
 	if (docp->URL != NULL) {
 		xmlFree(BAD_CAST docp->URL);
 	}
 
 	docp->URL = xmlStrdup((const xmlChar *) ZSTR_VAL(str));
 
-	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
@@ -1668,47 +1665,6 @@ PHP_METHOD(Dom_XMLDocument, saveXml)
 }
 /* }}} end dom_document_savexml */
 
-static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur) /* {{{ */
-{
-	xmlNodePtr xincnode;
-
-	xincnode = cur;
-	cur = cur->next;
-	xmlUnlinkNode(xincnode);
-	php_libxml_node_free_resource(xincnode);
-
-	return cur;
-}
-/* }}} */
-
-static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */
-{
-	while(cur) {
-		if (cur->type == XML_XINCLUDE_START) {
-			cur = php_dom_free_xinclude_node(cur);
-
-			/* XML_XINCLUDE_END node will be a sibling of XML_XINCLUDE_START */
-			while(cur && cur->type != XML_XINCLUDE_END) {
-				/* remove xinclude processing nodes from recursive xincludes */
-				if (cur->type == XML_ELEMENT_NODE) {
-					   php_dom_remove_xinclude_nodes(cur->children);
-				}
-				cur = cur->next;
-			}
-
-			if (cur && cur->type == XML_XINCLUDE_END) {
-				cur = php_dom_free_xinclude_node(cur);
-			}
-		} else {
-			if (cur->type == XML_ELEMENT_NODE) {
-				php_dom_remove_xinclude_nodes(cur->children);
-			}
-			cur = cur->next;
-		}
-	}
-}
-/* }}} */
-
 static void dom_xinclude_strip_references(xmlNodePtr basep)
 {
 	php_libxml_node_free_resource(basep);
@@ -1721,17 +1677,19 @@ static void dom_xinclude_strip_references(xmlNodePtr basep)
 	}
 }
 
-/* See GH-14702.
- * We have to remove userland references to xinclude fallback nodes because libxml2 will make clones of these
+/* See GH-14702 and GH-17847.
+ * We have to remove userland references to xinclude nodes because libxml2 will make clones of these
  * and remove the original nodes. If the originals are removed while there are still userland references
  * this will cause memory corruption. */
 static void dom_xinclude_strip_fallback_references(const xmlNode *basep)
 {
 	xmlNodePtr current = basep->children;
 
+	/* TODO: try to improve loop search performance */
 	while (current) {
-		if (current->type == XML_ELEMENT_NODE && current->ns != NULL && current->_private != NULL
-			&& xmlStrEqual(current->name, XINCLUDE_FALLBACK)
+		if (current->type == XML_ELEMENT_NODE
+			&& current->ns != NULL
+			&& xmlStrEqual(current->name, XINCLUDE_NODE)
 			&& (xmlStrEqual(current->ns->href, XINCLUDE_NS) || xmlStrEqual(current->ns->href, XINCLUDE_OLD_NS))) {
 			dom_xinclude_strip_references(current);
 		}
@@ -1744,22 +1702,11 @@ static int dom_perform_xinclude(xmlDocPtr docp, dom_object *intern, zend_long fl
 {
 	dom_xinclude_strip_fallback_references((const xmlNode *) docp);
 
+	flags |= XML_PARSE_NOXINCNODE;
 	PHP_LIBXML_SANITIZE_GLOBALS(xinclude);
 	int err = xmlXIncludeProcessFlags(docp, (int)flags);
 	PHP_LIBXML_RESTORE_GLOBALS(xinclude);
 
-	/* XML_XINCLUDE_START and XML_XINCLUDE_END nodes need to be removed as these
-	are added via xmlXIncludeProcess to mark beginning and ending of xincluded document
-	but are not wanted in resulting document - must be done even if err as it could fail after
-	having processed some xincludes */
-	xmlNodePtr root = docp->children;
-	while (root && root->type != XML_ELEMENT_NODE && root->type != XML_XINCLUDE_START) {
-		root = root->next;
-	}
-	if (root) {
-		php_dom_remove_xinclude_nodes(root);
-	}
-
 	php_libxml_invalidate_node_list_cache(intern->document);
 
 	return err;

diff --git a/ext/dom/node.c b/ext/dom/node.c
@@ -185,8 +185,8 @@ zend_result dom_node_node_value_write(dom_object *obj, zval *newval)
 {
 	DOM_PROP_NODE(xmlNodePtr, nodep, obj);
 
-	/* Cannot fail because the type is either null or a string. */
-	zend_string *str = zval_get_string(newval);
+	/* Type is ?string */
+	zend_string *str = Z_TYPE_P(newval) == IS_NULL ? ZSTR_EMPTY_ALLOC() : Z_STR_P(newval);
 
 	/* Access to Element node is implemented as a convenience method */
 	switch (nodep->type) {
@@ -213,7 +213,6 @@ zend_result dom_node_node_value_write(dom_object *obj, zval *newval)
 
 	php_libxml_invalidate_node_list_cache(obj->document);
 
-	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 

diff --git a/ext/dom/tests/gh17847.phpt b/ext/dom/tests/gh17847.phpt
@@ -0,0 +1,41 @@
+--TEST--
+GH-17847 (xinclude destroys live node)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$doc = new DOMDocument();
+$doc->loadXML(<<<XML
+<root>
+    <xi:include href="thisisnonexistent" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>fallback<p>garbage</p></xi:fallback>
+        <p>garbage</p>
+    </xi:include>
+    <xi:test xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:include href="thisisnonexistent">
+        <p>garbage</p>
+      </xi:include>
+    </xi:test>
+</root>
+XML);
+
+$xpath = new DOMXPath($doc);
+
+$garbage = [];
+foreach ($xpath->query('//p') as $entry)
+    $garbage[] = $entry;
+
+@$doc->xinclude();
+
+foreach ($garbage as $node) {
+  try {
+    var_dump($node->localName);
+  } catch (DOMException $e) {
+    echo $e->getMessage(), "\n";
+  }
+}
+?>
+--EXPECT--
+Invalid State Error
+Invalid State Error
+Invalid State Error
diff --git a/ext/dom/tests/modern/xml/return_dom_node_from_xpath.phpt b/ext/dom/tests/modern/xml/return_dom_node_from_xpath.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Returning a Dom\Node from Dom\XPath callback
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$dom = Dom\XMLDocument::createFromString('<root/>');
+$xpath = new Dom\XPath($dom);
+$xpath->registerPhpFunctionNs('urn:x', 'test', fn() => $dom->createElement('foo'));
+$xpath->registerNamespace('x', 'urn:x');
+$test = $xpath->query('x:test()');
+var_dump($test[0]->nodeName);
+
+?>
+--EXPECT--
+string(3) "foo"
diff --git a/ext/dom/xpath_callbacks.c b/ext/dom/xpath_callbacks.c
@@ -24,6 +24,7 @@
 #if defined(HAVE_LIBXML) && defined(HAVE_DOM)
 
 #include "php_dom.h"
+#include "internal_helpers.h"
 #include <libxml/parserInternals.h>
 
 static void xpath_callbacks_entry_dtor(zval *zv)
@@ -205,13 +206,14 @@ static zend_result php_dom_xpath_callback_ns_update_method_handler(
 			ZVAL_PTR(&registered_value, fcc);
 
 			if (!key) {
-				zend_string *str = zval_try_get_string(entry);
+				zend_string *tmp_str;
+				zend_string *str = zval_try_get_tmp_string(entry, &tmp_str);
 				if (str && php_dom_xpath_is_callback_name_valid_and_throw(str, name_validation, true)) {
 					zend_hash_update(&ns->functions, str, &registered_value);
 					if (register_func) {
 						register_func(ctxt, namespace, str);
 					}
-					zend_string_release_ex(str, false);
+					zend_tmp_string_release(tmp_str);
 				} else {
 					zend_fcc_dtor(fcc);
 					efree(fcc);
@@ -425,7 +427,8 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
 	}
 
 	if (Z_TYPE(callback_retval) != IS_UNDEF) {
-		if (Z_TYPE(callback_retval) == IS_OBJECT && instanceof_function(Z_OBJCE(callback_retval), dom_node_class_entry)) {
+		if (Z_TYPE(callback_retval) == IS_OBJECT
+		 && (instanceof_function(Z_OBJCE(callback_retval), dom_get_node_ce(php_dom_follow_spec_node((const xmlNode *) ctxt->context->doc))))) {
 			xmlNode *nodep;
 			dom_object *obj;
 			if (xpath_callbacks->node_list == NULL) {
@@ -439,13 +442,14 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
 		} else if (Z_TYPE(callback_retval) == IS_FALSE || Z_TYPE(callback_retval) == IS_TRUE) {
 			valuePush(ctxt, xmlXPathNewBoolean(Z_TYPE(callback_retval) == IS_TRUE));
 		} else if (Z_TYPE(callback_retval) == IS_OBJECT) {
-			zend_type_error("Only objects that are instances of DOMNode can be converted to an XPath expression");
+			zend_type_error("Only objects that are instances of DOM nodes can be converted to an XPath expression");
 			zval_ptr_dtor(&callback_retval);
 			return FAILURE;
 		} else {
-			zend_string *str = zval_get_string(&callback_retval);
+			zend_string *tmp_str;
+			zend_string *str = zval_get_tmp_string(&callback_retval, &tmp_str);
 			valuePush(ctxt, xmlXPathNewString(BAD_CAST ZSTR_VAL(str)));
-			zend_string_release_ex(str, 0);
+			zend_tmp_string_release(tmp_str);
 		}
 		zval_ptr_dtor(&callback_retval);
 	}

diff --git a/ext/gd/tests/gh17373.phpt b/ext/gd/tests/gh17373.phpt
@@ -2,6 +2,10 @@
 Bug GH-17373 (imagefttext() ignores clipping rect for palette images)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+if(!function_exists('imagefttext')) die('skip imagefttext() not available');
+?>
 --FILE--
 <?php
 $im = imagecreate(64, 32);

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -390,7 +390,8 @@ static zend_result php_mb_parse_encoding_array(HashTable *target_hash, const mbf
 	size_t n = 0;
 	zval *hash_entry;
 	ZEND_HASH_FOREACH_VAL(target_hash, hash_entry) {
-		zend_string *encoding_str = zval_try_get_string(hash_entry);
+		zend_string *tmp_encoding_str;
+		zend_string *encoding_str = zval_try_get_tmp_string(hash_entry, &tmp_encoding_str);
 		if (UNEXPECTED(!encoding_str)) {
 			efree(ZEND_VOIDP(list));
 			return FAILURE;
@@ -415,12 +416,12 @@ static zend_result php_mb_parse_encoding_array(HashTable *target_hash, const mbf
 				n++;
 			} else {
 				zend_argument_value_error(arg_num, "contains invalid encoding \"%s\"", ZSTR_VAL(encoding_str));
-				zend_string_release(encoding_str);
+				zend_tmp_string_release(tmp_encoding_str);
 				efree(ZEND_VOIDP(list));
 				return FAILURE;
 			}
 		}
-		zend_string_release(encoding_str);
+		zend_tmp_string_release(tmp_encoding_str);
 	} ZEND_HASH_FOREACH_END();
 	*return_list = list;
 	*return_size = n;