Merge branch '3.4' into 4.1

Robin Chalas · Robin Chalas · commit 45e683e16d14 · 2018-09-16T13:50:43.000+02:00
* 3.4:
  [Validator] Add Japanese translations
  [Console] Fix input values allowed types
diff --git a/Input/InputArgument.php b/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()
     {
diff --git a/Input/InputInterface.php b/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
      */
diff --git a/Input/InputOption.php b/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()
     {

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function isArray()`
`86`	`86`	`/**`
`87`	`87`	`* Sets the default value.`
`88`	`88`	`*`
`89`		`- * @param mixed $default The default value`
	`89`	`+ * @param string\|string[] $default The default value`
`90`	`90`	`*`
`91`	`91`	`* @throws LogicException When incorrect default value is given`
`92`	`92`	`*/`
`@@ -110,7 +110,7 @@ public function setDefault($default = null)`
`110`	`110`	`/**`
`111`	`111`	`* Returns the default value.`
`112`	`112`	`*`
`113`		`- * @return mixed The default value`
	`113`	`+ * @return string\|string[] The default value`
`114`	`114`	`*/`
`115`	`115`	`public function getDefault()`
`116`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getArguments();`
`85`	`85`	`*`
`86`	`86`	`* @param string $name The argument name`
`87`	`87`	`*`
`88`		`- * @return mixed The argument value`
	`88`	`+ * @return string\|string[] The argument value`
`89`	`89`	`*`
`90`	`90`	`* @throws InvalidArgumentException When argument given doesn't exist`
`91`	`91`	`*/`
`@@ -122,7 +122,7 @@ public function getOptions();`
`122`	`122`	`*`
`123`	`123`	`* @param string $name The option name`
`124`	`124`	`*`
`125`		`- * @return mixed The option value`
	`125`	`+ * @return string\|string[]\|bool The option value`
`126`	`126`	`*`
`127`	`127`	`* @throws InvalidArgumentException When option given doesn't exist`
`128`	`128`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function isArray()`
`149`	`149`	`/**`
`150`	`150`	`* Sets the default value.`
`151`	`151`	`*`
`152`		`- * @param mixed $default The default value`
	`152`	`+ * @param string\|string[]\|bool $default The default value`
`153`	`153`	`*`
`154`	`154`	`* @throws LogicException When incorrect default value is given`
`155`	`155`	`*/`
`@@ -173,7 +173,7 @@ public function setDefault($default = null)`
`173`	`173`	`/**`
`174`	`174`	`* Returns the default value.`
`175`	`175`	`*`
`176`		`- * @return mixed The default value`
	`176`	`+ * @return string\|string[]\|bool The default value`
`177`	`177`	`*/`
`178`	`178`	`public function getDefault()`
`179`	`179`	`{`