Merge branch '10.5' into 11.5

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 11.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.5.37] - 2025-MM-DD
+
+### Changed
+
+* Do not use `__sleep()` method (which will be deprecated in PHP 8.5)
+
 ## [11.5.36] - 2025-09-03
 
 ### Fixed
@@ -326,6 +332,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 * [#6055](https://github.com/sebastianbergmann/phpunit/issues/6055): `assertNotContainsOnly()` (use `assertContainsNotOnlyArray()`, `assertContainsNotOnlyBool()`, `assertContainsNotOnlyCallable()`, `assertContainsNotOnlyFloat()`, `assertContainsNotOnlyInt()`, `assertContainsNotOnlyIterable()`, `assertContainsNotOnlyNumeric()`, `assertContainsNotOnlyObject()`, `assertContainsNotOnlyResource()`, `assertContainsNotOnlyClosedResource()`, `assertContainsNotOnlyScalar()`, or `assertContainsNotOnlyString()` instead)
 * [#6059](https://github.com/sebastianbergmann/phpunit/issues/6059): `containsOnly()` (use `containsOnlyArray()`, `containsOnlyBool()`, `containsOnlyCallable()`, `containsOnlyFloat()`, `containsOnlyInt()`, `containsOnlyIterable()`, `containsOnlyNumeric()`, `containsOnlyObject()`, `containsOnlyResource()`, `containsOnlyClosedResource()`, `containsOnlyScalar()`, or `containsOnlyString()` instead)
 
+[11.5.37]: https://github.com/sebastianbergmann/phpunit/compare/11.5.36...11.5
 [11.5.36]: https://github.com/sebastianbergmann/phpunit/compare/11.5.35...11.5.36
 [11.5.35]: https://github.com/sebastianbergmann/phpunit/compare/11.5.34...11.5.35
 [11.5.34]: https://github.com/sebastianbergmann/phpunit/compare/11.5.33...11.5.34

src/Framework/Exception/Exception.php

@@ -70,9 +70,9 @@ public function __construct(string $message = '', int|string $code = 0, ?Throwab
         }
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
-        return array_keys(get_object_vars($this));
+        return get_object_vars($this);
     }
 
     /**

tests/unit/Framework/Exception/ExceptionTest.php

@@ -16,15 +16,15 @@
 #[Small]
 final class ExceptionTest extends TestCase
 {
-    public function testExceptionSleep(): void
+    public function testExceptionSerialize(): void
     {
-        $actual = (new Exception)->__sleep();
+        $actual = (new Exception)->__serialize();
 
         $this->assertCount(5, $actual);
-        $this->assertContains('serializableTrace', $actual);
-        $this->assertContains('message', $actual);
-        $this->assertContains('code', $actual);
-        $this->assertContains('file', $actual);
-        $this->assertContains('line', $actual);
+        $this->assertArrayHasKey('serializableTrace', $actual);
+        $this->assertArrayHasKey('message', $actual);
+        $this->assertArrayHasKey('code', $actual);
+        $this->assertArrayHasKey('file', $actual);
+        $this->assertArrayHasKey('line', $actual);
     }
 }