bug #20026 [Cache] Fixed password used to make the redis connection. (ErikSaunier)

fabpot · fabpot · commit 23eee70f6e0d · 2016-09-23T08:20:59.000-07:00
This PR was merged into the 3.1 branch. Discussion ---------- [Cache] Fixed password used to make the redis connection. | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20025 | License | MIT | Doc PR | http://symfony.com/blog/new-in-symfony-3-1-cache-component I do not know if it's possible to provide a test as `REDIS_HOST` is provided by Travis in [RedisAdapterTest.php](https://github.com/symfony/symfony/blob/3.1/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php). Commits ------- 77eea43 [Cache] Fix password used to make the redis connection.
diff --git a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
@@ -69,7 +69,7 @@ public static function createConnection($dsn, array $options = array())
         if (0 !== strpos($dsn, 'redis://')) {
             throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));
         }
-        $params = preg_replace_callback('#^redis://(?:([^@]*)@)?#', function ($m) use (&$auth) {
+        $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m[1])) {
                 $auth = $m[1];
             }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static function createConnection($dsn, array $options = array())`
`69`	`69`	`if (0 !== strpos($dsn, 'redis://')) {`
`70`	`70`	`throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));`
`71`	`71`	`}`
`72`		`- $params = preg_replace_callback('#^redis://(?:([^@]*)@)?#', function ($m) use (&$auth) {`
	`72`	`+ $params = preg_replace_callback('#^redis://(?:(?:[^:@]+:)?([^@]+)@)?#', function ($m) use (&$auth) {`
`73`	`73`	`if (isset($m[1])) {`
`74`	`74`	`$auth = $m[1];`
`75`	`75`	`}`