8000 [Console] Fix negated options not accessible by jderusse · Pull Request #41535 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Console] Fix negated options not accessible #41535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2021
Merged

[Console] Fix negated options not accessible #41535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Console] Fix negated options not accessible
  • Loading branch information
@jderusse
jderusse committed Jun 4, 2021
commit 440bd5f1c7ab5c64a8fe3a5f412c9508255b7d94
16 changes: 14 additions & 2 deletions src/Symfony/Component/Console/Input/Input.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ public function getOptions()
*/
public function getOption(string $name)
{
if ($this->definition->hasNegation($name)) {
if (null === $value = $this->getOption($this->definition->negationToName($name))) {
return $value;
}

return !$value;
}

if (!$this->definition->hasOption($name)) {
throw new InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
}
Expand All @@ -158,7 +166,11 @@ public function getOption(string $name)
*/
public function setOption(string $name, $value)
{
if (!$this->definition->hasOption($name)) {
if ($this->definition->hasNegation($name)) {
$this->options[$this->definition->negationToName($name)] = !$value;

return;
} elseif (!$this->definition->hasOption($name)) {
throw new InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
}

Expand All @@ -170,7 +182,7 @@ public function setOption(string $name, $value)
*/
public function hasOption(string $name)
{
return $this->definition->hasOption($name);
return $this->definition->hasOption($name) || $this->definition->hasNegation($name);
}

/**
Expand Down
14 changes: 14 additions & 0 deletions src/Symfony/Component/Console/Tests/Input/InputTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,20 @@ public function testOptions()
$input = new ArrayInput(['--name' => 'foo', '--bar' => null], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
$this->assertNull($input->getOption('bar'), '->getOption() returns null for options explicitly passed without value (or an empty value)');
$this->assertEquals(['name' => 'foo', 'bar' => null], $input->getOptions(), '->getOptions() returns all option values');

$input = new ArrayInput(['--name' => null], new InputDefinition([new InputOption('name', null, InputOption::VALUE_NEGATABLE)]));
$this->assertTrue($input->hasOption('name'));
$this->assertTrue($input->hasOption('no-name'));
$this->assertTrue($input->getOption('name'));
$this->assertFalse($input->getOption('no-name'));

$input = new ArrayInput(['--no-name' => null], new InputDefinition([new InputOption('name', null, InputOption::VALUE_NEGATABLE)]));
$this->assertFalse($input->getOption('name'));
$this->assertTrue($input->getOption('no-name'));

$input = new ArrayInput([], new InputDefinition([new InputOption('name', null, InputOption::VALUE_NEGATABLE)]));
$this->assertNull($input->getOption('name'));
$this->assertNull($input->getOption('no-name'));
}

public function testSetInvalidOption()
Expand Down
0