Merge branch '4.1'

* 4.1:
  Fix Use Class
  fix RoleVoter behaviour description
  Fix a configuration-block not rendered
  Fixed the versionadded directive (RST syntax)
  Add missing container argument for ServiceLocatorTagPass::register() call
  fix order of member vars
  Added the missing XML and PHP formats to some config
  Update external_parameters.rst

Author: javiereguiluz

components/messenger.rst

@@ -175,8 +175,8 @@ First, create your sender::
 
     class ImportantActionToEmailSender implements SenderInterface
     {
-       private $toEmail;
        private $mailer;
+       private $toEmail;
 
        public function __construct(\Swift_Mailer $mailer, string $toEmail)
        {

configuration/environments.rst

@@ -267,7 +267,7 @@ environment through your browser:
 
     You can achieve this by using a special ``imports`` key:
 
-    .. configuration-block:
+    .. configuration-block::
 
         .. code-block:: yaml
 

configuration/external_parameters.rst

@@ -515,15 +515,10 @@ create a class that implements
 :class:`Symfony\\Component\\DependencyInjection\\EnvVarProcessorInterface` and
 then, define a service for that class::
 
+    use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
+
     class LowercasingEnvVarProcessor implements EnvVarProcessorInterface
     {
-        private $container;
-
-        public function __construct(ContainerInterface $container)
-        {
-            $this->container = $container;
-        }
-
         public function getEnv($prefix, $name, \Closure $getEnv)
         {
             $env = $getEnv($name);

logging/monolog_exclude_http_codes.rst

@@ -6,7 +6,7 @@
 How to Configure Monolog to Exclude Specific HTTP Codes from the Log
 ====================================================================
 
-..versionadded:: 4.1
+.. versionadded:: 4.1
     The ability to exclude log messages based on their status codes was
     introduced in Symfony 4.1 and MonologBundle 3.3.
 

messenger.rst

@@ -49,7 +49,7 @@ message handler. It's a class with an ``__invoke`` method::
     // src/MessageHandler/MyMessageHandler.php
     namespace App\MessageHandler;
 
-    use Symfony\Component\Messenger\Handler;
+    use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
     class MyMessageHandler implements MessageHandlerInterface
     {

reference/twig_reference.rst

@@ -305,9 +305,8 @@ is_granted
     **type**: ``string``
 
 Returns ``true`` if the current user has the given role. If several roles are
-passed in an array, returns ``true`` if the user has all of them or at least one
-of them, depending on the value of this option:
-:ref:`security.access_decision_manager.strategy <security-voters-change-strategy>`.
+passed in an array, ``true`` is returned if the user has at least one of
+them.
 
 Optionally, an object can be passed to be used by the voter. More information
 can be found in :ref:`security-template`.

routing.rst

@@ -241,6 +241,35 @@ with a locale. This can be done by defining a different prefix for each locale
                 en: '' # don't prefix URLs for English, the default locale
                 nl: '/nl'
 
+    .. code-block:: xml
+
+        <!-- config/routes/annotations.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <routes xmlns="http://symfony.com/schema/routing"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
+
+            <import resource="../src/Controller/" type="annotation">
+                <!-- don't prefix URLs for English, the default locale -->
+                <prefix locale="en"></prefix>
+                <prefix locale="nl">/nl</prefix>
+            </import>
+        </routes>
+
+    .. code-block:: php
+
+        // config/routes/annotations.php
+        use Symfony\Component\Routing\RouteCollection;
+
+        $routes = $loader->import('../src/Controller/', 'annotation');
+
+        // don't prefix URLs for English, the default locale
+        $app->addPrefix('/', array('_locale' => 'en'));
+        $app->addPrefix('/nl', array('_locale' => 'nl'));
+
+        return $routes;
+
 .. _routing-requirements:
 
 Adding {wildcard} Requirements

service_container/service_subscribers_locators.rst

@@ -375,7 +375,7 @@ will share identical locators amongst all the services referencing them::
             'logger' => new Reference('logger'),
         );
 
-        $myService->addArgument(ServiceLocatorTagPass::register($locateableServices));
+        $myService->addArgument(ServiceLocatorTagPass::register($container, $locateableServices));
     }
 
 .. _`Command pattern`: https://en.wikipedia.org/wiki/Command_pattern