bug #15771 [Console] Ensure the console output is only detected as decorated when both stderr and stdout support colors (Seldaek)

fabpot · fabpot · commit e2156d7c2cc7 · 2015-09-13T13:30:23.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Console] Ensure the console output is only detected as decorated when both stderr and stdout support colors | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10592 #13449 | License | MIT | Doc PR | This is a simplified version of #13661 which does not create any issues with having two decorators but merely ensures that if either STDERR **or** STDOUT has colors disabled, then both will have decoration disabled. It's not a perfect solution but it's better than having both enabled as this breaks things. And I don't think we can come to a better solution without api changes. Commits ------- f3d8444 [Console] Ensure the console output is only detected as decorated when both stderr and stdout support colors
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -48,7 +48,12 @@ public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = nu
     {
         parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
 
+        $actualDecorated = $this->isDecorated();
         $this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated, $this->getFormatter());
+
+        if (null === $decorated) {
+            $this->setDecorated($actualDecorated && $this->stderr->isDecorated());
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,12 @@ public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = nu`
`48`	`48`	`{`
`49`	`49`	`parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);`
`50`	`50`
	`51`	`+ $actualDecorated = $this->isDecorated();`
`51`	`52`	`$this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated, $this->getFormatter());`
	`53`	`+`
	`54`	`+ if (null === $decorated) {`
	`55`	`+ $this->setDecorated($actualDecorated && $this->stderr->isDecorated());`
	`56`	`+ }`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`/**`