Skip to content

Commit 9728903

Browse files
committed
Merge branch 'phpstan-fix' into 'master'
phpstan fix See merge request head.trackingsoft/micro-plugin-redis!2
2 parents 1796030 + 68d0758 commit 9728903

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

src/Business/Redis/RedisBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
use Micro\Plugin\Redis\Configuration\ClientOptionsConfigurationInterface;
66
use Micro\Plugin\Redis\Configuration\RedisClientConfigurationInterface;
7-
use Micro\Plugin\Redis\RedisPluginConfiguration;
7+
use Micro\Plugin\Redis\RedisPluginConfigurationInterface;
88
use \Redis;
99

1010
class RedisBuilder implements RedisBuilderInterface
1111
{
1212
/**
13-
* @param RedisPluginConfiguration $pluginConfiguration
13+
* @param RedisPluginConfigurationInterface $pluginConfiguration
1414
* @param RedisFactoryInterface $redisFactory
1515
*/
1616
public function __construct(
17-
private RedisPluginConfiguration $pluginConfiguration,
17+
private RedisPluginConfigurationInterface $pluginConfiguration,
1818
private RedisFactoryInterface $redisFactory
1919
)
2020
{

src/Business/Redis/RedisBuilderFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
namespace Micro\Plugin\Redis\Business\Redis;
44

5-
use Micro\Plugin\Redis\RedisPluginConfiguration;
5+
use Micro\Plugin\Redis\RedisPluginConfigurationInterface;
66

77
class RedisBuilderFactory implements RedisBuilderFactoryInterface
88
{
99
/**
10-
* @param RedisPluginConfiguration $configuration
10+
* @param RedisPluginConfigurationInterface $configuration
1111
* @param RedisFactoryInterface $redisFactory
1212
*/
1313
public function __construct(
14-
private RedisPluginConfiguration $configuration,
14+
private RedisPluginConfigurationInterface $configuration,
1515
private RedisFactoryInterface $redisFactory
1616
)
1717
{

src/RedisPlugin.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Micro\Plugin\Redis;
44

55
use Micro\Component\DependencyInjection\Container;
6-
use Micro\Framework\Kernel\Configuration\PluginConfiguration;
76
use Micro\Framework\Kernel\Plugin\AbstractPlugin;
87
use Micro\Plugin\Redis\Business\Redis\RedisBuilderFactory;
98
use Micro\Plugin\Redis\Business\Redis\RedisBuilderFactoryInterface;
@@ -12,6 +11,9 @@
1211
use Micro\Plugin\Redis\Business\Redis\RedisManager;
1312
use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface;
1413

14+
/**
15+
* @method RedisPluginConfigurationInterface configuration()
16+
*/
1517
class RedisPlugin extends AbstractPlugin
1618
{
1719
/**
@@ -46,7 +48,7 @@ protected function createRedisManager(): RedisManagerInterface
4648
protected function createRedisBuilderFactory(): RedisBuilderFactoryInterface
4749
{
4850
return new RedisBuilderFactory(
49-
$this->configuration,
51+
$this->configuration(),
5052
$this->createRedisFactory()
5153
);
5254
}

src/RedisPluginConfiguration.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class RedisPluginConfiguration extends PluginConfiguration implements RedisPlugi
1414
public const CLIENT_DEFAULT = 'default';
1515

1616
/**
17-
* @return string[]
17+
* {@inheritDoc}
1818
*/
1919
public function getClientList(): array
2020
{
@@ -31,8 +31,10 @@ public function getClientConfiguration(string $clientName): RedisClientConfigura
3131
{
3232
if(!in_array($clientName, $this->getClientList(), true)) {
3333
throw new \InvalidArgumentException(
34-
'Redis client is not defined in the environment file. Please, append connection id to "%s"',
35-
self::CFG_CLIENT_LIST
34+
sprintf(
35+
'Redis client is not defined in the environment file. Please, append connection id to "%s"',
36+
self::CFG_CLIENT_LIST
37+
)
3638
);
3739
}
3840

0 commit comments

Comments
 (0)