8000 Merge branch '3.4' into 4.1 · symfony/symfony@3f1951a · GitHub
[go: up one dir, main page]

Skip to content

Commit 3f1951a

Browse files
author
Robin Chalas
committed
Merge branch '3.4' into 4.1
* 3.4: [Validator] Add Japanese translations [Console] Fix input values allowed types
2 parents 76f9bdc + 5d75f14 commit 3f1951a

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function isArray()
8686
/**
8787
* Sets the default value.
8888
*
89-
* @param mixed $default The default value
89+
* @param string|string[] $default The default value
9090
*
9191
* @throws LogicException When incorrect default value is given
9292
*/
@@ -110,7 +110,7 @@ public function setDefault($default = null)
110110
/**
111111
* Returns the default value.
112112
*
113-
* @return mixed The default value
113+
* @return string|string[] The default value
114114
*/
115115
public function getDefault()
116116
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getArguments();
8585
*
8686
* @param string $name The argument name
8787
*
88-
* @return mixed The argument value
88+
* @return string|string[] The argument value
8989
*
9090
* @throws InvalidArgumentException When argument given doesn't exist
9191
*/
@@ -122,7 +122,7 @@ public function getOptions();
122122
*
123123
* @param string $name The option name
124124
*
125-
* @return mixed The option value
125+
* @return string|string[]|bool The option value
126126
*
127127
* @throws InvalidArgumentException When option given doesn't exist
128128
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function isArray()
149149
/**
150150
* Sets the default value.
151151
*
152-
* @param mixed $default The default value
152+
* @param string|string[]|bool $default The default value
153153
*
154154
* @throws LogicException When incorrect default value is given
155155
*/
@@ -173,7 +173,7 @@ public function setDefault($default = null)
173173
/**
174174
* Returns the default value.
175175
*
176-
* @return mixed The default value
176+
* @return string|string[]|bool The default value
177177
*/
178178
public function getDefault()
179179
{

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

Lines changed: 8 additions & 0 deletions
< 6E32 td data-grid-cell-id="diff-7dd5ccfb567153bee7cc9e69f356f208f9ced064bdbe6b28701aab5c71168b60-320-321-2" data-line-anchor="diff-7dd5ccfb567153bee7cc9e69f356f208f9ced064bdbe6b28701aab5c71168b60R321" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionLine-bgColor, var(--diffBlob-addition-bgColor-line));padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell right-side-diff-cell left-side">+
<trans-unit id="83">
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,14 @@
318318
<source>Error</source>
319319
<target>エラー</target>
320320
</trans-unit>
321
322+
<source>This is not a valid UUID.</source>
323+
<target>有効なUUIDではありません。</target>
324+
</trans-unit>
325+
<trans-unit id="84">
326+
<source>This value should be a multiple of {{ compared_value }}.</source>
327+
<target>{{ compared_value }}の倍数でなければなりません。</target>
328+
</trans-unit>
321329
</body>
322330
</file>
323331
</xliff>

0 commit comments

Comments
 (0)
0