allow optional ConsoleOutput directly in the constructor

Author: Tobion

Handler/ConsoleHandler.php

@@ -25,7 +25,7 @@
  * Writes logs to the console output depending on its verbosity setting.
  *
  * It is disabled by default and gets activated as soon as a command is executed.
- * Instead of listening to the console events, setOutput can also be called manually.
+ * Instead of listening to the console events, the output can also be set manually.
  *
  * The minimum logging level at which this handler will be triggered depends on the
  * verbosity setting of the console output. The default mapping is:
@@ -58,13 +58,16 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
     /**
      * Constructor.
      *
-     * @param Boolean $bubble            Whether the messages that are handled can bubble up the stack
-     * @param array   $verbosityLevelMap Array that maps the OutputInterface verbosity to a minimum logging level
-     *                                   (leave empty to use the default mapping)
+     * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
+     *                                                until the output is set, e.g. by using console events)
+     * @param Boolean              $bubble            Whether the messages that are handled can bubble up the stack
+     * @param array                $verbosityLevelMap Array that maps the OutputInterface verbosity to a minimum logging
+     *                                                level (leave empty to use the default mapping)
      */
-    public function __construct($bubble = true, array $verbosityLevelMap = array())
+    public function __construct(OutputInterface $output = null, $bubble = true, array $verbosityLevelMap = array())
     {
         parent::__construct(Logger::DEBUG, $bubble);
+        $this->output = $output;
 
         if ($verbosityLevelMap) {
             $this->verbosityLevelMap = $verbosityLevelMap;

Tests/Handler/ConsoleHandlerTest.php

@@ -25,7 +25,7 @@ class ConsoleHandlerTest extends TestCase
 {
     public function testConstructor()
     {
-        $handler = new ConsoleHandler(false);
+        $handler = new ConsoleHandler(null, false);
         $this->assertFalse($handler->getBubble(), 'the bubble parameter gets propagated');
     }
 
@@ -46,8 +46,7 @@ public function testVerbosityMapping($verbosity, $level, $isHandling)
             ->method('getVerbosity')
             ->will($this->returnValue($verbosity))
         ;
-        $handler = new ConsoleHandler();
-        $handler->setOutput($output);
+        $handler = new ConsoleHandler($output);
         $this->assertSame($isHandling, $handler->isHandling(array('level' => $level)),
             '->isHandling returns correct value depending on console verbosity and log level'
         );
@@ -81,8 +80,7 @@ public function testVerbosityChanged()
             ->method('getVerbosity')
             ->will($this->returnValue(OutputInterface::VERBOSITY_DEBUG))
         ;
-        $handler = new ConsoleHandler();
-        $handler->setOutput($output);
+        $handler = new ConsoleHandler($output);
         $this->assertFalse($handler->isHandling(array('level' => Logger::NOTICE)),
             'when verbosity is set to quiet, the handler does not handle the log'
         );
@@ -126,7 +124,7 @@ public function testWritingAndFormatting()
             ->will($this->returnValue($errorOutput))
         ;
 
-        $handler = new ConsoleHandler(false);
+        $handler = new ConsoleHandler(null, false);
         $handler->setOutput($output);
 
         $infoRecord = array(