Remove duplicate condition
This commit is contained in:
parent
9075d2e64e
commit
925842af60
@ -303,14 +303,13 @@ class Command
|
|||||||
|
|
||||||
$this->definition->addOptions($this->application->getDefinition()->getOptions());
|
$this->definition->addOptions($this->application->getDefinition()->getOptions());
|
||||||
|
|
||||||
|
$this->applicationDefinitionMerged = true;
|
||||||
|
|
||||||
if ($mergeArgs) {
|
if ($mergeArgs) {
|
||||||
$currentArguments = $this->definition->getArguments();
|
$currentArguments = $this->definition->getArguments();
|
||||||
$this->definition->setArguments($this->application->getDefinition()->getArguments());
|
$this->definition->setArguments($this->application->getDefinition()->getArguments());
|
||||||
$this->definition->addArguments($currentArguments);
|
$this->definition->addArguments($currentArguments);
|
||||||
}
|
|
||||||
|
|
||||||
$this->applicationDefinitionMerged = true;
|
|
||||||
if ($mergeArgs) {
|
|
||||||
$this->applicationDefinitionMergedWithArgs = true;
|
$this->applicationDefinitionMergedWithArgs = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user