Skip to content

Commit f6f8d5a

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: [PhpUnitBridge] Fix missing backtick [Cache] Fix redis adapter option type
2 parents 18e1d69 + d179aa6 commit f6f8d5a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

components/cache/adapters/redis_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Available Options
218218
``error``, ``distribute`` or ``slaves``. For ``\Predis\ClientInterface`` valid options are ``slaves``
219219
or ``distribute``.
220220

221-
``ssl`` (type: ``bool``, default: ``null``)
221+
``ssl`` (type: ``array``, default: ``null``)
222222
SSL context options. See `php.net/context.ssl`_ for more information.
223223

224224
.. note::

components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ Clock Mocking
530530

531531
The :class:`Symfony\\Bridge\\PhpUnit\\ClockMock` class provided by this bridge
532532
allows you to mock the PHP's built-in time functions ``time()``, ``microtime()``,
533-
``sleep()``, ``usleep()``, ``gmdate()``, and ``hrtime()`. Additionally the
533+
``sleep()``, ``usleep()``, ``gmdate()``, and ``hrtime()``. Additionally the
534534
function ``date()`` is mocked so it uses the mocked time if no timestamp is
535535
specified.
536536

0 commit comments

Comments
 (0)