diff --git a/phpBB/phpbb/console/exception_subscriber.php b/phpBB/phpbb/console/exception_subscriber.php index b240993203..15b317f349 100644 --- a/phpBB/phpbb/console/exception_subscriber.php +++ b/phpBB/phpbb/console/exception_subscriber.php @@ -15,20 +15,18 @@ namespace phpbb\console; use phpbb\exception\exception_interface; use Symfony\Component\Console\ConsoleEvents; -use Symfony\Component\Console\Event\ConsoleExceptionEvent; +use Symfony\Component\Console\Event\ConsoleErrorEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class exception_subscriber implements EventSubscriberInterface { - /** - * @var \phpbb\language\language - */ + /** @var \phpbb\language\language */ protected $language; /** - * Construct method + * Constructor. * - * @param \phpbb\language\language $language Language object + * @param \phpbb\language\language $language Language object */ public function __construct(\phpbb\language\language $language) { @@ -36,30 +34,30 @@ class exception_subscriber implements EventSubscriberInterface } /** - * This listener is run when the ConsoleEvents::EXCEPTION event is triggered. - * It translate the exception message. If din debug mode the original exception is embedded. + * This listener is run when the ConsoleEvents::ERROR event is triggered. + * It translate the error message. If in debug mode the original exception is embedded. * - * @param ConsoleExceptionEvent $event + * @param ConsoleErrorEvent $event */ - public function on_exception(ConsoleExceptionEvent $event) + public function on_error(ConsoleErrorEvent $event) { - $original_exception = $event->getException(); + $original_exception = $event->getError(); if ($original_exception instanceof exception_interface) { - $parameters = array_merge(array($original_exception->getMessage()), $original_exception->get_parameters()); - $message = call_user_func_array(array($this->language, 'lang'), $parameters); + $parameters = array_merge([$original_exception->getMessage()], $original_exception->get_parameters()); + $message = call_user_func_array([$this->language, 'lang'], $parameters); $exception = new \RuntimeException($message , $original_exception->getCode(), $original_exception); - $event->setException($exception); + $event->setError($exception); } } static public function getSubscribedEvents() { - return array( - ConsoleEvents::EXCEPTION => 'on_exception', - ); + return [ + ConsoleEvents::ERROR => 'on_error', + ]; } }