Skip to content

Commit c82021b

Browse files
authored
Merge Release v2.x-automation-test
1 parent c9f8d99 commit c82021b

File tree

5 files changed

+14
-42
lines changed

5 files changed

+14
-42
lines changed

Facade/RedisFacade.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface;
1717
use Micro\Plugin\Redis\RedisPluginConfiguration;
1818

19-
/**
20-
* @psalm-suppress DeprecatedInterface
21-
*/
2219
readonly class RedisFacade implements RedisFacadeInterface
2320
{
2421
public function __construct(private RedisManagerInterface $redisManager)

Facade/RedisFacadeInterface.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@
1414
namespace Micro\Plugin\Redis\Facade;
1515

1616
use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface;
17+
use Micro\Plugin\Redis\RedisPluginConfiguration;
1718

18-
interface RedisFacadeInterface extends RedisManagerInterface, \Micro\Plugin\Redis\RedisFacadeInterface
19+
interface RedisFacadeInterface extends RedisManagerInterface
1920
{
21+
/**
22+
* @param string $clientName
23+
*
24+
* @return \Redis
25+
*/
26+
public function getClient(string $clientName = RedisPluginConfiguration::CLIENT_DEFAULT): \Redis;
2027
}

RedisFacadeInterface.php

Lines changed: 0 additions & 27 deletions
This file was deleted.

RedisPlugin.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Micro\Plugin\Redis\Business\Redis\RedisManager;
2323
use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface;
2424
use Micro\Plugin\Redis\Facade\RedisFacade;
25+
use Micro\Plugin\Redis\Facade\RedisFacadeInterface;
2526

2627
/**
2728
* @method RedisPluginConfigurationInterface configuration()
@@ -32,12 +33,12 @@ class RedisPlugin implements DependencyProviderInterface, ConfigurableInterface
3233

3334
public function provideDependencies(Container $container): void
3435
{
35-
$container->register(\Micro\Plugin\Redis\Facade\RedisFacadeInterface::class, function (): Facade\RedisFacadeInterface {
36+
$container->register(RedisFacadeInterface::class, function (): Facade\RedisFacadeInterface {
3637
return $this->createRedisFacade();
3738
});
3839

39-
$container->register(RedisFacadeInterface::class, function (Container $container) { // Deprecation support
40-
return $container->get(\Micro\Plugin\Redis\Facade\RedisFacadeInterface::class);
40+
$container->register(RedisFacadeInterface::class, function (Container $container) {
41+
return $container->get(RedisFacadeInterface::class);
4142
});
4243
}
4344

composer.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
"ext-redis": "*",
1414
"micro/kernel-app": "^2.0"
1515
},
16-
"require-dev": {
17-
"ergebnis/composer-normalize": "^2.34"
18-
},
16+
"minimum-stability": "dev",
1917
"autoload": {
2018
"psr-4": {
2119
"Micro\\Plugin\\Redis\\": "/"
@@ -25,10 +23,6 @@
2523
]
2624
},
2725
"config": {
28-
"allow-plugins": {
29-
"ergebnis/composer-normalize": true
30-
},
3126
"sort-packages": true
32-
},
33-
"minimum-stability": "dev"
27+
}
3428
}

0 commit comments

Comments
 (0)