Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 59724d9

Browse filesBrowse files
committed
Merge branch '5.3' into 5.4
* 5.3: Remove wrong parameter in MockHub [Messenger] Update messenger.rst Add missing space in custom-transport.rst doc The Doctrine adapter is not a database adapter Fix confusion of HttpKernel and Kernel
2 parents 9ce8caf + d7e8035 commit 59724d9
Copy full SHA for 59724d9

File tree

5 files changed

+5
-6
lines changed
Filter options

5 files changed

+5
-6
lines changed

‎components/cache/adapters/filesystem_adapter.rst

Copy file name to clipboardExpand all lines: components/cache/adapters/filesystem_adapter.rst
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ and cache root path as constructor parameters::
4545
choices. If throughput is paramount, the in-memory adapters
4646
(:ref:`Apcu <apcu-adapter>`, :ref:`Memcached <memcached-adapter>`, and
4747
:ref:`Redis <redis-adapter>`) or the database adapters
48-
(:ref:`Doctrine <doctrine-adapter>` and :ref:`PDO <pdo-doctrine-adapter>`)
49-
are recommended.
48+
(:ref:`PDO <pdo-doctrine-adapter>`) are recommended.
5049

5150
.. note::
5251

‎components/dependency_injection/workflow.rst

Copy file name to clipboardExpand all lines: components/dependency_injection/workflow.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Working with a Cached Container
2121
-------------------------------
2222

2323
Before building it, the kernel checks to see if a cached version of the
24-
container exists. The HttpKernel has a debug setting and if this is false,
24+
container exists. The kernel has a debug setting and if this is false,
2525
the cached version is used if it exists. If debug is true then the kernel
2626
:doc:`checks to see if configuration is fresh </components/config/caching>`
2727
and if it is, the cached version of the container is used. If not then the

‎mercure.rst

Copy file name to clipboardExpand all lines: mercure.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ You can instead make use of the `MockHub`::
577577
{
578578
public function testPublishing()
579579
{
580-
$hub = new MockHub('default', 'https://internal/.well-known/mercure', new StaticTokenProvider('foo'), function(Update $update): string {
580+
$hub = new MockHub('https://internal/.well-known/mercure', new StaticTokenProvider('foo'), function(Update $update): string {
581581
// $this->assertTrue($update->isPrivate());
582582

583583
return 'id';

‎messenger.rst

Copy file name to clipboardExpand all lines: messenger.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ Forcing Retrying
805805
Sometimes handling a message must fail in a way that you *know* is temporary
806806
and must be retried. If you throw
807807
:class:`Symfony\\Component\\Messenger\\Exception\\RecoverableMessageHandlingException`,
808-
the message will always be retried.
808+
the message will always be retried infinitely and ``max_retries`` setting will be ignored.
809809

810810
.. _messenger-failure-transport:
811811

‎messenger/custom-transport.rst

Copy file name to clipboardExpand all lines: messenger/custom-transport.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Here is a simplified example of a database transport::
6565
WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout)
6666
AND handled = FALSE'
6767
)
68-
->setParameter('redeliver_timeout', new DateTimeImmutable('-5minutes'))
68+
->setParameter('redeliver_timeout', new DateTimeImmutable('-5 minutes'))
6969
->getOneOrNullResult();
7070

7171
if (null === $row) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.