Update implementation

Author: kocsismate

Zend/tests/enum/json_encode.phpt

@@ -18,7 +18,7 @@ enum StringFoo: string {
 enum CustomFoo implements JsonSerializable {
     case Bar;
 
-    public function jsonSerialize() {
+    public function jsonSerialize(): mixed {
         return 'Custom ' . $this->name;
     }
 }

Zend/tests/iterator_key_by_ref.phpt

@@ -3,7 +3,7 @@ Iterator::key() with by-ref return
 --FILE--
 <?php
 class Test extends ArrayIterator {
-    function &key() {
+    function &key(): mixed {
         return $foo;
     }
 }

Zend/tests/type_declarations/variance/optional_return_type/incompatible_return_type.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Test that the notice can be suppressed when the return type/value of the overriding method is incompatible with the tentative return type/value of the overridden method
+--FILE--
+<?php
+
+class MyDateTime extends DateTime
+{
+    /**
+     * @return DateTime|false
+     */
+    #[ReturnTypeWillChange]
+    public function modify(string $modifier) {
+        return false;
+    }
+}
+
+$date = new MyDateTime("2021-01-01 00:00:00");
+var_dump($date->modify("+1 sec"));
+?>
+--EXPECT--
+bool(false)

Zend/tests/type_declarations/variance/optional_return_type/incompatible_return_type2.phpt

@@ -24,8 +24,7 @@
 #include "zend_smart_str.h"
 
 ZEND_API zend_class_entry *zend_ce_attribute;
-ZEND_API zend_class_entry *zend_ce_tentative_return_type_attribute;
-ZEND_API zend_class_entry *zend_ce_suppress_tentative_return_type_notice_attribute;
+ZEND_API zend_class_entry *zend_ce_return_type_will_change_attribute;
 
 static HashTable internal_attributes;
 
@@ -57,17 +56,10 @@ void validate_attribute(zend_attribute *attr, uint32_t target, zend_class_entry
 	}
 }
 
-void validate_tentative_return_type_attribute(zend_attribute *attr, uint32_t target, zend_class_entry *scope)
+void validate_return_type_will_change_attribute(zend_attribute *attr, uint32_t target, zend_class_entry *scope)
 {
 	if (target != ZEND_ATTRIBUTE_TARGET_METHOD) {
-		zend_error(E_COMPILE_ERROR, "Only methods can be marked with #[TentativeReturnType]");
-	}
-}
-
-void validate_suppress_tentative_return_type_notice_attribute(zend_attribute *attr, uint32_t target, zend_class_entry *scope)
-{
-	if (target != ZEND_ATTRIBUTE_TARGET_METHOD) {
-		zend_error(E_COMPILE_ERROR, "Only methods can be marked with #[SuppressTentativeReturnTypeNotice]");
+		zend_error(E_COMPILE_ERROR, "Only methods can be marked with #[ReturnTypeWillChange]");
 	}
 }
 
@@ -83,12 +75,7 @@ ZEND_METHOD(Attribute, __construct)
 	ZVAL_LONG(OBJ_PROP_NUM(Z_OBJ_P(ZEND_THIS), 0), flags);
 }
 
-ZEND_METHOD(TentativeReturnType, __construct)
-{
-	ZEND_PARSE_PARAMETERS_NONE();
-}
-
-ZEND_METHOD(SuppressTentativeReturnTypeNotice, __construct)
+ZEND_METHOD(ReturnTypeWillChange, __construct)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 }
@@ -305,13 +292,9 @@ void zend_register_attribute_ce(void)
 	zend_declare_class_constant_long(zend_ce_attribute, ZEND_STRL("TARGET_ALL"), ZEND_ATTRIBUTE_TARGET_ALL);
 	zend_declare_class_constant_long(zend_ce_attribute, ZEND_STRL("IS_REPEATABLE"), ZEND_ATTRIBUTE_IS_REPEATABLE);
 
-	zend_ce_tentative_return_type_attribute = register_class_TentativeReturnType();
-	attr = zend_internal_attribute_register(zend_ce_tentative_return_type_attribute, ZEND_ATTRIBUTE_TARGET_METHOD);
-	attr->validator = validate_tentative_return_type_attribute;
-
-	zend_ce_suppress_tentative_return_type_notice_attribute = register_class_SuppressTentativeReturnTypeNotice();
-	attr = zend_internal_attribute_register(zend_ce_suppress_tentative_return_type_notice_attribute, ZEND_ATTRIBUTE_TARGET_METHOD);
-	attr->validator = validate_suppress_tentative_return_type_notice_attribute;
+	zend_ce_return_type_will_change_attribute = register_class_ReturnTypeWillChange();
+	attr = zend_internal_attribute_register(zend_ce_return_type_will_change_attribute, ZEND_ATTRIBUTE_TARGET_METHOD);
+	attr->validator = validate_return_type_will_change_attribute;
 }
 
 void zend_attributes_shutdown(void)

Zend/tests/type_declarations/variance/optional_return_type/incompatible_return_type3.phpt

@@ -9,12 +9,7 @@ final class Attribute
     public function __construct(int $flags = Attribute::TARGET_ALL) {}
 }
 
-final class TentativeReturnType
-{
-    public function __construct() {}
-}
-
-final class SuppressTentativeReturnTypeNotice
+final class ReturnTypeWillChange
 {
     public function __construct() {}
 }