Skip to content

Commit f75de4c

Browse files
Merge branch '4.1'
* 4.1: Undeprecate the single-colon notation for controllers Command::addOption should allow int in $default Update symfony links to https [Form] Fixed keeping hash of equal \DateTimeInterface on submit [PhpUnitBridge] Fix typo [Routing] generate(null) should throw an exception [Form] Minor fixes in docs and cs [Workflow] Made code simpler [Config] Unset key during normalization [Form] Fixed empty data for compound date types invalidate forms on transformation failures [FrameworkBundle] fixed guard event names for transitions method buildTransitionBlockerList returns TransitionBlockerList of expected transition [FrameworkBundle] fixed guard event names for transitions [PropertyAccessor] Fix unable to write to singular property using setter while plural adder/remover exist
2 parents 7b2dc3e + 130a5ff commit f75de4c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Command/Command.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,11 @@ public function addArgument($name, $mode = null, $description = '', $default = n
379379
/**
380380
* Adds an option.
381381
*
382-
* @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
384-
* @param int|null $mode The option mode: One of the VALUE_* constants
385-
* @param string $description A description text
386-
* @param string|string[]|bool|null $default The default value (must be null for self::VALUE_NONE)
382+
* @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
384+
* @param int|null $mode The option mode: One of the VALUE_* constants
385+
* @param string $description A description text
386+
* @param string|string[]|int|bool|null $default The default value (must be null for self::VALUE_NONE)
387387
*
388388
* @throws InvalidArgumentException If option mode is invalid or incompatible
389389
*

0 commit comments

Comments
 (0)