Merge pull request #150 from petergallagher/redis-database-support

Add redis database support
shlinkio · Aug 23, 2024 · 9c887c5 · 9c887c5
2 parents 80979f1 + 892a56b
commit 9c887c5
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/Cache/RedisFactory.php b/src/Cache/RedisFactory.php
@@ -50,8 +50,9 @@ private function normalizeServer(string $server): array
         $parsedServer = parse_url(trim($server));
         if (! is_array($parsedServer)) {
             throw new InvalidArgumentException(sprintf(
-                'Provided server "%s" is not a valid URL with format schema://[[username]:password@]host:port',
+                'Provided server "%s" is not a valid URL with format %s',
                 $server,
+                'schema://[[username]:password@]host:port[/database]',
             ));
         }
 
@@ -73,6 +74,14 @@ private function normalizeServer(string $server): array
             $parsedServer['password'] = urldecode($pass);
         }
 
+        $database = $parsedServer['path'] ?? null;
+        unset($parsedServer['path']);
+
+        if ($database !== null) {
+            // TODO For the next major version, validate this is an integer and throw an exception otherwise
+            $parsedServer['database'] = (int) trim($database, '/');
+        }
+
         return $parsedServer;
     }
 

diff --git a/test/Cache/RedisFactoryTest.php b/test/Cache/RedisFactoryTest.php
@@ -157,4 +157,29 @@ public static function provideServersWithCredentials(): iterable
             'servers' => ['rediss://1.1.1.1:6379'],
         ], null, null, SSL::OPTIONS];
     }
+
+    #[Test, DataProvider('provideServersWithDatabases')]
+    public function databaseConfigurationIsApplied(
+        array $redisConfig,
+        ?int $expectedDatabase,
+    ): void {
+        $this->container->expects($this->once())->method('get')->with('config')->willReturn([
+            'cache' => ['redis' => $redisConfig],
+        ]);
+
+        $client = ($this->factory)($this->container);
+        $conn = $client->getConnection();
+
+        self::assertEquals($expectedDatabase, $conn->getParameters()->database); // @phpstan-ignore-line
+    }
+
+    public static function provideServersWithDatabases(): iterable
+    {
+        yield 'no database' => [[
+            'servers' => ['tcp://1.1.1.1:6379'],
+        ], null];
+        yield 'database' => [[
+            'servers' => ['tcp://1.1.1.1:6379/5'],
+        ], 5];
+    }
 }