Cast empty string to null

alexander-schranz · alexander-schranz · commit 1b4014f031df · 2020-08-10T15:05:43.000+02:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -103,6 +103,10 @@ public static function createConnection($dsn, array $options = [])
         $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m[2])) {
                 $auth = $m[2];
+
+                if ('' === $auth) {
+                    $auth = null;
+                }
             }
 
             return 'file:'.($m[1] ?? '');
@@ -182,7 +186,7 @@ public static function createConnection($dsn, array $options = [])
                         throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
                     }
 
-                    if (($auth && !$redis->auth($auth))
+                    if ((null !== $auth && !$redis->auth($auth))
                         || ($params['dbindex'] && !$redis->select($params['dbindex']))
                         || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
                     ) {
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
@@ -21,6 +21,7 @@
  */
 class ConnectionTest extends TestCase
 {
+    /*
     public static function setUpBeforeClass(): void
     {
         try {
@@ -36,6 +37,7 @@ public static function setUpBeforeClass(): void
             self::markTestSkipped($e->getMessage());
         }
     }
+    */
 
     public function testFromInvalidDsn()
     {
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -56,7 +56,11 @@ public function __construct(array $configuration, array $connectionCredentials =
         $this->connection->setOption(\Redis::OPT_SERIALIZER, $redisOptions['serializer'] ?? \Redis::SERIALIZER_PHP);
 
         $auth = $connectionCredentials['auth'] ?? null;
-        if ($auth && !$this->connection->auth($auth)) {
+        if ('' === $auth) {
+            $auth = null;
+        }
+
+        if (null !== $auth && !$this->connection->auth($auth)) {
             throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class ConnectionTest extends TestCase`
`23`	`23`	`{`
	`24`	`+ /*`
`24`	`25`	`public static function setUpBeforeClass(): void`
`25`	`26`	`{`
`26`	`27`	`try {`
`@@ -36,6 +37,7 @@ public static function setUpBeforeClass(): void`
`36`	`37`	`self::markTestSkipped($e->getMessage());`
`37`	`38`	`}`
`38`	`39`	`}`
	`40`	`+ */`
`39`	`41`
`40`	`42`	`public function testFromInvalidDsn()`
`41`	`43`	`{`