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 c79a1e8

Browse filesBrowse files
javiereguiluzjaviereguiluz
committed
Merge branch '5.4' into 6.0
* 5.4: 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 Document deprecation of Doctrine Cache Fix confusion of HttpKernel and Kernel
2 parents ca7c1fe + f7355bd commit c79a1e8
Copy full SHA for c79a1e8

File tree

8 files changed

+20
-6
lines changed
Filter options

8 files changed

+20
-6
lines changed

‎cache.rst

Copy file name to clipboardExpand all lines: cache.rst
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ The following example shows a typical usage of the cache::
3030
Symfony supports Cache Contracts, PSR-6/16 and Doctrine Cache interfaces.
3131
You can read more about these at the :doc:`component documentation </components/cache>`.
3232

33+
.. deprecated:: 5.4
34+
35+
Support for Doctrine Cache was deprecated in Symfony 5.4
36+
and it will be removed in Symfony 6.0.
37+
3338
.. _cache-configuration-with-frameworkbundle:
3439

3540
Configuring Cache with FrameworkBundle

‎components/cache.rst

Copy file name to clipboardExpand all lines: components/cache.rst
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ The Cache Component
2020
Doctrine caches. See :doc:`/components/cache/psr6_psr16_adapters` and
2121
:doc:`/components/cache/adapters/doctrine_adapter`.
2222

23+
.. deprecated:: 5.4
24+
25+
Support for Doctrine Cache was deprecated in Symfony 5.4
26+
and it will be removed in Symfony 6.0.
27+
2328
Installation
2429
------------
2530

‎components/cache/adapters/doctrine_adapter.rst

Copy file name to clipboardExpand all lines: components/cache/adapters/doctrine_adapter.rst
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
Doctrine Cache Adapter
88
======================
99

10+
.. deprecated:: 5.4
11+
12+
The ``DoctrineAdapter`` and ``DoctrineProvider`` classes were deprecated in Symfony 5.4
13+
and it will be removed in Symfony 6.0.
14+
1015
This adapter wraps any class extending the `Doctrine Cache`_ abstract provider, allowing
1116
you to use these providers in your application as if they were Symfony Cache adapters.
1217

‎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
@@ -788,7 +788,7 @@ Forcing Retrying
788788
Sometimes handling a message must fail in a way that you *know* is temporary
789789
and must be retried. If you throw
790790
:class:`Symfony\\Component\\Messenger\\Exception\\RecoverableMessageHandlingException`,
791-
the message will always be retried.
791+
the message will always be retried infinitely and ``max_retries`` setting will be ignored.
792792

793793
.. _messenger-failure-transport:
794794

‎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.