Remove duplicate condition

Nguyen Xuan Quynh · nicolas-grekas · commit 48ed63767c4a · 2018-10-30T15:26:34.000+01:00
diff --git a/Command/Command.php b/Command/Command.php
@@ -303,14 +303,13 @@ public function mergeApplicationDefinition($mergeArgs = true)
 
         $this->definition->addOptions($this->application->getDefinition()->getOptions());
 
+        $this->applicationDefinitionMerged = true;
+
         if ($mergeArgs) {
             $currentArguments = $this->definition->getArguments();
             $this->definition->setArguments($this->application->getDefinition()->getArguments());
             $this->definition->addArguments($currentArguments);
-        }
 
-        $this->applicationDefinitionMerged = true;
-        if ($mergeArgs) {
             $this->applicationDefinitionMergedWithArgs = true;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -303,14 +303,13 @@ public function mergeApplicationDefinition($mergeArgs = true)`
`303`	`303`
`304`	`304`	`$this->definition->addOptions($this->application->getDefinition()->getOptions());`
`305`	`305`
	`306`	`+ $this->applicationDefinitionMerged = true;`
	`307`	`+`
`306`	`308`	`if ($mergeArgs) {`
`307`	`309`	`$currentArguments = $this->definition->getArguments();`
`308`	`310`	`$this->definition->setArguments($this->application->getDefinition()->getArguments());`
`309`	`311`	`$this->definition->addArguments($currentArguments);`
`310`		`- }`
`311`	`312`
`312`		`- $this->applicationDefinitionMerged = true;`
`313`		`- if ($mergeArgs) {`
`314`	`313`	`$this->applicationDefinitionMergedWithArgs = true;`
`315`	`314`	`}`
`316`	`315`	`}`