[Console] ConsoleOuput::isDecorated is detected from STDOUT

giosh94mhz · giosh94mhz · commit df1ee7f1029a · 2015-01-22T11:03:42.000+01:00
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -50,7 +50,7 @@ public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = nu
 
         parent::__construct(fopen($outputStream, 'w'), $verbosity, $decorated, $formatter);
 
-        $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $this->getFormatter());
+        $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $this->getFormatter()->isDecorated(), $this->getFormatter());
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php b/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php
@@ -14,6 +14,22 @@
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\Output;
 
+class ConsoleOutputWithColorSupportDifferentFromStderr extends ConsoleOutput
+{
+    public $expected;
+
+    protected function hasColorSupport()
+    {
+        // emulate posix_isatty(STDOUT) !== posix_isatty(STDERR)
+        return ($this->expected = ! parent::hasColorSupport());
+    }
+
+    public function getUnexpectedValue()
+    {
+        return parent::hasColorSupport();
+    }
+}
+
 class ConsoleOutputTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructor()
@@ -22,4 +38,11 @@ public function testConstructor()
         $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
         $this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument');
     }
+
+    public function testDecoratedIsNotOverriddenByStderr()
+    {
+        $output = new ConsoleOutputWithColorSupportDifferentFromStderr(Output::VERBOSITY_QUIET, null);
+
+        $this->assertSame($output->expected, $output->isDecorated());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = nu`
`50`	`50`
`51`	`51`	`parent::__construct(fopen($outputStream, 'w'), $verbosity, $decorated, $formatter);`
`52`	`52`
`53`		`- $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $this->getFormatter());`
	`53`	`+ $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $this->getFormatter()->isDecorated(), $this->getFormatter());`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`