fix merge

This commit is contained in:
Nicolas Grekas 2019-08-08 13:27:29 +02:00
parent 0dc584e3ab
commit a2dd65f7f4

View File

@ -47,7 +47,7 @@ class ExceptionListener implements EventSubscriberInterface
$this->logException($event->getException(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine())); $this->logException($event->getException(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));
} }
public function onKernelException(ExceptionEvent $event, ?string $eventName, EventDispatcherInterface $eventDispatcher) public function onKernelException(ExceptionEvent $event, string $eventName = null, EventDispatcherInterface $eventDispatcher = null)
{ {
if (null === $this->controller) { if (null === $this->controller) {
return; return;