bug #16621 [Console] Fix bug with $output overloading (WouterJ)

fabpot · fabpot · commit 14f70aeafd5f · 2015-11-26T17:44:52.000+01:00
This PR was squashed before being merged into the 2.8 branch (closes #16621). Discussion ---------- [Console] Fix bug with $output overloading | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | https://github.com/symfony/symfony-standard/issues/887, #16622 | License | MIT | Doc PR | - This is exactly why variable overloading isn't a great idea :) Commits ------- 5764a00 [Console] Fix bug with overloading
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
@@ -74,7 +74,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $output = new SymfonyStyle($input, $output);
+        $output = new SymfonyStyle($input, $cliOutput = $output);
 
         if (!extension_loaded('pcntl')) {
             $output->error(array(
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($output->ask('Do you want to execute <info>server:run</info> immediately? [Yn] ', true)) {
                 $command = $this->getApplication()->find('server:run');
 
-                return $command->run($input, $output);
+                return $command->run($input, $cliOutput);
             }
 
             return 1;

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ protected function configure()`
`74`	`74`	`*/`
`75`	`75`	`protected function execute(InputInterface $input, OutputInterface $output)`
`76`	`76`	`{`
`77`		`- $output = new SymfonyStyle($input, $output);`
	`77`	`+ $output = new SymfonyStyle($input, $cliOutput = $output);`
`78`	`78`
`79`	`79`	`if (!extension_loaded('pcntl')) {`
`80`	`80`	`$output->error(array(`
`@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`85`	`85`	`if ($output->ask('Do you want to execute <info>server:run</info> immediately? [Yn] ', true)) {`
`86`	`86`	`$command = $this->getApplication()->find('server:run');`
`87`	`87`
`88`		`- return $command->run($input, $output);`
	`88`	`+ return $command->run($input, $cliOutput);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`return 1;`