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
symfony · Jan 10, 2019 · 6ed3d6a · 6ed3d6a
2 parents b0a03c1 + 2ca56db
commit 6ed3d6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Command/Command.php b/Command/Command.php
@@ -380,7 +380,7 @@ public function addArgument($name, $mode = null, $description = '', $default = n
      * Adds an option.
      *
      * @param string                        $name        The option name
-     * @param string|array                  $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param string|array|null             $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
      * @param int|null                      $mode        The option mode: One of the InputOption::VALUE_* constants
      * @param string                        $description A description text
      * @param string|string[]|int|bool|null $default     The default value (must be null for InputOption::VALUE_NONE)

diff --git a/Input/InputOption.php b/Input/InputOption.php
@@ -34,7 +34,7 @@ class InputOption
 
     /**
      * @param string                        $name        The option name
-     * @param string|array                  $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param string|array|null             $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
      * @param int|null                      $mode        The option mode: One of the VALUE_* constants
      * @param string                        $description A description text
      * @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
     /**
      * Returns the option shortcut.
      *
-     * @return string The shortcut
+     * @return string|null The shortcut
      */
     public function getShortcut()
     {