mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge pull request #3857 from Nicofuma/ticket/14124
[ticket/14124] Automatically translate exceptions in CLI
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
|
||||
namespace phpbb\console\command\cron;
|
||||
|
||||
use phpbb\exception\runtime_exception;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
@@ -93,8 +94,7 @@ class run extends \phpbb\console\command\command
|
||||
}
|
||||
else
|
||||
{
|
||||
$output->writeln('<error>' . $this->user->lang('CRON_LOCK_ERROR') . '</error>');
|
||||
return 1;
|
||||
throw new runtime_exception('CRON_LOCK_ERROR', array(), null, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -165,8 +165,7 @@ class run extends \phpbb\console\command\command
|
||||
}
|
||||
else
|
||||
{
|
||||
$output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK', $task_name) . '</error>');
|
||||
return 2;
|
||||
throw new runtime_exception('CRON_NO_SUCH_TASK', array( $task_name), null, 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
74
phpBB/phpbb/console/exception_subscriber.php
Normal file
74
phpBB/phpbb/console/exception_subscriber.php
Normal file
@@ -0,0 +1,74 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* This file is part of the phpBB Forum Software package.
|
||||
*
|
||||
* @copyright (c) phpBB Limited <https://www.phpbb.com>
|
||||
* @license GNU General Public License, version 2 (GPL-2.0)
|
||||
*
|
||||
* For full copyright and license information, please see
|
||||
* the docs/CREDITS.txt file.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace phpbb\console;
|
||||
|
||||
use phpbb\exception\exception_interface;
|
||||
use Symfony\Component\Console\ConsoleEvents;
|
||||
use Symfony\Component\Console\Event\ConsoleExceptionEvent;
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
|
||||
class exception_subscriber implements EventSubscriberInterface
|
||||
{
|
||||
/**
|
||||
* @var \phpbb\language\language
|
||||
*/
|
||||
protected $language;
|
||||
|
||||
/**
|
||||
* Construct method
|
||||
*
|
||||
* @param \phpbb\language\language $language Language object
|
||||
* @param bool $debug Debug mode
|
||||
*/
|
||||
public function __construct(\phpbb\language\language $language, $debug = false)
|
||||
{
|
||||
$this->language = $language;
|
||||
$this->debug = $debug;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*
|
||||
* @param ConsoleExceptionEvent $event
|
||||
*/
|
||||
public function on_exception(ConsoleExceptionEvent $event)
|
||||
{
|
||||
$original_exception = $event->getException();
|
||||
|
||||
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);
|
||||
|
||||
if ($this->debug)
|
||||
{
|
||||
$exception = new \RuntimeException($message , $original_exception->getCode(), $original_exception);
|
||||
}
|
||||
else
|
||||
{
|
||||
$exception = new \RuntimeException($message , $original_exception->getCode());
|
||||
}
|
||||
|
||||
$event->setException($exception);
|
||||
}
|
||||
}
|
||||
|
||||
static public function getSubscribedEvents()
|
||||
{
|
||||
return array(
|
||||
ConsoleEvents::EXCEPTION => 'on_exception',
|
||||
);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user