bug #16922 [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 (A…

…lmogBaku) This PR was squashed before being merged into the 2.8 branch (closes #16922). Discussion ---------- [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 | Q | A | ------------- | --- | Bug fix? | **yes** | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | **yes** | Fixed tickets | #16920 | License | MIT Commits ------- d2b9a1d [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920
symfony · Dec 9, 2015 · e18a42a · e18a42a
2 parents bbe72f9 + d2b9a1d
commit e18a42a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $options = array('tag' => $tag, 'show_private' => $input->getOption('show-private'));
         } elseif ($name = $input->getArgument('name')) {
             $object = $this->getContainerBuilder();
-            $name = $this->findProperServiceName($input, $output, $object, $name);
+            $name = $this->findProperServiceName($input, $io, $object, $name);
             $options = array('id' => $name);
         } else {
             $object = $this->getContainerBuilder();

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -118,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io->success(sprintf('Server running on http://%s', $address));
         $io->comment('Quit the server with CONTROL-C.');
 
-        if (null === $builder = $this->createPhpProcessBuilder($output, $address, $input->getOption('router'), $env)) {
+        if (null === $builder = $this->createPhpProcessBuilder($io, $address, $input->getOption('router'), $env)) {
             return 1;
         }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $env = $this->getContainer()->getParameter('kernel.environment');
 
-        if (false === $router = $this->determineRouterScript($input->getOption('router'), $env, $output)) {
+        if (false === $router = $this->determineRouterScript($input->getOption('router'), $env, $io)) {
             return 1;
         }
 
@@ -148,7 +148,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
-        if (null === $process = $this->createServerProcess($output, $address, $documentRoot, $router)) {
+        if (null === $process = $this->createServerProcess($io, $address, $documentRoot, $router)) {
             return 1;
         }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $content .= fread(STDIN, 1024);
             }
 
-            return $this->display($input, $output, $output, array($this->validate($content)));
+            return $this->display($input, $output, $io, array($this->validate($content)));
         }
 
         if (0 !== strpos($filename, '@') && !is_readable($filename)) {