minor #40428 [Console] Fix type of InputOption::$default (oliverklee)

jderusse · jderusse · commit bbf786c3dbe6 · 2021-03-11T19:20:35.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Fix type of InputOption::$default Options can also be `int`s. So add this type to the PHPDoc parameter type annotation of `InputInterface::setOption` and the return type annotation of `InputInterface::getOption`. | Q | A | ------------- | --- | Branch? | 4.4 or 5.2 for bug fixes | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40427 | License | MIT Commits ------- 3a2d1b4 bug #40427 [Console] Stop accepting ints as InputOption defaults
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -394,11 +394,11 @@ public function addArgument($name, $mode = null, $description = '', $default = n
     /**
      * Adds an option.
      *
-     * @param string                        $name        The option name
-     * @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)
+     * @param string                    $name        The option name
+     * @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[]|bool|null $default     The default value (must be null for InputOption::VALUE_NONE)
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      *
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
@@ -33,11 +33,11 @@ class InputOption
     private $description;
 
     /**
-     * @param string                        $name        The option name
-     * @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)
+     * @param string                    $name        The option name
+     * @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[]|bool|null $default     The default value (must be null for self::VALUE_NONE)
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      */
@@ -149,7 +149,7 @@ public function isArray()
     /**
      * Sets the default value.
      *
-     * @param string|string[]|int|bool|null $default The default value
+     * @param string|string[]|bool|null $default The default value
      *
      * @throws LogicException When incorrect default value is given
      */
@@ -173,7 +173,7 @@ public function setDefault($default = null)
     /**
      * Returns the default value.
      *
-     * @return string|string[]|int|bool|null The default value
+     * @return string|string[]|bool|null The default value
      */
     public function getDefault()
     {

Original file line number	Diff line number	Diff line change
`@@ -394,11 +394,11 @@ public function addArgument($name, $mode = null, $description = '', $default = n`
`394`	`394`	`/**`
`395`	`395`	`* Adds an option.`
`396`	`396`	`*`
`397`		`- * @param string $name The option name`
`398`		`- * @param string\|array\|null $shortcut The shortcuts, can be null, a string of shortcuts delimited by \| or an array of shortcuts`
`399`		`- * @param int\|null $mode The option mode: One of the InputOption::VALUE_* constants`
`400`		`- * @param string $description A description text`
`401`		`- * @param string\|string[]\|int\|bool\|null $default The default value (must be null for InputOption::VALUE_NONE)`
	`397`	`+ * @param string $name The option name`
	`398`	`+ * @param string\|array\|null $shortcut The shortcuts, can be null, a string of shortcuts delimited by \| or an array of shortcuts`
	`399`	`+ * @param int\|null $mode The option mode: One of the InputOption::VALUE_* constants`
	`400`	`+ * @param string $description A description text`
	`401`	`+ * @param string\|string[]\|bool\|null $default The default value (must be null for InputOption::VALUE_NONE)`
`402`	`402`	`*`
`403`	`403`	`* @throws InvalidArgumentException If option mode is invalid or incompatible`
`404`	`404`	`*`