Merge branch '4.2'

OskarStark · OskarStark · commit 165e57347c9e · 2019-04-24T13:16:02.000+02:00
* 4.2:
  ordered use statements for php code examples
diff --git a/components/ldap.rst b/components/ldap.rst
@@ -152,8 +152,8 @@ ______________
 Use the entry manager's :method:`Symfony\\Component\\Ldap\\Adapter\\ExtLdap\\EntryManager::applyOperations`
 method to update multiple attributes at once::
 
-    use Symfony\Component\Ldap\Ldap;
     use Symfony\Component\Ldap\Entry;
+    use Symfony\Component\Ldap\Ldap;
     // ...
 
     $entry = new Entry('cn=Fabien Potencier,dc=symfony,dc=com', [
diff --git a/components/mercure.rst b/components/mercure.rst
@@ -31,9 +31,9 @@ The following example shows the component in action::
     define('HUB_URL', 'https://demo.mercure.rocks/hub');
     define('JWT', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyJmb28iLCJiYXIiXSwicHVibGlzaCI6WyJmb28iXX19.LRLvirgONK13JgacQ_VbcjySbVhkSmHy3IznH3tA9PM');
 
+    use Symfony\Component\Mercure\Jwt\StaticJwtProvide;
     use Symfony\Component\Mercure\Publisher;
     use Symfony\Component\Mercure\Update;
-    use Symfony\Component\Mercure\Jwt\StaticJwtProvide;
 
     $publisher = new Publisher(HUB_URL, new StaticJwtProvide(JWT));
     // Serialize the update, and dispatch it to the hub, that will broadcast it to the clients
diff --git a/components/messenger.rst b/components/messenger.rst
@@ -82,8 +82,8 @@ are configured for you:
 Example::
 
     use App\Message\MyMessage;
-    use Symfony\Component\Messenger\MessageBus;
     use Symfony\Component\Messenger\Handler\HandlersLocator;
+    use Symfony\Component\Messenger\MessageBus;
     use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware;
 
     $bus = new MessageBus([
@@ -155,9 +155,9 @@ Instead of dealing directly with the messages in the middleware you receive the
 Hence you can inspect the envelope content and its stamps, or add any::
 
     use App\Message\Stamp\AnotherStamp;
-    use Symfony\Component\Messenger\Stamp\ReceivedStamp;
     use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
     use Symfony\Component\Messenger\Middleware\StackInterface;
+    use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 
     class MyOwnMiddleware implements MiddlewareInterface
     {
@@ -210,8 +210,8 @@ First, create your sender::
     namespace App\MessageSender;
 
     use App\Message\ImportantAction;
-    use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
     use Symfony\Component\Messenger\Envelope;
+    use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
 
     class ImportantActionToEmailSender implements SenderInterface
     {
@@ -264,9 +264,9 @@ First, create your receiver::
     namespace App\MessageReceiver;
 
     use App\Message\NewOrder;
+    use Symfony\Component\Messenger\Envelope;
     use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
     use Symfony\Component\Serializer\SerializerInterface;
-    use Symfony\Component\Messenger\Envelope;
 
     class NewOrdersFromCsvFileReceiver implements ReceiverInterface
     {
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -747,9 +747,9 @@ for encoding (array to format) and
 
 You can add new encoders to a Serializer instance by using its second constructor argument::
 
-    use Symfony\Component\Serializer\Serializer;
-    use Symfony\Component\Serializer\Encoder\XmlEncoder;
     use Symfony\Component\Serializer\Encoder\JsonEncoder;
+    use Symfony\Component\Serializer\Encoder\XmlEncoder;
+    use Symfony\Component\Serializer\Serializer;
 
     $encoders = [new XmlEncoder(), new JsonEncoder()];
     $serializer = new Serializer([], $encoders);
@@ -1061,11 +1061,11 @@ maximum depth is reached. This is especially useful when serializing entities
 having unique identifiers::
 
     use Doctrine\Common\Annotations\AnnotationReader;
-    use Symfony\Component\Serializer\Serializer;
     use Symfony\Component\Serializer\Annotation\MaxDepth;
     use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
     use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
     use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+    use Symfony\Component\Serializer\Serializer;
 
     class Foo
     {
@@ -1227,8 +1227,8 @@ If the class constructor defines arguments, as usually happens with
 arguments are missing. In those cases, use the ``default_constructor_arguments``
 context option::
 
-    use Symfony\Component\Serializer\Serializer;
     use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+    use Symfony\Component\Serializer\Serializer;
 
     class MyObj
     {
@@ -1347,8 +1347,8 @@ this is already set up and you only need to provide the configuration. Otherwise
 
     // ...
     use Symfony\Component\Serializer\Encoder\JsonEncoder;
-    use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
     use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
+    use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
     use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
     use Symfony\Component\Serializer\Serializer;
 
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
@@ -152,13 +152,13 @@ Outside a Symfony application, use the :class:`Symfony\\Component\\VarDumper\\Du
 
     require __DIR__.'/vendor/autoload.php';
 
-    use Symfony\Component\VarDumper\VarDumper;
     use Symfony\Component\VarDumper\Cloner\VarCloner;
     use Symfony\Component\VarDumper\Dumper\CliDumper;
     use Symfony\Component\VarDumper\Dumper\ContextProvider\CliContextProvider;
     use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
     use Symfony\Component\VarDumper\Dumper\HtmlDumper;
     use Symfony\Component\VarDumper\Dumper\ServerDumper;
+    use Symfony\Component\VarDumper\VarDumper;
 
     $cloner = new VarCloner();
     $fallbackDumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg']) ? new CliDumper() : new HtmlDumper();
diff --git a/form/form_themes.rst b/form/form_themes.rst
@@ -260,8 +260,8 @@ based on your form type name (e.g. ``ProductType`` equates to ``product``). If
 you're not sure what your form name is, look at the HTML code rendered for your
 form. You can also define this value explicitly with the ``block_name`` option::
 
-    use Symfony\Component\Form\FormBuilderInterface;
     use Symfony\Component\Form\Extension\Core\Type\TextType;
+    use Symfony\Component\Form\FormBuilderInterface;
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/mercure.rst b/mercure.rst
@@ -249,8 +249,8 @@ it will be handled automatically::
     namespace App\Controller;
 
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Messenger\MessageBusInterface;
     use Symfony\Component\Mercure\Update;
+    use Symfony\Component\Messenger\MessageBusInterface;
 
     class PublishController
     {
diff --git a/messenger.rst b/messenger.rst
@@ -698,10 +698,10 @@ Create your Transport Factory
 You need to give FrameworkBundle the opportunity to create your transport from a
 DSN. You will need a transport factory::
 
-    use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
-    use Symfony\Component\Messenger\Transport\TransportInterface;
     use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
     use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
+    use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
+    use Symfony\Component\Messenger\Transport\TransportInterface;
 
     class YourTransportFactory implements TransportFactoryInterface
     {
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -156,8 +156,8 @@ Are you building an API? You can already return JSON easily from any controller:
     // src/Controller/DefaultController.php
     namespace App\Controller;
 
-    use Symfony\Component\Routing\Annotation\Route;
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class DefaultController extends AbstractController
     {
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -25,8 +25,8 @@ use the logger in a controller, add a new argument type-hinted with ``LoggerInte
     namespace App\Controller;
 
     use Psr\Log\LoggerInterface;
-    use Symfony\Component\Routing\Annotation\Route;
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class DefaultController extends AbstractController
     {
@@ -110,8 +110,8 @@ Great! You can use this immediately in your controller::
 
     use App\GreetingGenerator;
     use Psr\Log\LoggerInterface;
-    use Symfony\Component\Routing\Annotation\Route;
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class DefaultController extends AbstractController
     {
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
@@ -380,8 +380,9 @@ alternatives based on the :ref:`service binding <services-binding>` feature:
 
         // config/services.php
         use App\Some\Service;
-        use Symfony\Component\DependencyInjection\Reference;
         use Psr\Log\LoggerInterface;
+        use Symfony\Component\DependencyInjection\Reference;
+
 
         $container->register(Service::class)
             ->setPublic(true)
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -259,13 +259,11 @@ you can pass the class name and the method as an array.
         namespace App\Entity;
 
         use App\Entity\Genre;
-        use Symfony\Component\Validator\Mapping\ClassMetadata;
         use Symfony\Component\Validator\Constraints as Assert;
+        use Symfony\Component\Validator\Mapping\ClassMetadata;
 
         class Author
         {
-            protected $genre;
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('genre', new Assert\Choice([
diff --git a/reference/constraints/DivisibleBy.rst b/reference/constraints/DivisibleBy.rst
@@ -85,8 +85,8 @@ The following constraints ensure that:
         // src/Entity/Item.php
         namespace App\Entity;
 
-        use Symfony\Component\Validator\Mapping\ClassMetadata;
         use Symfony\Component\Validator\Constraints as Assert;
+        use Symfony\Component\Validator\Mapping\ClassMetadata;
 
         class Item
         {
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst
@@ -146,8 +146,8 @@ option to the value of any of the ``CHECK_DNS_TYPE_*`` constants in the
         // src/Entity/Author.php
         namespace App\Entity;
 
-        use Symfony\Component\Validator\Mapping\ClassMetadata;
         use Symfony\Component\Validator\Constraints as Assert;
+        use Symfony\Component\Validator\Mapping\ClassMetadata;
 
         class Author
         {
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -1087,8 +1087,8 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
 
     .. code-block:: php
 
-        use App\Twig\AppExtension;
         use App\Twig\AnotherExtension;
+        use App\Twig\AppExtension;
 
         $container
             ->register(AppExtension::class)
@@ -1229,7 +1229,6 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
     .. code-block:: php
 
         use App\Twig\AppExtension;
-        use App\Twig\AnotherExtension;
 
         $container
             ->register(AppExtension::class)
diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst
@@ -168,12 +168,13 @@ a traditional HTML form that submits to ``/login``:
 
     use App\Entity\User;
     use Doctrine\ORM\EntityManagerInterface;
-    use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
+
     use Symfony\Component\HttpFoundation\RedirectResponse;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\Routing\RouterInterface;
     use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
     use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+    use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
     use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenException;
     use Symfony\Component\Security\Core\Security;
     use Symfony\Component\Security\Core\User\UserInterface;
diff --git a/security/user_provider.rst b/security/user_provider.rst
@@ -128,8 +128,8 @@ interface only requires one method: ``loadUserByUsername($username)``::
     // src/Repository/UserRepository.php
     namespace App\Repository;
 
-    use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
     use Doctrine\ORM\EntityRepository;
+    use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
 
     class UserRepository extends EntityRepository implements UserLoaderInterface
     {
@@ -480,8 +480,8 @@ and want to inject in your ``LoginFormAuthenticator`` a user provider of type
     // src/Security/LoginFormAuthenticator.php
     namespace App\Security;
 
-    use Symfony\Component\Security\Guard\Authenticator\AbstractFormLoginAuthenticator;
     use Symfony\Component\Security\Core\User\InMemoryUserProvider;
+    use Symfony\Component\Security\Guard\Authenticator\AbstractFormLoginAuthenticator;
 
     class LoginFormAuthenticator extends AbstractFormLoginAuthenticator
     {

Original file line number	Diff line number	Diff line change
@@ -260,8 +260,8 @@ based on your form type name (e.g. ``ProductType`` equates to ``product``). If
`260`	`260`	`you're not sure what your form name is, look at the HTML code rendered for your`
`261`	`261`	form. You can also define this value explicitly with the ``block_name`` option::
`262`	`262`
`263`		`- use Symfony\Component\Form\FormBuilderInterface;`
`264`	`263`	`use Symfony\Component\Form\Extension\Core\Type\TextType;`
	`264`	`+ use Symfony\Component\Form\FormBuilderInterface;`
`265`	`265`
`266`	`266`	`public function buildForm(FormBuilderInterface $builder, array $options)`
`267`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,8 @@ it will be handled automatically::`
`249`	`249`	`namespace App\Controller;`
`250`	`250`
`251`	`251`	`use Symfony\Component\HttpFoundation\Response;`
`252`		`- use Symfony\Component\Messenger\MessageBusInterface;`
`253`	`252`	`use Symfony\Component\Mercure\Update;`
	`253`	`+ use Symfony\Component\Messenger\MessageBusInterface;`
`254`	`254`
`255`	`255`	`class PublishController`
`256`	`256`	`{`
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,8 @@ Are you building an API? You can already return JSON easily from any controller:`
`156`	`156`	`// src/Controller/DefaultController.php`
`157`	`157`	`namespace App\Controller;`
`158`	`158`
`159`		`- use Symfony\Component\Routing\Annotation\Route;`
`160`	`159`	`use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;`
	`160`	`+ use Symfony\Component\Routing\Annotation\Route;`
`161`	`161`
`162`	`162`	`class DefaultController extends AbstractController`
`163`	`163`	`{`