Fix CS

Author: Seldaek

src/DependencyInjection/SncRedisExtension.php

@@ -15,6 +15,7 @@
 
 use InvalidArgumentException;
 use LogicException;
+use Predis\Client;
 use RedisSentinel;
 use Relay\Sentinel;
 use Snc\RedisBundle\DependencyInjection\Configuration\Configuration;
@@ -36,6 +37,7 @@
 use function class_exists;
 use function count;
 use function sprintf;
+use function version_compare;
 
 class SncRedisExtension extends Extension
 {
@@ -139,21 +141,21 @@ private function loadPredisClient(array $client, ContainerBuilder $container): v
         $client['options']['exceptions']    = $client['options']['throw_errors'];
         // fix ssl configuration key name
         $client['options']['ssl'] = $client['options']['parameters']['ssl_context'] ?? [];
-        
+
         // Handle connection_persistent_id for predis conn_uid (requires predis >= 2.4.0)
         if (isset($client['options']['connection_persistent_id'])) {
             if (class_exists('Predis\Client')) {
-                if (version_compare(\Predis\Client::VERSION, '2.4.0', '>=')) {
-                    $client['options']['conn_uid'] = $client['options']['connection_persistent_id'];
-                } else {
+                if (!version_compare(Client::VERSION, '2.4.0', '>=')) {
                     throw new InvalidConfigurationException(
                         'The connection_persistent_id parameter for Predis requires predis/predis version 2.4.0 or higher. ' .
-                        sprintf('Current version: %s', \Predis\Client::VERSION)
+                        sprintf('Current version: %s', Client::VERSION),
                     );
                 }
+
+                $client['options']['conn_uid'] = $client['options']['connection_persistent_id'];
             }
         }
-        
+
         unset($client['options']['connection_async']);
         unset($client['options']['connection_timeout']);
         unset($client['options']['connection_persistent']);

src/Factory/PhpredisClientFactory.php

@@ -127,8 +127,9 @@ private function createClientFromSentinel(string $class, array $dsns, string $al
         if ($options['connection_persistent']) {
             $connectionPersistent = $options['connection_persistent_id'] ?? $masterName;
         }
-        $readTimeout          = $options['read_write_timeout'] ?? 0;
-        $parameters           = $options['parameters'];
+
+        $readTimeout = $options['read_write_timeout'] ?? 0;
+        $parameters  = $options['parameters'];
 
         foreach ($dsns as $dsn) {
             $args = [

tests/DependencyInjection/SncRedisExtensionTest.php

@@ -15,6 +15,7 @@
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use Predis\Client;
 use Redis;
 use RedisException;
 use Relay\Relay;
@@ -30,9 +31,11 @@
 use Symfony\Component\Yaml\Parser;
 
 use function array_key_exists;
+use function class_exists;
 use function count;
 use function current;
 use function sys_get_temp_dir;
+use function version_compare;
 
 /**
  * SncRedisExtensionTest
@@ -764,12 +767,12 @@ public function testPredisWithConnectionPersistentId(): void
             $this->markTestSkipped('Predis not available');
         }
 
-        if (version_compare(\Predis\Client::VERSION, '2.4.0', '<')) {
+        if (version_compare(Client::VERSION, '2.4.0', '<')) {
             $this->markTestSkipped('Predis version 2.4.0 or higher required for connection_persistent_id');
         }
 
         $extension = new SncRedisExtension();
-        $config = $this->parseYaml($this->getPredisWithConnectionPersistentIdYamlConfig());
+        $config    = $this->parseYaml($this->getPredisWithConnectionPersistentIdYamlConfig());
         $extension->load([$config], $container = $this->getContainer());
 
         $this->assertTrue($container->hasDefinition('snc_redis.default'));
@@ -783,15 +786,15 @@ public function testPredisWithConnectionPersistentIdVersionTooOld(): void
             $this->markTestSkipped('Predis not available');
         }
 
-        if (version_compare(\Predis\Client::VERSION, '2.4.0', '>=')) {
+        if (version_compare(Client::VERSION, '2.4.0', '>=')) {
             $this->markTestSkipped('This test requires Predis version < 2.4.0');
         }
 
         $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('The connection_persistent_id parameter for Predis requires predis/predis version 2.4.0 or higher');
 
         $extension = new SncRedisExtension();
-        $config = $this->parseYaml($this->getPredisWithConnectionPersistentIdYamlConfig());
+        $config    = $this->parseYaml($this->getPredisWithConnectionPersistentIdYamlConfig());
         $extension->load([$config], $container = $this->getContainer());
     }