bug symfony#11272 [Console] Make sure formatter is the same. (akimsko)

fabpot · fabpot · commit 5f8ee9d596d1 · 2014-07-02T15:19:50.000+02:00
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes symfony#11272). Discussion ---------- [Console] Make sure formatter is the same. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The parent constructor will create a new formatter if the $formatter parameter is null. This fix avoids that the formatter becomes 2 different instances in $this and $this->stderr, if null was passed to the constructor. Commits ------- 64328d9 [Console] Make sure formatter is the same
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, $formatter);
+        $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $this->getFormatter());
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php b/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php
@@ -20,5 +20,6 @@ public function testConstructor()
     {
         $output = new ConsoleOutput(Output::VERBOSITY_QUIET, true);
         $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');
     }
 }

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, $formatter);`
	`53`	`+ $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $this->getFormatter());`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ public function testConstructor()`
`20`	`20`	`{`
`21`	`21`	`$output = new ConsoleOutput(Output::VERBOSITY_QUIET, true);`
`22`	`22`	`$this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');`
	`23`	`+ $this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument');`
`23`	`24`	`}`
`24`	`25`	`}`