Merge branch '8.5' into 9.6

Author: sebastianbergmann

ChangeLog-9.6.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.6 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.6.26] - 2025-MM-DD
+
+### Changed
+
+* Implement `__serialize()` in addition to `__sleep()` (which will be deprecated in PHP 8.5)
+
 ## [9.6.25] - 2025-08-20
 
 ### Changed
@@ -182,7 +188,7 @@ All notable changes of the PHPUnit 9.6 release series are documented in this fil
 * [#5064](https://github.com/sebastianbergmann/phpunit/issues/5064): Deprecate `PHPUnit\Framework\TestCase::getMockClass()`
 * [#5132](https://github.com/sebastianbergmann/phpunit/issues/5132): Deprecate `Test` suffix for abstract test case classes
 
-[9.6.25]: https://github.com/sebastianbergmann/phpunit/compare/9.6.24...9.6.25
+[9.6.25]: https://github.com/sebastianbergmann/phpunit/compare/9.6.25...9.6
 [9.6.24]: https://github.com/sebastianbergmann/phpunit/compare/9.6.23...9.6.24
 [9.6.23]: https://github.com/sebastianbergmann/phpunit/compare/9.6.22...9.6.23
 [9.6.22]: https://github.com/sebastianbergmann/phpunit/compare/9.6.21...9.6.22

src/Framework/Exception/Exception.php

@@ -71,6 +71,11 @@ public function __sleep(): array
         return array_keys(get_object_vars($this));
     }
 
+    public function __serialize(): array
+    {
+        return get_object_vars($this);
+    }
+
     /**
      * Returns the serializable trace (without 'args').
      */

tests/_files/SingletonClass.php

@@ -27,7 +27,6 @@
 use PHPUnit\TestFixture\InterfaceWithSemiReservedMethodName;
 use PHPUnit\TestFixture\MockObject\AbstractMockTestClass;
 use PHPUnit\TestFixture\MockObject\ReadonlyClass;
-use PHPUnit\TestFixture\SingletonClass;
 use stdClass;
 use Throwable;
 
@@ -213,13 +212,6 @@ public function testGetMockClassMethodsForNonExistantClass(): void
         $mock = $this->generator->mockClassMethods('Tux', true, true);
     }
 
-    public function testGetMockForSingletonWithReflectionSuccess(): void
-    {
-        $mock = $this->generator->getMock(SingletonClass::class, ['doSomething'], [], '', false);
-
-        $this->assertInstanceOf(SingletonClass::class, $mock);
-    }
-
     public function testExceptionIsRaisedForMutuallyExclusiveOptions(): void
     {
         $this->expectException(OriginalConstructorInvocationRequiredException::class);