Do not use SplObjectStorage methods that will be deprecated in PHP 8.5

Author: sebastianbergmann

ChangeLog-8.5.md

@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 ### Changed
 
 * Do not use `ReflectionProperty::setAccessible()` with PHP >= 8.1
+* Do not use `SplObjectStorage` methods that will be deprecated in PHP 8.5
 
 ## [8.5.42] - 2025-05-02
 

src/Framework/Constraint/TraversableContains.php

@@ -70,7 +70,7 @@ public function toString(): string
     protected function matches($other): bool
     {
         if ($other instanceof SplObjectStorage) {
-            return $other->contains($this->value);
+            return $other->offsetExists($this->value);
         }
 
         if (is_object($this->value)) {

tests/unit/Framework/AssertTest.php

@@ -2459,9 +2459,9 @@ protected function notEqualValues(): array
         $object2  = new SampleClass(16, 23, 42);
         $object3  = new SampleClass(4, 8, 15);
         $storage1 = new SplObjectStorage;
-        $storage1->attach($object1);
+        $storage1->offsetSet($object1);
         $storage2 = new SplObjectStorage;
-        $storage2->attach($object3); // same content, different object
+        $storage2->offsetSet($object3); // same content, different object
 
         $file = TEST_FILES_PATH . 'foo.xml';
 
@@ -2600,9 +2600,9 @@ protected function equalValues(): array
         $object1  = new SampleClass(4, 8, 15);
         $object2  = new SampleClass(4, 8, 15);
         $storage1 = new SplObjectStorage;
-        $storage1->attach($object1);
+        $storage1->offsetSet($object1);
         $storage2 = new SplObjectStorage;
-        $storage2->attach($object1);
+        $storage2->offsetSet($object1);
 
         return [
             // arrays

tests/unit/Framework/Constraint/IsEqualTest.php

@@ -105,10 +105,10 @@ public function isEqualProvider(): array
         $d->c            = $c;
 
         $storage1 = new SplObjectStorage;
-        $storage1->attach($a);
-        $storage1->attach($b);
+        $storage1->offsetSet($a);
+        $storage1->offsetSet($b);
         $storage2 = new SplObjectStorage;
-        $storage2->attach($b);
+        $storage2->offsetSet($b);
         $storage1hash = spl_object_hash($storage1);
         $storage2hash = spl_object_hash($storage2);
 

tests/unit/Framework/Constraint/TraversableContainsTest.php

@@ -153,7 +153,7 @@ public function testConstraintTraversableToStringMethodsWithSplObjectStorage():
         $storage = new SplObjectStorage;
         $this->assertFalse($constraint->evaluate($storage, '', true));
 
-        $storage->attach($object);
+        $storage->offsetSet($object);
         $this->assertTrue($constraint->evaluate($storage, '', true));
     }