[FrameworkBundle] tweaked previous merge (refs #8242)

fabpot · fabpot · commit 24a07fbab80c · 2013-06-13T09:07:59.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -68,6 +68,8 @@ public function doRun(InputInterface $input, OutputInterface $output)
     {
         if (!$this->commandsRegistered) {
             $this->registerCommands();
+
+            $this->commandsRegistered = true;
         }
 
         if (true === $input->hasParameterOption(array('--shell', '-s'))) {
@@ -90,7 +92,5 @@ protected function registerCommands()
                 $bundle->registerCommands($this);
             }
         }
-
-        $this->commandsRegistered = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ public function doRun(InputInterface $input, OutputInterface $output)`
`68`	`68`	`{`
`69`	`69`	`if (!$this->commandsRegistered) {`
`70`	`70`	`$this->registerCommands();`
	`71`	`+`
	`72`	`+ $this->commandsRegistered = true;`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`if (true === $input->hasParameterOption(array('--shell', '-s'))) {`
`@@ -90,7 +92,5 @@ protected function registerCommands()`
`90`	`92`	`$bundle->registerCommands($this);`
`91`	`93`	`}`
`92`	`94`	`}`
`93`		`-`
`94`		`- $this->commandsRegistered = true;`
`95`	`95`	`}`
`96`	`96`	`}`