bug #23045 [Cache] fix Redis scheme detection (xabbuh)

nicolas-grekas · nicolas-grekas · commit 7078cdfb5cbc · 2017-06-03T10:40:33.000+02:00
This PR was merged into the 3.2 branch. Discussion ---------- [Cache] fix Redis scheme detection | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22974 | License | MIT | Doc PR | Commits ------- 61685c7 [Cache] fix Redis scheme detection
diff --git a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
@@ -90,6 +90,11 @@ public static function createConnection($dsn, array $options = array())
             $params['dbindex'] = $m[1];
             $params['path'] = substr($params['path'], 0, -strlen($m[0]));
         }
+        if (isset($params['host'])) {
+            $scheme = 'tcp';
+        } else {
+            $scheme = 'unix';
+        }
         $params += array(
             'host' => isset($params['host']) ? $params['host'] : $params['path'],
             'port' => isset($params['host']) ? 6379 : null,
@@ -120,7 +125,7 @@ public static function createConnection($dsn, array $options = array())
                 throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e, $dsn));
             }
         } elseif (is_a($class, \Predis\Client::class, true)) {
-            $params['scheme'] = isset($params['host']) ? 'tcp' : 'unix';
+            $params['scheme'] = $scheme;
             $params['database'] = $params['dbindex'] ?: null;
             $params['password'] = $auth;
             $redis = new $class((new Factory())->create($params));
