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

[ticket/13361] Rename exception to runtime_exception

Browse source 
PHPBB3-13361
This commit is contained in:
Tristan Darricau 2015-01-20 23:08:30 +01:00
parent 8ef238ea73
commit 7fef91afd2
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/exception/http_exception.php
View file

@ -18,7 +18,7 @@ use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
/** /**
* Class http_exception * Class http_exception
*/ */
class http_exception extends exception implements HttpExceptionInterface class http_exception extends runtime_exception implements HttpExceptionInterface
{ {
/** /**
* Http status code. * Http status code.

6
phpBB/phpbb/exception/exception.php → phpBB/phpbb/exception/runtime_exception.php
View file

@ -14,11 +14,11 @@
namespace phpbb\exception; namespace phpbb\exception;
/** /**
* Class exception * Class runtime_exception
* *
* Define an exception which support a language var as message. * Define an exception which support a language var as message.
*/ */
class exception extends \RuntimeException implements exception_interface class runtime_exception extends \RuntimeException implements exception_interface
{ {
/** /**
* Parameters to use with the language var. * Parameters to use with the language var.
@ -32,7 +32,7 @@ class exception extends \RuntimeException implements exception_interface
* *
* @param string $message The Exception message to throw (must be a language variable). * @param string $message The Exception message to throw (must be a language variable).
* @param array $parameters The parameters to use with the language var. * @param array $parameters The parameters to use with the language var.
* @param \Exception $previous The previous exception used for the exception chaining. * @param \Exception $previous The previous runtime_exception used for the runtime_exception chaining.
* @param integer $code The Exception code. * @param integer $code The Exception code.
*/ */
public function __construct($message = "", array $parameters = array(), \Exception $previous = null, $code = 0) public function __construct($message = "", array $parameters = array(), \Exception $previous = null, $code = 0)

4
tests/event/exception_listener.php → tests/event/exception_listener_test.php
View file

@ -35,7 +35,7 @@ class exception_listener extends phpbb_test_case
), ),
array( array(
true, true,
new \phpbb\exception\exception('AJAX_ERROR_TEXT'), new \phpbb\exception\runtime_exception('AJAX_ERROR_TEXT'),
array( array(
'status_code' => 500, 'status_code' => 500,
'content' => 'Something went wrong when processing your request.', 'content' => 'Something went wrong when processing your request.',
@ -84,7 +84,7 @@ class exception_listener extends phpbb_test_case
$exception_listener = new \phpbb\event\kernel_exception_subscriber($template, $user); $exception_listener = new \phpbb\event\kernel_exception_subscriber($template, $user);
$event = new \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent(new \phpbb\kernel('test'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST, $exception); $event = new \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST, $exception);
$exception_listener->on_kernel_exception($event); $exception_listener->on_kernel_exception($event);
$response = $event->getResponse(); $response = $event->getResponse();