Merge branch '5.4' into 6.0

* 5.4:
  [Cache] backport type fixes
  [Cache] Remove MemcachedTrait

Author: nicolas-grekas

Store/RedisStore.php

@@ -36,15 +36,15 @@ class RedisStore implements SharedLockStoreInterface
     private $supportTime;
 
     /**
-     * @param float $initialTtl the expiration delay of locks in seconds
+     * @param float $initialTtl The expiration delay of locks in seconds
      */
     public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redisClient, float $initialTtl = 300.0)
     {
         if ($initialTtl <= 0) {
             throw new InvalidTtlException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl));
         }
 
-        $this->redis = $redisClient;
+        $this->redis = $redis;
         $this->initialTtl = $initialTtl;
     }