bug #11448 [MonologBridge] fixed Console handler priorities (fabpot)

fabpot · fabpot · commit dde854d96a30 · 2014-07-25T07:02:35.000+02:00
This PR was merged into the 2.4 branch. Discussion ---------- [MonologBridge] fixed Console handler priorities | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #11432 | License | MIT | Doc PR | n/a alternative to #11432 ping @Seldaek Commits ------- bdf874f [MonologBridge] fixed Console handler priorities
diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -139,8 +139,8 @@ public function onTerminate(ConsoleTerminateEvent $event)
     public static function getSubscribedEvents()
     {
         return array(
-            ConsoleEvents::COMMAND => 'onCommand',
-            ConsoleEvents::TERMINATE => 'onTerminate'
+            ConsoleEvents::COMMAND => array('onCommand', 255),
+            ConsoleEvents::TERMINATE => array('onTerminate', -255),
         );
     }
 
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -13,7 +13,13 @@
 
 use Monolog\Logger;
 use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Console\Command\Command;
 
 /**
  * Tests the ConsoleHandler and also the ConsoleFormatter.
@@ -156,4 +162,42 @@ public function testWritingAndFormatting()
 
         $this->assertTrue($handler->handle($errorRecord), 'The handler finished handling the log as bubble is false.');
     }
+
+    public function testLogsFromListeners()
+    {
+        $output = new BufferedOutput();
+        $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
+
+        $handler = new ConsoleHandler(null, false);
+
+        $logger = new Logger('app');
+        $logger->pushHandler($handler);
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(ConsoleEvents::COMMAND, function () use ($logger) {
+            $logger->addInfo('Before command message.');
+        });
+        $dispatcher->addListener(ConsoleEvents::TERMINATE, function () use ($logger) {
+            $logger->addInfo('Before terminate message.');
+        });
+
+        $dispatcher->addSubscriber($handler);
+
+        $dispatcher->addListener(ConsoleEvents::COMMAND, function () use ($logger) {
+            $logger->addInfo('After command message.');
+        });
+        $dispatcher->addListener(ConsoleEvents::TERMINATE, function () use ($logger) {
+            $logger->addInfo('After terminate message.');
+        });
+
+        $event = new ConsoleCommandEvent(new Command('foo'), $this->getMock('Symfony\Component\Console\Input\InputInterface'), $output);
+        $dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
+        $this->assertContains('Before command message.', $out = $output->fetch());
+        $this->assertContains('After command message.', $out);
+
+        $event = new ConsoleTerminateEvent(new Command('foo'), $this->getMock('Symfony\Component\Console\Input\InputInterface'), $output, 0);
+        $dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
+        $this->assertContains('Before terminate message.', $out = $output->fetch());
+        $this->assertContains('After terminate message.', $out);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,8 @@ public function onTerminate(ConsoleTerminateEvent $event)`
`139`	`139`	`public static function getSubscribedEvents()`
`140`	`140`	`{`
`141`	`141`	`return array(`
`142`		`- ConsoleEvents::COMMAND => 'onCommand',`
`143`		`- ConsoleEvents::TERMINATE => 'onTerminate'`
	`142`	`+ ConsoleEvents::COMMAND => array('onCommand', 255),`
	`143`	`+ ConsoleEvents::TERMINATE => array('onTerminate', -255),`
`144`	`144`	`);`
`145`	`145`	`}`
`146`	`146`