Skip to content

Commit 6ed3d6a

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: Fix docs enabled short array notation in CS [fabbot] enable short arrays bumped Symfony version to 4.1.11 updated VERSION for 4.1.10 updated CHANGELOG for 4.1.10 bumped Symfony version to 3.4.22 updated VERSION for 3.4.21 update CONTRIBUTORS for 3.4.21 updated CHANGELOG for 3.4.21
2 parents b0a03c1 + 2ca56db commit 6ed3d6a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Command/Command.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public function addArgument($name, $mode = null, $description = '', $default = n
380380
* Adds an option.
381381
*
382382
* @param string $name The option name
383-
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
383+
* @param string|array|null $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
384384
* @param int|null $mode The option mode: One of the InputOption::VALUE_* constants
385385
* @param string $description A description text
386386
* @param string|string[]|int|bool|null $default The default value (must be null for InputOption::VALUE_NONE)

Input/InputOption.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class InputOption
3434

3535
/**
3636
* @param string $name The option name
37-
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
37+
* @param string|array|null $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
3838
* @param int|null $mode The option mode: One of the VALUE_* constants
3939
* @param string $description A description text
4040
* @param string|string[]|int|bool|null $default The default value (must be null for self::VALUE_NONE)
@@ -89,7 +89,7 @@ public function __construct(string $name, $shortcut = null, int $mode = null, st
8989
/**
9090
* Returns the option shortcut.
9191
*
92-
* @return string The shortcut
92+
* @return string|null The shortcut
9393
*/
9494
public function getShortcut()
9595
{

0 commit comments

Comments
 (0)