8000 Merge branch '5.1' into master · symfony/symfony-docs@52c2ca0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 52c2ca0

Browse files
wouterjwouterj
committed
Merge branch '5.1' into master
* 5.1: [#13980] add route name ADD Annotations for The Locale and the URL section Update performance.rst Fix HttpClientInterface path in HttpClient documentation verify_peer in dsn should be 0 [String] Fix missing locale in slugger substitution map Removed Mailer component docs Add public typed properties autowiring
2 parents a5f3a0f + c2bcbf6 commit 52c2ca0

File tree

12 files changed

+357
-288
lines changed

12 files changed

+357
-288
lines changed

‎_build/conf.py

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,4 +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-
/redirection_test /session/database.html#store-sessions-in-a-nosql-database-mongodb
510+
/components/mailer /mailer

‎components/mailer.rst

Lines changed: 0 additions & 232 deletions
This file was deleted.

‎components/messenger.rst

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 5 deletions
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
----------------

‎components/string.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ that only includes safe ASCII characters::
469469
// $slug = 'Workspace-settings'
470470

471471
// you can also pass an array with additional character substitutions
472-
$slugger = new AsciiSlugger('en', ['%' => 'percent', '€' => 'euro']);
472+
$slugger = new AsciiSlugger('en', ['en' => ['%' => 'percent', '€' => 'euro']]);
473473
$slug = $slugger->slug('10% or 5€');
474474
// $slug = '10-percent-or-5-euro'
475475

‎http_client.rst

Lines changed: 2 additions & 2 deletions
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)
0