[Cache] added DSN support for rediss in AbstractAdapter and RedisTrait

alex-vasilchenko-md · fabpot · commit e5e9a6d35558 · 2019-03-20T12:35:07.000+01:00
diff --git a/Adapter/AbstractAdapter.php b/Adapter/AbstractAdapter.php
@@ -132,7 +132,7 @@ public static function createConnection($dsn, array $options = [])
         if (!\is_string($dsn)) {
             throw new InvalidArgumentException(sprintf('The %s() method expect argument #1 to be string, %s given.', __METHOD__, \gettype($dsn)));
         }
-        if (0 === strpos($dsn, 'redis:')) {
+        if (0 === strpos($dsn, 'redis:') || 0 === strpos($dsn, 'rediss:')) {
             return RedisAdapter::createConnection($dsn, $options);
         }
         if (0 === strpos($dsn, 'memcached:')) {
diff --git a/Tests/Adapter/RedisAdapterTest.php b/Tests/Adapter/RedisAdapterTest.php
@@ -31,30 +31,33 @@ public function createCachePool($defaultLifetime = 0)
         return $adapter;
     }
 
-    public function testCreateConnection()
+    /**
+     * @dataProvider provideValidSchemes
+     */
+    public function testCreateConnection($dsnScheme)
     {
-        $redis = RedisAdapter::createConnection('redis:?host[h1]&host[h2]&host[/foo:]');
+        $redis = RedisAdapter::createConnection($dsnScheme.':?host[h1]&host[h2]&host[/foo:]');
         $this->assertInstanceOf(\RedisArray::class, $redis);
         $this->assertSame(['h1:6379', 'h2:6379', '/foo'], $redis->_hosts());
         @$redis = null; // some versions of phpredis connect on destruct, let's silence the warning
 
         $redisHost = getenv('REDIS_HOST');
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
+        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost);
         $this->assertInstanceOf(\Redis::class, $redis);
         $this->assertTrue($redis->isConnected());
         $this->assertSame(0, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
+        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
+        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
@@ -87,6 +90,14 @@ public function testInvalidCreateConnection($dsn)
         RedisAdapter::createConnection($dsn);
     }
 
+    public function provideValidSchemes()
+    {
+        return [
+            ['redis'],
+            ['rediss'],
+        ];
+    }
+
     public function provideInvalidCreateConnection()
     {
         return [
diff --git a/Traits/RedisTrait.php b/Traits/RedisTrait.php
@@ -80,15 +80,19 @@ private function init($redisClient, $namespace, $defaultLifetime, ?MarshallerInt
      */
     public static function createConnection($dsn, array $options = [])
     {
-        if (0 !== strpos($dsn, 'redis:')) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis:".', $dsn));
+        if (0 === strpos($dsn, 'redis:')) {
+            $scheme = 'redis';
+        } elseif (0 === strpos($dsn, 'rediss:')) {
+            $scheme = 'rediss';
+        } else {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis:" or "rediss".', $dsn));
         }
 
         if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
             throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: %s', $dsn));
         }
 
-        $params = preg_replace_callback('#^redis:(//)?(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
+        $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m[2])) {
                 $auth = $m[2];
             }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public static function createConnection($dsn, array $options = [])`
`132`	`132`	`if (!\is_string($dsn)) {`
`133`	`133`	`throw new InvalidArgumentException(sprintf('The %s() method expect argument #1 to be string, %s given.', __METHOD__, \gettype($dsn)));`
`134`	`134`	`}`
`135`		`- if (0 === strpos($dsn, 'redis:')) {`
	`135`	`+ if (0 === strpos($dsn, 'redis:') \|\| 0 === strpos($dsn, 'rediss:')) {`
`136`	`136`	`return RedisAdapter::createConnection($dsn, $options);`
`137`	`137`	`}`
`138`	`138`	`if (0 === strpos($dsn, 'memcached:')) {`
Original file line number	Diff line number	Diff line change
`@@ -80,15 +80,19 @@ private function init($redisClient, $namespace, $defaultLifetime, ?MarshallerInt`
`80`	`80`	`*/`
`81`	`81`	`public static function createConnection($dsn, array $options = [])`
`82`	`82`	`{`
`83`		`- if (0 !== strpos($dsn, 'redis:')) {`
`84`		`- throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis:".', $dsn));`
	`83`	`+ if (0 === strpos($dsn, 'redis:')) {`
	`84`	`+ $scheme = 'redis';`
	`85`	`+ } elseif (0 === strpos($dsn, 'rediss:')) {`
	`86`	`+ $scheme = 'rediss';`
	`87`	`+ } else {`
	`88`	`+ throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis:" or "rediss".', $dsn));`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {`
`88`	`92`	`throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: %s', $dsn));`
`89`	`93`	`}`
`90`	`94`
`91`		`- $params = preg_replace_callback('#^redis:(//)?(?:(?:[^:@]+:)?([^@]+)@)?#', function ($m) use (&$auth) {`
	`95`	`+ $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:[^:@]+:)?([^@]+)@)?#', function ($m) use (&$auth) {`
`92`	`96`	`if (isset($m[2])) {`
`93`	`97`	`$auth = $m[2];`
`94`	`98`	`}`