Merge branch '5.4' into 6.2

* 5.4:
  [Cache] Fix redis adapter option type

Author: javiereguiluz

components/cache/adapters/redis_adapter.rst

@@ -210,7 +210,7 @@ Available Options
     ``error``, ``distribute`` or ``slaves``.  For ``\Predis\ClientInterface`` valid options are ``slaves``
     or ``distribute``.
 
-``ssl`` (type: ``bool``, default: ``null``)
+``ssl`` (type: ``array``, default: ``null``)
     SSL context options. See `php.net/context.ssl`_ for more information.
 
 .. note::