Update dependencies

composer.json

@@ -25,7 +25,7 @@
     }
   },
   "require": {
-    "php": "^8.4",
+    "php": "^8.5",
     "ext-apcu": "*",
     "ext-pcntl": "*",
     "ext-posix": "*",
@@ -80,7 +80,7 @@
     "phpstan/extension-installer": "^1.4",
     "phpstan/phpstan": "^2.1",
     "phpstan/phpstan-doctrine": "^2.0",
-    "phpunit/phpunit": "^10.3",
+    "phpunit/phpunit": "^12.5",
     "roave/security-advisories": "dev-master",
     "squizlabs/php_codesniffer": "^3.11",
     "symfony/debug-bundle": "^7.0",

config/chat/services/consumer.yml

@@ -20,7 +20,7 @@ services:
 
     chat.transient-rpc-message-handler.topology:
         class: Gaming\Common\MessageBroker\Integration\AmqpLib\Topology\QueueTopology
-        arguments: ['Chat.TransientRpc', 'gaming', ['Chat.TransientRpc'], {'x-message-ttl': 7000}]]
+        arguments: ['Chat.TransientRpc', 'gaming', ['Chat.TransientRpc'], { 'x-message-ttl': 7000 }]
         tags: [{ name: 'gaming.message-broker.topology' }]
 
     chat.transient-rpc-message-handler.consumer:

config/config.yml

@@ -115,9 +115,9 @@ services:
     Gaming\Common\SymfonyPrometheus\CollectMetricsListener:
         arguments: ['@gaming.prometheus.registry', 'app']
         tags:
-            - { name: kernel.event_listener, event: kernel.request, priority: 1024 }]
-            - { name: kernel.event_listener, event: kernel.response, priority: -1024 }]
-            - { name: kernel.event_listener, event: kernel.exception, priority: 1024 }]
+            - { name: kernel.event_listener, event: kernel.request, priority: 1024 }
+            - { name: kernel.event_listener, event: kernel.response, priority: -1024 }
+            - { name: kernel.event_listener, event: kernel.exception, priority: 1024 }
 
     Gaming\Common\DoctrinePrometheusMiddleware\CollectMetricsMiddleware:
         arguments: ['@gaming.prometheus.registry', 'app']

config/connect-four/services/consumer.yml

@@ -1,7 +1,7 @@
 services:
     connect-four.transient-rpc-message-handler.topology:
         class: Gaming\Common\MessageBroker\Integration\AmqpLib\Topology\QueueTopology
-        arguments: ['ConnectFour.TransientRpc', 'gaming', ['ConnectFour.TransientRpc'], {'x-message-ttl': 7000}]]
+        arguments: ['ConnectFour.TransientRpc', 'gaming', ['ConnectFour.TransientRpc'], { 'x-message-ttl': 7000 }]
         tags: [{ name: 'gaming.message-broker.topology' }]
 
     connect-four.transient-rpc-message-handler.consumer:

config/identity/config.yml

@@ -21,6 +21,7 @@ doctrine:
                     charset: utf8mb4
                     collate: utf8mb4_unicode_ci
     orm:
+        enable_native_lazy_objects: true
         entity_managers:
             identity:
                 connection: identity

config/identity/services/consumer.yml

@@ -1,7 +1,7 @@
 services:
     identity.transient-rpc-message-handler.topology:
         class: Gaming\Common\MessageBroker\Integration\AmqpLib\Topology\QueueTopology
-        arguments: ['Identity.TransientRpc', 'gaming', ['Identity.TransientRpc'], {'x-message-ttl': 7000}]]
+        arguments: ['Identity.TransientRpc', 'gaming', ['Identity.TransientRpc'], { 'x-message-ttl': 7000 }]
         tags: [{ name: 'gaming.message-broker.topology' }]
 
     identity.transient-rpc-message-handler.consumer:

config/routing_dev.yml

@@ -1,9 +1,9 @@
 _wdt:
-    resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+    resource: '@WebProfilerBundle/Resources/config/routing/wdt.php'
     prefix: /_wdt
 
 _profiler:
-    resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+    resource: '@WebProfilerBundle/Resources/config/routing/profiler.php'
     prefix: /_profiler
 
 _main:

docker/Dockerfile

@@ -3,7 +3,7 @@ ARG environment=development
 ##############################
 #     Build dependencies     #
 ##############################
-FROM ghcr.io/gaming-platform/docker-php-fpm:8.4-development as builder
+FROM ghcr.io/gaming-platform/docker-php-fpm:8.5-development AS builder
 
 ARG environment=development
 
@@ -19,7 +19,7 @@ RUN /composer-install-after-code-copy.sh
 ##############################
 #       Build php-fpm        #
 ##############################
-FROM ghcr.io/gaming-platform/docker-php-fpm:8.4-$environment
+FROM ghcr.io/gaming-platform/docker-php-fpm:8.5-$environment
 
 ARG environment=development
 
@@ -31,7 +31,8 @@ COPY --from=builder /project /project
 
 RUN /warmup.sh
 
-COPY /docker/${environment}.ini /etc/php/8.4/fpm/conf.d/
+COPY /docker/fpm/${environment}.ini /etc/php/8.5/fpm/conf.d/
+COPY /docker/cli/${environment}.ini /etc/php/8.5/cli/conf.d/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-http"]

docker/cli/development.ini

@@ -0,0 +1 @@
+register_argc_argv = 1

docker/cli/production.ini

@@ -0,0 +1 @@
+register_argc_argv = 1

phpstan.neon.dist

@@ -5,7 +5,6 @@ parameters:
   ignoreErrors:
     # Ignoring non-empty-string because there are currently many false positives.
     - message: '#(should return|expects) non-empty-string( but returns string|, string given)\.$#'
-    - message: '#^Call to an undefined method Symfony[^:]+::children\(\)\.$#'
     - message: '#^While loop condition is always true\.$#'
     - message: "#^Property Gaming\\\\Identity\\\\Domain\\\\Model\\\\Account\\\\Account\\:\\:\\$version#"
     - message: "#^Property Gaming\\\\Memory\\\\Domain\\\\Model\\\\Game\\\\Game\\:\\:\\$cards is never read, only written\\.$#"

src/Common/MessageBroker/Integration/AmqpLib/AmqpConsumer.php

@@ -25,7 +25,7 @@ final class AmqpConsumer implements Consumer
     /**
      * @var ArrayObject<int, AmqpContext>
      */
-    private readonly ArrayObject $pendingMessageToContext;
+    private ArrayObject $pendingMessageToContext;
 
     /**
      * @param positive-int $prefetchCount
@@ -84,13 +84,13 @@ public function stop(): void
 
     private function onPositiveAcknowledgement(AMQPMessage $pendingMessage): void
     {
-        $this->pendingMessageToContext[$pendingMessage->getDeliveryTag()]
+        ($this->pendingMessageToContext[$pendingMessage->getDeliveryTag()] ?? null)
             ?->resolvePositiveAcknowledgement($pendingMessage);
     }
 
     private function onNegativeAcknowledgement(AMQPMessage $pendingMessage): void
     {
-        $this->pendingMessageToContext[$pendingMessage->getDeliveryTag()]
+        ($this->pendingMessageToContext[$pendingMessage->getDeliveryTag()] ?? null)
             ?->resolveNegativeAcknowledgement($pendingMessage);
     }
 

src/Common/Timer/TimeoutService.php

@@ -23,7 +23,7 @@ public function add(array $timeouts): void
     }
 
     /**
-     * @param string[] $timeoutIds
+     * @param list<string> $timeoutIds
      */
     public function remove(array $timeoutIds): void
     {

src/Common/Timer/TimeoutStore.php

@@ -13,7 +13,7 @@ interface TimeoutStore
     public function add(array $timeouts): void;
 
     /**
-     * @param string[] $timeoutIds
+     * @param list<string> $timeoutIds
      */
     public function remove(array $timeoutIds): void;
 

src/ConnectFour/Port/Adapter/Persistence/Projection/TimerProjection.php

@@ -23,7 +23,7 @@ final class TimerProjection implements StoredEventSubscriber
     private array $additions = [];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     private array $removals = [];
 

tests/integration/Common/DoctrineHeartbeatMiddleware/SchedulePeriodicHeartbeatMiddlewareTest.php

@@ -4,23 +4,23 @@
 
 namespace Gaming\Tests\Integration\Common\DoctrineHeartbeatMiddleware;
 
+use Codeception\Attribute\DataProvider;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Logging\Middleware as LoggerMiddleware;
 use Doctrine\DBAL\Tools\DsnParser;
 use Gaming\Common\DoctrineHeartbeatMiddleware\SchedulePeriodicHeartbeatMiddleware;
 use Gaming\Common\Scheduler\TestScheduler;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Psr\Clock\ClockInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Clock\MockClock;
 
 final class SchedulePeriodicHeartbeatMiddlewareTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldScheduleHeartbeatsUntilClosed(): void
     {
         $scheduler = new TestScheduler();
@@ -57,10 +57,8 @@ public function itShouldScheduleHeartbeatsUntilClosed(): void
         self::assertSame(0, $scheduler->numberOfPendingJobs());
     }
 
-    /**
-     * @test
-     * @dataProvider withoutHeartbeatDataProvider
-     */
+    #[Test]
+    #[DataProvider('withoutHeartbeatDataProvider')]
     public function itShouldNotScheduleWithoutHeartbeatConfiguration(string $url, int $heartbeat): void
     {
         $scheduler = new TestScheduler();

tests/unit/Chat/Application/ChatIdTest.php

@@ -4,26 +4,24 @@
 
 namespace Gaming\Tests\Unit\Chat\Application;
 
+use Codeception\Attribute\DataProvider;
 use Gaming\Chat\Application\ChatId;
 use Gaming\Chat\Application\Exception\ChatNotFoundException;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Uid\Uuid;
 
 class ChatIdTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function itCanBeGenerated(): void
     {
         $chatId = ChatId::generate();
 
         $this->assertTrue(Uuid::isValid($chatId->toString()));
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itCanBeCreatedFromString(): void
     {
         $expected = Uuid::v6()->toRfc4122();
@@ -33,9 +31,7 @@ public function itCanBeCreatedFromString(): void
         $this->assertSame($expected, $chatId->toString());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itCanBeTypeCastedToString(): void
     {
         $chatId = ChatId::generate();
@@ -44,10 +40,8 @@ public function itCanBeTypeCastedToString(): void
         $this->assertTrue(Uuid::isValid((string)$chatId));
     }
 
-    /**
-     * @test
-     * @dataProvider invalidStringProvider
-     */
+    #[Test]
+    #[DataProvider('invalidStringProvider')]
     public function itShouldThrowChatNotFoundExceptionOnInvalidString(string $invalidString): void
     {
         $this->expectException(ChatNotFoundException::class);

tests/unit/Chat/Application/ChatServiceTest.php

@@ -18,14 +18,13 @@
 use Gaming\Common\EventStore\DomainEvent;
 use Gaming\Common\EventStore\InMemoryEventStore;
 use Gaming\Common\IdempotentStorage\InMemoryIdempotentStorage;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Clock\MockClock;
 
 final class ChatServiceTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldInitiateChatExactlyOnce(): void
     {
         $expectedChatId = ChatId::generate();
@@ -70,9 +69,7 @@ public function itShouldInitiateChatExactlyOnce(): void
         );
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldThrowMessageEmptyException(): void
     {
         $this->expectException(EmptyMessageException::class);
@@ -94,9 +91,7 @@ public function itShouldThrowMessageEmptyException(): void
         );
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldAllowOnlyAuthorsAssignedToChat(): void
     {
         $this->expectException(AuthorNotAllowedException::class);
@@ -127,9 +122,7 @@ public function itShouldAllowOnlyAuthorsAssignedToChat(): void
         );
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldWriteMessage(): void
     {
         $clock = new MockClock();
@@ -182,9 +175,7 @@ public function itShouldWriteMessage(): void
         );
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldReturnMessages(): void
     {
         $chatId = ChatId::generate();

tests/unit/Common/Bus/Integration/SymfonyValidatorBusTest.php

@@ -10,6 +10,7 @@
 use Gaming\Common\Domain\Exception\DomainException;
 use Gaming\Common\Domain\Exception\Violation;
 use Gaming\Common\Domain\Exception\ViolationParameter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationInterface;
@@ -19,9 +20,7 @@
 
 class SymfonyValidatorBusTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldForwardRequestToHandlerAndReturnItsValue(): void
     {
         $request = $this->createRequest('Request');
@@ -48,9 +47,7 @@ public function itShouldForwardRequestToHandlerAndReturnItsValue(): void
         $this->assertSame($response, $bus->handle($request));
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldThrowDomainExceptionWithViolationsOnError(): void
     {
         $this->expectException(DomainException::class);

tests/unit/Common/Bus/PsrCallableRoutingBusTest.php

@@ -11,23 +11,20 @@
 use Gaming\Tests\Unit\Common\Bus\Fixture\FirstRequest;
 use Gaming\Tests\Unit\Common\Bus\Fixture\SecondRequest;
 use Gaming\Tests\Unit\Common\Bus\Fixture\UniversalHandler;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 final class PsrCallableRoutingBusTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldThrowMissingHandlerException(): void
     {
         $this->expectException(BusException::class);
 
         (new PsrCallableRoutingBus(new TestContainer()))->handle(new FirstRequest());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldThrowMissingHandlerExceptionIfHandlerIsNotCallable(): void
     {
         $this->expectException(BusException::class);
@@ -40,9 +37,7 @@ public function itShouldThrowMissingHandlerExceptionIfHandlerIsNotCallable(): vo
         $bus->handle(new FirstRequest());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function itShouldRouteRequestToHandlerAndReturnItsValue(): void
     {
         $bus = new PsrCallableRoutingBus(