Merge branch '4.1'

* 4.1:
  [FrameworkBundle] Don't register MessengerDataCollector if messenger is not enabled
  [Validator] Add Japanese translations
  [Console] Fix input values allowed types

Author: Robin Chalas

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -118,6 +118,7 @@ class FrameworkExtension extends Extension
     private $sessionConfigEnabled = false;
     private $annotationsConfigEnabled = false;
     private $validatorConfigEnabled = false;
+    private $messengerConfigEnabled = false;
 
     /**
      * Responds to the app.config configuration parameter.
@@ -279,7 +280,7 @@ public function load(array $configs, ContainerBuilder $container)
             $this->registerLockConfiguration($config['lock'], $container, $loader);
         }
 
-        if ($this->isConfigEnabled($container, $config['messenger'])) {
+        if ($this->messengerConfigEnabled = $this->isConfigEnabled($container, $config['messenger'])) {
             $this->registerMessengerConfiguration($config['messenger'], $container, $loader, $config['serializer'], $config['validation']);
         } else {
             $container->removeDefinition('console.command.messenger_consume_messages');
@@ -466,6 +467,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             $container->getDefinition('translator.data_collector')->setDecoratedService('translator');
         }
 
+        if ($this->messengerConfigEnabled) {
+            $loader->load('messenger_debug.xml');
+        }
+
         $container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
         $container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
 

src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

@@ -52,9 +52,5 @@
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
             <tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="285" />
         </service>
-
-        <service id="data_collector.messenger" class="Symfony\Component\Messenger\DataCollector\MessengerDataCollector">
-            <tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
-        </service>
     </services>
 </container>

src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger_debug.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <defaults public="false" />
+
+        <service id="data_collector.messenger" class="Symfony\Component\Messenger\DataCollector\MessengerDataCollector">
+            <tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
+        </service>
+    </services>
+</container>

src/Symfony/Component/Console/Input/InputArgument.php

@@ -86,7 +86,7 @@ public function isArray()
     /**
      * Sets the default value.
      *
-     * @param mixed $default The default value
+     * @param string|string[] $default The default value
      *
      * @throws LogicException When incorrect default value is given
      */
@@ -110,7 +110,7 @@ public function setDefault($default = null)
     /**
      * Returns the default value.
      *
-     * @return mixed The default value
+     * @return string|string[] The default value
      */
     public function getDefault()
     {

src/Symfony/Component/Console/Input/InputInterface.php

@@ -85,7 +85,7 @@ public function getArguments();
      *
      * @param string $name The argument name
      *
-     * @return mixed The argument value
+     * @return string|string[] The argument value
      *
      * @throws InvalidArgumentException When argument given doesn't exist
      */
@@ -122,7 +122,7 @@ public function getOptions();
      *
      * @param string $name The option name
      *
-     * @return mixed The option value
+     * @return string|string[]|bool The option value
      *
      * @throws InvalidArgumentException When option given doesn't exist
      */

src/Symfony/Component/Console/Input/InputOption.php

@@ -149,7 +149,7 @@ public function isArray()
     /**
      * Sets the default value.
      *
-     * @param mixed $default The default value
+     * @param string|string[]|bool $default The default value
      *
      * @throws LogicException When incorrect default value is given
      */
@@ -173,7 +173,7 @@ public function setDefault($default = null)
     /**
      * Returns the default value.
      *
-     * @return mixed The default value
+     * @return string|string[]|bool The default value
      */
     public function getDefault()
     {

src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf

@@ -318,6 +318,14 @@
                 <source>Error</source>
                 <target>エラー</target>
             </trans-unit>
+            <trans-unit id="83">
+                <source>This is not a valid UUID.</source>
+                <target>有効なUUIDではありません。</target>
+            </trans-unit>
+            <trans-unit id="84">
+                <source>This value should be a multiple of {{ compared_value }}.</source>
+                <target>{{ compared_value }}の倍数でなければなりません。</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>