Merge branch '3.4' into 4.1

* 3.4:
  [Validator] Add Japanese translations
  [Console] Fix input values allowed types
This commit is contained in:
Robin Chalas 2018-09-16 13:50:43 +02:00
commit 3f1951af45
4 changed files with 14 additions and 6 deletions

View File

@ -86,7 +86,7 @@ class InputArgument
/** /**
* Sets the default value. * 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 * @throws LogicException When incorrect default value is given
*/ */
@ -110,7 +110,7 @@ class InputArgument
/** /**
* Returns the default value. * Returns the default value.
* *
* @return mixed The default value * @return string|string[] The default value
*/ */
public function getDefault() public function getDefault()
{ {

View File

@ -85,7 +85,7 @@ interface InputInterface
* *
* @param string $name The argument name * @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 * @throws InvalidArgumentException When argument given doesn't exist
*/ */
@ -122,7 +122,7 @@ interface InputInterface
* *
* @param string $name The option name * @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 * @throws InvalidArgumentException When option given doesn't exist
*/ */

View File

@ -149,7 +149,7 @@ class InputOption
/** /**
* Sets the default value. * 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 * @throws LogicException When incorrect default value is given
*/ */
@ -173,7 +173,7 @@ class InputOption
/** /**
* Returns the default value. * Returns the default value.
* *
* @return mixed The default value * @return string|string[]|bool The default value
*/ */
public function getDefault() public function getDefault()
{ {

View File

@ -318,6 +318,14 @@
<source>Error</source> <source>Error</source>
<target>エラー</target> <target>エラー</target>
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>