Fix tests

Author: kocsismate

ext/spl/spl_observer.stub.php

@@ -34,10 +34,10 @@ public function contains(object $object): bool {}
     public function addAll(SplObjectStorage $storage): int {}
 
     /** @tentative-return-type */
-    public function removeAll(SplObjectStorage $storage): void {}
+    public function removeAll(SplObjectStorage $storage): int {}
 
     /** @tentative-return-type */
-    public function removeAllExcept(SplObjectStorage $storage): void {}
+    public function removeAllExcept(SplObjectStorage $storage): int {}
 
     /** @tentative-return-type */
     public function getInfo(): mixed {}

ext/spl/spl_observer_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 743017a29d50b11d3e18476664ad4c5f648d2571 */
+ * Stub hash: 7afd0fa1170cb9c21bef514336e6cfb38dccdacd */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SplObserver_update, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)
@@ -31,11 +31,9 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObjectStorage
 	ZEND_ARG_OBJ_INFO(0, storage, SplObjectStorage, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObjectStorage_removeAll, 0, 1, IS_VOID, 0)
-	ZEND_ARG_OBJ_INFO(0, storage, SplObjectStorage, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_class_SplObjectStorage_removeAll arginfo_class_SplObjectStorage_addAll
 
-#define arginfo_class_SplObjectStorage_removeAllExcept arginfo_class_SplObjectStorage_removeAll
+#define arginfo_class_SplObjectStorage_removeAllExcept arginfo_class_SplObjectStorage_addAll
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObjectStorage_getInfo, 0, 0, IS_MIXED, 0)
 ZEND_END_ARG_INFO()

ext/spl/tests/SplObjectStorage_getHash.phpt

@@ -9,16 +9,17 @@ $s[$o1] = "some_value\n";
 echo $s->offsetGet($o1);
 
 class MySplObjectStorage extends SplObjectStorage {
-    public function getHash($obj): string {
-        return "2";
+    #[ReturnTypeWillChange]
+    public function getHash($obj) {
+        return 2;
     }
 }
 
 try {
     $s1 = new MySplObjectStorage;
     $s1[$o1] = "foo";
 } catch(Exception $e) {
-    echo "caught\n";
+    echo "caught 1\n";
 }
 
 class MySplObjectStorage2 extends SplObjectStorage {
@@ -32,7 +33,7 @@ try {
     $s2 = new MySplObjectStorage2;
     $s2[$o2] = "foo";
 } catch(Exception $e) {
-    echo "caught\n";
+    echo "caught 2\n";
 }
 
 class MySplObjectStorage3 extends SplObjectStorage {
@@ -51,8 +52,8 @@ var_dump($s3[$o1] === $s3[$o2]);
 ?>
 --EXPECT--
 some_value
-caught
-caught
+caught 1
+caught 2
 object(stdClass)#2 (0) {
 }
 bool(true)

ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt

@@ -5,21 +5,21 @@ Matthew Turland ([email protected])
 --FILE--
 <?php
 
-    $a = (object) 'a';
-    $b = (object) 'b';
-    $c = (object) 'c';
+$a = (object) 'a';
+$b = (object) 'b';
+$c = (object) 'c';
 
-   $foo = new SplObjectStorage;
-    $foo->attach($a);
-    $foo->attach($b);
+$foo = new SplObjectStorage;
+$foo->attach($a);
+$foo->attach($b);
 
-    $bar = new SplObjectStorage;
-    $bar->attach($b);
-    $bar->attach($c);
+$bar = new SplObjectStorage;
+$bar->attach($b);
+$bar->attach($c);
 
-    $foo->removeAllExcept($bar);
-    var_dump($foo->contains($a));
-    var_dump($foo->contains($b));
+$foo->removeAllExcept($bar);
+var_dump($foo->contains($a));
+var_dump($foo->contains($b));
 
 ?>
 --EXPECT--

ext/spl/tests/observer_008.phpt

@@ -12,7 +12,7 @@ $a = new A;
 $a->attach($o1);
 $a->attach($o2);
 
-$b = new SplObjectSTorage();
+$b = new SplObjectStorage();
 $b->attach($o2);
 $b->attach($o3);