Merge branch '12.3'

Author: sebastianbergmann

composer.json

@@ -38,7 +38,7 @@
         "phpunit/php-text-template": "^5.0.0",
         "phpunit/php-timer": "^8.0.0",
         "sebastian/cli-parser": "^4.0.0",
-        "sebastian/comparator": "^7.1.0",
+        "sebastian/comparator": "^7.1.1",
         "sebastian/diff": "^7.0.0",
         "sebastian/environment": "^8.0.2",
         "sebastian/exporter": "^7.0.0",

composer.lock

@@ -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/TraversableContainsEqual.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) {

src/Framework/Constraint/Traversable/TraversableContainsIdentical.php

@@ -65,9 +65,9 @@ public 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
@@ -159,9 +159,9 @@ public 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';
 

tests/unit/Framework/Assert/assertEqualsTest.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/TraversableContainsEqualTest.php

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