diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-10 18:15:19 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-11 11:28:45 +0100 |
| commit | 1f4bb2c1495e8d2641abe9606f14281e810feee4 (patch) | |
| tree | 71c491200fb0c3cfe5f42334093387491c16053e | |
| parent | 74e8f9bd4e6c55dddb473e1a301d2cae9edb6e50 (diff) | |
| download | forums-1f4bb2c1495e8d2641abe9606f14281e810feee4.tar forums-1f4bb2c1495e8d2641abe9606f14281e810feee4.tar.gz forums-1f4bb2c1495e8d2641abe9606f14281e810feee4.tar.bz2 forums-1f4bb2c1495e8d2641abe9606f14281e810feee4.tar.xz forums-1f4bb2c1495e8d2641abe9606f14281e810feee4.zip | |
[ticket/13361] Add tests
PHPBB3-13361
| -rw-r--r-- | phpBB/phpbb/event/kernel_exception_subscriber.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/exception/http_exception.php | 6 | ||||
| -rw-r--r-- | tests/event/exception_listener.php | 100 |
3 files changed, 111 insertions, 5 deletions
diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index b6b34675f0..01940a4fa9 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -54,8 +54,6 @@ class kernel_exception_subscriber implements EventSubscriberInterface */ public function on_kernel_exception(GetResponseForExceptionEvent $event) { - page_header($this->user->lang('INFORMATION')); - $exception = $event->getException(); $message = $exception->getMessage(); @@ -67,6 +65,8 @@ class kernel_exception_subscriber implements EventSubscriberInterface if (!$event->getRequest()->isXmlHttpRequest()) { + page_header($this->user->lang('INFORMATION')); + $this->template->assign_vars(array( 'MESSAGE_TITLE' => $this->user->lang('INFORMATION'), 'MESSAGE_TEXT' => $message, @@ -83,7 +83,11 @@ class kernel_exception_subscriber implements EventSubscriberInterface else { $data = array(); - $data['message'] = $message; + + if (!empty($message)) + { + $data['message'] = $message; + } if (defined('DEBUG')) { diff --git a/phpBB/phpbb/exception/http_exception.php b/phpBB/phpbb/exception/http_exception.php index 57604d49d4..f733462a05 100644 --- a/phpBB/phpbb/exception/http_exception.php +++ b/phpBB/phpbb/exception/http_exception.php @@ -13,10 +13,12 @@ namespace phpbb\exception; +use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; + /** * Class http_exception */ -class http_exception extends exception implements exception_interface +class http_exception extends exception implements HttpExceptionInterface { /** * Http status code. @@ -47,7 +49,7 @@ class http_exception extends exception implements exception_interface $this->status_code = $status_code; $this->headers = $headers; - parent::__construct($message, $code, $previous); + parent::__construct($message, $parameters, $previous, $code); } /** diff --git a/tests/event/exception_listener.php b/tests/event/exception_listener.php new file mode 100644 index 0000000000..9d6b70e2d3 --- /dev/null +++ b/tests/event/exception_listener.php @@ -0,0 +1,100 @@ +<?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. +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; + +class exception_listener extends phpbb_test_case +{ + public function phpbb_exception_data() + { + return array( + array( + true, + new \Exception(), + array( + 'status_code' => 500, + ), + ), + array( + true, + new \Exception('AJAX_ERROR_TEXT'), + array( + 'status_code' => 500, + 'content' => 'AJAX_ERROR_TEXT', + ), + ), + array( + true, + new \phpbb\exception\exception('AJAX_ERROR_TEXT'), + array( + 'status_code' => 500, + 'content' => 'Something went wrong when processing your request.', + ), + ), + array( + true, + new \Symfony\Component\HttpKernel\Exception\HttpException(404, 'AJAX_ERROR_TEXT'), + array( + 'status_code' => 404, + 'content' => 'AJAX_ERROR_TEXT', + ), + ), + array( + true, + new \phpbb\exception\http_exception(404, 'AJAX_ERROR_TEXT'), + array( + 'status_code' => 404, + 'content' => 'Something went wrong when processing your request.', + ), + ), + array( + true, + new \phpbb\exception\http_exception(404, 'CURRENT_TIME', array('today')), + array( + 'status_code' => 404, + 'content' => 'It is currently today', + ), + ), + ); + } + + /** + * @dataProvider phpbb_exception_data + */ + public function test_phpbb_exception($is_ajax, $exception, $expected) + { + $request = \Symfony\Component\HttpFoundation\Request::create('test.php', 'GET', array(), array(), array(), $is_ajax ? array('HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest') : array()); + + $template = $this->getMockBuilder('\phpbb\template\twig\twig') + ->disableOriginalConstructor() + ->getMock(); + + $user = new \phpbb\user('\phpbb\datetime'); + $user->add_lang('common'); + + $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); + $exception_listener->on_kernel_exception($event); + + $response = $event->getResponse(); + + $this->assertEquals($expected['status_code'], $response->getStatusCode()); + $this->assertEquals($is_ajax, $response instanceof \Symfony\Component\HttpFoundation\JsonResponse); + + if (isset($expected['content'])) + { + $this->assertContains($expected['content'], $response->getContent()); + } + } +} |