diff --git a/Facade/RedisFacade.php b/Facade/RedisFacade.php index 5e143c4..b3cb0d9 100644 --- a/Facade/RedisFacade.php +++ b/Facade/RedisFacade.php @@ -16,9 +16,6 @@ use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface; use Micro\Plugin\Redis\RedisPluginConfiguration; -/** - * @psalm-suppress DeprecatedInterface - */ readonly class RedisFacade implements RedisFacadeInterface { public function __construct(private RedisManagerInterface $redisManager) diff --git a/Facade/RedisFacadeInterface.php b/Facade/RedisFacadeInterface.php index a8bfc58..a5c0c3f 100644 --- a/Facade/RedisFacadeInterface.php +++ b/Facade/RedisFacadeInterface.php @@ -14,7 +14,14 @@ namespace Micro\Plugin\Redis\Facade; use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface; +use Micro\Plugin\Redis\RedisPluginConfiguration; -interface RedisFacadeInterface extends RedisManagerInterface, \Micro\Plugin\Redis\RedisFacadeInterface +interface RedisFacadeInterface extends RedisManagerInterface { + /** + * @param string $clientName + * + * @return \Redis + */ + public function getClient(string $clientName = RedisPluginConfiguration::CLIENT_DEFAULT): \Redis; } diff --git a/RedisFacadeInterface.php b/RedisFacadeInterface.php deleted file mode 100644 index 9ed7005..0000000 --- a/RedisFacadeInterface.php +++ /dev/null @@ -1,27 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Micro\Plugin\Redis; - -/** - * @deprecated - */ -interface RedisFacadeInterface -{ - /** - * @param string $clientName - * - * @return \Redis - */ - public function getClient(string $clientName = RedisPluginConfiguration::CLIENT_DEFAULT): \Redis; -} diff --git a/RedisPlugin.php b/RedisPlugin.php index 229c06d..68a6985 100644 --- a/RedisPlugin.php +++ b/RedisPlugin.php @@ -22,6 +22,7 @@ use Micro\Plugin\Redis\Business\Redis\RedisManager; use Micro\Plugin\Redis\Business\Redis\RedisManagerInterface; use Micro\Plugin\Redis\Facade\RedisFacade; +use Micro\Plugin\Redis\Facade\RedisFacadeInterface; /** * @method RedisPluginConfigurationInterface configuration() @@ -32,12 +33,12 @@ class RedisPlugin implements DependencyProviderInterface, ConfigurableInterface public function provideDependencies(Container $container): void { - $container->register(\Micro\Plugin\Redis\Facade\RedisFacadeInterface::class, function (): Facade\RedisFacadeInterface { + $container->register(RedisFacadeInterface::class, function (): Facade\RedisFacadeInterface { return $this->createRedisFacade(); }); - $container->register(RedisFacadeInterface::class, function (Container $container) { // Deprecation support - return $container->get(\Micro\Plugin\Redis\Facade\RedisFacadeInterface::class); + $container->register(RedisFacadeInterface::class, function (Container $container) { + return $container->get(RedisFacadeInterface::class); }); } diff --git a/composer.json b/composer.json index 5f932a1..cf6bced 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,7 @@ "ext-redis": "*", "micro/kernel-app": "^2.0" }, - "require-dev": { - "ergebnis/composer-normalize": "^2.34" - }, + "minimum-stability": "dev", "autoload": { "psr-4": { "Micro\\Plugin\\Redis\\": "/" @@ -25,10 +23,6 @@ ] }, "config": { - "allow-plugins": { - "ergebnis/composer-normalize": true - }, "sort-packages": true - }, - "minimum-stability": "dev" + } }