Merge branch '3.4' into 4.1

* 3.4:
  [Validator] Add Japanese translations
  [Console] Fix input values allowed types

Author: Robin Chalas

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>