PHPUnit 12, misc. updates

Author: mbabker

.php-cs-fixer.php

@@ -4,8 +4,8 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP82Migration' => true,
-        '@PHP80Migration:risky' => true,
+        '@PHP83Migration' => true,
+        '@PHP82Migration:risky' => true,
         '@PHPUnit100Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => false,

composer.json

@@ -23,12 +23,12 @@
         "ext-session": "*",
         "ext-sockets": "*",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "2.1.1",
-        "phpstan/phpstan-phpunit": "2.0.3",
-        "phpunit/phpunit": "11.5.2",
+        "phpstan/phpstan": "2.1.4",
+        "phpstan/phpstan-phpunit": "2.0.4",
+        "phpunit/phpunit": "12.0.2",
         "psr/container": "^1.0 || ^2.0",
         "psr/event-dispatcher": "^1.0",
-        "rector/rector": "2.0.6",
+        "rector/rector": "2.0.9",
         "symfony/security-core": "^6.4 || ^7.2"
     },
     "conflict": {

rector.php

@@ -12,5 +12,6 @@
         __DIR__ . '/vendor/phpstan/phpstan-phpunit/extension.neon',
         __DIR__ . '/phpstan.neon',
     ])
-    ->withPreparedSets(codeQuality: true)
+    ->withPhpSets()
+    ->withPreparedSets(codeQuality: true, phpunitCodeQuality: true)
 ;

src/ReactPhpServer.php

@@ -13,13 +13,13 @@
  * The {@see ReactPhpServer} is an implementation of the server interface which runs a WebSocket server stack using
  * the ReactPHP library.
  */
-final class ReactPhpServer implements Server
+final readonly class ReactPhpServer implements Server
 {
-    private readonly LoopInterface $loop;
+    private LoopInterface $loop;
 
     public function __construct(
-        private readonly ServerMiddleware $middleware,
-        private readonly ServerInterface $socket,
+        private ServerMiddleware $middleware,
+        private ServerInterface $socket,
         ?LoopInterface $loop = null
     ) {
         gc_enable();

src/Session/Reader/PhpReader.php

@@ -11,7 +11,7 @@
  */
 final class PhpReader implements Reader
 {
-    private const DELIMITER = '|';
+    private const string DELIMITER = '|';
 
     /**
      * @throws InvalidSession if the session data cannot be deserialized

src/Session/Storage/Proxy/ReadOnlySessionHandlerProxy.php

@@ -22,6 +22,7 @@ public function __construct(
         $this->sessionName = $this->optionsHandler->get('session.name');
     }
 
+    #[\Override]
     public function getId(): string
     {
         return $this->sessionId ?? parent::getId();
@@ -30,6 +31,7 @@ public function getId(): string
     /**
      * @throws ReadOnlySession if trying to change the session ID once it has been set
      */
+    #[\Override]
     public function setId(string $id): void
     {
         if (null !== $this->sessionId) {
@@ -39,6 +41,7 @@ public function setId(string $id): void
         $this->sessionId = $id;
     }
 
+    #[\Override]
     public function getName(): string
     {
         return $this->sessionName;
@@ -47,6 +50,7 @@ public function getName(): string
     /**
      * @throws ReadOnlySession
      */
+    #[\Override]
     public function setName(string $name): never
     {
         throw new ReadOnlySession(\sprintf('The session name cannot be changed in "%s".', self::class));

src/WAMP/Middleware/ParseWAMPMessage.php

@@ -21,7 +21,7 @@
  */
 final class ParseWAMPMessage implements WebSocketServerMiddleware
 {
-    private const WAMP_PROTOCOL_VERSION = 1;
+    private const int WAMP_PROTOCOL_VERSION = 1;
 
     /**
      * @var \SplObjectStorage<Connection, WAMPConnection>

tests/Connection/ReactSocketConnectionTest.php

@@ -10,11 +10,11 @@
 
 final class ReactSocketConnectionTest extends TestCase
 {
-    private MockObject&ReactSocketConnectionInterface $reactConnection;
+    private readonly MockObject&ReactSocketConnectionInterface $reactConnection;
 
-    private MockObject&AttributeStore $attributeStore;
+    private readonly MockObject&AttributeStore $attributeStore;
 
-    private ReactSocketConnection $connection;
+    private readonly ReactSocketConnection $connection;
 
     protected function setUp(): void
     {

tests/Http/GuzzleRequestParserTest.php

@@ -51,12 +51,9 @@ public function testConvertsToRequest(bool $valid, string $message): void
             $attributeStore->expects($this->once())
                 ->method('remove')
                 ->with('http.buffer');
-            $this->assertInstanceOf(
-                RequestInterface::class,
-                (new GuzzleRequestParser())->parse($connection, $message)
-            );
+            $this->assertInstanceOf(RequestInterface::class, (new GuzzleRequestParser())->parse($connection, $message));
         } else {
-            $this->assertNull((new GuzzleRequestParser())->parse($connection, $message));
+            $this->assertNotInstanceOf(RequestInterface::class, (new GuzzleRequestParser())->parse($connection, $message));
         }
     }
 

tests/Http/Middleware/ParseHttpRequestTest.php

@@ -16,9 +16,9 @@
 
 final class ParseHttpRequestTest extends TestCase
 {
-    private MockObject&ServerMiddleware $decoratedMiddleware;
-    private MockObject&RequestParser $requestParser;
-    private ParseHttpRequest $middleware;
+    private readonly MockObject&ServerMiddleware $decoratedMiddleware;
+    private readonly MockObject&RequestParser $requestParser;
+    private readonly ParseHttpRequest $middleware;
 
     protected function setUp(): void
     {