Skip to content

Commit ae8fc4e

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [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 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path [TwigBridge] Symfony 3.1 forward compatibility
2 parents d59b01b + 0b296b2 commit ae8fc4e

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
@@ -390,7 +390,7 @@ public function addArgument($name, $mode = null, $description = '', $default = n
390390
* @param string $shortcut The shortcut (can be null)
391391
* @param int $mode The option mode: One of the InputOption::VALUE_* constants
392392
* @param string $description A description text
393-
* @param mixed $default The default value (must be null for InputOption::VALUE_REQUIRED or InputOption::VALUE_NONE)
393+
* @param mixed $default The default value (must be null for InputOption::VALUE_NONE)
394394
*
395395
* @return Command The current instance
396396
*/

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)