diff --git a/Zend/tests/float_to_int/explicit_casts_should_not_warn.phpt b/Zend/tests/type_coercion/float_to_int/explicit_casts_should_not_warn.phpt similarity index 100% rename from Zend/tests/float_to_int/explicit_casts_should_not_warn.phpt rename to Zend/tests/type_coercion/float_to_int/explicit_casts_should_not_warn.phpt diff --git a/Zend/tests/float_to_int/explicit_casts_should_not_warn_32bit.phpt b/Zend/tests/type_coercion/float_to_int/explicit_casts_should_not_warn_32bit.phpt similarity index 100% rename from Zend/tests/float_to_int/explicit_casts_should_not_warn_32bit.phpt rename to Zend/tests/type_coercion/float_to_int/explicit_casts_should_not_warn_32bit.phpt diff --git a/Zend/tests/float_to_int/negative_zero_check.phpt b/Zend/tests/type_coercion/float_to_int/negative_zero_check.phpt similarity index 100% rename from Zend/tests/float_to_int/negative_zero_check.phpt rename to Zend/tests/type_coercion/float_to_int/negative_zero_check.phpt diff --git a/Zend/tests/float_to_int/no_warning_compatible_float_literals.phpt b/Zend/tests/type_coercion/float_to_int/no_warning_compatible_float_literals.phpt similarity index 100% rename from Zend/tests/float_to_int/no_warning_compatible_float_literals.phpt rename to Zend/tests/type_coercion/float_to_int/no_warning_compatible_float_literals.phpt diff --git a/Zend/tests/float_to_int/no_warning_compatible_string_float_literals.phpt b/Zend/tests/type_coercion/float_to_int/no_warning_compatible_string_float_literals.phpt similarity index 100% rename from Zend/tests/float_to_int/no_warning_compatible_string_float_literals.phpt rename to Zend/tests/type_coercion/float_to_int/no_warning_compatible_string_float_literals.phpt diff --git a/Zend/tests/float_to_int/no_warnings_compatible_float_literals_assignment_ops.phpt b/Zend/tests/type_coercion/float_to_int/no_warnings_compatible_float_literals_assignment_ops.phpt similarity index 100% rename from Zend/tests/float_to_int/no_warnings_compatible_float_literals_assignment_ops.phpt rename to Zend/tests/type_coercion/float_to_int/no_warnings_compatible_float_literals_assignment_ops.phpt diff --git a/Zend/tests/float_to_int/no_warnings_compatible_float_vars.phpt b/Zend/tests/type_coercion/float_to_int/no_warnings_compatible_float_vars.phpt similarity index 100% rename from Zend/tests/float_to_int/no_warnings_compatible_float_vars.phpt rename to Zend/tests/type_coercion/float_to_int/no_warnings_compatible_float_vars.phpt diff --git a/Zend/tests/float_to_int/no_warnings_compatible_string_float_vars.phpt b/Zend/tests/type_coercion/float_to_int/no_warnings_compatible_string_float_vars.phpt similarity index 100% rename from Zend/tests/float_to_int/no_warnings_compatible_string_float_vars.phpt rename to Zend/tests/type_coercion/float_to_int/no_warnings_compatible_string_float_vars.phpt diff --git a/Zend/tests/float_to_int/union_int_string_type_arg.phpt b/Zend/tests/type_coercion/float_to_int/union_int_string_type_arg.phpt similarity index 100% rename from Zend/tests/float_to_int/union_int_string_type_arg.phpt rename to Zend/tests/type_coercion/float_to_int/union_int_string_type_arg.phpt diff --git a/Zend/tests/float_to_int/union_int_string_type_arg_promote_exception.phpt b/Zend/tests/type_coercion/float_to_int/union_int_string_type_arg_promote_exception.phpt similarity index 100% rename from Zend/tests/float_to_int/union_int_string_type_arg_promote_exception.phpt rename to Zend/tests/type_coercion/float_to_int/union_int_string_type_arg_promote_exception.phpt diff --git a/Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_arrays.phpt b/Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_arrays.phpt similarity index 100% rename from Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_arrays.phpt rename to Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_arrays.phpt diff --git a/Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_strings.phpt b/Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_strings.phpt similarity index 100% rename from Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_strings.phpt rename to Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_strings.phpt diff --git a/Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_strings_32bit.phpt b/Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_strings_32bit.phpt similarity index 100% rename from Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_strings_32bit.phpt rename to Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_strings_32bit.phpt diff --git a/Zend/tests/float_to_int/warnings_float_literals.phpt b/Zend/tests/type_coercion/float_to_int/warnings_float_literals.phpt similarity index 100% rename from Zend/tests/float_to_int/warnings_float_literals.phpt rename to Zend/tests/type_coercion/float_to_int/warnings_float_literals.phpt diff --git a/Zend/tests/float_to_int/warnings_float_literals_assignment_ops.phpt b/Zend/tests/type_coercion/float_to_int/warnings_float_literals_assignment_ops.phpt similarity index 100% rename from Zend/tests/float_to_int/warnings_float_literals_assignment_ops.phpt rename to Zend/tests/type_coercion/float_to_int/warnings_float_literals_assignment_ops.phpt diff --git a/Zend/tests/float_to_int/warnings_float_vars.phpt b/Zend/tests/type_coercion/float_to_int/warnings_float_vars.phpt similarity index 100% rename from Zend/tests/float_to_int/warnings_float_vars.phpt rename to Zend/tests/type_coercion/float_to_int/warnings_float_vars.phpt diff --git a/Zend/tests/float_to_int/warnings_string_float_literals.phpt b/Zend/tests/type_coercion/float_to_int/warnings_string_float_literals.phpt similarity index 100% rename from Zend/tests/float_to_int/warnings_string_float_literals.phpt rename to Zend/tests/type_coercion/float_to_int/warnings_string_float_literals.phpt diff --git a/Zend/tests/float_to_int/warnings_string_float_literals_assignment_ops.phpt b/Zend/tests/type_coercion/float_to_int/warnings_string_float_literals_assignment_ops.phpt similarity index 100% rename from Zend/tests/float_to_int/warnings_string_float_literals_assignment_ops.phpt rename to Zend/tests/type_coercion/float_to_int/warnings_string_float_literals_assignment_ops.phpt diff --git a/Zend/tests/float_to_int/warnings_string_float_vars.phpt b/Zend/tests/type_coercion/float_to_int/warnings_string_float_vars.phpt similarity index 100% rename from Zend/tests/float_to_int/warnings_string_float_vars.phpt rename to Zend/tests/type_coercion/float_to_int/warnings_string_float_vars.phpt diff --git a/Zend/tests/int_special_values.phpt b/Zend/tests/type_coercion/int_special_values.phpt similarity index 100% rename from Zend/tests/int_special_values.phpt rename to Zend/tests/type_coercion/int_special_values.phpt diff --git a/Zend/tests/settype/settype_array.phpt b/Zend/tests/type_coercion/settype/settype_array.phpt similarity index 100% rename from Zend/tests/settype/settype_array.phpt rename to Zend/tests/type_coercion/settype/settype_array.phpt diff --git a/Zend/tests/settype/settype_bool.phpt b/Zend/tests/type_coercion/settype/settype_bool.phpt similarity index 100% rename from Zend/tests/settype/settype_bool.phpt rename to Zend/tests/type_coercion/settype/settype_bool.phpt diff --git a/Zend/tests/settype/settype_double.phpt b/Zend/tests/type_coercion/settype/settype_double.phpt similarity index 100% rename from Zend/tests/settype/settype_double.phpt rename to Zend/tests/type_coercion/settype/settype_double.phpt diff --git a/Zend/tests/settype/settype_int.phpt b/Zend/tests/type_coercion/settype/settype_int.phpt similarity index 100% rename from Zend/tests/settype/settype_int.phpt rename to Zend/tests/type_coercion/settype/settype_int.phpt diff --git a/Zend/tests/settype/settype_null.phpt b/Zend/tests/type_coercion/settype/settype_null.phpt similarity index 100% rename from Zend/tests/settype/settype_null.phpt rename to Zend/tests/type_coercion/settype/settype_null.phpt diff --git a/Zend/tests/settype/settype_object.phpt b/Zend/tests/type_coercion/settype/settype_object.phpt similarity index 100% rename from Zend/tests/settype/settype_object.phpt rename to Zend/tests/type_coercion/settype/settype_object.phpt diff --git a/Zend/tests/settype/settype_resource.phpt b/Zend/tests/type_coercion/settype/settype_resource.phpt similarity index 100% rename from Zend/tests/settype/settype_resource.phpt rename to Zend/tests/type_coercion/settype/settype_resource.phpt diff --git a/Zend/tests/settype/settype_string.phpt b/Zend/tests/type_coercion/settype/settype_string.phpt similarity index 100% rename from Zend/tests/settype/settype_string.phpt rename to Zend/tests/type_coercion/settype/settype_string.phpt diff --git a/Zend/tests/type_casts/cast_to_array.phpt b/Zend/tests/type_coercion/type_casts/cast_to_array.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_array.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_array.phpt diff --git a/Zend/tests/type_casts/cast_to_bool.phpt b/Zend/tests/type_coercion/type_casts/cast_to_bool.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_bool.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_bool.phpt diff --git a/Zend/tests/type_casts/cast_to_double.phpt b/Zend/tests/type_coercion/type_casts/cast_to_double.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_double.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_double.phpt diff --git a/Zend/tests/type_casts/cast_to_int.phpt b/Zend/tests/type_coercion/type_casts/cast_to_int.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_int.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_int.phpt diff --git a/Zend/tests/type_casts/cast_to_object.phpt b/Zend/tests/type_coercion/type_casts/cast_to_object.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_object.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_object.phpt diff --git a/Zend/tests/type_casts/cast_to_string.phpt b/Zend/tests/type_coercion/type_casts/cast_to_string.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_string.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_string.phpt diff --git a/Zend/tests/type_casts/cast_to_void.phpt b/Zend/tests/type_coercion/type_casts/cast_to_void.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_void.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_void.phpt diff --git a/Zend/tests/type_casts/cast_to_void_ast.phpt b/Zend/tests/type_coercion/type_casts/cast_to_void_ast.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_void_ast.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_void_ast.phpt diff --git a/Zend/tests/type_casts/cast_to_void_destructor.phpt b/Zend/tests/type_coercion/type_casts/cast_to_void_destructor.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_void_destructor.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_void_destructor.phpt diff --git a/Zend/tests/type_casts/cast_to_void_statement.phpt b/Zend/tests/type_coercion/type_casts/cast_to_void_statement.phpt similarity index 100% rename from Zend/tests/type_casts/cast_to_void_statement.phpt rename to Zend/tests/type_coercion/type_casts/cast_to_void_statement.phpt diff --git a/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt b/Zend/tests/type_coercion/type_casts/gh18301_cast_to_void_for.phpt similarity index 100% rename from Zend/tests/type_casts/gh18301_cast_to_void_for.phpt rename to Zend/tests/type_coercion/type_casts/gh18301_cast_to_void_for.phpt diff --git a/Zend/tests/type_casts/gh18301_cast_to_void_statement_for_condition.phpt b/Zend/tests/type_coercion/type_casts/gh18301_cast_to_void_statement_for_condition.phpt similarity index 100% rename from Zend/tests/type_casts/gh18301_cast_to_void_statement_for_condition.phpt rename to Zend/tests/type_coercion/type_casts/gh18301_cast_to_void_statement_for_condition.phpt diff --git a/Zend/tests/type_casts/non_canonical_binary_cast.phpt b/Zend/tests/type_coercion/type_casts/non_canonical_binary_cast.phpt similarity index 100% rename from Zend/tests/type_casts/non_canonical_binary_cast.phpt rename to Zend/tests/type_coercion/type_casts/non_canonical_binary_cast.phpt diff --git a/Zend/tests/type_casts/non_canonical_boolean_cast.phpt b/Zend/tests/type_coercion/type_casts/non_canonical_boolean_cast.phpt similarity index 100% rename from Zend/tests/type_casts/non_canonical_boolean_cast.phpt rename to Zend/tests/type_coercion/type_casts/non_canonical_boolean_cast.phpt diff --git a/Zend/tests/type_casts/non_canonical_double_cast.phpt b/Zend/tests/type_coercion/type_casts/non_canonical_double_cast.phpt similarity index 100% rename from Zend/tests/type_casts/non_canonical_double_cast.phpt rename to Zend/tests/type_coercion/type_casts/non_canonical_double_cast.phpt diff --git a/Zend/tests/type_casts/non_canonical_integer_cast.phpt b/Zend/tests/type_coercion/type_casts/non_canonical_integer_cast.phpt similarity index 100% rename from Zend/tests/type_casts/non_canonical_integer_cast.phpt rename to Zend/tests/type_coercion/type_casts/non_canonical_integer_cast.phpt diff --git a/Zend/tests/type_casts/real_cast.phpt b/Zend/tests/type_coercion/type_casts/real_cast.phpt similarity index 100% rename from Zend/tests/type_casts/real_cast.phpt rename to Zend/tests/type_coercion/type_casts/real_cast.phpt diff --git a/Zend/tests/type_casts/string_cast_reference_tostring.phpt b/Zend/tests/type_coercion/type_casts/string_cast_reference_tostring.phpt similarity index 100% rename from Zend/tests/type_casts/string_cast_reference_tostring.phpt rename to Zend/tests/type_coercion/type_casts/string_cast_reference_tostring.phpt diff --git a/Zend/zend.c b/Zend/zend.c index 2f5a21ef24040..045d25134f8c9 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1275,9 +1275,10 @@ ZEND_API size_t zend_get_page_size(void) SYSTEM_INFO system_info; GetSystemInfo(&system_info); return system_info.dwPageSize; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__APPLE__) /* This returns the value obtained from - * the auxv vector, avoiding a syscall. */ + * the auxv vector, avoiding a + * syscall (on FreeBSD)/function call (on macOS). */ return getpagesize(); #else return (size_t) sysconf(_SC_PAGESIZE);