Skip to content

[Console] Allow dupplicate negative option #41792

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

Closed
wants to merge 1 commit into from
Closed

[Console] Allow dupplicate negative option #41792

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
4 changes: 2 additions & 2 deletions src/Symfony/Component/Console/Input/InputDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public function addOption(InputOption $option)
if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) {
throw new LogicException(sprintf('An option named "%s" already exists.', $option->getName()));
}
if (isset($this->negations[$option->getName()])) {
if (isset($this->negations[$option->getName()]) && !$option->equals($this->options[$this->negations[$option->getName()]])) {
throw new LogicException(sprintf('An option named "%s" already exists.', $option->getName()));
}

Expand All @@ -252,7 +252,7 @@ public function addOption(InputOption $option)

if ($option->isNegatable()) {
$negatedName = 'no-'.$option->getName();
if (isset($this->options[$negatedName])) {
if (isset($this->options[$negatedName]) && !$option->equals($this->options[$negatedName])) {
throw new LogicException(sprintf('An option named "%s" already exists.', $negatedName));
}
$this->negations[$negatedName] = $option->getName();
Expand Down
29 changes: 26 additions & 3 deletions src/Symfony/Component/Console/Input/InputOption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,36 @@ public function getDescription()
*/
public function equals(self $option)
{
return $option->getName() === $this->getName()
if ($option->getName() === $this->getName()
&& $option->getShortcut() === $this->getShortcut()
&& $option->getDefault() === $this->getDefault()
&& $option->isNegatable() === $this->isNegatable()
&& $option->isArray() === $this->isArray()
&& $option->isValueRequired() === $this->isValueRequired()
&& $option->isValueOptional() === $this->isValueOptional()
;
) {
return true;
}

if (!($option->isNegatable() xor $this->isNegatable())) {
return false;
}

if ($option->isNegatable()) {
$n = $option;
$p = $this;
} else {
$p = $option;
$n = $this;
}

return (
(
$n->getName() === $p->getName()
&& $n->getShortcut() === $p->getShortcut()
) || (
'no-'.$n->getName() === $p->getName()
&& null === $p->getShortcut()
)
) && !$p->acceptValue();
}
}
10 changes: 4 additions & 6 deletions src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,22 +244,20 @@ public function testAddDuplicateOption()

public function testAddDuplicateNegatedOption()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('An option named "no-foo" already exists.');

$definition = new InputDefinition();
$definition->addOption(new InputOption('no-foo'));
$definition->addOption(new InputOption('foo', null, InputOption::VALUE_NEGATABLE));

$this->expectNotToPerformAssertions();
}

public function testAddDuplicateNegatedReverseOption()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('An option named "no-foo" already exists.');

$definition = new InputDefinition();
$definition->addOption(new InputOption('foo', null, InputOption::VALUE_NEGATABLE));
$definition->addOption(new InputOption('no-foo'));

$this->expectNotToPerformAssertions();
}

public function testAddDuplicateShortcutOption()
Expand Down
13 changes: 13 additions & 0 deletions src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,5 +193,18 @@ public function testEquals()
$option = new InputOption('foo', 'f', null, 'Some description');
$option2 = new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, 'Some description');
$this->assertFalse($option->equals($option2));

$option = new InputOption('foo', null, InputOption::VALUE_NEGATABLE, 'Some description');
$option2 = new InputOption('no-foo', null, null, 'Alternative description');
$this->assertTrue($option->equals($option2));
$this->assertTrue($option2->equals($option));

$option = new InputOption('foo', null, InputOption::VALUE_NEGATABLE, 'Some description');
$option2 = new InputOption('foo', null, null, 'Alternative description');
$this->assertTrue($option->equals($option2));

$option = new InputOption('foo', null, InputOption::VALUE_NEGATABLE, 'Some description');
$option2 = new InputOption('bar', null, null, 'Alternative description');
$this->assertFalse($option->equals($option2));
}
}