Merge pull request #39 from Hexanet/console-error-event

Use the new ConsoleErrorEvent when possible

Author: nclsHart

src/DependencyInjection/Configuration.php

@@ -5,11 +5,6 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
-/**
- * This is the class that validates and merges configuration from your app/config files
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
- */
 class Configuration implements ConfigurationInterface
 {
     /**

src/DependencyInjection/HexanetMonologExtraExtension.php

@@ -2,16 +2,13 @@
 
 namespace Hexanet\Common\MonologExtraBundle\DependencyInjection;
 
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\KernelEvents;
 
-/**
- * This is the class that loads and manages your bundle configuration
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
- */
 class HexanetMonologExtraExtension extends Extension
 {
     /**
@@ -79,8 +76,10 @@ protected function addConsoleExceptionListener(ContainerBuilder $container, arra
             return;
         }
 
+        $event = class_exists('Symfony\Component\Console\Event\ConsoleErrorEvent') ? ConsoleEvents::ERROR : ConsoleEvents::EXCEPTION;
+
         $definition = $container->getDefinition('hexanet_monolog_extra.listener.console_exception');
-        $definition->addTag('kernel.event_listener', ['event' => 'console.exception', 'method' => 'onConsoleException']);
+        $definition->addTag('kernel.event_listener', ['event' => $event, 'method' => 'onConsoleException']);
     }
 
     protected function addRequestResponseListener(ContainerBuilder $container, array $config)
@@ -94,11 +93,11 @@ protected function addRequestResponseListener(ContainerBuilder $container, array
         $definition = $container->getDefinition('hexanet_monolog_extra.listener.request_response');
 
         if ($config['logger']['on_request']) {
-            $definition->addTag('kernel.event_listener', ['event' => 'kernel.request', 'method' => 'onRequest']);
+            $definition->addTag('kernel.event_listener', ['event' => KernelEvents::REQUEST, 'method' => 'onRequest']);
         }
 
         if ($config['logger']['on_response']) {
-            $definition->addTag('kernel.event_listener', ['event' => 'kernel.response', 'method' => 'onResponse']);
+            $definition->addTag('kernel.event_listener', ['event' => KernelEvents::RESPONSE, 'method' => 'onResponse']);
         }
     }
 
@@ -111,7 +110,7 @@ protected function addCommandListener(ContainerBuilder $container, array $config
         }
 
         $definition = $container->getDefinition('hexanet_monolog_extra.listener.command');
-        $definition->addTag('kernel.event_listener', ['event' => 'console.command', 'method' => 'onCommandResponse']);
+        $definition->addTag('kernel.event_listener', ['event' => ConsoleEvents::COMMAND, 'method' => 'onCommandResponse']);
     }
 
     protected function addUidToResponseListener(ContainerBuilder $container, array $config)
@@ -123,6 +122,6 @@ protected function addUidToResponseListener(ContainerBuilder $container, array $
         }
 
         $definition = $container->getDefinition('hexanet_monolog_extra.listener.uid_to_response');
-        $definition->addTag('kernel.event_listener', ['event' => 'kernel.response', 'method' => 'onKernelResponse']);
+        $definition->addTag('kernel.event_listener', ['event' => KernelEvents::RESPONSE, 'method' => 'onKernelResponse']);
     }
 }

src/EventListener/ConsoleExceptionListener.php

@@ -2,6 +2,7 @@
 
 namespace Hexanet\Common\MonologExtraBundle\EventListener;
 
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
 use Symfony\Component\Console\Event\ConsoleExceptionEvent;
 use Psr\Log\LoggerInterface;
 
@@ -21,12 +22,16 @@ public function __construct(LoggerInterface $logger)
     }
 
     /**
-     * @param ConsoleExceptionEvent $event
+     * @param ConsoleErrorEvent $event
      */
-    public function onConsoleException(ConsoleExceptionEvent $event) : void
+    public function onConsoleException(ConsoleErrorEvent $event) : void
     {
+        if (!$event instanceof ConsoleExceptionEvent && !$event instanceof ConsoleErrorEvent) {
+            throw new \InvalidArgumentException('Event must be an instance of ConsoleExceptionEvent or ConsoleErrorEvent');
+        }
+
         $command = $event->getCommand();
-        $exception = $event->getException();
+        $exception = $event instanceof ConsoleErrorEvent ? $event->getError() : $event->getException();
 
         $message = sprintf(
             '%s: %s (uncaught exception) at %s line %s while running console command `%s`',