diff --git a/best_practices/forms.rst b/best_practices/forms.rst
index 31ffa4d5707..79a95da0be1 100644
--- a/best_practices/forms.rst
+++ b/best_practices/forms.rst
@@ -134,7 +134,7 @@ view layer:
     {{ form_start(form) }}
         {{ form_widget(form) }}
 
-        <input type="submit" class="btn" value="Create" />
+        <input type="submit" class="btn" value="Create"/>
     {{ form_end(form) }}
 
 Validation
diff --git a/components/dependency_injection/_imports-parameters-note.rst.inc b/components/dependency_injection/_imports-parameters-note.rst.inc
index abb01a6ef13..92868df1985 100644
--- a/components/dependency_injection/_imports-parameters-note.rst.inc
+++ b/components/dependency_injection/_imports-parameters-note.rst.inc
@@ -22,7 +22,7 @@
                     https://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <imports>
-                    <import resource="%kernel.project_dir%/somefile.yaml" />
+                    <import resource="%kernel.project_dir%/somefile.yaml"/>
                 </imports>
             </container>
 
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
index fc7d4ca7879..3e35dbda49e 100644
--- a/components/phpunit_bridge.rst
+++ b/components/phpunit_bridge.rst
@@ -55,7 +55,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
         <!-- ... -->
 
         <listeners>
-            <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+            <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
         </listeners>
     </phpunit>
 
@@ -122,7 +122,7 @@ The summary includes:
         <!-- phpunit.xml.dist -->
         <!-- ... -->
         <listeners>
-            <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+            <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
         </listeners>
 
 Trigger Deprecation Notices
@@ -179,8 +179,8 @@ message, enclosed with ``/``. For example, with:
         <!-- ... -->
 
         <php>
-            <server name="KERNEL_CLASS" value="App\Kernel" />
-            <env name="SYMFONY_DEPRECATIONS_HELPER" value="/foobar/" />
+            <server name="KERNEL_CLASS" value="App\Kernel"/>
+            <env name="SYMFONY_DEPRECATIONS_HELPER" value="/foobar/"/>
         </php>
     </phpunit>
 
@@ -342,7 +342,7 @@ following listener in your PHPUnit configuration:
     <!-- phpunit.xml.dist -->
     <!-- ... -->
     <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>
 
 .. note::
@@ -676,7 +676,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file
         <!-- ... -->
 
         <listeners>
-            <listener class="Symfony\Bridge\PhpUnit\CoverageListener" />
+            <listener class="Symfony\Bridge\PhpUnit\CoverageListener"/>
         </listeners>
     </phpunit>
 
diff --git a/components/serializer.rst b/components/serializer.rst
index 8134d21662b..7aa3af21c37 100644
--- a/components/serializer.rst
+++ b/components/serializer.rst
@@ -589,7 +589,7 @@ defines a ``Person`` entity with a ``firstName`` property:
                 https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
         >
             <class name="App\Entity\Person">
-                <attribute name="firstName" serialized-name="customer_name" />
+                <attribute name="firstName" serialized-name="customer_name"/>
             </class>
         </serializer>
 
@@ -795,7 +795,7 @@ the key  ``#comment`` for encoding XML comments::
     // will return:
     // <?xml version="1.0"?>
     // <response>
-    //     <foo bar="value" />
+    //     <foo bar="value"/>
     //     <qux><!-- A comment --!><qux>
     // </response>
 
@@ -1370,8 +1370,8 @@ and ``BitBucketCodeRepository`` classes:
         >
             <class name="App\CodeRepository">
                 <discriminator-map type-property="type">
-                    <mapping type="github" class="App\GitHubCodeRepository" />
-                    <mapping type="bitbucket" class="App\BitBucketCodeRepository" />
+                    <mapping type="github" class="App\GitHubCodeRepository"/>
+                    <mapping type="bitbucket" class="App\BitBucketCodeRepository"/>
                 </discriminator-map>
             </class>
         </serializer>
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
index aea067e35e2..ac2c6f84086 100644
--- a/components/var_dumper.rst
+++ b/components/var_dumper.rst
@@ -140,7 +140,7 @@ the :ref:`dump_destination option <configuration-debug-dump_destination>` of the
                 https://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/debug https://symfony.com/schema/dic/debug/debug-1.0.xsd">
 
-            <debug:config dump-destination="tcp://%env(VAR_DUMPER_SERVER)%" />
+            <debug:config dump-destination="tcp://%env(VAR_DUMPER_SERVER)%"/>
         </container>
 
     .. code-block:: php
diff --git a/configuration.rst b/configuration.rst
index caef02546f0..4c0401084f6 100644
--- a/configuration.rst
+++ b/configuration.rst
@@ -47,15 +47,15 @@ instance, the framework bundle is configured in ``config/packages/framework.yaml
                     http://symfony.com/schema/dic/framework https://symfony.com/schema/dic/framework/framework-1.0.xsd"
             >
                 <framework:config secret="%env(APP_SECRET)%">
-                    <!--<framework:csrf-protection enabled="true“ />-->
-                    <!--<framework:esi enabled="true" />-->
-                    <!--<framework:fragments enabled="true" />-->
+                    <!--<framework:csrf-protection enabled="true“/>-->
+                    <!--<framework:esi enabled="true"/>-->
+                    <!--<framework:fragments enabled="true"/>-->
 
                     <!-- Enables session support. Note that the session will ONLY be started if you read or write from it.
                          Remove or comment this section to explicitly disable session support. -->
-                    <framework:session />
+                    <framework:session/>
 
-                    <framework:php-errors log="true" />
+                    <framework:php-errors log="true"/>
                 </framework:config>
             </container>
 
diff --git a/configuration/configuration_organization.rst b/configuration/configuration_organization.rst
index f93f7e60ce3..5fe86fe290d 100644
--- a/configuration/configuration_organization.rst
+++ b/configuration/configuration_organization.rst
@@ -103,8 +103,8 @@ format (``.yaml``, ``.xml``, ``.php``, ``.ini``):
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <imports>
-                <import resource="my_config_file.yaml" />
-                <import resource="legacy.php" />
+                <import resource="my_config_file.yaml"/>
+                <import resource="legacy.php"/>
             </imports>
 
             <!-- ... -->
@@ -157,7 +157,7 @@ when importing it from any other configuration file:
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <imports>
-                <import resource="/etc/sites/mysite.com/parameters.yaml" ignore-errors="true" />
+                <import resource="/etc/sites/mysite.com/parameters.yaml" ignore-errors="true"/>
             </imports>
 
             <!-- ... -->
diff --git a/configuration/environments.rst b/configuration/environments.rst
index 6343c605c1d..5fa5f61ee42 100644
--- a/configuration/environments.rst
+++ b/configuration/environments.rst
@@ -158,7 +158,7 @@ the environment variable is passed to the kernel::
                     http://symfony.com/schema/dic/twig
                     https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-                <twig:config debug="%kernel.debug%" />
+                <twig:config debug="%kernel.debug%"/>
 
             </container>
 
@@ -231,7 +231,7 @@ configuration file:
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:profiler only-exceptions="false" />
+                <framework:profiler only-exceptions="false"/>
             </framework:config>
 
         </container>
diff --git a/configuration/external_parameters.rst b/configuration/external_parameters.rst
index 22a7a621afe..193ed4c46f0 100644
--- a/configuration/external_parameters.rst
+++ b/configuration/external_parameters.rst
@@ -164,7 +164,7 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:router http-port="%env(int:HTTP_PORT)%" />
+                <framework:router http-port="%env(int:HTTP_PORT)%"/>
             </framework:config>
         </container>
 
@@ -208,7 +208,7 @@ Symfony provides the following env var processors:
                     <parameter key="env(SECRET)">some_secret</parameter>
                 </parameters>
 
-                <framework:config secret="%env(string:SECRET)%" />
+                <framework:config secret="%env(string:SECRET)%"/>
             </container>
 
         .. code-block:: php
@@ -248,7 +248,7 @@ Symfony provides the following env var processors:
                     <parameter key="env(HTTP_METHOD_OVERRIDE)">true</parameter>
                 </parameters>
 
-                <framework:config http-methode-override="%env(bool:HTTP_METHOD_OVERRIDE)%" />
+                <framework:config http-methode-override="%env(bool:HTTP_METHOD_OVERRIDE)%"/>
             </container>
 
         .. code-block:: php
@@ -294,7 +294,7 @@ Symfony provides the following env var processors:
                 </parameters>
 
                 <security:config>
-                    <rule path="^/health-check$" methods="%env(const:HEALTH_CHECK_METHOD)%" />
+                    <rule path="^/health-check$" methods="%env(const:HEALTH_CHECK_METHOD)%"/>
                 </security:config>
             </container>
 
@@ -344,7 +344,7 @@ Symfony provides the following env var processors:
                     <parameter key="env(TRUSTED_HOSTS)">["10.0.0.1", "10.0.0.2"]</parameter>
                 </parameters>
 
-                <framework:config trusted-hosts="%env(json:TRUSTED_HOSTS)%" />
+                <framework:config trusted-hosts="%env(json:TRUSTED_HOSTS)%"/>
             </container>
 
         .. code-block:: php
@@ -384,7 +384,7 @@ Symfony provides the following env var processors:
                     <parameter key="env(SENTRY_DSN)">http://%env(HOST)%/project</parameter>
                 </parameters>
 
-                <sentry:config dsn="%env(resolve:SENTRY_DSN)%" />
+                <sentry:config dsn="%env(resolve:SENTRY_DSN)%"/>
             </container>
 
         .. code-block:: php
@@ -435,7 +435,7 @@ Symfony provides the following env var processors:
                     <parameter key="env(AUTH_FILE)">../config/auth.json</parameter>
                 </parameters>
 
-                <google auth="%env(file:AUTH_FILE)%" />
+                <google auth="%env(file:AUTH_FILE)%"/>
             </container>
 
         .. code-block:: php
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
index 6064a02a16b..d6d9f04eb32 100644
--- a/configuration/micro_kernel_trait.rst
+++ b/configuration/micro_kernel_trait.rst
@@ -224,7 +224,7 @@ because the configuration started to get bigger:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config secret="S0ME_SECRET">
-                <framework:profiler only-exceptions="false" />
+                <framework:profiler only-exceptions="false"/>
             </framework:config>
         </container>
 
diff --git a/configuration/using_parameters_in_dic.rst b/configuration/using_parameters_in_dic.rst
index 2bb0da9cc3c..253da553084 100644
--- a/configuration/using_parameters_in_dic.rst
+++ b/configuration/using_parameters_in_dic.rst
@@ -53,15 +53,15 @@ Now, examine the results to see this closely:
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:my-bundle="http://example.org/schema/dic/my_bundle">
 
-            <my-bundle:config logging="true" />
+            <my-bundle:config logging="true"/>
             <!-- true, as expected -->
 
-            <my-bundle:config logging="%kernel.debug%" />
+            <my-bundle:config logging="%kernel.debug%"/>
             <!-- true/false (depends on 2nd parameter of Kernel),
                  as expected, because %kernel.debug% inside configuration
                  gets evaluated before being passed to the extension -->
 
-            <my-bundle:config />
+            <my-bundle:config/>
             <!-- passes the string "%kernel.debug%".
                  Which is always considered as true.
                  The Configurator does not know anything about
diff --git a/console/commands_as_services.rst b/console/commands_as_services.rst
index 2662d38e61f..9c45d7fc2e3 100644
--- a/console/commands_as_services.rst
+++ b/console/commands_as_services.rst
@@ -104,7 +104,7 @@ Or set the ``command`` attribute on the ``console.command`` tag in your service
 
             <services>
                 <service id="App\Command\SunshineCommand">
-                     <tag name="console.command" command="app:sunshine" />
+                     <tag name="console.command" command="app:sunshine"/>
                 </service>
             </services>
         </container>
diff --git a/controller/argument_value_resolver.rst b/controller/argument_value_resolver.rst
index b8ac20acd80..3132bc0649f 100644
--- a/controller/argument_value_resolver.rst
+++ b/controller/argument_value_resolver.rst
@@ -88,7 +88,7 @@ type-hinted method arguments:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <sensio-framework-extra:config>
-                <request converters="true" auto-convert="false" />
+                <request converters="true" auto-convert="false"/>
             </sensio-framework-extra:config>
         </container>
 
@@ -194,11 +194,11 @@ and adding a priority.
 
             <services>
                 <!-- ... be sure autowiring is enabled -->
-                <defaults autowire="true" />
+                <defaults autowire="true"/>
                 <!-- ... -->
 
                 <service id="App\ArgumentResolver\UserValueResolver">
-                    <tag name="controller.argument_value_resolver" priority="50" />
+                    <tag name="controller.argument_value_resolver" priority="50"/>
                 </service>
             </services>
 
diff --git a/controller/error_pages.rst b/controller/error_pages.rst
index 323199dfc81..9bf48728ca8 100644
--- a/controller/error_pages.rst
+++ b/controller/error_pages.rst
@@ -171,7 +171,7 @@ automatically when installing Twig support):
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="@TwigBundle/Resources/config/routing/errors.xml" prefix="/_error" />
+            <import resource="@TwigBundle/Resources/config/routing/errors.xml" prefix="/_error"/>
         </routes>
 
     .. code-block:: php
@@ -293,7 +293,7 @@ In that case, you might want to override one or both of the ``showAction()`` and
 
                 <services>
                     <!-- ... be sure autowiring is enabled -->
-                    <defaults autowire="true" />
+                    <defaults autowire="true"/>
                     <!-- ... -->
 
                     <service id="App\Controller\CustomExceptionController" public="true">
diff --git a/controller/service.rst b/controller/service.rst
index 0f127e6e3d4..3c8311755b1 100644
--- a/controller/service.rst
+++ b/controller/service.rst
@@ -57,7 +57,7 @@ a service like: ``App\Controller\HelloController::index``:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="hello" path="/hello" controller="App\Controller\HelloController::index" methods="GET" />
+            <route id="hello" path="/hello" controller="App\Controller\HelloController::index" methods="GET"/>
 
         </routes>
 
diff --git a/controller/soap_web_service.rst b/controller/soap_web_service.rst
index 902d3d9a796..ac9e4a9ff3f 100644
--- a/controller/soap_web_service.rst
+++ b/controller/soap_web_service.rst
@@ -120,17 +120,17 @@ An example WSDL is below.
 
         <types>
             <xsd:schema targetNamespace="urn:hellowsdl">
-                <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
-                <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" />
+                <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+                <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
             </xsd:schema>
         </types>
 
         <message name="helloRequest">
-            <part name="name" type="xsd:string" />
+            <part name="name" type="xsd:string"/>
         </message>
 
         <message name="helloResponse">
-            <part name="return" type="xsd:string" />
+            <part name="return" type="xsd:string"/>
         </message>
 
         <portType name="hellowsdlPortType">
@@ -160,7 +160,7 @@ An example WSDL is below.
 
         <service name="hellowsdl">
             <port name="hellowsdlPort" binding="tns:hellowsdlBinding">
-                <soap:address location="http://example.com/index.php/soap" />
+                <soap:address location="http://example.com/index.php/soap"/>
             </port>
         </service>
     </definitions>
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
index 4efe6c4cf28..16c9edcfaa0 100644
--- a/controller/upload_file.rst
+++ b/controller/upload_file.rst
@@ -418,7 +418,7 @@ Now, register this class as a Doctrine listener:
 
             <services>
                 <!-- ... be sure autowiring is enabled -->
-                <defaults autowire="true" />
+                <defaults autowire="true"/>
                 <!-- ... -->
 
                 <service id="App\EventListener\BrochureUploaderListener">
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
index f872596cb8c..52f8a5fa2f4 100644
--- a/doctrine/associations.rst
+++ b/doctrine/associations.rst
@@ -196,7 +196,7 @@ the ``Product`` entity (and getter & setter methods):
                     field="category"
                     target-entity="App\Entity\Category"
                     inversed-by="products">
-                    <join-column nullable="false" />
+                    <join-column nullable="false"/>
                 </many-to-one>
             </entity>
         </doctrine-mapping>
@@ -271,7 +271,7 @@ class that will hold these objects:
                 <one-to-many
                     field="products"
                     target-entity="App\Entity\Product"
-                    mapped-by="category" />
+                    mapped-by="category"/>
 
                 <!--
                     don't forget to init the collection in
diff --git a/doctrine/dbal.rst b/doctrine/dbal.rst
index dfa09330b3a..01acf13b796 100644
--- a/doctrine/dbal.rst
+++ b/doctrine/dbal.rst
@@ -89,8 +89,8 @@ mapping types, read Doctrine's `Custom Mapping Types`_ section of their document
 
             <doctrine:config>
                 <doctrine:dbal>
-                    <doctrine:type name="custom_first" class="App\Type\CustomFirst" />
-                    <doctrine:type name="custom_second" class="App\Type\CustomSecond" />
+                    <doctrine:type name="custom_first" class="App\Type\CustomFirst"/>
+                    <doctrine:type name="custom_second" class="App\Type\CustomSecond"/>
                 </doctrine:dbal>
             </doctrine:config>
         </container>
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
index febe9753dcf..e3b8d90fa23 100644
--- a/doctrine/event_listeners_subscribers.rst
+++ b/doctrine/event_listeners_subscribers.rst
@@ -55,13 +55,13 @@ managers that use this connection.
                 <!-- ... -->
 
                 <service id="App\EventListener\SearchIndexer">
-                    <tag name="doctrine.event_listener" event="postPersist" />
+                    <tag name="doctrine.event_listener" event="postPersist"/>
                 </service>
                 <service id="App\EventListener\SearchIndexer2">
-                    <tag name="doctrine.event_listener" event="postPersist" connection="default" />
+                    <tag name="doctrine.event_listener" event="postPersist" connection="default"/>
                 </service>
                 <service id="App\EventListener\SearchIndexerSubscriber">
-                    <tag name="doctrine.event_subscriber" connection="default" />
+                    <tag name="doctrine.event_subscriber" connection="default"/>
                 </service>
             </services>
         </container>
@@ -230,10 +230,10 @@ numbers mean that listeners are invoked earlier.
 
             <services>
                 <service id="App\EventListener\MyHighPriorityListener" autowire="true">
-                    <tag name="doctrine.event_listener" event="postPersist" priority="10" />
+                    <tag name="doctrine.event_listener" event="postPersist" priority="10"/>
                 </service>
                 <service id="App\EventListener\MyLowPriorityListener" autowire="true">
-                    <tag name="doctrine.event_listener" event="postPersist" priority="1" />
+                    <tag name="doctrine.event_listener" event="postPersist" priority="1"/>
                 </service>
             </services>
         </container>
diff --git a/event_dispatcher.rst b/event_dispatcher.rst
index cf77cca8512..f86f1d476ad 100644
--- a/event_dispatcher.rst
+++ b/event_dispatcher.rst
@@ -92,7 +92,7 @@ using a special "tag":
 
             <services>
                 <service id="App\EventListener\ExceptionListener">
-                    <tag name="kernel.event_listener" event="kernel.exception" />
+                    <tag name="kernel.event_listener" event="kernel.exception"/>
                 </service>
             </services>
         </container>
diff --git a/form/form_themes.rst b/form/form_themes.rst
index 4ebe67130a2..71cb83319e4 100644
--- a/form/form_themes.rst
+++ b/form/form_themes.rst
@@ -201,7 +201,7 @@ upon the form themes enabled in your app):
 
 .. code-block:: html
 
-    <input type="number" id="form_age" name="form[age]" required="required" value="33" />
+    <input type="number" id="form_age" name="form[age]" required="required" value="33"/>
 
 Symfony uses a Twig block called ``integer_widget`` to render that field. This
 is because the field type is ``integer`` and you're rendering its ``widget`` (as
diff --git a/frontend/custom_version_strategy.rst b/frontend/custom_version_strategy.rst
index 3b79c1ee39b..1999dc40c39 100644
--- a/frontend/custom_version_strategy.rst
+++ b/frontend/custom_version_strategy.rst
@@ -182,7 +182,7 @@ the :ref:`version_strategy <reference-assets-version-strategy>` option:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:assets version-strategy="App\Asset\VersionStrategy\GulpBusterVersionStrategy" />
+                <framework:assets version-strategy="App\Asset\VersionStrategy\GulpBusterVersionStrategy"/>
             </framework:config>
         </container>
 
diff --git a/logging/monolog_exclude_http_codes.rst b/logging/monolog_exclude_http_codes.rst
index 4da301299ef..c0bc4f92fa6 100644
--- a/logging/monolog_exclude_http_codes.rst
+++ b/logging/monolog_exclude_http_codes.rst
@@ -41,7 +41,7 @@ logging these HTTP codes based on the MonologBundle configuration:
                         <monolog:url>^/foo</monolog:url>
                         <monolog:url>^/bar</monolog:url>
                     </monolog:excluded-http-code>
-                    <monolog:excluded-http-code code="404" />
+                    <monolog:excluded-http-code code="404"/>
                 </monolog:handler>
             </monolog:config>
         </container>
diff --git a/logging/processors.rst b/logging/processors.rst
index 4363424a1c2..691185de322 100644
--- a/logging/processors.rst
+++ b/logging/processors.rst
@@ -84,7 +84,7 @@ information:
                 </service>
 
                 <service id="App\Logger\SessionRequestProcessor">
-                    <tag name="monolog.processor" />
+                    <tag name="monolog.processor"/>
                 </service>
             </services>
         </container>
@@ -189,7 +189,7 @@ the ``monolog.processor`` tag:
 
             <services>
                 <service id="App\Logger\SessionRequestProcessor">
-                    <tag name="monolog.processor" handler="main" />
+                    <tag name="monolog.processor" handler="main"/>
                 </service>
             </services>
         </container>
@@ -233,7 +233,7 @@ the ``monolog.processor`` tag:
 
             <services>
                 <service id="App\Logger\SessionRequestProcessor">
-                    <tag name="monolog.processor" channel="main" />
+                    <tag name="monolog.processor" channel="main"/>
                 </service>
             </services>
         </container>
diff --git a/messenger.rst b/messenger.rst
index 9bf12e8fd59..077683b85e4 100644
--- a/messenger.rst
+++ b/messenger.rst
@@ -111,7 +111,7 @@ If you're not using service autoconfiguration, then you need to add this config:
 
             <services>
                 <service id="App\MessageHandler\SmsNotificationHandler">
-                   <tag name="messenger.message_handler" />
+                   <tag name="messenger.message_handler"/>
                 </service>
             </services>
         </container>
@@ -171,7 +171,7 @@ the messenger component, the following configuration should have been created:
 
             <framework:config>
                 <framework:messenger>
-                    <framework:transport name="amqp" dsn="%env(MESSENGER_TRANSPORT_DSN)%" />
+                    <framework:transport name="amqp" dsn="%env(MESSENGER_TRANSPORT_DSN)%"/>
                 </framework:messenger>
             </framework:config>
         </container>
@@ -242,7 +242,7 @@ configuration:
             <framework:config>
                 <framework:messenger>
                     <framework:routing message-class="My\Message\Message">
-                        <framework:sender service="amqp" />
+                        <framework:sender service="amqp"/>
                     </framework:routing>
                 </framework:messenger>
             </framework:config>
@@ -291,10 +291,10 @@ instead of a class name:
             <framework:config>
                 <framework:messenger>
                     <framework:routing message-class="My\Message\Message">
-                        <framework:sender service="another_transport" />
+                        <framework:sender service="another_transport"/>
                     </framework:routing>
                     <framework:routing message-class="*">
-                        <framework:sender service="amqp" />
+                        <framework:sender service="amqp"/>
                     </framework:routing>
                 </framework:messenger>
             </framework:config>
@@ -339,8 +339,8 @@ A class of messages can also be routed to multiple senders by specifying a list:
             <framework:config>
                 <framework:messenger>
                     <framework:routing message-class="My\Message\ToBeSentToTwoSenders">
-                        <framework:sender service="amqp" />
-                        <framework:sender service="audit" />
+                        <framework:sender service="amqp"/>
+                        <framework:sender service="audit"/>
                     </framework:routing>
                 </framework:messenger>
             </framework:config>
@@ -387,7 +387,7 @@ while still having them passed to their respective handler:
             <framework:config>
                 <framework:messenger>
                     <framework:routing message-class="My\Message\ThatIsGoingToBeSentAndHandledLocally" send-and-handle="true">
-                        <framework:sender service="amqp" />
+                        <framework:sender service="amqp"/>
                     </framework:routing>
                 </framework:messenger>
             </framework:config>
@@ -477,7 +477,7 @@ you can disable them like this:
 
             <framework:config>
                 <framework:messenger>
-                    <framework:bus name="messenger.bus.default" default-middleware="false" />
+                    <framework:bus name="messenger.bus.default" default-middleware="false"/>
                 </framework:messenger>
             </framework:config>
         </container>
@@ -529,8 +529,8 @@ within the buses to add some extra capabilities like this:
             <framework:config>
                 <framework:messenger>
                     <framework:bus name="messenger.bus.default">
-                        <framework:middleware id="App\Middleware\MyMiddleware" />
-                        <framework:middleware id="App\Middleware\AnotherMiddleware" />
+                        <framework:middleware id="App\Middleware\MyMiddleware"/>
+                        <framework:middleware id="App\Middleware\AnotherMiddleware"/>
                     </framework:bus>
                 </framework:messenger>
             </framework:config>
@@ -597,7 +597,7 @@ This middleware can be configured to define the entity manager to use:
                 <framework:messenger>
                     <framework:bus name="command_bus">
                         <!-- Using the default configured entity manager name -->
-                        <framework:middleware id="doctrine_transaction" />
+                        <framework:middleware id="doctrine_transaction"/>
                         <!-- Using another entity manager -->
                         <framework:middleware id="doctrine_transaction">
                             <framework:argument>custom</framework:argument>
@@ -658,7 +658,7 @@ Defining such configurable middleware is based on Symfony's
                     abstract="true">
                     <!-- Main dependencies are defined by the parent definitions. -->
                     <!-- Arguments provided in the middleware config will be appended on the child definition. -->
-                    <argument type="service" id="doctrine" />
+                    <argument type="service" id="doctrine"/>
                 </service>
             </services>
         </container>
@@ -756,7 +756,7 @@ Register your Factory
 
             <services>
                 <service id="Your\Transport\YourTransportFactory">
-                   <tag name="messenger.transport_factory" />
+                   <tag name="messenger.transport_factory"/>
                 </service>
             </services>
         </container>
@@ -799,7 +799,7 @@ named transport using your own DSN:
 
             <framework:config>
                 <framework:messenger>
-                    <framework:transport name="yours" dsn="my-transport://..." />
+                    <framework:transport name="yours" dsn="my-transport://..."/>
                 </framework:messenger>
             </framework:config>
         </container>
diff --git a/messenger/multiple_buses.rst b/messenger/multiple_buses.rst
index 403607b71db..1f6c11ac75a 100644
--- a/messenger/multiple_buses.rst
+++ b/messenger/multiple_buses.rst
@@ -54,14 +54,14 @@ an **event bus**. The event bus could have zero or more subscribers.
                 <!-- The bus that is going to be injected when injecting MessageBusInterface -->
                 <framework:messenger default-bus="messenger.bus.commands">
                     <framework:bus name="messenger.bus.commands">
-                        <framework:middleware id="validation" />
-                        <framework:middleware id="doctrine_transaction" />
+                        <framework:middleware id="validation"/>
+                        <framework:middleware id="doctrine_transaction"/>
                     <framework:bus>
                     <framework:bus name="messenger.bus.queries">
-                        <framework:middleware id="validation" />
+                        <framework:middleware id="validation"/>
                     <framework:bus>
                     <framework:bus name="messenger.bus.events" default-middleware="allow_no_handlers">
-                        <framework:middleware id="validation" />
+                        <framework:middleware id="validation"/>
                     <framework:bus>
                 </framework:messenger>
             </framework:config>
@@ -135,9 +135,9 @@ binding capabilities to clarify which bus will be injected based on the argument
 
             <services>
                 <defaults>
-                   <bind key="$commandBus" type="service" id="messenger.bus.commands" />
-                   <bind key="$queryBus" type="service" id="messenger.bus.queries" />
-                   <bind key="$eventBus" type="service" id="messenger.bus.events" />
+                   <bind key="$commandBus" type="service" id="messenger.bus.commands"/>
+                   <bind key="$queryBus" type="service" id="messenger.bus.queries"/>
+                   <bind key="$eventBus" type="service" id="messenger.bus.events"/>
                 </defaults>
             </services>
         </container>
@@ -177,7 +177,7 @@ you can restrict each handler to a specific bus using the ``messenger.message_ha
 
             <services>
                 <service id="App\MessageHandler\SomeCommandHandler">
-                    <tag name="messenger.message_handler" bus="messenger.bus.commands" />
+                    <tag name="messenger.message_handler" bus="messenger.bus.commands"/>
                 </service>
             </services>
         </container>
@@ -228,11 +228,11 @@ the correct tag:
             <services>
                 <!-- command handlers -->
                 <prototype namespace="App\MessageHandler\" resource="%kernel.project_dir%/src/MessageHandler/*CommandHandler.php">
-                    <tag name="messenger.message_handler" bus="messenger.bus.commands" />
+                    <tag name="messenger.message_handler" bus="messenger.bus.commands"/>
                 </service>
                 <!-- query handlers -->
                 <prototype namespace="App\MessageHandler\" resource="%kernel.project_dir%/src/MessageHandler/*QueryHandler.php">
-                    <tag name="messenger.message_handler" bus="messenger.bus.queries" />
+                    <tag name="messenger.message_handler" bus="messenger.bus.queries"/>
                 </service>
             </services>
         </container>
diff --git a/profiler.rst b/profiler.rst
index 145ddca76a0..4521b21df08 100644
--- a/profiler.rst
+++ b/profiler.rst
@@ -167,7 +167,7 @@ create an alias pointing to the existing ``profiler`` service:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="Symfony\Component\HttpKernel\Profiler\Profiler" alias="profiler" />
+                <service id="Symfony\Component\HttpKernel\Profiler\Profiler" alias="profiler"/>
             </services>
         </container>
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index c08191bea49..3a1d35bae24 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -311,7 +311,7 @@ doubling them to prevent Symfony from interpreting them as container parameters)
                 https://symfony.com/schema/dic/services/services-1.0.xsd
                 https://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-            <framework:config ide="myide://open?url=file://%%f&line=%%l" />
+            <framework:config ide="myide://open?url=file://%%f&line=%%l"/>
         </container>
 
     .. code-block:: php
@@ -543,7 +543,7 @@ You can also set ``esi`` to ``true`` to enable it:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:esi />
+                <framework:esi/>
             </framework:config>
         </container>
 
@@ -946,7 +946,7 @@ setting the value to ``null``:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:session save-path="null" />
+                <framework:session save-path="null"/>
             </framework:config>
         </container>
 
@@ -1003,7 +1003,7 @@ Whether to enable the session support in the framework.
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:session enabled="true" />
+                <framework:session enabled="true"/>
             </framework:config>
         </container>
 
@@ -1059,7 +1059,7 @@ This option allows you to define a base path to be used for assets:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:assets base-path="/images" />
+                <framework:assets base-path="/images"/>
             </framework:config>
         </container>
 
@@ -1108,7 +1108,7 @@ collection each time it generates an asset's path:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:assets base-url="http://cdn.example.com/" />
+                <framework:assets base-url="http://cdn.example.com/"/>
             </framework:config>
         </container>
 
@@ -1156,7 +1156,7 @@ You can group assets into packages, to specify different base URLs for them:
                 <framework:assets>
                     <framework:package
                         name="avatars"
-                        base-url="http://static_cdn.example.com/avatars" />
+                        base-url="http://static_cdn.example.com/avatars"/>
                 </framework:assets>
             </framework:config>
         </container>
@@ -1207,7 +1207,7 @@ For example, suppose you have the following:
 
 .. code-block:: html+twig
 
-    <img src="{{ asset('images/logo.png') }}" alt="Symfony!" />
+    <img src="{{ asset('images/logo.png') }}" alt="Symfony!"/>
 
 By default, this will render a path to your image such as ``/images/logo.png``.
 Now, activate the ``version`` option:
@@ -1234,7 +1234,7 @@ Now, activate the ``version`` option:
                 http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:assets version="v2" />
+                <framework:assets version="v2"/>
             </framework:config>
         </container>
 
@@ -1352,15 +1352,15 @@ individually for each asset package:
                     <!-- this package removes any versioning (its assets won't be versioned) -->
                     <framework:package
                         name="foo_package"
-                        version="null" />
+                        version="null"/>
                     <!-- this package uses its own strategy (the default strategy is ignored) -->
                     <framework:package
                         name="bar_package"
-                        version-strategy="app.asset.another_version_strategy" />
+                        version-strategy="app.asset.another_version_strategy"/>
                     <!-- this package inherits the default strategy -->
                     <framework:package
                         name="baz_package"
-                        base_path="/images" />
+                        base_path="/images"/>
                 </framework:assets>
             </framework:config>
         </container>
@@ -1448,11 +1448,11 @@ package:
                     <!-- this package uses its own manifest (the default file is ignored) -->
                     <framework:package
                         name="foo_package"
-                        json-manifest-path="%kernel.project_dir%/public/build/a_different_manifest.json" />
+                        json-manifest-path="%kernel.project_dir%/public/build/a_different_manifest.json"/>
                     <!-- this package uses the global manifest (the default file is used) -->
                     <framework:package
                         name="bar_package"
-                        base-path="/images" />
+                        base-path="/images"/>
                 </framework:assets>
             </framework:config>
         </container>
@@ -2203,7 +2203,7 @@ A list of workflows to be created by the framework extension:
             <framework:config>
                 <framework:workflows>
                     <framework:workflow
-                        name="my_workflow" />
+                        name="my_workflow"/>
                 </framework:workflows>
                 <!-- ... -->
             </framework:config>
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
index e93e38020b1..1aca88bb444 100644
--- a/reference/dic_tags.rst
+++ b/reference/dic_tags.rst
@@ -80,11 +80,11 @@ services:
 
             <services>
                 <service id="app.mysql_lock" public="false"
-                         class="App\Lock\MysqlLock" />
+                         class="App\Lock\MysqlLock"/>
                 <service id="app.postgresql_lock" public="false"
-                         class="App\Lock\PostgresqlLock" />
+                         class="App\Lock\PostgresqlLock"/>
                 <service id="app.sqlite_lock" public="false"
-                         class="App\Lock\SqliteLock" />
+                         class="App\Lock\SqliteLock"/>
             </services>
         </container>
 
@@ -131,14 +131,14 @@ the generic ``app.lock`` service can be defined as follows:
 
             <services>
                 <service id="app.mysql_lock" public="false"
-                         class="App\Lock\MysqlLock" />
+                         class="App\Lock\MysqlLock"/>
                 <service id="app.postgresql_lock" public="false"
-                         class="App\Lock\PostgresqlLock" />
+                         class="App\Lock\PostgresqlLock"/>
                 <service id="app.sqlite_lock" public="false"
-                         class="App\Lock\SqliteLock" />
+                         class="App\Lock\SqliteLock"/>
 
                 <service id="app.lock">
-                    <tag name="auto_alias" format="app.%database_type%_lock" />
+                    <tag name="auto_alias" format="app.%database_type%_lock"/>
                 </service>
             </services>
         </container>
@@ -297,7 +297,7 @@ can also register it manually:
 
             <services>
                 <service id="App\Cache\MyClearer">
-                    <tag name="kernel.cache_clearer" />
+                    <tag name="kernel.cache_clearer"/>
                 </service>
             </services>
         </container>
@@ -374,7 +374,7 @@ can also register it manually:
 
             <services>
                 <service id="App\Cache\MyCustomWarmer">
-                    <tag name="kernel.cache_warmer" priority="0" />
+                    <tag name="kernel.cache_warmer" priority="0"/>
                 </service>
             </services>
         </container>
@@ -497,8 +497,8 @@ channel when injecting the logger in a service.
 
             <services>
                 <service id="App\Log\CustomLogger">
-                    <argument type="service" id="logger" />
-                    <tag name="monolog.logger" channel="app" />
+                    <argument type="service" id="logger"/>
+                    <tag name="monolog.logger" channel="app"/>
                 </service>
             </services>
         </container>
@@ -553,7 +553,7 @@ You can add a processor globally:
 
             <services>
                 <service id="Monolog\Processor\IntrospectionProcessor">
-                    <tag name="monolog.processor" />
+                    <tag name="monolog.processor"/>
                 </service>
             </services>
         </container>
@@ -594,7 +594,7 @@ attribute:
 
             <services>
                 <service id="Monolog\Processor\IntrospectionProcessor">
-                    <tag name="monolog.processor" handler="firephp" />
+                    <tag name="monolog.processor" handler="firephp"/>
                 </service>
             </services>
         </container>
@@ -631,7 +631,7 @@ You can also add a processor for a specific logging channel by using the
 
             <services>
                 <service id="Monolog\Processor\IntrospectionProcessor">
-                    <tag name="monolog.processor" channel="security" />
+                    <tag name="monolog.processor" channel="security"/>
                 </service>
             </services>
         </container>
@@ -676,7 +676,7 @@ of your configuration and tag it with ``routing.loader``:
 
             <services>
                 <service id="App\Routing\CustomLoader">
-                    <tag name="routing.loader" />
+                    <tag name="routing.loader"/>
                 </service>
             </services>
         </container>
@@ -818,7 +818,7 @@ templates):
 
             <services>
                 <service id="App\Templating\AppHelper">
-                    <tag name="templating.helper" alias="alias_name" />
+                    <tag name="templating.helper" alias="alias_name"/>
                 </service>
             </services>
         </container>
@@ -867,7 +867,7 @@ Now, register your loader as a service and tag it with ``translation.loader``:
 
             <services>
                 <service id="App\Translation\MyCustomLoader">
-                    <tag name="translation.loader" alias="bin" />
+                    <tag name="translation.loader" alias="bin"/>
                 </service>
             </services>
         </container>
@@ -961,7 +961,7 @@ required option: ``alias``, which defines the name of the extractor::
 
             <services>
                 <service id="App\Translation\CustomExtractor">
-                    <tag name="translation.extractor" alias="foo" />
+                    <tag name="translation.extractor" alias="foo"/>
                 </service>
             </services>
         </container>
@@ -1018,7 +1018,7 @@ This is the name that's used to determine which dumper should be used.
 
             <services>
                 <service id="App\Translation\JsonFileDumper">
-                    <tag name="translation.dumper" alias="json" />
+                    <tag name="translation.dumper" alias="json"/>
                 </service>
             </services>
         </container>
@@ -1071,11 +1071,11 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
 
             <services>
                 <service id="App\Twig\AppExtension">
-                    <tag name="twig.extension" />
+                    <tag name="twig.extension"/>
                 </service>
 
                 <service id="App\Twig\AnotherExtension">
-                    <tag name="twig.extension" priority="-100" />
+                    <tag name="twig.extension" priority="-100"/>
                 </service>
             </services>
         </container>
@@ -1122,7 +1122,7 @@ also have to be added as regular services:
 
             <services>
                 <service id="Twig\Extensions\IntlExtension">
-                    <tag name="twig.extension" />
+                    <tag name="twig.extension"/>
                 </service>
             </services>
         </container>
@@ -1167,7 +1167,7 @@ also register it manually:
 
             <services>
                 <service id="App\Twig\CustomLoader">
-                    <tag name="twig.loader" priority="0" />
+                    <tag name="twig.loader" priority="0"/>
                 </service>
             </services>
         </container>
@@ -1216,7 +1216,7 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
 
             <services>
                 <service id="App\Twig\AppExtension">
-                    <tag name="twig.runtime" />
+                    <tag name="twig.runtime"/>
                 </service>
             </services>
         </container>
diff --git a/routing.rst b/routing.rst
index 64ca0e46605..7bc3dacd204 100644
--- a/routing.rst
+++ b/routing.rst
@@ -407,7 +407,7 @@ concise, but it can decrease route readability when requirements are complex:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="blog_list" path="/blog/{page<\d+>}" controller="App\Controller\BlogController::list" />
+            <route id="blog_list" path="/blog/{page<\d+>}" controller="App\Controller\BlogController::list"/>
 
             <!-- ... -->
         </routes>
@@ -553,7 +553,7 @@ placeholder:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="blog_list" path="/blog/{page <\d+>?1}" controller="App\Controller\BlogController::list" />
+            <route id="blog_list" path="/blog/{page <\d+>?1}" controller="App\Controller\BlogController::list"/>
 
             <!-- ... -->
         </routes>
diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst
index cbd005d690f..522d01e3970 100644
--- a/routing/custom_route_loader.rst
+++ b/routing/custom_route_loader.rst
@@ -230,7 +230,7 @@ Now define a service for the ``ExtraLoader``:
                 <!-- ... -->
 
                 <service id="App\Routing\ExtraLoader">
-                    <tag name="routing.loader" />
+                    <tag name="routing.loader"/>
                 </service>
             </services>
         </container>
@@ -274,7 +274,7 @@ What remains to do is adding a few lines to the routing configuration:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="." type="extra" />
+            <import resource="." type="extra"/>
         </routes>
 
     .. code-block:: php
diff --git a/routing/external_resources.rst b/routing/external_resources.rst
index ccbad58cf6f..b610ac87e0e 100644
--- a/routing/external_resources.rst
+++ b/routing/external_resources.rst
@@ -46,16 +46,16 @@ This can be done by importing routing resources from the main routing file:
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
             <!-- loads routes from the given routing file stored in some bundle -->
-            <import resource="@AcmeOtherBundle/Resources/config/routing.yaml" />
+            <import resource="@AcmeOtherBundle/Resources/config/routing.yaml"/>
 
             <!-- loads routes from the PHP annotations of the controllers found in that directory -->
-            <import resource="../src/Controller/" type="annotation" />
+            <import resource="../src/Controller/" type="annotation"/>
 
             <!-- loads routes from the YAML or XML files found in that directory -->
-            <import resource="../legacy/routing/" type="directory" />
+            <import resource="../legacy/routing/" type="directory"/>
 
             <!-- loads routes from the YAML or XML files found in some bundle directory -->
-            <import resource="@AppBundle/Resources/config/routing/public/" type="directory" />
+            <import resource="@AppBundle/Resources/config/routing/public/" type="directory"/>
         </routes>
 
     .. code-block:: php
@@ -122,7 +122,7 @@ suppose you want to prefix all application routes with ``/site`` (e.g.
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="../src/Controller/" type="annotation" prefix="/site" />
+            <import resource="../src/Controller/" type="annotation" prefix="/site"/>
         </routes>
 
     .. code-block:: php
@@ -170,7 +170,7 @@ be prefixed with the string ``/site``.
                     resource="../src/Controller/"
                     type="annotation"
                     prefix="/site"
-                    trailing-slash-on-root="false" />
+                    trailing-slash-on-root="false"/>
             </routes>
 
         .. code-block:: php
@@ -240,7 +240,7 @@ a controller class or imported from a configuration file:
             <import
                 resource="../src/Controller/"
                 type="annotation"
-                name-prefix="blog_" />
+                name-prefix="blog_"/>
         </routes>
 
     .. code-block:: php
diff --git a/routing/hostname_pattern.rst b/routing/hostname_pattern.rst
index d8f68d61715..bb1f918e91f 100644
--- a/routing/hostname_pattern.rst
+++ b/routing/hostname_pattern.rst
@@ -59,9 +59,9 @@ You can also match on the HTTP *host* of the incoming request.
             <route id="mobile_homepage"
                 path="/"
                 host="m.example.com"
-                controller="App\Controller\MainController::mobileHomepage" />
+                controller="App\Controller\MainController::mobileHomepage"/>
 
-            <route id="homepage" path="/" controller="App\Controller\MainController::homepage" />
+            <route id="homepage" path="/" controller="App\Controller\MainController::homepage"/>
         </routes>
 
     .. code-block:: php
@@ -145,9 +145,9 @@ you can use placeholders in your hostname:
             <route id="projects_homepage"
                 path="/"
                 host="{project}.example.com"
-                controller="App\Controller\MainController::projectsHomepage" />
+                controller="App\Controller\MainController::projectsHomepage"/>
 
-            <route id="homepage" path="/" controller="App\Controller\MainController::homepage" />
+            <route id="homepage" path="/" controller="App\Controller\MainController::homepage"/>
         </routes>
 
     .. code-block:: php
@@ -239,7 +239,7 @@ instance, if you want to match both ``m.example.com`` and
                 <requirement key="subdomain">m|mobile</requirement>
             </route>
 
-            <route id="homepage" path="/" controller="App\Controller\MainController::homepage" />
+            <route id="homepage" path="/" controller="App\Controller\MainController::homepage"/>
         </routes>
 
     .. code-block:: php
@@ -338,7 +338,7 @@ instance, if you want to match both ``m.example.com`` and
                     <requirement key="domain">%domain%</requirement>
                 </route>
 
-                <route id="homepage" path="/" controller="App\Controller\MainController::homepage" />
+                <route id="homepage" path="/" controller="App\Controller\MainController::homepage"/>
             </routes>
 
         .. code-block:: php
@@ -411,7 +411,7 @@ You can also set the host option on imported routes:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="@AcmeHelloBundle/Resources/config/routing.xml" host="hello.example.com" />
+            <import resource="@AcmeHelloBundle/Resources/config/routing.xml" host="hello.example.com"/>
         </routes>
 
     .. code-block:: php
diff --git a/routing/optional_placeholders.rst b/routing/optional_placeholders.rst
index e39fb9266ca..2d53844b0d0 100644
--- a/routing/optional_placeholders.rst
+++ b/routing/optional_placeholders.rst
@@ -43,7 +43,7 @@ the available blog posts for this imaginary blog application:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="blog" path="/blog" controller="App\Controller\BlogController::index" />
+            <route id="blog" path="/blog" controller="App\Controller\BlogController::index"/>
         </routes>
 
     .. code-block:: php
@@ -96,7 +96,7 @@ entries? Update the route to have a new ``{page}`` placeholder:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="blog" path="/blog/{page}" controller="App\Controller\BlogController::index" />
+            <route id="blog" path="/blog/{page}" controller="App\Controller\BlogController::index"/>
         </routes>
 
     .. code-block:: php
diff --git a/routing/redirect_in_config.rst b/routing/redirect_in_config.rst
index 9b690618cb5..be643800cae 100644
--- a/routing/redirect_in_config.rst
+++ b/routing/redirect_in_config.rst
@@ -50,7 +50,7 @@ action to redirect to this new url:
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
             <!-- load some routes - one should ultimately have the path "/app" -->
-            <import resource="../src/Controller/" type="annotation" prefix="/app" />
+            <import resource="../src/Controller/" type="annotation" prefix="/app"/>
 
             <!-- redirecting the homepage -->
             <route id="homepage"
diff --git a/routing/requirements.rst b/routing/requirements.rst
index a18ffec93f4..e6bf328c758 100644
--- a/routing/requirements.rst
+++ b/routing/requirements.rst
@@ -241,12 +241,12 @@ accomplished with the following route configuration:
             <route id="api_post_show"
                 path="/api/posts/{id}"
                 controller="App\Controller\BlogApiController::show"
-                methods="GET|HEAD" />
+                methods="GET|HEAD"/>
 
             <route id="api_post_edit"
                 path="/api/posts/{id}"
                 controller="App\Controller\BlogApiController::edit"
-                methods="PUT" />
+                methods="PUT"/>
         </routes>
 
     .. code-block:: php
diff --git a/routing/scheme.rst b/routing/scheme.rst
index 5badcb080ba..b4951578fa8 100644
--- a/routing/scheme.rst
+++ b/routing/scheme.rst
@@ -46,7 +46,7 @@ the URI scheme via schemes:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="secure" path="/secure" schemes="https" controller="App\Controller\MainController::secure" />
+            <route id="secure" path="/secure" schemes="https" controller="App\Controller\MainController::secure"/>
         </routes>
 
     .. code-block:: php
diff --git a/routing/service_container_parameters.rst b/routing/service_container_parameters.rst
index fd21f5855f7..cd6bc35fe60 100644
--- a/routing/service_container_parameters.rst
+++ b/routing/service_container_parameters.rst
@@ -148,7 +148,7 @@ path):
 
             <route id="some_route"
                 path="/%app.route_prefix%/contact"
-                controller="App\Controller\MainController::contact" />
+                controller="App\Controller\MainController::contact"/>
         </routes>
 
     .. code-block:: php
diff --git a/security.rst b/security.rst
index 4de7e31761a..287579e6396 100644
--- a/security.rst
+++ b/security.rst
@@ -144,7 +144,7 @@ command will pre-configure this for you:
 
                 <encoder class="App\Entity\User"
                     algorithm="bcrypt"
-                    cost="12" />
+                    cost="12"/>
 
                 <!-- ... -->
             </config>
@@ -254,10 +254,10 @@ important section is ``firewalls``:
             <config>
                 <firewall name="dev"
                     pattern="^/(_(profiler|wdt)|css|images|js)/"
-                    security="false" />
+                    security="false"/>
 
                 <firewall name="main">
-                    <anonymous />
+                    <anonymous/>
                 </firewall>
             </config>
         </srv:container>
@@ -456,7 +456,7 @@ start with ``/admin``, you can:
                 </firewall>
 
                 <!-- require ROLE_ADMIN for /admin* -->
-                <rule path="^/admin" role="ROLE_ADMIN" />
+                <rule path="^/admin" role="ROLE_ADMIN"/>
             </config>
         </srv:container>
 
@@ -510,8 +510,8 @@ the list and stops when it finds the first match:
             <config>
                 <!-- ... -->
 
-                <rule path="^/admin/users" role="ROLE_SUPER_ADMIN" />
-                <rule path="^/admin" role="ROLE_ADMIN" />
+                <rule path="^/admin/users" role="ROLE_SUPER_ADMIN"/>
+                <rule path="^/admin" role="ROLE_ADMIN"/>
             </config>
         </srv:container>
 
@@ -772,7 +772,7 @@ To enable logging out, activate the  ``logout`` config parameter under your fire
 
                 <firewall name="secured_area">
                     <!-- ... -->
-                    <logout path="app_logout" />
+                    <logout path="app_logout"/>
                 </firewall>
             </config>
         </srv:container>
@@ -831,7 +831,7 @@ Next, you'll need to create a route for this URL (but not a controller):
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="app_logout" path="/logout" methods="GET" />
+            <route id="app_logout" path="/logout" methods="GET"/>
         </routes>
 
     ..  code-block:: php
diff --git a/security/access_control.rst b/security/access_control.rst
index a669ddbc0c6..012609cc4e1 100644
--- a/security/access_control.rst
+++ b/security/access_control.rst
@@ -58,11 +58,11 @@ Take the following ``access_control`` entries as an example:
 
             <config>
                 <!-- ... -->
-                <rule path="^/admin" role="ROLE_USER_IP" ip="127.0.0.1" />
-                <rule path="^/admin" role="ROLE_USER_PORT" ip="127.0.0.1" port="8080" />
-                <rule path="^/admin" role="ROLE_USER_HOST" host="symfony\.com$" />
-                <rule path="^/admin" role="ROLE_USER_METHOD" methods="POST, PUT" />
-                <rule path="^/admin" role="ROLE_USER" />
+                <rule path="^/admin" role="ROLE_USER_IP" ip="127.0.0.1"/>
+                <rule path="^/admin" role="ROLE_USER_PORT" ip="127.0.0.1" port="8080"/>
+                <rule path="^/admin" role="ROLE_USER_HOST" host="symfony\.com$"/>
+                <rule path="^/admin" role="ROLE_USER_METHOD" methods="POST, PUT"/>
+                <rule path="^/admin" role="ROLE_USER"/>
             </config>
         </srv:container>
 
@@ -215,7 +215,7 @@ pattern so that it is only accessible by requests from the local server itself:
                     <ip>::1</ip>
                 </rule>
 
-                <rule path="^/internal" role="ROLE_NO_ACCESS" />
+                <rule path="^/internal" role="ROLE_NO_ACCESS"/>
             </config>
         </srv:container>
 
@@ -292,7 +292,7 @@ key:
 
             <config>
                 <rule path="^/_internal/secure"
-                    allow-if="'127.0.0.1' == request.getClientIp() or is_granted('ROLE_ADMIN')" />
+                    allow-if="'127.0.0.1' == request.getClientIp() or is_granted('ROLE_ADMIN')"/>
             </config>
         </srv:container>
 
diff --git a/security/auth_providers.rst b/security/auth_providers.rst
index 3ecc692b329..f5ec3723c7b 100644
--- a/security/auth_providers.rst
+++ b/security/auth_providers.rst
@@ -63,7 +63,7 @@ To support HTTP Basic authentication, add the ``http_basic`` key to your firewal
                 <!-- ... -->
 
                 <firewall name="main">
-                    <http-basic realm="Secured Area" />
+                    <http-basic realm="Secured Area"/>
                 </firewall>
             </config>
         </srv:container>
@@ -130,7 +130,7 @@ Enable the x509 authentication for a particular firewall in the security configu
 
                 <firewall name="main">
                     <!-- ... -->
-                    <x509 provider="your_user_provider" />
+                    <x509 provider="your_user_provider"/>
                 </firewall>
             </config>
         </srv:container>
diff --git a/security/csrf.rst b/security/csrf.rst
index ebe79d9134e..f61358eaeca 100644
--- a/security/csrf.rst
+++ b/security/csrf.rst
@@ -44,7 +44,7 @@ for more information):
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:csrf-protection enabled="true" />
+                <framework:csrf-protection enabled="true"/>
             </framework:config>
         </container>
 
@@ -132,7 +132,7 @@ generate a CSRF token in the template and store it as a hidden form field:
 
     <form action="{{ url('admin_post_delete', { id: post.id }) }}" method="post">
         {# the argument of csrf_token() is an arbitrary string used to generate the token #}
-        <input type="hidden" name="token" value="{{ csrf_token('delete-item') }}" />
+        <input type="hidden" name="token" value="{{ csrf_token('delete-item') }}"/>
 
         <button type="submit">Delete item</button>
     </form>
diff --git a/security/force_https.rst b/security/force_https.rst
index fa6e9442e65..bf69d7ad995 100644
--- a/security/force_https.rst
+++ b/security/force_https.rst
@@ -41,7 +41,7 @@ access control:
                 <config>
                     <!-- ... -->
 
-                    <rule path="^/secure" role="ROLE_ADMIN" requires_channel="https" />
+                    <rule path="^/secure" role="ROLE_ADMIN" requires_channel="https"/>
                     <rule path="^/login"
                         role="IS_AUTHENTICATED_ANONYMOUSLY"
                         requires_channel="https"
diff --git a/security/form_login.rst b/security/form_login.rst
index bea979e42d1..981b71feccb 100644
--- a/security/form_login.rst
+++ b/security/form_login.rst
@@ -45,8 +45,8 @@ First, enable ``form_login`` under your firewall:
 
             <config>
                 <firewall name="main">
-                    <anonymous />
-                    <form-login login-path="login" check-path="login" />
+                    <anonymous/>
+                    <form-login login-path="login" check-path="login"/>
                 </firewall>
             </config>
         </srv:container>
@@ -124,7 +124,7 @@ configuration (``login``):
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="GET|POST" />
+            <route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="GET|POST"/>
         </routes>
 
     ..  code-block:: php
@@ -190,15 +190,15 @@ Finally, create the template:
 
     <form action="{{ path('login') }}" method="post">
         <label for="username">Username:</label>
-        <input type="text" id="username" name="_username" value="{{ last_username }}" />
+        <input type="text" id="username" name="_username" value="{{ last_username }}"/>
 
         <label for="password">Password:</label>
-        <input type="password" id="password" name="_password" />
+        <input type="password" id="password" name="_password"/>
 
         {#
             If you want to control the URL the user
             is redirected to on success (more details below)
-            <input type="hidden" name="_target_path" value="/account" />
+            <input type="hidden" name="_target_path" value="/account"/>
         #}
 
         <button type="submit">login</button>
@@ -287,7 +287,7 @@ security component:
 
                 <firewall name="secured_area">
                     <!-- ... -->
-                    <form-login csrf-token-generator="security.csrf.token_manager" />
+                    <form-login csrf-token-generator="security.csrf.token_manager"/>
                 </firewall>
             </config>
         </srv:container>
diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst
index a77cc36af52..08763fbfc95 100644
--- a/security/form_login_setup.rst
+++ b/security/form_login_setup.rst
@@ -245,7 +245,7 @@ a traditional HTML form that submits to ``/login``:
                 <firewall name="main">
                     <!-- ... -->
                     <guard>
-                        <authenticator class="App\Security\LoginFormAuthenticator" />
+                        <authenticator class="App\Security\LoginFormAuthenticator"/>
                     </guard>
                 </firewall>
             </config>
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
index 33ababe388c..ae3b5349898 100644
--- a/security/guard_authentication.rst
+++ b/security/guard_authentication.rst
@@ -215,7 +215,7 @@ Finally, configure your ``firewalls`` key in ``security.yaml`` to use this authe
                     pattern="^/"
                     anonymous="true"
                 >
-                    <logout />
+                    <logout/>
 
                     <guard>
                         <authenticator>App\Security\TokenAuthenticator</authenticator>
diff --git a/security/json_login_setup.rst b/security/json_login_setup.rst
index 8bc6bca20a2..c7fb73cb9f2 100644
--- a/security/json_login_setup.rst
+++ b/security/json_login_setup.rst
@@ -104,7 +104,7 @@ The next step is to configure a route in your app matching this path:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="POST" />
+            <route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="POST"/>
         </routes>
 
     .. code-block:: php
diff --git a/security/multiple_guard_authenticators.rst b/security/multiple_guard_authenticators.rst
index e0ddcca1f32..66896aa7075 100644
--- a/security/multiple_guard_authenticators.rst
+++ b/security/multiple_guard_authenticators.rst
@@ -47,7 +47,7 @@ This is how your security configuration can look in action:
             <config>
                 <!-- ... -->
                 <firewall name="default">
-                    <anonymous />
+                    <anonymous/>
                     <guard entry-point="App\Security\LoginFormAuthenticator">
                         <authenticator>App\Security\LoginFormAuthenticator</authenticator>
                         <authenticator>App\Security\FacebookConnectAuthenticator</authenticator>
@@ -130,14 +130,14 @@ the solution is to split the configuration into two separate firewalls:
                     </guard>
                 </firewall>
                 <firewall name="default">
-                    <anonymous />
+                    <anonymous/>
                     <guard>
                         <authenticator>App\Security\LoginFormAuthenticator</authenticator>
                     </guard>
                 </firewall>
-                <rule path="^/login" role="IS_AUTHENTICATED_ANONYMOUSLY" />
-                <rule path="^/api" role="ROLE_API_USER" />
-                <rule path="^/" role="ROLE_USER" />
+                <rule path="^/login" role="IS_AUTHENTICATED_ANONYMOUSLY"/>
+                <rule path="^/api" role="ROLE_API_USER"/>
+                <rule path="^/" role="ROLE_USER"/>
             </config>
         </srv:container>
 
diff --git a/security/named_encoders.rst b/security/named_encoders.rst
index f65878f07a7..fbf57fe8dce 100644
--- a/security/named_encoders.rst
+++ b/security/named_encoders.rst
@@ -88,7 +88,7 @@ be done with named encoders:
                 <!-- ... -->
                 <encoder class="harsh"
                     algorithm="bcrypt"
-                    cost="15" />
+                    cost="15"/>
             </config>
         </srv:container>
 
@@ -164,7 +164,7 @@ you must register a service for it in order to use it as a named encoder:
             <config>
                 <!-- ... -->
                 <encoder class="app_encoder"
-                    id="App\Security\Encoder\MyCustomPasswordEncoder" />
+                    id="App\Security\Encoder\MyCustomPasswordEncoder"/>
             </config>
         </srv:container>
 
diff --git a/security/remember_me.rst b/security/remember_me.rst
index 38f7a1d4af6..7396856f89f 100644
--- a/security/remember_me.rst
+++ b/security/remember_me.rst
@@ -50,7 +50,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
                     <remember-me
                         secret="%kernel.secret%"
                         lifetime="604800"
-                        path="/" />
+                        path="/"/>
                     <!-- by default, the feature is enabled by checking a checkbox
                          in the login form (see below), add always-remember-me="true"
                          to always enable it. -->
@@ -154,7 +154,7 @@ this:
     <form method="post">
         {# ... your form fields #}
 
-        <input type="checkbox" id="remember_me" name="_remember_me" checked />
+        <input type="checkbox" id="remember_me" name="_remember_me" checked/>
         <label for="remember_me">Keep me logged in</label>
 
         {# ... #}
diff --git a/security/user_provider.rst b/security/user_provider.rst
index 5ec911be778..b1bf2b8b1f5 100644
--- a/security/user_provider.rst
+++ b/security/user_provider.rst
@@ -73,12 +73,12 @@ to retrieve them:
                 <provider name="users">
                     <!-- 'class' is the entity that represents users and 'property'
                          is the entity property to query by - e.g. username, email, etc -->
-                    <entity class="App\Entity\User" property="username" />
+                    <entity class="App\Entity\User" property="username"/>
 
                     <!-- optional: if you're using multiple Doctrine entity
                          managers, this option defines which one to use -->
                     <!-- <entity class="App\Entity\User" property="username"
-                                 manager-name="customer" /> -->
+                                 manager-name="customer"/> -->
                 </provider>
 
                 <!-- ... -->
@@ -175,7 +175,7 @@ To finish this, remove the ``property`` key from the user provider in
                 <!-- ... -->
 
                 <provider name="users">
-                    <entity class="App\Entity\User" />
+                    <entity class="App\Entity\User"/>
                 </provider>
             </config>
         </srv:container>
diff --git a/serializer.rst b/serializer.rst
index 72515c00106..b31fefb7e4f 100644
--- a/serializer.rst
+++ b/serializer.rst
@@ -101,7 +101,7 @@ properties and setters (``setXxx()``) to change properties:
 
             <services>
                 <service id="get_set_method_normalizer" class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer" public="false">
-                    <tag name="serializer.normalizer" />
+                    <tag name="serializer.normalizer"/>
                 </service>
             </services>
         </container>
@@ -186,7 +186,7 @@ value:
         <!-- config/packages/framework.xml -->
         <framework:config>
             <!-- ... -->
-            <framework:serializer name-converter="serializer.name_converter.camel_case_to_snake_case" />
+            <framework:serializer name-converter="serializer.name_converter.camel_case_to_snake_case"/>
         </framework:config>
 
     .. code-block:: php
diff --git a/service_container.rst b/service_container.rst
index 64f1e0330fd..69dc8b2470f 100644
--- a/service_container.rst
+++ b/service_container.rst
@@ -173,9 +173,9 @@ each time you ask for it.
 
                 <services>
                     <!-- Default configuration for services in *this* file -->
-                    <defaults autowire="true" autoconfigure="true" public="false" />
+                    <defaults autowire="true" autoconfigure="true" public="false"/>
 
-                    <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}" />
+                    <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}"/>
                 </services>
             </container>
 
@@ -416,7 +416,7 @@ pass here. No problem! In your configuration, you can explicitly set this argume
                 <!-- ... -->
 
                 <!-- Same as before -->
-                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}" />
+                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}"/>
 
                 <!-- Explicitly configure the service -->
                 <service id="App\Updates\SiteUpdateManager">
@@ -604,7 +604,7 @@ But, you can control this and pass in a different logger:
 
                 <!-- Explicitly configure the service -->
                 <service id="App\Service\MessageGenerator">
-                    <argument key="$logger" type="service" id="monolog.logger.request" />
+                    <argument key="$logger" type="service" id="monolog.logger.request"/>
                 </service>
             </services>
         </container>
@@ -883,7 +883,7 @@ key. For example, the default Symfony configuration contains this:
             <services>
                 <!-- ... -->
 
-                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}" />
+                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}"/>
             </services>
         </container>
 
@@ -1020,18 +1020,18 @@ admin email. In this case, each needs to have a unique service id:
                 <!-- ... -->
 
                 <service id="site_update_manager.superadmin" class="App\Updates\SiteUpdateManager" autowire="false">
-                    <argument type="service" id="App\Service\MessageGenerator" />
-                    <argument type="service" id="mailer" />
+                    <argument type="service" id="App\Service\MessageGenerator"/>
+                    <argument type="service" id="mailer"/>
                     <argument>superadmin@example.com</argument>
                 </service>
 
                 <service id="site_update_manager.normal_users" class="App\Updates\SiteUpdateManager" autowire="false">
-                    <argument type="service" id="App\Service\MessageGenerator" />
-                    <argument type="service" id="mailer" />
+                    <argument type="service" id="App\Service\MessageGenerator"/>
+                    <argument type="service" id="mailer"/>
                     <argument>contact@example.com</argument>
                 </service>
 
-                <service id="App\Updates\SiteUpdateManager" alias="site_update_manager.superadmin" />
+                <service id="App\Updates\SiteUpdateManager" alias="site_update_manager.superadmin"/>
             </services>
         </container>
 
diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst
index d1e01f79b02..e2455b09972 100644
--- a/service_container/3.3-di-changes.rst
+++ b/service_container/3.3-di-changes.rst
@@ -69,12 +69,12 @@ what the file looks like in Symfony 4):
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <defaults autowire="true" autoconfigure="true" public="false" />
+                <defaults autowire="true" autoconfigure="true" public="false"/>
 
-                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}" />
+                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}"/>
 
                 <prototype namespace="App\Controller\" resource="../src/Controller">
-                    <tag name="controller.service_arguments" />
+                    <tag name="controller.service_arguments"/>
                 </prototype>
 
                 <!-- add more services, or override services that need manual wiring -->
@@ -122,7 +122,7 @@ thanks to the following config:
             <services>
                 <!-- ... -->
 
-                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}" />
+                <prototype namespace="App\" resource="../src/*" exclude="../src/{Entity,Migrations,Tests}"/>
             </services>
         </container>
 
@@ -194,12 +194,12 @@ service as an argument to another with the following config:
 
             <services>
                 <service id="app.invoice_generator"
-                    class="App\Service\InvoiceGenerator" />
+                    class="App\Service\InvoiceGenerator"/>
 
                 <service id="app.invoice_mailer"
                     class="App\Service\InvoiceMailer">
 
-                    <argument type="service" id="app.invoice_generator" />
+                    <argument type="service" id="app.invoice_generator"/>
                 </service>
             </services>
         </container>
@@ -311,7 +311,7 @@ The third big change is that, in a new Symfony 3.3 project, your controllers are
                 <!-- ... -->
 
                 <prototype namespace="App\Controller\" resource="../src/Controller">
-                    <tag name="controller.service_arguments" />
+                    <tag name="controller.service_arguments"/>
                 </prototype>
             </services>
         </container>
@@ -457,7 +457,7 @@ inherited from an abstract definition:
                 <!-- ... -->
 
                 <instanceof id="App\Domain\LoaderInterface" public="true">
-                    <tag name="app.domain_loader" />
+                    <tag name="app.domain_loader"/>
                 </instanceof>
             </services>
         </container>
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
index 44925e2c6e9..18d1d22464c 100644
--- a/service_container/alias_private.rst
+++ b/service_container/alias_private.rst
@@ -48,7 +48,7 @@ You can also control the ``public`` option on a service-by-service basis:
             xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Service\Foo" public="false" />
+                <service id="App\Service\Foo" public="false"/>
             </services>
         </container>
 
@@ -114,9 +114,9 @@ services.
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Mail\PhpMailer" public="false" />
+                <service id="App\Mail\PhpMailer" public="false"/>
 
-                <service id="app.mailer" alias="App\Mail\PhpMailer" />
+                <service id="app.mailer" alias="App\Mail\PhpMailer"/>
             </services>
         </container>
 
@@ -183,7 +183,7 @@ The following example shows how to inject an anonymous service into another serv
             <services>
                 <service id="foo" class="App\Foo">
                     <argument type="service">
-                        <service class="App\AnonymousBar" />
+                        <service class="App\AnonymousBar"/>
                     </argument>
                 </service>
             </services>
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
index 958b9f7510c..38957df4fff 100644
--- a/service_container/autowiring.rst
+++ b/service_container/autowiring.rst
@@ -92,12 +92,12 @@ both services:
             xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <defaults autowire="true" autoconfigure="true" public="false" />
+                <defaults autowire="true" autoconfigure="true" public="false"/>
                 <!-- ... -->
 
-                <service id="App\Service\TwitterClient" autowire="true" />
+                <service id="App\Service\TwitterClient" autowire="true"/>
 
-                <service id="App\Util\Rot13Transformer" autowire="true" />
+                <service id="App\Util\Rot13Transformer" autowire="true"/>
             </services>
         </container>
 
@@ -221,8 +221,8 @@ adding a service alias:
             <services>
                 <!-- ... -->
 
-                <service id="app.rot13.transformer" class="App\Util\Rot13Transformer" autowire="true" />
-                <service id="App\Util\Rot13Transformer" alias="app.rot13.transformer" />
+                <service id="app.rot13.transformer" class="App\Util\Rot13Transformer" autowire="true"/>
+                <service id="App\Util\Rot13Transformer" alias="app.rot13.transformer"/>
             </services>
         </container>
 
@@ -315,9 +315,9 @@ To fix that, add an :ref:`alias <service-autowiring-alias>`:
 
             <services>
                 <!-- ... -->
-                <service id="App\Util\Rot13Transformer" />
+                <service id="App\Util\Rot13Transformer"/>
 
-                <service id="App\Util\TransformerInterface" alias="App\Util\Rot13Transformer" />
+                <service id="App\Util\TransformerInterface" alias="App\Util\Rot13Transformer"/>
             </services>
         </container>
 
@@ -401,13 +401,13 @@ that alias:
 
             <services>
                 <!-- ... -->
-                <service id="App\Util\Rot13Transformer" />
-                <service id="App\Util\UppercaseTransformer" />
+                <service id="App\Util\Rot13Transformer"/>
+                <service id="App\Util\UppercaseTransformer"/>
 
-                <service id="App\Util\TransformerInterface" alias="App\Util\Rot13Transformer" />
+                <service id="App\Util\TransformerInterface" alias="App\Util\Rot13Transformer"/>
 
                 <service id="App\Service\TwitterClient" autowire="true">
-                    <!-- <argument key="$transformer" type="service" id="App\Util\UppercaseTransformer" /> -->
+                    <!-- <argument key="$transformer" type="service" id="App\Util\UppercaseTransformer"/> -->
                 </service>
             </services>
         </container>
diff --git a/service_container/configurators.rst b/service_container/configurators.rst
index 19032e9abfd..4287b9ba24d 100644
--- a/service_container/configurators.rst
+++ b/service_container/configurators.rst
@@ -151,14 +151,14 @@ all the classes are already loaded as services. All you need to do is specify th
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <prototype namespace="App\" resource="../src/*" />
+                <prototype namespace="App\" resource="../src/*"/>
 
                 <service id="App\Mail\NewsletterManager">
-                    <configurator service="App\Mail\EmailConfigurator" method="configure" />
+                    <configurator service="App\Mail\EmailConfigurator" method="configure"/>
                 </service>
 
                 <service id="App\Mail\GreetingCardManager">
-                    <configurator service="App\Mail\EmailConfigurator" method="configure" />
+                    <configurator service="App\Mail\EmailConfigurator" method="configure"/>
                 </service>
             </services>
         </container>
diff --git a/service_container/factories.rst b/service_container/factories.rst
index 88ff23056ac..97e9fefd634 100644
--- a/service_container/factories.rst
+++ b/service_container/factories.rst
@@ -55,12 +55,12 @@ configure the service container to use the
             <services>
                 <service id="App\Email\NewsletterManager">
                     <!-- call the static method -->
-                    <factory class="App\Email\NewsletterManagerStaticFactory" method="createNewsletterManager" />
+                    <factory class="App\Email\NewsletterManagerStaticFactory" method="createNewsletterManager"/>
 
                     <!-- if the factory class is the same as the service class, you can omit
                          the 'class' attribute and define just the 'method' attribute:
 
-                         <factory method="createNewsletterManager" />
+                         <factory method="createNewsletterManager"/>
                     -->
                 </service>
             </services>
@@ -116,7 +116,7 @@ Configuration of the service container then looks like this:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Email\NewsletterManagerFactory" />
+                <service id="App\Email\NewsletterManagerFactory"/>
 
                 <service id="App\Email\NewsletterManager">
                     <!-- call a method on the specified factory service -->
diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst
index ee497678b7a..19f1cbd248c 100644
--- a/service_container/injection_types.rst
+++ b/service_container/injection_types.rst
@@ -146,7 +146,7 @@ that accepts the dependency::
 
                 <service id="app.newsletter_manager" class="App\Mail\NewsletterManager">
                     <call method="setMailer">
-                        <argument type="service" id="mailer" />
+                        <argument type="service" id="mailer"/>
                     </call>
                 </service>
             </services>
@@ -220,7 +220,7 @@ Another possibility is setting public fields of the class directly::
                 <!-- ... -->
 
                 <service id="app.newsletter_manager" class="App\Mail\NewsletterManager">
-                    <property name="mailer" type="service" id="mailer" />
+                    <property name="mailer" type="service" id="mailer"/>
                 </service>
             </services>
         </container>
diff --git a/service_container/lazy_services.rst b/service_container/lazy_services.rst
index 807cd057a0d..fa198777e3e 100644
--- a/service_container/lazy_services.rst
+++ b/service_container/lazy_services.rst
@@ -57,7 +57,7 @@ You can mark the service as ``lazy`` by manipulating its definition:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Twig\AppExtension" lazy="true" />
+                <service id="App\Twig\AppExtension" lazy="true"/>
             </services>
         </container>
 
diff --git a/service_container/optional_dependencies.rst b/service_container/optional_dependencies.rst
index f4baa529f5a..0b01b32e211 100644
--- a/service_container/optional_dependencies.rst
+++ b/service_container/optional_dependencies.rst
@@ -26,7 +26,7 @@ if the service does not exist:
                 <!-- ... -->
 
                 <service id="App\Newsletter\NewsletterManager">
-                    <argument type="service" id="logger" on-invalid="null" />
+                    <argument type="service" id="logger" on-invalid="null"/>
                 </service>
             </services>
         </container>
diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst
index 8a2fedd10b4..77015d37409 100644
--- a/service_container/parent_services.rst
+++ b/service_container/parent_services.rst
@@ -94,10 +94,10 @@ duplicated service definitions:
 
             <services>
                 <service id="App\Repository\BaseDoctrineRepository" abstract="true">
-                    <argument type="service" id="doctrine.orm.entity_manager" />
+                    <argument type="service" id="doctrine.orm.entity_manager"/>
 
                     <call method="setLogger">
-                        <argument type="service" id="logger" />
+                        <argument type="service" id="logger"/>
                     </call>
                 </service>
 
@@ -212,14 +212,14 @@ the child class:
                 >
                     <!-- appends the '@app.username_checker' argument to the parent
                          argument list -->
-                    <argument type="service" id="app.username_checker" />
+                    <argument type="service" id="app.username_checker"/>
                 </service>
 
                 <service id="App\Repository\DoctrinePostRepository"
                     parent="App\Repository\BaseDoctrineRepository"
                 >
                     <!-- overrides the first argument (using the index attribute) -->
-                    <argument index="0" type="service" id="doctrine.custom_entity_manager" />
+                    <argument index="0" type="service" id="doctrine.custom_entity_manager"/>
                 </service>
 
                 <!-- ... -->
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
index 0086fe65dd1..80c16374def 100644
--- a/service_container/service_decoration.rst
+++ b/service_container/service_decoration.rst
@@ -28,11 +28,11 @@ When overriding an existing definition, the original service is lost:
             xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Mailer" />
+                <service id="App\Mailer"/>
 
                 <!-- this replaces the old App\Mailer definition with the new
                      one, the old definition is lost -->
-                <service id="App\Mailer" class="App\NewMailer" />
+                <service id="App\Mailer" class="App\NewMailer"/>
             </services>
         </container>
 
@@ -76,7 +76,7 @@ but keeps a reference of the old one as ``App\DecoratingMailer.inner``:
             xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Mailer" />
+                <service id="App\Mailer"/>
 
                 <service id="App\DecoratingMailer"
                     decorates="App\Mailer"
@@ -131,12 +131,12 @@ automatically changed to ``decorating_service_id + '.inner'``):
             xsd:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Mailer" />
+                <service id="App\Mailer"/>
 
                 <service id="App\DecoratingMailer"
                     decorates="App\Mailer"
                 >
-                    <argument type="service" id="App\DecoratingMailer.inner" />
+                    <argument type="service" id="App\DecoratingMailer.inner"/>
                 </service>
 
             </services>
@@ -197,7 +197,7 @@ automatically changed to ``decorating_service_id + '.inner'``):
                         decoration-inner-name="App\DecoratingMailer.wooz"
                         public="false"
                     >
-                        <argument type="service" id="App\DecoratingMailer.wooz" />
+                        <argument type="service" id="App\DecoratingMailer.wooz"/>
                     </service>
 
                 </services>
@@ -251,14 +251,14 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
             xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="Foo" />
+                <service id="Foo"/>
 
                 <service id="Bar" decorates="Foo" decoration-priority="5" public="false">
-                    <argument type="service" id="Bar.inner" />
+                    <argument type="service" id="Bar.inner"/>
                 </service>
 
                 <service id="Baz" decorates="Foo" decoration-priority="1" public="false">
-                    <argument type="service" id="Baz.inner" />
+                    <argument type="service" id="Baz.inner"/>
                 </service>
             </services>
         </container>
diff --git a/service_container/service_subscribers_locators.rst b/service_container/service_subscribers_locators.rst
index f92c56a3cd0..19272798fcf 100644
--- a/service_container/service_subscribers_locators.rst
+++ b/service_container/service_subscribers_locators.rst
@@ -216,7 +216,7 @@ service type to a service.
             <services>
 
                 <service id="App\CommandBus">
-                    <tag name="container.service_subscriber" key="logger" id="monolog.logger.event" />
+                    <tag name="container.service_subscriber" key="logger" id="monolog.logger.event"/>
                 </service>
 
             </services>
@@ -274,13 +274,13 @@ include as many services as needed in it.
 
                 <service id="app.command_handler_locator" class="Symfony\Component\DependencyInjection\ServiceLocator">
                     <argument type="collection">
-                        <argument key="App\FooCommand" type="service" id="app.command_handler.foo" />
-                        <argument key="App\BarCommand" type="service" id="app.command_handler.bar" />
+                        <argument key="App\FooCommand" type="service" id="app.command_handler.foo"/>
+                        <argument key="App\BarCommand" type="service" id="app.command_handler.bar"/>
                     </argument>
                     <!--
                         if you are not using the default service autoconfiguration,
                         add the following tag to the service definition:
-                        <tag name="container.service_locator" />
+                        <tag name="container.service_locator"/>
                     -->
                 </service>
 
@@ -333,7 +333,7 @@ Now you can use the service locator by injecting it in any other service:
             <services>
 
                 <service id="App\CommandBus">
-                    <argument type="service" id="app.command_handler_locator" />
+                    <argument type="service" id="app.command_handler_locator"/>
                 </service>
 
             </services>
diff --git a/service_container/shared.rst b/service_container/shared.rst
index decb9d09cf2..00f0ddf0e43 100644
--- a/service_container/shared.rst
+++ b/service_container/shared.rst
@@ -26,7 +26,7 @@ in your service definition:
 
         <!-- config/services.xml -->
         <services>
-            <service id="App\SomeNonSharedService" shared="false" />
+            <service id="App\SomeNonSharedService" shared="false"/>
         </services>
 
     .. code-block:: php
diff --git a/service_container/tags.rst b/service_container/tags.rst
index 8d49f6b6693..b9a343e293d 100644
--- a/service_container/tags.rst
+++ b/service_container/tags.rst
@@ -30,7 +30,7 @@ example:
 
             <services>
                 <service id="App\Twig\AppExtension" public="false">
-                    <tag name="twig.extension" />
+                    <tag name="twig.extension"/>
                 </service>
             </services>
         </container>
@@ -88,7 +88,7 @@ If you want to apply tags automatically for your own services, use the
                 <!-- this config only applies to the services created by this file -->
                 <instanceof id="App\Security\CustomInterface" autowire="true">
                     <!-- services whose classes are instances of CustomInterface will be tagged automatically -->
-                    <tag name="app.custom_tag" />
+                    <tag name="app.custom_tag"/>
                 </instanceof>
             </services>
         </container>
@@ -175,7 +175,7 @@ Then, define the chain as a service:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="App\Mail\TransportChain" />
+                <service id="App\Mail\TransportChain"/>
             </services>
         </container>
 
@@ -219,11 +219,11 @@ For example, you may add the following transports as services:
                 <service id="Swift_SmtpTransport">
                     <argument>%mailer_host%</argument>
 
-                    <tag name="app.mail_transport" />
+                    <tag name="app.mail_transport"/>
                 </service>
 
                 <service class="\Swift_SendmailTransport">
-                    <tag name="app.mail_transport" />
+                    <tag name="app.mail_transport"/>
                 </service>
             </services>
         </container>
@@ -375,11 +375,11 @@ To answer this, change the service declaration:
                 <service id="Swift_SmtpTransport">
                     <argument>%mailer_host%</argument>
 
-                    <tag name="app.mail_transport" alias="smtp" />
+                    <tag name="app.mail_transport" alias="smtp"/>
                 </service>
 
                 <service id="Swift_SendmailTransport">
-                    <tag name="app.mail_transport" alias="sendmail" />
+                    <tag name="app.mail_transport" alias="sendmail"/>
                 </service>
             </services>
         </container>
@@ -483,16 +483,16 @@ first  constructor argument to the ``App\HandlerCollection`` service:
 
             <services>
                 <service id="App\Handler\One">
-                    <tag name="app.handler" />
+                    <tag name="app.handler"/>
                 </service>
 
                 <service id="App\Handler\Two">
-                    <tag name="app.handler" />
+                    <tag name="app.handler"/>
                 </service>
 
                 <service id="App\HandlerCollection">
                     <!-- inject all services tagged with app.handler as first argument -->
-                    <argument type="tagged" tag="app.handler" />
+                    <argument type="tagged" tag="app.handler"/>
                 </service>
             </services>
         </container>
@@ -550,7 +550,7 @@ application handlers::
 
                 <services>
                     <service id="App\Handler\One">
-                        <tag name="app.handler" priority="20" />
+                        <tag name="app.handler" priority="20"/>
                     </service>
                 </services>
             </container>
diff --git a/session.rst b/session.rst
index 7795bb10934..2da8448f457 100644
--- a/session.rst
+++ b/session.rst
@@ -48,7 +48,7 @@ sessions, check their default configuration:
                 <framework:session enabled="true"
                                    handler-id="null"
                                    cookie-secure="auto"
-                                   cookie-samesite="lax" />
+                                   cookie-samesite="lax"/>
             </framework:config>
         </container>
 
@@ -105,7 +105,7 @@ session metadata files:
             <framework:config>
                 <framework:session enabled="true"
                                    handler-id="session.handler.native_file"
-                                   save-path="%kernel.project_dir%/var/sessions/%kernel.environment%" />
+                                   save-path="%kernel.project_dir%/var/sessions/%kernel.environment%"/>
             </framework:config>
         </container>
 
diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst
index dfa4e95f0b4..ab3b8be3b36 100644
--- a/session/locale_sticky_session.rst
+++ b/session/locale_sticky_session.rst
@@ -96,7 +96,7 @@ via some "Change Locale" route & controller), or create a route with a the :ref:
                         <argument>%kernel.default_locale%</argument>
 
                         <!-- uncomment the next line if you are not using autoconfigure -->
-                        <!-- <tag name="kernel.event_subscriber" /> -->
+                        <!-- <tag name="kernel.event_subscriber"/> -->
                     </service>
                 </services>
             </container>
diff --git a/session/proxy_examples.rst b/session/proxy_examples.rst
index 6e68e49578e..b11d1094147 100644
--- a/session/proxy_examples.rst
+++ b/session/proxy_examples.rst
@@ -38,7 +38,7 @@ Symfony to use your session handler instead of the default one:
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <framework:config>
-                <framework:session handler-id="App\Session\CustomSessionHandler" />
+                <framework:session handler-id="App\Session\CustomSessionHandler"/>
             </framework:config>
         </container>
 
diff --git a/templating.rst b/templating.rst
index 53985a54587..72c2eb068d5 100644
--- a/templating.rst
+++ b/templating.rst
@@ -524,7 +524,7 @@ configuration:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="welcome" path="/" controller="App\Controller\WelcomeController::index" methods="GET" />
+            <route id="welcome" path="/" controller="App\Controller\WelcomeController::index" methods="GET"/>
         </routes>
 
     .. code-block:: php
@@ -590,7 +590,7 @@ route:
             <route id="article_show"
                 path="/article/{slug}"
                 controller="App\Controller\ArticleController::show"
-                methods="GET" />
+                methods="GET"/>
         </routes>
 
     .. code-block:: php
diff --git a/testing.rst b/testing.rst
index e904f23f590..d92d71a463b 100644
--- a/testing.rst
+++ b/testing.rst
@@ -889,7 +889,7 @@ configuration option:
                 https://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
 
             <!-- ... -->
-            <swiftmailer:config disable-delivery="true" />
+            <swiftmailer:config disable-delivery="true"/>
         </container>
 
     .. code-block:: php
diff --git a/testing/database.rst b/testing/database.rst
index 98f66389e4c..ee48e55d8b1 100644
--- a/testing/database.rst
+++ b/testing/database.rst
@@ -129,7 +129,7 @@ To do this, you can override the value of the ``DATABASE_URL`` env var in the
     <phpunit>
         <php>
             <!-- the value is the Doctrine connection string in DSN format -->
-            <env name="DATABASE_URL" value="mysql://USERNAME:PASSWORD@127.0.0.1/DB_NAME" />
+            <env name="DATABASE_URL" value="mysql://USERNAME:PASSWORD@127.0.0.1/DB_NAME"/>
         </php>
         <!-- ... -->
     </phpunit>
diff --git a/testing/profiling.rst b/testing/profiling.rst
index 3a52617d480..659a07c7573 100644
--- a/testing/profiling.rst
+++ b/testing/profiling.rst
@@ -40,7 +40,7 @@ tests significantly. That's why Symfony disables it by default:
             <!-- ... -->
 
             <framework:config>
-                <framework:profiler enabled="true" collect="false" />
+                <framework:profiler enabled="true" collect="false"/>
             </framework:config>
         </container>
 
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst
index a229ffd7714..331f3529d50 100644
--- a/validation/custom_constraint.rst
+++ b/validation/custom_constraint.rst
@@ -144,8 +144,8 @@ You can use custom validators just as the ones provided by Symfony itself:
 
             <class name="App\Entity\AcmeEntity">
                 <property name="name">
-                    <constraint name="NotBlank" />
-                    <constraint name="App\Validator\Constraints\ContainsAlphanumeric" />
+                    <constraint name="NotBlank"/>
+                    <constraint name="App\Validator\Constraints\ContainsAlphanumeric"/>
                 </property>
             </class>
         </constraint-mapping>
@@ -237,5 +237,5 @@ not to the property:
 
         <!-- config/validator/validation.xml -->
         <class name="App\Entity\AcmeEntity">
-            <constraint name="App\Validator\Constraints\ProtocolClassValidator" />
+            <constraint name="App\Validator\Constraints\ProtocolClassValidator"/>
         </class>
diff --git a/validation/sequence_provider.rst b/validation/sequence_provider.rst
index ec32bae9c05..0a2983e5c22 100644
--- a/validation/sequence_provider.rst
+++ b/validation/sequence_provider.rst
@@ -75,11 +75,11 @@ username and the password are different only if all other validation passes
 
             <class name="App\Entity\User">
                 <property name="username">
-                    <constraint name="NotBlank" />
+                    <constraint name="NotBlank"/>
                 </property>
 
                 <property name="password">
-                    <constraint name="NotBlank" />
+                    <constraint name="NotBlank"/>
                 </property>
 
                 <getter property="passwordSafe">
@@ -223,7 +223,7 @@ entity and a new constraint group called ``Premium``:
 
             <class name="App\Entity\User">
                 <property name="name">
-                    <constraint name="NotBlank" />
+                    <constraint name="NotBlank"/>
                 </property>
 
                 <property name="creditCard">
@@ -332,7 +332,7 @@ provides a sequence of groups to be validated:
                 https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
             <class name="App\Entity\User">
-                <group-sequence-provider />
+                <group-sequence-provider/>
                 <!-- ... -->
             </class>
         </constraint-mapping>