Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit b778acc0837a · 2022-01-17T17:15:49.000+01:00
* 4.4:
  [Cache] fix tests with RedisArray
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -122,7 +122,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          extensions: "json,couchbase,memcached,mongodb,redis,rdkafka,xsl,ldap"
+          extensions: "json,couchbase,memcached,mongodb,redis-5.3.4,rdkafka,xsl,ldap"
           ini-values: date.timezone=Europe/Paris,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
           tools: pecl
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php
@@ -50,6 +50,7 @@ static function (CacheItem $item, $expiry) {
         );
 
         $cache = $this->createCachePool(1);
+        $cache->clear();
         $value = rand();
         $item = $cache->getItem('foo');
         $setCacheItemExpiry($item, 0);
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -189,7 +189,7 @@ public static function createConnection(string $dsn, array $options = [])
 
             $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts, $tls) {
                 $host = $hosts[0]['host'] ?? $hosts[0]['path'];
-                $port = $hosts[0]['port'] ?? null;
+                $port = $hosts[0]['port'] ?? 6379;
 
                 if (isset($hosts[0]['host']) && $tls) {
                     $host = 'tls://'.$host;
