makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16378] Update deprecated console exception_subscriber event

Browse source 
PHPBB3-16378
This commit is contained in:
mrgoldy 2020-02-27 15:51:12 +01:00
parent b1f0276307
commit 34595c02ba
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/phpbb/console/exception_subscriber.php
View file

@ -15,7 +15,7 @@ namespace phpbb\console;
use phpbb\exception\exception_interface; use phpbb\exception\exception_interface;
use Symfony\Component\Console\ConsoleEvents; use Symfony\Component\Console\ConsoleEvents;
use Symfony\Component\Console\Event\ConsoleExceptionEvent; use Symfony\Component\Console\Event\ConsoleErrorEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class exception_subscriber implements EventSubscriberInterface class exception_subscriber implements EventSubscriberInterface
@ -39,27 +39,27 @@ class exception_subscriber implements EventSubscriberInterface
* This listener is run when the ConsoleEvents::EXCEPTION event is triggered. * 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. * It translate the exception message. If din debug mode the original exception is embedded.
* *
* @param ConsoleExceptionEvent $event * @param ConsoleErrorEvent $event
*/ */
public function on_exception(ConsoleExceptionEvent $event) public function on_exception(ConsoleErrorEvent $event)
{ {
$original_exception = $event->getException(); $original_exception = $event->getError();
if ($original_exception instanceof exception_interface) if ($original_exception instanceof exception_interface)
{ {
$parameters = array_merge(array($original_exception->getMessage()), $original_exception->get_parameters()); $parameters = array_merge([$original_exception->getMessage()], $original_exception->get_parameters());
$message = call_user_func_array(array($this->language, 'lang'), $parameters); $message = call_user_func_array([$this->language, 'lang'], $parameters);
$exception = new \RuntimeException($message , $original_exception->getCode(), $original_exception); $exception = new \RuntimeException($message , $original_exception->getCode(), $original_exception);
$event->setException($exception); $event->setError($exception);
} }
} }
static public function getSubscribedEvents() static public function getSubscribedEvents()
{ {
return array( return [
ConsoleEvents::EXCEPTION => 'on_exception', ConsoleEvents::ERROR => 'on_exception',
); ];
} }
} }