Skip to content

Commit c2bcbf6

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [symfony#13980] add route name ADD Annotations for The Locale and the URL section Fix HttpClientInterface path in HttpClient documentation Removed Mailer component docs
2 parents 50dc02e + 4d52670 commit c2bcbf6

File tree

8 files changed

+330
-283
lines changed

8 files changed

+330
-283
lines changed

_build/conf.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@
127127
'rst': 'reStructuredText',
128128
'varnish2': 'Varnish 2',
129129
'varnish3': 'Varnish 3',
130-
'varnish4': 'Varnish 4'
130+
'varnish4': 'Varnish 4',
131+
'env': '.env'
131132
}
132133

133134
# don't enable Sphinx Domains

_build/redirection_map

+1
Original file line numberDiff line numberDiff line change
@@ -507,3 +507,4 @@
507507
/components/class_loader https://github.com/symfony/class-loader
508508
/frontend/encore/versus-assetic /frontend
509509
/components/http_client /http_client
510+
/components/mailer /mailer

components/mailer.rst

-232
This file was deleted.

components/messenger.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Your own Sender
212212
Imagine that you already have an ``ImportantAction`` message going through the
213213
message bus and being handled by a handler. Now, you also want to send this
214214
message as an email (using the :doc:`Mime </components/mime>` and
215-
:doc:`Mailer </components/mailer>` components).
215+
:doc:`Mailer </mailer>` components).
216216

217217
Using the :class:`Symfony\\Component\\Messenger\\Transport\\Sender\\SenderInterface`,
218218
you can create your own message sender::

components/mime.rst

+1-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ methods to compose the entire email message::
5757
;
5858

5959
This only purpose of this component is to create the email messages. Use the
60-
:doc:`Mailer component </components/mailer>` to actually send them. In Symfony
61-
applications, it's easier to use the :doc:`Mailer integration </mailer>`.
62-
63-
Most of the details about how to create Email objects, including Twig integration,
64-
can be found in the :doc:`Mailer documentation </mailer>`.
60+
:doc:`Mailer component </mailer>` to actually send them.
6561

6662
Twig Integration
6763
----------------

http_client.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ Basic Usage
2222
Use the :class:`Symfony\\Component\\HttpClient\\HttpClient` class to make
2323
requests. In the Symfony framework, this class is available as the
2424
``http_client`` service. This service will be :doc:`autowired </service_container/autowiring>`
25-
automatically when type-hinting for :class:`Symfony\\Component\\HttpClient\\HttpClientInterface`:
25+
automatically when type-hinting for :class:`Symfony\\Contracts\\HttpClient\\HttpClientInterface`:
2626

2727
.. configuration-block::
2828

2929
.. code-block:: php-symfony
3030
31-
use Symfony\Component\HttpClient\HttpClientInterface;
31+
use Symfony\Contracts\HttpClient\HttpClientInterface;
3232
3333
class SymfonyDocs
3434
{

0 commit comments

Comments
 (0)