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

Author: sebastianbergmann

ChangeLog-9.6.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.6 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.6.24] - 2025-MM-DD
+
+### Changed
+
+* Do not use `SplObjectStorage` methods that will be deprecated in PHP 8.5
+
 ## [9.6.23] - 2025-05-02
 
 ### Changed
@@ -169,6 +175,7 @@ All notable changes of the PHPUnit 9.6 release series are documented in this fil
 * [#5064](https://github.com/sebastianbergmann/phpunit/issues/5064): Deprecate `PHPUnit\Framework\TestCase::getMockClass()`
 * [#5132](https://github.com/sebastianbergmann/phpunit/issues/5132): Deprecate `Test` suffix for abstract test case classes
 
+[9.6.24]: https://github.com/sebastianbergmann/phpunit/compare/9.6.23...9.6
 [9.6.23]: https://github.com/sebastianbergmann/phpunit/compare/9.6.22...9.6.23
 [9.6.22]: https://github.com/sebastianbergmann/phpunit/compare/9.6.21...9.6.22
 [9.6.21]: https://github.com/sebastianbergmann/phpunit/compare/9.6.20...9.6.21

src/Framework/Constraint/Traversable/TraversableContainsEqual.php

@@ -25,7 +25,7 @@ final class TraversableContainsEqual extends TraversableContains
     protected function matches($other): bool
     {
         if ($other instanceof SplObjectStorage) {
-            return $other->contains($this->value());
+            return $other->offsetExists($this->value());
         }
 
         foreach ($other as $element) {

src/Framework/Constraint/Traversable/TraversableContainsIdentical.php

@@ -25,7 +25,7 @@ final class TraversableContainsIdentical extends TraversableContains
     protected function matches($other): bool
     {
         if ($other instanceof SplObjectStorage) {
-            return $other->contains($this->value());
+            return $other->offsetExists($this->value());
         }
 
         foreach ($other as $element) {

tests/unit/Framework/Constraint/TraversableContainsEqualTest.php

@@ -74,10 +74,10 @@ public function test_SplObjectStorage_ContainsObject(): void
         $c->foo = 'baz';
 
         $storageWithA = new SplObjectStorage;
-        $storageWithA->attach($a);
+        $storageWithA->offsetSet($a);
 
         $storageWithoutA = new SplObjectStorage;
-        $storageWithoutA->attach($b);
+        $storageWithoutA->offsetSet($b);
 
         $constraint = new TraversableContainsEqual($a);
 

tests/unit/Framework/Constraint/TraversableContainsIdenticalTest.php

@@ -75,10 +75,10 @@ public function test_SplObjectStorage_ContainsObject(): void
         $c->foo = 'baz';
 
         $storageWithA = new SplObjectStorage;
-        $storageWithA->attach($a);
+        $storageWithA->offsetSet($a);
 
         $storageWithoutA = new SplObjectStorage;
-        $storageWithoutA->attach($b);
+        $storageWithoutA->offsetSet($b);
 
         $constraint = new TraversableContainsIdentical($a);