v1.6.1 Test fix

.github/workflows/ci.yaml

@@ -35,7 +35,8 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          coverage: "none"
+          coverage: "xdebug"
+          extensions: redis
           php-version: "${{ matrix.php-version }}"
 
       - name: "Composer install"
@@ -55,4 +56,4 @@ jobs:
           # Replace `linux` below with the appropriate OS
           curl -Os https://uploader.codecov.io/latest/linux/codecov
           chmod +x codecov
-          ./codecov -t ${CODECOV_TOKEN}
+          ./codecov -t ${CODECOV_TOKEN}

phpunit.xml.dist

@@ -16,22 +16,14 @@
             <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
     <coverage>
         <include>
             <directory suffix=".php">src</directory>
         </include>
         <report>
+            <clover outputFile="coverage/clover.xml" />
             <html outputDirectory="test-coverage-report/" />
         </report>
     </coverage>
 
-    <logging>
-        <log type="coverage-clover" target="coverage/clover.xml"/>
-    </logging>
-
-</phpunit>
+</phpunit>

src/Business/Redis/RedisManager.php

@@ -25,7 +25,7 @@ class RedisManager implements RedisManagerInterface
 
     public function __construct(
         private readonly RedisFactoryInterface $redisFactory,
-        private readonly RedisPluginConfigurationInterface $redisPluginConfiguration
+        private readonly RedisPluginConfigurationInterface $redisPluginConfiguration,
     ) {
         $this->redisCollection = [];
     }

src/Configuration/RedisClientConfiguration.php

@@ -57,7 +57,7 @@ public function connectionType(): string
     {
         $connectionType = $this->get(self::CFG_CONNECTION_TYPE, self::CONNECTION_TYPE_DEFAULT);
         if (!\in_array($connectionType, $this->getAvailableConnectionTypes(), true)) {
-            throw new InvalidConfigurationException(sprintf('Configuration key "%s" has invalid value. Redis: connection type %s is not available', $this->cfg(self::CFG_CONNECTION_TYPE), $connectionType));
+            throw new InvalidConfigurationException(\sprintf('Configuration key "%s" has invalid value. Redis: connection type %s is not available', $this->cfg(self::CFG_CONNECTION_TYPE), $connectionType));
         }
 
         return $connectionType;

src/RedisPlugin.php

@@ -32,12 +32,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(Facade\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, static function () use ($container): Facade\RedisFacadeInterface { // Deprecation support
+            return $container->get(Facade\RedisFacadeInterface::class);
         });
     }
 

tests/Unit/Business/Redis/RedisManagerTest.php

@@ -20,7 +20,7 @@
 
 class RedisManagerTest extends TestCase
 {
-    public function testGetClient()
+    public function testGetClient(): void
     {
         $factory = $this->createMock(RedisFactoryInterface::class);
         $cfg = $this->createMock(RedisPluginConfigurationInterface::class);

tests/Unit/Facade/RedisFacadeTest.php

@@ -19,7 +19,7 @@
 
 class RedisFacadeTest extends TestCase
 {
-    public function testGetClient()
+    public function testGetClient(): void
     {
         $manager = $this->createMock(RedisManagerInterface::class);
         $manager->expects($this->once())->method('getClient')->with('test');

tests/Unit/RedisPluginTest.php

@@ -20,7 +20,7 @@
 
 class RedisPluginTest extends TestCase
 {
-    public function testPlugin()
+    public function testPlugin(): void
     {
         $kernel = new AppKernel(
             [],
@@ -31,12 +31,13 @@ public function testPlugin()
 
         $kernel->run();
 
-        $this->expectException(\RedisException::class);
-        $this->expectExceptionMessage('Connection refused');
         $facade = $kernel->container()->get(RedisFacadeInterface::class);
         $facadeDeprecated = $kernel->container()->get(\Micro\Plugin\Redis\RedisFacadeInterface::class);
 
-        $this->assertEquals($facade, $facadeDeprecated);
+        $this->assertSame($facade, $facadeDeprecated);
+
+        $this->expectException(\RedisException::class);
+        $this->expectExceptionMessage('Connection refused');
 
         $kernel->container()->get(RedisFacadeInterface::class)->getClient();
     }