Merge branch '8.5' into 9.6

Author: sebastianbergmann

tests/unit/Framework/AssertTest.php

@@ -2209,9 +2209,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';
 
@@ -2350,9 +2350,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/MockObject/MockObjectTest.php

@@ -9,11 +9,13 @@
  */
 namespace PHPUnit\Framework\MockObject;
 
+use const PHP_VERSION;
 use function class_uses;
 use function func_get_args;
 use function get_class;
 use function get_parent_class;
 use function sprintf;
+use function version_compare;
 use Exception;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
@@ -1352,7 +1354,11 @@ private function resetMockObjects(): void
         $refl = new ReflectionObject($this);
         $refl = $refl->getParentClass();
         $prop = $refl->getProperty('mockObjects');
-        $prop->setAccessible(true);
+
+        if (version_compare(PHP_VERSION, '8.1.0', '<')) {
+            $prop->setAccessible(true);
+        }
+
         $prop->setValue($this, []);
     }
 }