From 0c16cd9faeb7d08c7992c4399338260c6c3695b4 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Tue, 11 Sep 2018 18:38:47 +0200 Subject: [PATCH 1/2] [Console] Fix input values allowed types --- src/Symfony/Component/Console/Input/InputArgument.php | 4 ++-- src/Symfony/Component/Console/Input/InputInterface.php | 4 ++-- src/Symfony/Component/Console/Input/InputOption.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php index d4c5e35627..2330cdc2ea 100644 --- a/src/Symfony/Component/Console/Input/InputArgument.php +++ b/src/Symfony/Component/Console/Input/InputArgument.php @@ -86,7 +86,7 @@ class InputArgument /** * 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 @@ class InputArgument /** * Returns the default value. * - * @return mixed The default value + * @return string|string[] The default value */ public function getDefault() { diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php index 088d1cfb31..354d198e04 100644 --- a/src/Symfony/Component/Console/Input/InputInterface.php +++ b/src/Symfony/Component/Console/Input/InputInterface.php @@ -83,7 +83,7 @@ interface InputInterface * * @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 */ @@ -120,7 +120,7 @@ interface InputInterface * * @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/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php index 9567876c8a..429c9f037d 100644 --- a/src/Symfony/Component/Console/Input/InputOption.php +++ b/src/Symfony/Component/Console/Input/InputOption.php @@ -149,7 +149,7 @@ class InputOption /** * 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 @@ class InputOption /** * Returns the default value. * - * @return mixed The default value + * @return string|string[]|bool The default value */ public function getDefault() { From 7d78e3672b9c7b2160b5a502bb9d12bfd770f9ac Mon Sep 17 00:00:00 2001 From: "Issei.M" Date: Sat, 15 Sep 2018 14:34:41 +0900 Subject: [PATCH 2/2] [Validator] Add Japanese translations --- .../Validator/Resources/translations/validators.ja.xlf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf index a9d6b0812b..0c61d15715 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf @@ -318,6 +318,14 @@ Error エラー + + This is not a valid UUID. + 有効なUUIDではありません。 + + + This value should be a multiple of {{ compared_value }}. + {{ compared_value }}の倍数でなければなりません。 +