Upgrade PHPUnit

Author: mbabker

.github/workflows/run-tests.yml

@@ -40,4 +40,4 @@ jobs:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit --display-deprecations

.php-cs-fixer.php

@@ -6,7 +6,7 @@
         '@Symfony:risky' => true,
         '@PHP83Migration' => true,
         '@PHP82Migration:risky' => true,
-        '@PHPUnit91Migration:risky' => true,
+        '@PHPUnit100Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => false,
         'fopen_flags' => false,

composer.json

@@ -29,13 +29,13 @@
         "doctrine/doctrine-bundle": "^2.7",
         "fig/log-test": "^1.1",
         "guzzlehttp/psr7": "^2.4",
-        "matthiasnoback/symfony-config-test": "^5.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
+        "matthiasnoback/symfony-config-test": "^6.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.1",
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan": "2.1.29",
         "phpstan/phpstan-phpunit": "2.0.7",
         "phpstan/phpstan-symfony": "2.0.8",
-        "phpunit/phpunit": "9.6.29",
+        "phpunit/phpunit": "12.3.15",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/http-message": "^1.0 || ^2.0",

phpstan-baseline.neon

@@ -234,6 +234,18 @@ parameters:
 			count: 1
 			path: src/Routing/Loader/AttributeLoader.php
 
+		-
+			message: '#^Cannot use array destructuring on \(list\<\(BabDev\\WebSocket\\Server\\WAMP\\WAMPConnection&PHPUnit\\Framework\\MockObject\\MockObject\)\|string\>\)\|null\.$#'
+			identifier: offsetAccess.nonArray
+			count: 5
+			path: tests/Authentication/StorageBackedConnectionRepositoryTest.php
+
+		-
+			message: '#^Cannot use array destructuring on \(list\<\(PHPUnit\\Framework\\MockObject\\MockObject&Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface\)\|string\>\)\|null\.$#'
+			identifier: offsetAccess.nonArray
+			count: 5
+			path: tests/Authentication/StorageBackedConnectionRepositoryTest.php
+
 		-
 			message: '#^Cannot cast mixed to string\.$#'
 			identifier: cast.string

phpunit.xml.dist

@@ -11,17 +11,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
-            <directory suffix=".php">./src</directory>
+            <directory>./src</directory>
         </include>
-    </coverage>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
-
-    <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=2"/>
-    </php>
+    </source>
 </phpunit>

tests/Authentication/Provider/SessionAuthenticationProviderTest.php

@@ -3,7 +3,7 @@
 namespace BabDev\WebSocketBundle\Tests\Authentication\Provider;
 
 use BabDev\WebSocket\Server\Connection;
-use BabDev\WebSocket\Server\Connection\AttributeStore;
+use BabDev\WebSocket\Server\Connection\ArrayAttributeStore;
 use BabDev\WebSocketBundle\Authentication\Provider\SessionAuthenticationProvider;
 use BabDev\WebSocketBundle\Authentication\Storage\TokenStorage;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -34,17 +34,8 @@ protected function setUp(): void
 
     public function testTheProviderSupportsAConnectionWhenItHasASession(): void
     {
-        /** @var MockObject&AttributeStore $attributeStore */
-        $attributeStore = $this->createMock(AttributeStore::class);
-        $attributeStore->expects(self::once())
-            ->method('has')
-            ->with('session')
-            ->willReturn(true);
-
-        $attributeStore->expects(self::once())
-            ->method('get')
-            ->with('session')
-            ->willReturn($this->createMock(SessionInterface::class));
+        $attributeStore = new ArrayAttributeStore();
+        $attributeStore->set('session', $this->createMock(SessionInterface::class));
 
         /** @var MockObject&Connection $connection */
         $connection = $this->createMock(Connection::class);
@@ -56,12 +47,7 @@ public function testTheProviderSupportsAConnectionWhenItHasASession(): void
 
     public function testTheProviderDoesNotSupportAConnectionWhenItDoesNotHaveASession(): void
     {
-        /** @var MockObject&AttributeStore $attributeStore */
-        $attributeStore = $this->createMock(AttributeStore::class);
-        $attributeStore->expects(self::once())
-            ->method('has')
-            ->with('session')
-            ->willReturn(false);
+        $attributeStore = new ArrayAttributeStore();
 
         /** @var MockObject&Connection $connection */
         $connection = $this->createMock(Connection::class);
@@ -80,18 +66,9 @@ public function testATokenIsCreatedAndAddedToStorageWhenAGuestUserWithoutASessio
             ->with('_security_main')
             ->willReturn(false);
 
-        /** @var MockObject&AttributeStore $attributeStore */
-        $attributeStore = $this->createMock(AttributeStore::class);
-        $attributeStore->method('get')
-            ->withConsecutive(
-                ['session'],
-                ['resource_id'],
-            )
-            ->willReturnOnConsecutiveCalls(
-                $session,
-                'resource',
-                'test',
-            );
+        $attributeStore = new ArrayAttributeStore();
+        $attributeStore->set('session', $session);
+        $attributeStore->set('resource_id', 'resource');
 
         /** @var MockObject&Connection $connection */
         $connection = $this->createMock(Connection::class);
@@ -126,17 +103,9 @@ public function testAnAuthenticatedUserFromASharedSessionIsAuthenticated(): void
             ->with('_security_main')
             ->willReturn(serialize($token));
 
-        /** @var MockObject&AttributeStore $attributeStore */
-        $attributeStore = $this->createMock(AttributeStore::class);
-        $attributeStore->method('get')
-            ->withConsecutive(
-                ['session'],
-                ['resource_id'],
-            )
-            ->willReturnOnConsecutiveCalls(
-                $session,
-                'resource',
-            );
+        $attributeStore = new ArrayAttributeStore();
+        $attributeStore->set('session', $session);
+        $attributeStore->set('resource_id', 'resource');
 
         /** @var MockObject&Connection $connection */
         $connection = $this->createMock(Connection::class);