Fixing/bumping dependencies

Signed-off-by: RJ Garcia <[email protected]>

Author: ragboyjr

Dockerfile

@@ -5,4 +5,4 @@ RUN apt-get update && apt-get install -y git zip
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
 RUN install-php-extensions redis pcntl
 
-COPY --from=composer:1.9.1 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.5.4 /usr/bin/composer /usr/bin/composer

composer.json

@@ -26,7 +26,7 @@
     },
     "require-dev": {
         "nyholm/symfony-bundle-test": "^1.6",
-        "phpunit/phpunit": "^7.3",
+        "phpunit/phpunit": "^9.0",
         "symfony/dependency-injection": "^5.4",
         "symfony/http-kernel": "^5.4",
         "symfony/property-access": "^5.4",

phpunit.xml.dist

@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php">
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <env name="SHELL_VERBOSITY" value="-1" />
-        <env name="REDIS_DSN" value="redis://u:password123@redis:6379?queue=messenger"/>
-    </php>
-    <testsuites>
-        <testsuite name="feature">
-            <directory>tests/Feature</directory>
-        </testsuite>
-        <testsuite name="unit">
-            <directory>tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./src/</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <env name="SHELL_VERBOSITY" value="-1"/>
+    <env name="REDIS_DSN" value="redis://u:password123@redis:6379?queue=messenger"/>
+  </php>
+  <testsuites>
+    <testsuite name="feature">
+      <directory>tests/Feature</directory>
+    </testsuite>
+    <testsuite name="unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

tests/Feature/BundleTest.php

@@ -15,9 +15,9 @@ final class BundleTest extends BaseBundleTestCase
 {
     use RedisSteps;
 
-    protected function setUp() {
+    protected function setUp(): void {
         parent::setUp();
-        $this->addCompilerPass(new PublicServicePass('/(Krak.*|messenger.default_serializer)/'));
+        $this->addCompilerPass(new PublicServicePass('/(Krak.*|messenger.default_serializer|.*MessageBus.*)/'));
         $this->given_a_redis_client_is_configured_with_a_fresh_redis_db();
     }
 
@@ -39,7 +39,7 @@ public function registers_the_redis_message_bus_integration() {
 
         // Act: dispatch the krak redis message on the bus
         /** @var MessageBusInterface $bus */
-        $bus = $this->getContainer()->get('message_bus');
+        $bus = $this->messageBus();
         $bus->dispatch(new KrakRedisMessage());
 
         // Assert: verify the message was pushed to krak redis transport
@@ -55,7 +55,7 @@ public function allows_sf_redis_transport() {
 
         // Act: dispatch the sf message on the bus
         /** @var MessageBusInterface $bus */
-        $bus = $this->getContainer()->get('message_bus');
+        $bus = $this->messageBus();
         $bus->dispatch(new SfRedisMessage());
 
         // Assert: verify the message was not pushed to krak redis transport
@@ -76,4 +76,8 @@ private function createKrakRedisTransport(): RedisTransport {
             'blocking_timeout' => 1,
         ], $this->getContainer()->get('messenger.default_serializer'));
     }
+
+    private function messageBus(): MessageBusInterface {
+        return $this->getContainer()->get(MessageBusInterface::class);
+    }
 }

tests/Feature/Fixtures/redis-config.yaml

@@ -5,7 +5,7 @@ framework:
     transports:
       krak_redis: 'redis://u:password123@redis:6379?queue=messenger'
       sf_redis:
-        dsn: 'redis://u:password123@redis:6379'
+        dsn: 'redis://password123@redis:6379'
         options: { use_krak_redis: false }
     routing:
       'Krak\SymfonyMessengerRedis\Tests\Feature\Fixtures\KrakRedisMessage': krak_redis

tests/Feature/TransportTest.php

@@ -26,7 +26,7 @@ final class TransportTest extends TestCase
     /** @var Envelope */
     private $envelope;
 
-    protected function setUp() {
+    protected function setUp(): void {
         parent::setUp();
         $this->transportFactory = new RedisTransportFactory();
         $this->given_a_redis_client_is_configured_with_a_fresh_redis_db();