Even more test fixes

Author: kocsismate

Zend/zend_interfaces.stub.php

@@ -12,13 +12,13 @@ public function getIterator(): Traversable;
 
 interface Iterator extends Traversable
 {
-    /** @return mixed */
+    /** @tentative-return-type */
     public function current(): mixed;
 
     /** @tentative-return-type */
     public function next(): void;
 
-    /** @return mixed */
+    /** @tentative-return-type */
     public function key(): mixed;
 
     /** @tentative-return-type */
@@ -57,6 +57,7 @@ public function unserialize(string $data);
 
 interface Countable
 {
+    /** @tentative-return-type */
     public function count(): int;
 }
 

Zend/zend_interfaces_arginfo.h

@@ -1,10 +1,10 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: b43f6527e45ee22732e3227e933a8950a641a8b5 */
+ * Stub hash: 339e326a82a7fd1e2ae419c8c86095e29028fbd6 */
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IteratorAggregate_getIterator, 0, 0, Traversable, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Iterator_current, 0, 0, IS_MIXED, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Iterator_current, 0, 0, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Iterator_next, 0, 0, IS_VOID, 0)
@@ -41,17 +41,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Serializable_unserialize, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Countable_count, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Countable_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Stringable___toString, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_InternalIterator___construct arginfo_class_Serializable_serialize
 
-#define arginfo_class_InternalIterator_current arginfo_class_Iterator_current
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_InternalIterator_current, 0, 0, IS_MIXED, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_InternalIterator_key arginfo_class_Iterator_current
+#define arginfo_class_InternalIterator_key arginfo_class_InternalIterator_current
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_InternalIterator_next, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()

ext/reflection/tests/intersection_types.phpt

@@ -29,7 +29,7 @@ dumpType($rp->getType());
 
 interface y {}
 class x implements Y, Countable {
-    public function count() {}
+    public function count(): int { return 0; }
 }
 $test = new Test;
 $test->prop = new x;

ext/spl/tests/countable_class_basic1.phpt

@@ -24,6 +24,7 @@ Interface [ <internal%s> interface Countable ] {
 
       - Parameters [0] {
       }
+      - Tentative return [ int ]
     }
   }
 }

ext/spl/tests/countable_count_variation1.phpt

@@ -4,29 +4,34 @@ SPL: Countable::count() with wrong return types and exception.
 <?php
 
 Class returnNull implements Countable {
-    function count() {
+    function count(): int {
+        return 0;
     }
 }
 
 Class returnString implements Countable {
+    #[ReturnTypeWillChange]
     function count() {
         return "hello";
     }
 }
 
 Class returnObject implements Countable {
+    #[ReturnTypeWillChange]
     function count() {
         return new returnObject;
     }
 }
 
 Class returnArray implements Countable {
+    #[ReturnTypeWillChange]
     function count() {
         return array(1,2,3);
     }
 }
 
 Class throwException implements Countable {
+    #[ReturnTypeWillChange]
     function count() {
         throw new Exception('Thrown from count');
     }

ext/spl/tests/observer_002.phpt

@@ -79,7 +79,7 @@ class SubjectImpl implements SplSubject
         $this->observers->detach($observer);
     }
 
-    function count()
+    function count(): int
     {
         return $this->observers->count();
     }

ext/spl/tests/spl_002.phpt

@@ -5,7 +5,7 @@ SPL: Countable
 
 class Test implements Countable
 {
-    function count()
+    function count(): int
     {
         return 4;
     }

ext/standard/tests/array/bug43505.phpt

@@ -5,6 +5,7 @@ error_reporting=0
 --FILE--
 <?php
 class Test implements Countable {
+    #[ReturnTypeWillChange]
     public function count() {
         return $some;
     }

ext/standard/tests/array/count_recursive.phpt

@@ -58,7 +58,7 @@ class count_class implements Countable {
   public $var_public;
   protected $var_protected;
 
-  public function count() {
+  public function count(): int {
     return 3;
   }
 }

ext/standard/tests/array/sizeof_object1.phpt

@@ -11,7 +11,7 @@ class sizeof_class implements Countable
   private $member2;
   protected $member3;
 
-  public function count()
+  public function count(): int
   {
     return 3; // return the count of member variables in the object
   }

ext/standard/tests/general_functions/is_countable_with_classes.phpt

@@ -7,7 +7,7 @@ Gabriel Caruso ([email protected])
 var_dump(is_countable(new class extends ArrayIterator {}));
 var_dump(is_countable((array) new stdClass()));
 var_dump(is_countable(new class implements Countable {
-    public function count()
+    public function count(): int
     {
         return count(1, 'foo');
     }

sapi/cli/tests/005.phpt

@@ -37,7 +37,7 @@ string(183) "Class [ <internal:Core> class stdClass ] {
 }
 
 "
-string(2201) "Class [ <internal:Core> class Exception implements Throwable, Stringable ] {
+string(2235) "Class [ <internal:Core> class Exception implements Throwable, Stringable ] {
 
   - Constants [0] {
   }
@@ -79,6 +79,7 @@ string(2201) "Class [ <internal:Core> class Exception implements Throwable, Stri
 
       - Parameters [0] {
       }
+      - Tentative return [ void ]
     }
 
     Method [ <internal:Core, prototype Throwable> final public method getMessage ] {