diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joni Halme 2020-03-31 20:28:05 +03:00 committed by Fabien Potencier
parent 44dd80f3fd
commit 4ebbe3d86b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Lock/Store/StoreFactory.php
View File

@ -66,13 +66,13 @@ class StoreFactory
case 'semaphore' === $connection: case 'semaphore' === $connection:
return new SemaphoreStore(); return new SemaphoreStore();
case 0 === strpos($connection, 'redis://'): case 0 === strpos($connection, 'redis:'):
case 0 === strpos($connection, 'rediss://'): case 0 === strpos($connection, 'rediss:'):
case 0 === strpos($connection, 'memcached://'): case 0 === strpos($connection, 'memcached:'):
if (!class_exists(AbstractAdapter::class)) { if (!class_exists(AbstractAdapter::class)) {
throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection)); 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]); $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
return new $storeClass($connection); return new $storeClass($connection);

4
src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
View File

@ -58,12 +58,14 @@ class StoreFactoryTest extends TestCase
} }
if (class_exists(\Memcached::class) && class_exists(AbstractAdapter::class)) { if (class_exists(\Memcached::class) && class_exists(AbstractAdapter::class)) {
yield ['memcached://server.com', MemcachedStore::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', RedisStore::class];
yield ['redis://localhost?lazy=1', RedisStore::class]; yield ['redis://localhost?lazy=1', RedisStore::class];
yield ['redis://localhost?redis_cluster=1', RedisStore::class]; yield ['redis://localhost?redis_cluster=1', RedisStore::class];
yield ['redis://localhost?redis_cluster=1&lazy=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)) { if (class_exists(\PDO::class)) {
yield ['sqlite:/tmp/sqlite.db', PdoStore::class]; yield ['sqlite:/tmp/sqlite.db', PdoStore::class];