Upgrade 1-11.38

vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php

@@ -17,7 +17,7 @@ use Symfony\Component\Cache\Traits\RedisProxy;
 
 class RedisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
         self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
@@ -31,33 +31,25 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
         return $adapter;
     }
 
-    /**
-     * @dataProvider provideValidSchemes
-     */
-    public function testCreateConnection($dsnScheme)
+    public function testCreateConnection()
     {
-        $redis = RedisAdapter::createConnection($dsnScheme.':?host[h1]&host[h2]&host[/foo:]');
-        $this->assertInstanceOf(\RedisArray::class, $redis);
-        $this->assertSame(['h1:6379', 'h2:6379', '/foo'], $redis->_hosts());
-        @$redis = null; // some versions of phpredis connect on destruct, let's silence the warning
-
         $redisHost = getenv('REDIS_HOST');
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
         $this->assertInstanceOf(\Redis::class, $redis);
         $this->assertTrue($redis->isConnected());
         $this->assertSame(0, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'/2');
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'?timeout=4');
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
@@ -67,7 +59,7 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
     public function testFailedCreateConnection($dsn)
     {
         $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection failed');
+        $this->expectExceptionMessage('Redis connection ');
         RedisAdapter::createConnection($dsn);
     }
 
@@ -90,14 +82,6 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
         RedisAdapter::createConnection($dsn);
     }
 
-    public function provideValidSchemes()
-    {
-        return [
-            ['redis'],
-            ['rediss'],
-        ];
-    }
-
     public function provideInvalidCreateConnection()
     {
         return [