diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[console] Negatable option are null by default

Browse Source
This commit is contained in:
Jérémy Derussé 2021-04-29 15:43:07 +02:00
parent 1ed5e0ca46
commit 22cb37cc85
No known key found for this signature in database
GPG Key ID: 2083FA5758C473D2
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Console/Application.php
View File

@ -1036,7 +1036,7 @@ class Application implements ResetInterface
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'), new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'), new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'), new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', null), new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', false),
new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'), new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
]); ]);
} }

5
src/Symfony/Component/Console/Input/InputOption.php
View File

@ -186,9 +186,6 @@ class InputOption
if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) { if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) {
throw new LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.'); throw new LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.');
} }
if (self::VALUE_NEGATABLE === (self::VALUE_NEGATABLE & $this->mode) && null !== $default) {
throw new LogicException('Cannot set a default value when using InputOption::VALUE_NEGATABLE mode.');
}
if ($this->isArray()) { if ($this->isArray()) {
if (null === $default) { if (null === $default) {
@ -198,7 +195,7 @@ class InputOption
} }
} }
$this->default = $this->acceptValue() ? $default : false; $this->default = $this->acceptValue() || $this->isNegatable() ? $default : false;
} }
/** /**

18
src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
View File

@ -214,6 +214,24 @@ class ArgvInputTest extends TestCase
['foo' => false], ['foo' => false],
'->parse() parses long options without a value', '->parse() parses long options without a value',
], ],
[
['cli.php'],
[new InputOption('foo', null, InputOption::VALUE_NEGATABLE)],
['foo' => null],
'->parse() parses long options without a value',
],
[
['cli.php'],
[new InputOption('foo', null, InputOption::VALUE_NONE | InputOption::VALUE_NEGATABLE)],
['foo' => null],
'->parse() parses long options without a value',
],
[
['cli.php'],
[new InputOption('foo', null, InputOption::VALUE_NEGATABLE, '', false)],
['foo' => false],
'->parse() parses long options without a value',
],
]; ];
} }

8
src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
View File

@ -164,14 +164,6 @@ class InputOptionTest extends TestCase
$option->setDefault('default'); $option->setDefault('default');
} }
public function testDefaultValueWithValueBooleanMode()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('Cannot set a default value when using InputOption::VALUE_NEGATABLE mode.');
$option = new InputOption('foo', 'f', InputOption::VALUE_NEGATABLE);
$option->setDefault('default');
}
public function testDefaultValueWithIsArrayMode() public function testDefaultValueWithIsArrayMode()
{ {
$this->expectException(\LogicException::class); $this->expectException(\LogicException::class);