[Lock] Fix StoreFactory to accept same DSN syntax as AbstractAdapter

Jontsa · fabpot · commit 4ebbe3d86b8d · 2020-10-03T08:30:00.000+02:00
diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php
@@ -66,13 +66,13 @@ public static function createStore($connection)
             case 'semaphore' === $connection:
                 return new SemaphoreStore();
 
-            case 0 === strpos($connection, 'redis://'):
-            case 0 === strpos($connection, 'rediss://'):
-            case 0 === strpos($connection, 'memcached://'):
+            case 0 === strpos($connection, 'redis:'):
+            case 0 === strpos($connection, 'rediss:'):
+            case 0 === strpos($connection, 'memcached:'):
                 if (!class_exists(AbstractAdapter::class)) {
                     throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));
                 }
-                $storeClass = 0 === strpos($connection, 'memcached://') ? MemcachedStore::class : RedisStore::class;
+                $storeClass = 0 === strpos($connection, 'memcached:') ? MemcachedStore::class : RedisStore::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
 
                 return new $storeClass($connection);
diff --git a/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php b/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
@@ -58,12 +58,14 @@ public function validConnections()
         }
         if (class_exists(\Memcached::class) && class_exists(AbstractAdapter::class)) {
             yield ['memcached://server.com', MemcachedStore::class];
+            yield ['memcached:?host[localhost]&host[localhost:12345]', MemcachedStore::class];
         }
-        if (class_exists(\Redis::class) && class_exists(AbstractAdapter::class)) {
+        if ((class_exists(\Redis::class) || class_exists(\Predis\Client::class)) && class_exists(AbstractAdapter::class)) {
             yield ['redis://localhost', RedisStore::class];
             yield ['redis://localhost?lazy=1', RedisStore::class];
             yield ['redis://localhost?redis_cluster=1', RedisStore::class];
             yield ['redis://localhost?redis_cluster=1&lazy=1', RedisStore::class];
+            yield ['redis:?host[localhost]&host[localhost:6379]&redis_cluster=1', RedisStore::class];
         }
         if (class_exists(\PDO::class)) {
             yield ['sqlite:/tmp/sqlite.db', PdoStore::class];

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,14 @@ public function validConnections()`
`58`	`58`	`}`
`59`	`59`	`if (class_exists(\Memcached::class) && class_exists(AbstractAdapter::class)) {`
`60`	`60`	`yield ['memcached://server.com', MemcachedStore::class];`
	`61`	`+ yield ['memcached:?host[localhost]&host[localhost:12345]', MemcachedStore::class];`
`61`	`62`	`}`
`62`		`- if (class_exists(\Redis::class) && class_exists(AbstractAdapter::class)) {`
	`63`	`+ if ((class_exists(\Redis::class) \|\| class_exists(\Predis\Client::class)) && class_exists(AbstractAdapter::class)) {`
`63`	`64`	`yield ['redis://localhost', RedisStore::class];`
`64`	`65`	`yield ['redis://localhost?lazy=1', RedisStore::class];`
`65`	`66`	`yield ['redis://localhost?redis_cluster=1', RedisStore::class];`
`66`	`67`	`yield ['redis://localhost?redis_cluster=1&lazy=1', RedisStore::class];`
	`68`	`+ yield ['redis:?host[localhost]&host[localhost:6379]&redis_cluster=1', RedisStore::class];`
`67`	`69`	`}`
`68`	`70`	`if (class_exists(\PDO::class)) {`
`69`	`71`	`yield ['sqlite:/tmp/sqlite.db', PdoStore::class];`