Parse url key in Redis configuration.

Author: mathieutu

src/Illuminate/Redis/RedisManager.php

@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use Illuminate\Contracts\Redis\Factory;
 use Illuminate\Redis\Connections\Connection;
+use Illuminate\Support\ConfigurationUrlParser;
 
 /**
  * @mixin \Illuminate\Redis\Connections\Connection
@@ -95,7 +96,9 @@ public function resolve($name = null)
         $options = $this->config['options'] ?? [];
 
         if (isset($this->config[$name])) {
-            return $this->connector()->connect($this->config[$name], $options);
+            return $this->connector()->connect(
+                $this->parseConnectionConfigWithUrl($this->config[$name]), $options
+            );
         }
 
         if (isset($this->config['clusters'][$name])) {
@@ -113,10 +116,10 @@ public function resolve($name = null)
      */
     protected function resolveCluster($name)
     {
-        $clusterOptions = $this->config['clusters']['options'] ?? [];
-
         return $this->connector()->connectToCluster(
-            $this->config['clusters'][$name], $clusterOptions, $this->config['options'] ?? []
+            $this->parseConnectionConfigWithUrl($this->config['clusters'][$name]),
+            $this->config['clusters']['options'] ?? [],
+            $this->config['options'] ?? []
         );
     }
 
@@ -153,6 +156,21 @@ protected function connector()
         }
     }
 
+    /**
+     * Parse the redis configuration, hydrating options using a redis configuration URL if possible.
+     *
+     * @param  array  $config
+     * @return array
+     */
+    protected function parseConnectionConfigWithUrl($config)
+    {
+        $parsedConfig = (new ConfigurationUrlParser)->parseConfiguration($config);
+
+        return array_filter($parsedConfig, function ($key) {
+            return !in_array($key, ['driver', 'username']);
+        }, ARRAY_FILTER_USE_KEY);
+    }
+
     /**
      * Return all of the created connections.
      *