Add support for phpredis 6 (#22)

* Update ext-redis requirement * Remove unnessary lines * Fix tests * Update CI * Fix code style * Use docker redis * Add will returng --------- Co-authored-by: Alexander Schranz <alexander@sulu.io>
handcraftedinthealps · Jan 17, 2024 · 74f3ab4 · 74f3ab4
1 parent a892dd4
commit 74f3ab4
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 25 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -47,21 +47,28 @@ jobs:
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: disabled
 
-        services:
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
+                    - php-version: '8.2'
+                      dependency-versions: 'highest'
+                      php-extensions: 'redis'
+                      tools: 'composer:v2'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: disabled
+
+                    - php-version: '8.3'
+                      dependency-versions: 'highest'
+                      php-extensions: 'redis'
+                      tools: 'composer:v2'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: disabled
 
         steps:
             - name: Checkout project
               uses: actions/checkout@v2
 
+            - name: Start Docker services
+              run: |
+                  docker compose up --wait
+
             - name: Install and configure PHP
               uses: shivammathur/setup-php@v2
               with:

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -25,6 +25,7 @@
         'phpdoc_to_comment' => [
             'ignored_tags' => ['todo', 'var'],
         ],
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
     ->setFinder($finder);
 

diff --git a/Command/TrimRedisStreamCommand.php b/Command/TrimRedisStreamCommand.php
@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         /** @var int $x */
-        $x = $redis->xtrim($stream, (int) $maxLength, true);
+        $x = $redis->xtrim($stream, (string) $maxLength, true);
         if ($errorMessage = $redis->getLastError()) {
             throw new \RuntimeException($errorMessage);
         }

diff --git a/README.md b/README.md
@@ -75,12 +75,12 @@ And you can consume the messages with:
 bin/console messenger:consume-messages redis_stream
 ```
 
-Have also a look at the the [messenger component documentation](https://symfony.com/doc/current/components/messenger.html) and [messenger usage documentation](https://symfony.com/doc/current/messenger.html).
+Have also a look at the [messenger component documentation](https://symfony.com/doc/current/components/messenger.html) and [messenger usage documentation](https://symfony.com/doc/current/messenger.html).
 
 
 ## Commands
 
-Messages in streams wont be removed by default. Therefor this bundle provides a command:
+Messages in streams won't be removed by default. Therefor this bundle provides a command:
 
 ```
 bin/console redis-transport:trim <redis-dsn> --maxlen 1000

diff --git a/Tests/Functional/Transport/RedisStreamSenderTest.php b/Tests/Functional/Transport/RedisStreamSenderTest.php
@@ -64,15 +64,15 @@ public function testSend(): void
         if (\class_exists(RedisReceiver::class) && \class_exists(Connection::class)) {
             $redisReceiver = new RedisReceiver(
                 Connection::fromDsn(\sprintf(
-                    'redis-stream://%s:%s/my_test_stream/my_group',
+                    'redis-stream://%s:%s/my_test_stream/my_group?serializer=0',
                     \getenv('REDIS_HOST'),
                     \getenv('REDIS_PORT')
                 ), [], $this->redis)
             );
         } else {
             $redisReceiver = new \Symfony\Component\Messenger\Transport\RedisExt\RedisReceiver(
                 \Symfony\Component\Messenger\Transport\RedisExt\Connection::fromDsn(\sprintf(
-                    'redis-stream://%s:%s/my_test_stream/my_group',
+                    'redis-stream://%s:%s/my_test_stream/my_group?serializer=0',
                     \getenv('REDIS_HOST'),
                     \getenv('REDIS_PORT')
                 ), [], $this->redis)

diff --git a/Tests/Unit/Command/TrimRedisStreamCommandTest.php b/Tests/Unit/Command/TrimRedisStreamCommandTest.php
@@ -33,7 +33,9 @@ public function testExecute(): void
         $redis->connect('127.0.0.1', '6739')->shouldBeCalled();
         $redis->getLastError()->willReturn(null)->shouldBeCalled();
         $redis->auth('password')->shouldBeCalled();
-        $redis->xtrim('stream', 1000, true)->shouldBeCalled();
+        $redis->xtrim('stream', '1000', true)
+            ->willReturn(1)
+            ->shouldBeCalled();
 
         $command = new TrimRedisStreamCommand($redis->reveal());
         $command->run($input, $output);

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -15,10 +15,3 @@
 if (!\file_exists($file)) {
     throw new RuntimeException('Install dependencies to run test suite.');
 }
-
-if (!\file_exists(__DIR__ . '/var/cache')) {
-    // To speed up multiple tests do this only when cache folder not exists
-    if (\system(\sprintf('php %s ongr:es:index:create --manager location --if-not-exists', __DIR__ . '/bin/console'))) {
-        throw new RuntimeException('Could not find elasticsearch instance!');
-    }
-}
diff --git a/Tests/config/config.yml b/Tests/config/config.yml
@@ -8,4 +8,4 @@ framework:
             'HandcraftedInTheAlps\Bundle\RedisTransportBundle\Message\DomainEventMessage':
                 senders: ['redis_stream']
         transports:
-            redis_stream: 'redis-stream://%env(resolve:REDIS_HOST)%:%env(resolve:REDIS_PORT)%/my_test_stream/my_group/my_consumer'
+            redis_stream: 'redis-stream://%env(resolve:REDIS_HOST)%:%env(resolve:REDIS_PORT)%/my_test_stream/my_group/my_consumer?serializer=0'
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3 || ^8.0",
-        "ext-redis": "^4.2 || ^5.0",
+        "ext-redis": "^4.2 || ^5.0 || ^6.0",
         "symfony/messenger": "^4.3 || ^5.4 || ^6.0",
         "symfony/config": "^3.4 || ^4.0 || ^5.4 || ^6.0",
         "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.4 || ^6.0",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,13 @@
+services:
+  redis:
+    image: redis/redis-stack:7.2.0-v6
+    ports:
+      - 6379:6379 # redis server
+      - 8001:8001 # redis insight
+#    environment:
+#      REDIS_ARGS: --requirepass supersecure
+    volumes:
+        - redisearch-data:/data
+
+volumes:
+  redisearch-data: