bug #15728 Use stderr by default when a specific output is not injected (Seldaek)

fabpot · fabpot · commit eff9a26c76c4 · 2015-09-14T15:18:21.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- Use stderr by default when a specific output is not injected | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | stderr is really the best place to put logs by default, so unless someone explicitly passes something else we should use it, and especially not depend on the log level to decide where to output. Commits ------- c28796e Use stderr by default when a specific output is not injected
diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -120,7 +120,12 @@ public function close()
      */
     public function onCommand(ConsoleCommandEvent $event)
     {
-        $this->setOutput($event->getOutput());
+        $output = $event->getOutput();
+        if ($output instanceof ConsoleOutputInterface) {
+            $output = $output->getErrorOutput();
+        }
+
+        $this->setOutput($output);
     }
 
     /**
@@ -149,11 +154,7 @@ public static function getSubscribedEvents()
      */
     protected function write(array $record)
     {
-        if ($record['level'] >= Logger::ERROR && $this->output instanceof ConsoleOutputInterface) {
-            $this->output->getErrorOutput()->write((string) $record['formatted']);
-        } else {
-            $this->output->write((string) $record['formatted']);
-        }
+        $this->output->write((string) $record['formatted']);
     }
 
     /**
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -110,7 +110,7 @@ public function testGetFormatter()
 
     public function testWritingAndFormatting()
     {
-        $output = $this->getMock('Symfony\Component\Console\Output\ConsoleOutputInterface');
+        $output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
         $output
             ->expects($this->any())
             ->method('getVerbosity')
@@ -122,19 +122,6 @@ public function testWritingAndFormatting()
             ->with('<info>[2013-05-29 16:21:54] app.INFO:</info> My info message  '."\n")
         ;
 
-        $errorOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
-        $errorOutput
-            ->expects($this->once())
-            ->method('write')
-            ->with('<error>[2013-05-29 16:21:54] app.ERROR:</error> My error message  '."\n")
-        ;
-
-        $output
-            ->expects($this->any())
-            ->method('getErrorOutput')
-            ->will($this->returnValue($errorOutput))
-        ;
-
         $handler = new ConsoleHandler(null, false);
         $handler->setOutput($output);
 
@@ -149,18 +136,6 @@ public function testWritingAndFormatting()
         );
 
         $this->assertTrue($handler->handle($infoRecord), 'The handler finished handling the log as bubble is false.');
-
-        $errorRecord = array(
-            'message' => 'My error message',
-            'context' => array(),
-            'level' => Logger::ERROR,
-            'level_name' => Logger::getLevelName(Logger::ERROR),
-            'channel' => 'app',
-            'datetime' => new \DateTime('2013-05-29 16:21:54'),
-            'extra' => array(),
-        );
-
-        $this->assertTrue($handler->handle($errorRecord), 'The handler finished handling the log as bubble is false.');
     }
 
     public function testLogsFromListeners()

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,12 @@ public function close()`
`120`	`120`	`*/`
`121`	`121`	`public function onCommand(ConsoleCommandEvent $event)`
`122`	`122`	`{`
`123`		`- $this->setOutput($event->getOutput());`
	`123`	`+ $output = $event->getOutput();`
	`124`	`+ if ($output instanceof ConsoleOutputInterface) {`
	`125`	`+ $output = $output->getErrorOutput();`
	`126`	`+ }`
	`127`	`+`
	`128`	`+ $this->setOutput($output);`
`124`	`129`	`}`
`125`	`130`
`126`	`131`	`/**`
`@@ -149,11 +154,7 @@ public static function getSubscribedEvents()`
`149`	`154`	`*/`
`150`	`155`	`protected function write(array $record)`
`151`	`156`	`{`
`152`		`- if ($record['level'] >= Logger::ERROR && $this->output instanceof ConsoleOutputInterface) {`
`153`		`- $this->output->getErrorOutput()->write((string) $record['formatted']);`
`154`		`- } else {`
`155`		`- $this->output->write((string) $record['formatted']);`
`156`		`- }`
	`157`	`+ $this->output->write((string) $record['formatted']);`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`/**`