Merge branch '4.2'

* 4.2: (27 commits)
  [VarExporter] dont call userland code with uninitialized objects
  Fix typos in doc blocks
  [Debug] ignore underscore vs backslash namespaces in DebugClassLoader
  [TwigBridge][Form] Prevent multiple rendering of form collection prototypes
  [FrameworkBundle] fix describing routes with no controllers
  [DI] move RegisterServiceSubscribersPass before DecoratorServicePass
  Update ValidationListener.php
  [Yaml] ensures that the mb_internal_encoding is reset to its initial value
  [Messenger] Restore message handlers laziness
  [WebLink] Fixed documentation link
  [Security] getTargetPath of TargetPathTrait must return string or null
  [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument
  Optimize perf by replacing call_user_func with dynamic vars
  [Cache] Fix dsn parsing
  [Routing] fix dumping same-path routes with placeholders
  [WebProfilerBundle][TwigBundle] CSS fixes
  Add a docblock for FormFactoryInterface
  [Security] defer log message in guard authenticator
  [Validator] Added IBAN format for Vatican City State
  merge conflicts
  ...

Author: nicolas-grekas

Console/Descriptor/TextDescriptor.php

@@ -57,7 +57,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
 
             if ($showControllers) {
                 $controller = $route->getDefault('_controller');
-                $row[] = $this->formatCallable($controller);
+                $row[] = $controller ? $this->formatCallable($controller) : '';
             }
 
             $tableRows[] = $row;

Controller/AbstractController.php

@@ -15,7 +15,6 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -27,6 +26,7 @@
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Templating\EngineInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Twig\Environment;
 
 /**

Controller/RedirectController.php

@@ -50,7 +50,7 @@ public function __construct(UrlGeneratorInterface $router = null, int $httpPort
      * @param string     $route             The route name to redirect to
      * @param bool       $permanent         Whether the redirection is permanent
      * @param bool|array $ignoreAttributes  Whether to ignore attributes or an array of attributes to ignore
-     * @param bool       $keepRequestMethod Wheter redirect action should keep HTTP request method
+     * @param bool       $keepRequestMethod Whether redirect action should keep HTTP request method
      *
      * @throws HttpException In case the route name is empty
      */
@@ -94,7 +94,7 @@ public function redirectAction(Request $request, string $route, bool $permanent
      * @param string|null $scheme            The URL scheme (null to keep the current one)
      * @param int|null    $httpPort          The HTTP port (null to keep the current one for the same scheme or the default configured port)
      * @param int|null    $httpsPort         The HTTPS port (null to keep the current one for the same scheme or the default configured port)
-     * @param bool        $keepRequestMethod Wheter redirect action should keep HTTP request method
+     * @param bool        $keepRequestMethod Whether redirect action should keep HTTP request method
      *
      * @throws HttpException In case the path is empty
      */

DependencyInjection/FrameworkExtension.php

@@ -37,7 +37,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
-use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -1602,12 +1601,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
                 $senders[$sender] = new Reference($senderAliases[$sender] ?? $sender);
             }
 
-            $sendersId = 'messenger.senders.'.$message;
-            $container->register($sendersId, RewindableGenerator::class)
-                ->setFactory('current')
-                ->addArgument(array(new IteratorArgument($senders)));
-            $messageToSendersMapping[$message] = new Reference($sendersId);
-
+            $messageToSendersMapping[$message] = new IteratorArgument($senders);
             $messagesToSendAndHandle[$message] = $messageConfiguration['send_and_handle'];
         }
 

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -651,10 +651,11 @@ public function testMessengerRouting()
         );
 
         $this->assertSame($messageToSendAndHandleMapping, $senderLocatorDefinition->getArgument(1));
+        $sendersMapping = $senderLocatorDefinition->getArgument(0);
         $this->assertEquals(array(
             'amqp' => new Reference('messenger.transport.amqp'),
             'audit' => new Reference('audit'),
-        ), $container->getDefinition('messenger.senders.'.DummyMessage::class)->getArgument(0)[0]->getValues());
+        ), $sendersMapping[DummyMessage::class]->getValues());
     }
 
     /**