diff --git a/Zend/tests/deprecation_to_exception_during_inheritance.phpt b/Zend/tests/deprecation_to_exception_during_inheritance.phpt index 9c10035930e..69eb53eb556 100644 --- a/Zend/tests/deprecation_to_exception_during_inheritance.phpt +++ b/Zend/tests/deprecation_to_exception_during_inheritance.phpt @@ -13,7 +13,7 @@ $class = new class extends DateTime { ?> --EXPECTF-- -Fatal error: During inheritance of DateTime: Uncaught Exception: Declaration of DateTime@anonymous::getTimezone() should be compatible with DateTime::getTimezone(): DateTimeZone|false in %s:%d +Fatal error: During inheritance of DateTime: Uncaught Exception: Return type of DateTime@anonymous::getTimezone() should either be compatible with DateTime::getTimezone(): DateTimeZone|false, or the #[ReturnTypeWillChange] attribute should be used to temporarily suppress the notice in %s:%d Stack trace: -#0 %s(%d): {closure}(8192, 'Declaration of ...', '%s', 8) +#0 %s(%d): {closure}(8192, 'Return type of ...', '%s', 8) #1 {main} in %s on line %d diff --git a/Zend/tests/type_declarations/variance/internal_parent/incompatible_return_type.phpt b/Zend/tests/type_declarations/variance/internal_parent/incompatible_return_type.phpt index 8c40a46a866..e69e0a6b945 100644 --- a/Zend/tests/type_declarations/variance/internal_parent/incompatible_return_type.phpt +++ b/Zend/tests/type_declarations/variance/internal_parent/incompatible_return_type.phpt @@ -13,5 +13,5 @@ class MyDateTimeZone extends DateTimeZone var_dump(MyDateTimeZone::listIdentifiers()); ?> --EXPECTF-- -Deprecated: Declaration of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): string should be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array in %s on line %d +Deprecated: Return type of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): string should either be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array, or the #[ReturnTypeWillChange] attribute should be used to temporarily suppress the notice in %s on line %d string(0) "" diff --git a/Zend/tests/type_declarations/variance/internal_parent/missing_return_type.phpt b/Zend/tests/type_declarations/variance/internal_parent/missing_return_type.phpt index c20255df15c..21e6ba6d140 100644 --- a/Zend/tests/type_declarations/variance/internal_parent/missing_return_type.phpt +++ b/Zend/tests/type_declarations/variance/internal_parent/missing_return_type.phpt @@ -10,4 +10,4 @@ class MyDateTimeZone extends DateTimeZone } ?> --EXPECTF-- -Deprecated: Declaration of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null) should be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array in %s on line %d +Deprecated: Return type of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null) should either be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array, or the #[ReturnTypeWillChange] attribute should be used to temporarily suppress the notice in %s on line %d diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index bb0c10772a0..a66957c4fef 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -875,7 +875,8 @@ static void ZEND_COLD emit_incompatible_method_error( if (!return_type_will_change_attribute) { zend_error_at(E_DEPRECATED, NULL, func_lineno(child), - "Declaration of %s should be compatible with %s", + "Return type of %s should either be compatible with %s, " + "or the #[ReturnTypeWillChange] attribute should be used to temporarily suppress the notice", ZSTR_VAL(child_prototype), ZSTR_VAL(parent_prototype)); if (EG(exception)) { zend_exception_uncaught_error(