Skip to content

Commit 7e91f51

Browse files
Merge branch '3.4' into 4.1
* 3.4: (21 commits) Added the Code of Conduct file do not override custom access decision configs [Security] Do not deauthenticate user when the first refreshed user has changed invalidate stale commits for PRs too add missing cache prefix seed attribute to XSD fix command description Fix class documentation [Validator] Add a missing translation [FrameworkBundle] Fix 3.4 tests [DI] fix dumping inline services again Fix phpdocs [EventDispatcher] Remove template method in test case Added LB translation for #27993 (UUID validator message translation) Replace deprecated validateValue with validate [FWBundle] Automatically enable PropertyInfo when using Flex [Process] fix locking of pipe files on Windows Correct PHPDoc type for float ttl bumped Symfony version to 3.4.18 updated VERSION for 3.4.17 updated CHANGELOG for 3.4.17 ...
2 parents dc7122f + 115ef74 commit 7e91f51

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

Command/Command.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,12 @@ public function getNativeDefinition()
361361
/**
362362
* Adds an argument.
363363
*
364-
* @param string $name The argument name
365-
* @param int $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
366-
* @param string $description A description text
367-
* @param mixed $default The default value (for InputArgument::OPTIONAL mode only)
364+
* @param string $name The argument name
365+
* @param int|null $mode The argument mode: self::REQUIRED or self::OPTIONAL
366+
* @param string $description A description text
367+
* @param string|string[]|null $default The default value (for self::OPTIONAL mode only)
368+
*
369+
* @throws InvalidArgumentException When argument mode is not valid
368370
*
369371
* @return $this
370372
*/
@@ -378,11 +380,13 @@ public function addArgument($name, $mode = null, $description = '', $default = n
378380
/**
379381
* Adds an option.
380382
*
381-
* @param string $name The option name
382-
* @param string $shortcut The shortcut (can be null)
383-
* @param int $mode The option mode: One of the InputOption::VALUE_* constants
384-
* @param string $description A description text
385-
* @param mixed $default The default value (must be null for InputOption::VALUE_NONE)
383+
* @param string $name The option name
384+
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
385+
* @param int|null $mode The option mode: One of the VALUE_* constants
386+
* @param string $description A description text
387+
* @param string|string[]|bool|null $default The default value (must be null for self::VALUE_NONE)
388+
*
389+
* @throws InvalidArgumentException If option mode is invalid or incompatible
386390
*
387391
* @return $this
388392
*/

0 commit comments

Comments
 (0)