mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-14 04:42:04 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2020-03-01 19:10:55 +01:00
commit 65ea56f0e2
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 15 additions and 17 deletions

32
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',
];
}
}