diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default to stderr for console helpers (only merge if #15794 gets merged)

Browse Source
This commit is contained in:
Rob Bast 2015-09-14 19:21:18 +02:00
parent c38326c1cd
commit 90c2a96936
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Console/Helper/ProcessHelper.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Component\Console\Helper; namespace Symfony\Component\Console\Helper;
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Process\Exception\ProcessFailedException; use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
@ -37,6 +38,10 @@ class ProcessHelper extends Helper
*/ */
public function run(OutputInterface $output, $cmd, $error = null, $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE) public function run(OutputInterface $output, $cmd, $error = null, $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)
{ {
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
$formatter = $this->getHelperSet()->get('debug_formatter'); $formatter = $this->getHelperSet()->get('debug_formatter');
if (is_array($cmd)) { if (is_array($cmd)) {
@ -109,6 +114,10 @@ class ProcessHelper extends Helper
*/ */
public function wrapCallback(OutputInterface $output, Process $process, $callback = null) public function wrapCallback(OutputInterface $output, Process $process, $callback = null)
{ {
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
$formatter = $this->getHelperSet()->get('debug_formatter'); $formatter = $this->getHelperSet()->get('debug_formatter');
$that = $this; $that = $this;

5
src/Symfony/Component/Console/Helper/ProgressBar.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Component\Console\Helper; namespace Symfony\Component\Console\Helper;
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
/** /**
@ -54,6 +55,10 @@ class ProgressBar
*/ */
public function __construct(OutputInterface $output, $max = 0) public function __construct(OutputInterface $output, $max = 0)
{ {
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
$this->output = $output; $this->output = $output;
$this->setMaxSteps($max); $this->setMaxSteps($max);

5
src/Symfony/Component/Console/Helper/QuestionHelper.php
View File

@ -12,6 +12,7 @@
namespace Symfony\Component\Console\Helper; namespace Symfony\Component\Console\Helper;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Formatter\OutputFormatterStyle; use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Console\Question\Question; use Symfony\Component\Console\Question\Question;
@ -41,6 +42,10 @@ class QuestionHelper extends Helper
*/ */
public function ask(InputInterface $input, OutputInterface $output, Question $question) public function ask(InputInterface $input, OutputInterface $output, Question $question)
{ {
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
if (!$input->isInteractive()) { if (!$input->isInteractive()) {
return $question->getDefault(); return $question->getDefault();
} }