Skip to content

Commit b93de9e

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: $default can be string Fix wording for Process class documentation Option can be bool too (eg. --force) [Form] Update DateTime objects only if the actual value has changed Revert "bug #10091 [Translation] Update PluralizationRules.php (guilhermeblanco)" [HttpFoundation] fixed typo Added delta for Request comparison add zh_TW validator translations Added Bulgarian translation for security component
2 parents 80068b6 + d20b978 commit b93de9e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Helper/DialogHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class DialogHelper extends InputAwareHelper
3131
* @param OutputInterface $output An Output instance
3232
* @param string|array $question The question to ask
3333
* @param array $choices List of choices to pick from
34-
* @param Boolean $default The default answer if the user enters nothing
34+
* @param Boolean|string $default The default answer if the user enters nothing
3535
* @param Boolean|integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
3636
* @param string $errorMessage Message which will be shown if invalid value from choice list would be picked
3737
* @param Boolean $multiselect Select more than one value separated by comma

Input/Input.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ public function getOption($name)
186186
/**
187187
* Sets an option value by name.
188188
*
189-
* @param string $name The option name
190-
* @param string $value The option value
189+
* @param string $name The option name
190+
* @param string|boolean $value The option value
191191
*
192192
* @throws \InvalidArgumentException When option given doesn't exist
193193
*/

Input/InputInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public function getOption($name);
120120
/**
121121
* Sets an option value by name.
122122
*
123-
* @param string $name The option name
124-
* @param string $value The option value
123+
* @param string $name The option name
124+
* @param string|boolean $value The option value
125125
*
126126
* @throws \InvalidArgumentException When option given doesn't exist
127127
*/

0 commit comments

Comments
 (0)