Merge branch '9.6' into 10.5

Author: sebastianbergmann

ChangeLog-10.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 10.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [10.5.54] - 2025-MM-DD
+
+### Changed
+
+* Do not use `__sleep()` method (which will be deprecated in PHP 8.5)
+
 ## [10.5.53] - 2025-08-20
 
 ### Changed
@@ -472,6 +478,7 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
 
 * [#5563](https://github.com/sebastianbergmann/phpunit/issues/5563): `createMockForIntersectionOfInterfaces()` does not automatically register mock object for expectation verification
 
+[10.5.54]: https://github.com/sebastianbergmann/phpunit/compare/10.5.53...10.5
 [10.5.53]: https://github.com/sebastianbergmann/phpunit/compare/10.5.52...10.5.53
 [10.5.52]: https://github.com/sebastianbergmann/phpunit/compare/10.5.51...10.5.52
 [10.5.51]: https://github.com/sebastianbergmann/phpunit/compare/10.5.50...10.5.51

src/Framework/Exception/Exception.php

@@ -67,9 +67,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);
     }
 }