Merge branch '9.6' into 10.5

Author: sebastianbergmann

ChangeLog-10.5.md

@@ -7,6 +7,8 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
 ### Changed
 
 * [#6300](https://github.com/sebastianbergmann/phpunit/issues/6300): Emit warning when the name of a data provider method begins with `test`
+* Do not use `ReflectionProperty::setAccessible()` with PHP >= 8.1
+* Do not use `SplObjectStorage` methods that will be deprecated in PHP 8.5
 
 ## [10.5.49] - 2025-08-09
 

src/Framework/Constraint/Traversable/TraversableContainsEqual.php

@@ -23,7 +23,7 @@ final class TraversableContainsEqual extends TraversableContains
     protected function matches(mixed $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

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

tests/end-to-end/mock-objects/generator/return_type_declarations_generator_empty_by_default.phpt

@@ -19,13 +19,10 @@ $generator = new \PHPUnit\Framework\MockObject\Generator\Generator;
 
 $mock = $generator->testDouble('Foo', false);
 
-var_dump(iterator_to_array($mock->forTraversable()));
-var_dump(iterator_to_array($mock->forGenerator()));
-var_dump(iterator_to_array($mock->forIterable()));
+print count(iterator_to_array($mock->forTraversable())) . PHP_EOL;
+print count(iterator_to_array($mock->forGenerator())) . PHP_EOL;
+print count(iterator_to_array($mock->forIterable())) . PHP_EOL;
 --EXPECTF--
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
+0
+0
+0

tests/unit/Framework/AssertTest.php

@@ -2321,9 +2321,9 @@ protected static 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';
 
@@ -2462,9 +2462,9 @@ protected static 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/Traversable/TraversableContainsEqualTest.php

@@ -28,7 +28,7 @@ public static function provider(): array
         $o = new stdClass;
 
         $s = new SplObjectStorage;
-        $s->attach($o);
+        $s->offsetSet($o);
 
         return [
             [

tests/unit/Framework/Constraint/Traversable/TraversableContainsIdenticalTest.php

@@ -28,7 +28,7 @@ public static function provider(): array
         $o = new stdClass;
 
         $s = new SplObjectStorage;
-        $s->attach($o);
+        $s->offsetSet($o);
 
         return [
             [