From 867c75a480ecdf758a93aeae2a68dac1f9d4a0cb Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Thu, 20 Feb 2025 17:47:29 -0800 Subject: [PATCH] Zend/tests: merge `constant_expressions` into `constexpr`, update names While reviewing the existing tests in the `constexpr` directory, I found that some of the names were not updated to reflect the contents when the contents were changed in #9301. Follow-up to #15638 --- .../class_on_expression_in_constant_expression.phpt | 0 .../constant_expressions.phpt | 0 .../constant_expressions_arrays.phpt | 0 .../constant_expressions_classes.phpt | 0 .../constant_expressions_coalesce.phpt | 0 .../constant_expressions_coalesce_empty_dim.phpt | 0 .../constant_expressions_dynamic.phpt | 0 .../constant_expressions_dynamic_class_name_error.phpt | 0 .../constant_expressions_exceptions.inc | 0 .../constant_expressions_exceptions_001.phpt | 0 .../constant_expressions_exceptions_002.phpt | 0 .../constant_expressions_invalid_offset_type_error.phpt | 0 .../constant_expressions_self_referencing_array.phpt | 0 .../constant_expressions_static_class_name_error.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh10014.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh10356.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh7771_1.phpt | 0 .../{constant_expressions => constexpr}/gh7771_1_definition.inc | 0 Zend/tests/{constant_expressions => constexpr}/gh7771_2.phpt | 0 .../{constant_expressions => constexpr}/gh7771_2_definition.inc | 0 Zend/tests/{constant_expressions => constexpr}/gh7771_3.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh9136.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh9136_2.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh9138.phpt | 0 Zend/tests/{constant_expressions => constexpr}/gh9138_2.phpt | 0 Zend/tests/constexpr/new_dynamic_class_name.phpt | 2 +- Zend/tests/constexpr/new_invalid_operation_in_arg.phpt | 2 +- Zend/tests/constexpr/new_static.phpt | 2 +- 28 files changed, 3 insertions(+), 3 deletions(-) rename Zend/tests/{constant_expressions => constexpr}/class_on_expression_in_constant_expression.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_arrays.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_classes.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_coalesce.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_coalesce_empty_dim.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_dynamic.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_dynamic_class_name_error.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_exceptions.inc (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_exceptions_001.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_exceptions_002.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_invalid_offset_type_error.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_self_referencing_array.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/constant_expressions_static_class_name_error.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh10014.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh10356.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh7771_1.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh7771_1_definition.inc (100%) rename Zend/tests/{constant_expressions => constexpr}/gh7771_2.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh7771_2_definition.inc (100%) rename Zend/tests/{constant_expressions => constexpr}/gh7771_3.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh9136.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh9136_2.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh9138.phpt (100%) rename Zend/tests/{constant_expressions => constexpr}/gh9138_2.phpt (100%) diff --git a/Zend/tests/constant_expressions/class_on_expression_in_constant_expression.phpt b/Zend/tests/constexpr/class_on_expression_in_constant_expression.phpt similarity index 100% rename from Zend/tests/constant_expressions/class_on_expression_in_constant_expression.phpt rename to Zend/tests/constexpr/class_on_expression_in_constant_expression.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions.phpt b/Zend/tests/constexpr/constant_expressions.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions.phpt rename to Zend/tests/constexpr/constant_expressions.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_arrays.phpt b/Zend/tests/constexpr/constant_expressions_arrays.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_arrays.phpt rename to Zend/tests/constexpr/constant_expressions_arrays.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_classes.phpt b/Zend/tests/constexpr/constant_expressions_classes.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_classes.phpt rename to Zend/tests/constexpr/constant_expressions_classes.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_coalesce.phpt b/Zend/tests/constexpr/constant_expressions_coalesce.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_coalesce.phpt rename to Zend/tests/constexpr/constant_expressions_coalesce.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_coalesce_empty_dim.phpt b/Zend/tests/constexpr/constant_expressions_coalesce_empty_dim.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_coalesce_empty_dim.phpt rename to Zend/tests/constexpr/constant_expressions_coalesce_empty_dim.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_dynamic.phpt b/Zend/tests/constexpr/constant_expressions_dynamic.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_dynamic.phpt rename to Zend/tests/constexpr/constant_expressions_dynamic.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_dynamic_class_name_error.phpt b/Zend/tests/constexpr/constant_expressions_dynamic_class_name_error.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_dynamic_class_name_error.phpt rename to Zend/tests/constexpr/constant_expressions_dynamic_class_name_error.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_exceptions.inc b/Zend/tests/constexpr/constant_expressions_exceptions.inc similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_exceptions.inc rename to Zend/tests/constexpr/constant_expressions_exceptions.inc diff --git a/Zend/tests/constant_expressions/constant_expressions_exceptions_001.phpt b/Zend/tests/constexpr/constant_expressions_exceptions_001.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_exceptions_001.phpt rename to Zend/tests/constexpr/constant_expressions_exceptions_001.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_exceptions_002.phpt b/Zend/tests/constexpr/constant_expressions_exceptions_002.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_exceptions_002.phpt rename to Zend/tests/constexpr/constant_expressions_exceptions_002.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_invalid_offset_type_error.phpt b/Zend/tests/constexpr/constant_expressions_invalid_offset_type_error.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_invalid_offset_type_error.phpt rename to Zend/tests/constexpr/constant_expressions_invalid_offset_type_error.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_self_referencing_array.phpt b/Zend/tests/constexpr/constant_expressions_self_referencing_array.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_self_referencing_array.phpt rename to Zend/tests/constexpr/constant_expressions_self_referencing_array.phpt diff --git a/Zend/tests/constant_expressions/constant_expressions_static_class_name_error.phpt b/Zend/tests/constexpr/constant_expressions_static_class_name_error.phpt similarity index 100% rename from Zend/tests/constant_expressions/constant_expressions_static_class_name_error.phpt rename to Zend/tests/constexpr/constant_expressions_static_class_name_error.phpt diff --git a/Zend/tests/constant_expressions/gh10014.phpt b/Zend/tests/constexpr/gh10014.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh10014.phpt rename to Zend/tests/constexpr/gh10014.phpt diff --git a/Zend/tests/constant_expressions/gh10356.phpt b/Zend/tests/constexpr/gh10356.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh10356.phpt rename to Zend/tests/constexpr/gh10356.phpt diff --git a/Zend/tests/constant_expressions/gh7771_1.phpt b/Zend/tests/constexpr/gh7771_1.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh7771_1.phpt rename to Zend/tests/constexpr/gh7771_1.phpt diff --git a/Zend/tests/constant_expressions/gh7771_1_definition.inc b/Zend/tests/constexpr/gh7771_1_definition.inc similarity index 100% rename from Zend/tests/constant_expressions/gh7771_1_definition.inc rename to Zend/tests/constexpr/gh7771_1_definition.inc diff --git a/Zend/tests/constant_expressions/gh7771_2.phpt b/Zend/tests/constexpr/gh7771_2.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh7771_2.phpt rename to Zend/tests/constexpr/gh7771_2.phpt diff --git a/Zend/tests/constant_expressions/gh7771_2_definition.inc b/Zend/tests/constexpr/gh7771_2_definition.inc similarity index 100% rename from Zend/tests/constant_expressions/gh7771_2_definition.inc rename to Zend/tests/constexpr/gh7771_2_definition.inc diff --git a/Zend/tests/constant_expressions/gh7771_3.phpt b/Zend/tests/constexpr/gh7771_3.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh7771_3.phpt rename to Zend/tests/constexpr/gh7771_3.phpt diff --git a/Zend/tests/constant_expressions/gh9136.phpt b/Zend/tests/constexpr/gh9136.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh9136.phpt rename to Zend/tests/constexpr/gh9136.phpt diff --git a/Zend/tests/constant_expressions/gh9136_2.phpt b/Zend/tests/constexpr/gh9136_2.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh9136_2.phpt rename to Zend/tests/constexpr/gh9136_2.phpt diff --git a/Zend/tests/constant_expressions/gh9138.phpt b/Zend/tests/constexpr/gh9138.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh9138.phpt rename to Zend/tests/constexpr/gh9138.phpt diff --git a/Zend/tests/constant_expressions/gh9138_2.phpt b/Zend/tests/constexpr/gh9138_2.phpt similarity index 100% rename from Zend/tests/constant_expressions/gh9138_2.phpt rename to 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 index 60ae3ea4195d7..bd7aa07bd1e75 100644 --- 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--