Skip to content

Commit d809df0

Browse files
committed
Merge branch '3.0'
* 3.0: [DependencyInjection] fix dumped YAML snytax Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method [Yaml] always restore the error handler in tests [FrameworkBundle] fix YAML syntax fix YAML syntax in functional tests config [HttpFoundation] [Session] Removed unnecessary PHP version check as minimum requirement is now 5.5.9 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path fix FQCN in tests added by #17694 Fix locale and written standard inconsistencies for Norwegian translations [Form] [Validator] Fix locale inconsistencies in Norwegian translations [TwigBridge] Symfony 3.1 forward compatibility fixed CS [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder [Yaml] properly parse lists in object maps [FrameworkBundle] Remove unused private method. [Form] remove useless code in ResizeFormListener [Config] Fix EnumNodeDefinition to allow building enum nodes with one element [Form] remove deprecated empty_value_in_choices fix choice_value option in EntityType and add some tests
2 parents a76821c + 4aed084 commit d809df0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Command/Command.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public function addArgument($name, $mode = null, $description = '', $default = n
383383
* @param string $shortcut The shortcut (can be null)
384384
* @param int $mode The option mode: One of the InputOption::VALUE_* constants
385385
* @param string $description A description text
386-
* @param mixed $default The default value (must be null for InputOption::VALUE_REQUIRED or InputOption::VALUE_NONE)
386+
* @param mixed $default The default value (must be null for InputOption::VALUE_NONE)
387387
*
388388
* @return Command The current instance
389389
*/

Input/InputOption.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class InputOption
3939
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
4040
* @param int $mode The option mode: One of the VALUE_* constants
4141
* @param string $description A description text
42-
* @param mixed $default The default value (must be null for self::VALUE_REQUIRED or self::VALUE_NONE)
42+
* @param mixed $default The default value (must be null for self::VALUE_NONE)
4343
*
4444
* @throws InvalidArgumentException If option mode is invalid or incompatible
4545
*/

0 commit comments

Comments
 (0)