Merge branch '6.2' into 6.3

* 6.2:
  From SwiftMailer to Mailer
  Better wording
  Some little corrections
  Add comma
  Removing another self-closing HTML slash

Author: javiereguiluz

README.markdown

@@ -24,15 +24,15 @@ Contributing
 ------------
 
 We love contributors! For more information on how you can contribute, please read
-the [Symfony Docs Contributing Guide](https://symfony.com/doc/current/contributing/documentation/overview.html)
+the [Symfony Docs Contributing Guide](https://symfony.com/doc/current/contributing/documentation/overview.html).
 
 **Important**: use `4.4` branch as the base of your pull requests, unless you are
 documenting a feature that was introduced *after* Symfony 4.4 (e.g. in Symfony 5.4).
 
 Build Documentation Locally
 ---------------------------
 
-This is not needed for contributing, but it's useful if you want to debug some
+This is not needed for contributing, but it's useful if you would like to debug some
 issue in the docs or if you want to read Symfony Documentation offline.
 
 ```bash

components/validator/metadata.rst

@@ -67,7 +67,7 @@ Then, add the Validator component configuration to the class::
 Classes
 -------
 
-Some constraints allow to validate the entire object. For example, the
+Some constraints allow validating the entire object. For example, the
 :doc:`Callback </reference/constraints/Callback>` constraint is a generic
 constraint that's applied to the class itself.
 

components/validator/resources.rst

@@ -76,7 +76,7 @@ configure the locations of these files::
 
 .. note::
 
-    If you want to load YAML mapping files then you will also need to install
+    If you want to load YAML mapping files, then you will also need to install
     :doc:`the Yaml component </components/yaml>`.
 
 .. tip::

routing.rst

@@ -247,7 +247,7 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
 
     HTML forms only support ``GET`` and ``POST`` methods. If you're calling a
     route with a different method from an HTML form, add a hidden field called
-    ``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT"/>``).
+    ``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT">``).
     If you create your forms with :doc:`Symfony Forms </forms>` this is done
     automatically for you.
 

service_container/tags.rst

@@ -161,9 +161,9 @@ all services that were tagged with some specific tag. This is useful in
 compiler passes where you can find these services and use or modify them in
 some specific way.
 
-For example, if you are using Swift Mailer you might imagine that you want
+For example, if you are using the Symfony Mailer component you might want
 to implement a "transport chain", which is a collection of classes implementing
-``\Swift_Transport``. Using the chain, you'll want Swift Mailer to try several
+``\MailerTransport``. Using the chain, you'll want Mailer to try several
 ways of transporting the message until one succeeds.
 
 To begin with, define the ``TransportChain`` class::
@@ -180,7 +180,7 @@ To begin with, define the ``TransportChain`` class::
             $this->transports = [];
         }
 
-        public function addTransport(\Swift_Transport $transport): void
+        public function addTransport(\MailerTransport $transport): void
         {
             $this->transports[] = $transport;
         }
@@ -227,7 +227,7 @@ Then, define the chain as a service:
 Define Services with a Custom Tag
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Now you might want several of the ``\Swift_Transport`` classes to be instantiated
+Now you might want several of the ``\MailerTransport`` classes to be instantiated
 and added to the chain automatically using the ``addTransport()`` method.
 For example, you may add the following transports as services:
 
@@ -237,11 +237,11 @@ For example, you may add the following transports as services:
 
         # config/services.yaml
         services:
-            Swift_SmtpTransport:
+            MailerSmtpTransport:
                 arguments: ['%mailer_host%']
                 tags: ['app.mail_transport']
 
-            Swift_SendmailTransport:
+            MailerSendmailTransport:
                 tags: ['app.mail_transport']
 
     .. code-block:: xml
@@ -254,13 +254,13 @@ For example, you may add the following transports as services:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="Swift_SmtpTransport">
+                <service id="MailerSmtpTransport">
                     <argument>%mailer_host%</argument>
 
                     <tag name="app.mail_transport"/>
                 </service>
 
-                <service id="Swift_SendmailTransport">
+                <service id="MailerSendmailTransport">
                     <tag name="app.mail_transport"/>
                 </service>
             </services>
@@ -274,13 +274,13 @@ For example, you may add the following transports as services:
         return function(ContainerConfigurator $configurator) {
             $services = $configurator->services();
 
-            $services->set(\Swift_SmtpTransport::class)
+            $services->set(\MailerSmtpTransport::class)
                 // the param() method was introduced in Symfony 5.2.
                 ->args([param('mailer_host')])
                 ->tag('app.mail_transport')
             ;
 
-            $services->set(\Swift_SendmailTransport::class)
+            $services->set(\MailerSendmailTransport::class)
                 ->tag('app.mail_transport')
             ;
         };
@@ -375,12 +375,12 @@ To begin with, change the ``TransportChain`` class::
             $this->transports = [];
         }
 
-        public function addTransport(\Swift_Transport $transport, $alias): void
+        public function addTransport(\MailerTransport $transport, $alias): void
         {
             $this->transports[$alias] = $transport;
         }
 
-        public function getTransport($alias): ?\Swift_Transport
+        public function getTransport($alias): ?\MailerTransport
         {
             if (array_key_exists($alias, $this->transports)) {
                 return $this->transports[$alias];
@@ -390,7 +390,7 @@ To begin with, change the ``TransportChain`` class::
         }
     }
 
-As you can see, when ``addTransport()`` is called, it takes not only a ``Swift_Transport``
+As you can see, when ``addTransport()`` is called, it takes not only a ``MailerTransport``
 object, but also a string alias for that transport. So, how can you allow
 each tagged transport service to also supply an alias?
 
@@ -402,12 +402,12 @@ To answer this, change the service declaration:
 
         # config/services.yaml
         services:
-            Swift_SmtpTransport:
+            MailerSmtpTransport:
                 arguments: ['%mailer_host%']
                 tags:
                     - { name: 'app.mail_transport', alias: 'smtp' }
 
-            Swift_SendmailTransport:
+            MailerSendmailTransport:
                 tags:
                     - { name: 'app.mail_transport', alias: 'sendmail' }
 
@@ -421,13 +421,13 @@ To answer this, change the service declaration:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="Swift_SmtpTransport">
+                <service id="MailerSmtpTransport">
                     <argument>%mailer_host%</argument>
 
                     <tag name="app.mail_transport" alias="smtp"/>
                 </service>
 
-                <service id="Swift_SendmailTransport">
+                <service id="MailerSendmailTransport">
                     <tag name="app.mail_transport" alias="sendmail"/>
                 </service>
             </services>
@@ -441,13 +441,13 @@ To answer this, change the service declaration:
         return function(ContainerConfigurator $configurator) {
             $services = $configurator->services();
 
-            $services->set(\Swift_SmtpTransport::class)
+            $services->set(\MailerSmtpTransport::class)
                 // the param() method was introduced in Symfony 5.2.
                 ->args([param('mailer_host')])
                 ->tag('app.mail_transport', ['alias' => 'smtp'])
             ;
 
-            $services->set(\Swift_SendmailTransport::class)
+            $services->set(\MailerSendmailTransport::class)
                 ->tag('app.mail_transport', ['alias' => 'sendmail'])
             ;
         };
@@ -463,13 +463,13 @@ To answer this, change the service declaration:
         # config/services.yaml
         services:
             # Compact syntax
-            Swift_SendmailTransport:
-                class: \Swift_SendmailTransport
+            MailerSendmailTransport:
+                class: \MailerSendmailTransport
                 tags: ['app.mail_transport']
 
             # Verbose syntax
-            Swift_SendmailTransport:
-                class: \Swift_SendmailTransport
+            MailerSendmailTransport:
+                class: \MailerSendmailTransport
                 tags:
                     - { name: 'app.mail_transport' }