OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated RedisFactory so that it loads redis config from cache.redis too

Browse Source
This commit is contained in:
Alejandro Celaya 2019-08-10 17:12:22 +02:00
parent 406f947096
commit c9be89647c
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/Common/src/Cache/RedisFactory.php
View File

@ -16,7 +16,8 @@ class RedisFactory
public function __invoke(ContainerInterface $container): PredisClient public function __invoke(ContainerInterface $container): PredisClient
{ {
$redisConfig = $container->get('config')['redis'] ?? []; $config = $container->get('config');
$redisConfig = $config['cache']['redis'] ?? $config['redis'] ?? [];
$servers = $redisConfig['servers'] ?? []; $servers = $redisConfig['servers'] ?? [];
$servers = is_string($servers) ? explode(',', $servers) : $servers; $servers = is_string($servers) ? explode(',', $servers) : $servers;

20
module/Common/test/Cache/RedisFactoryTest.php
View File

@ -27,7 +27,7 @@ class RedisFactoryTest extends TestCase
* @test * @test
* @dataProvider provideRedisConfig * @dataProvider provideRedisConfig
*/ */
public function createsRedisClientBasedOnConfig(?array $config, string $expectedCluster): void public function createsRedisClientBasedOnRedisConfig(?array $config, string $expectedCluster): void
{ {
$getConfig = $this->container->get('config')->willReturn([ $getConfig = $this->container->get('config')->willReturn([
'redis' => $config, 'redis' => $config,
@ -39,6 +39,24 @@ class RedisFactoryTest extends TestCase
$this->assertInstanceOf($expectedCluster, $client->getOptions()->cluster); $this->assertInstanceOf($expectedCluster, $client->getOptions()->cluster);
} }
/**
* @test
* @dataProvider provideRedisConfig
*/
public function createsRedisClientBasedOnCacheConfig(?array $config, string $expectedCluster): void
{
$getConfig = $this->container->get('config')->willReturn([
'cache' => [
'redis' => $config,
],
]);
$client = ($this->factory)($this->container->reveal());
$getConfig->shouldHaveBeenCalledOnce();
$this->assertInstanceOf($expectedCluster, $client->getOptions()->cluster);
}
public function provideRedisConfig(): iterable public function provideRedisConfig(): iterable
{ {
yield 'no config' => [null, PredisCluster::class]; yield 'no config' => [null, PredisCluster::class];