From 0c1aeb862b745a672d9eec3295fe6ea2c1905f68 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Jan 2025 20:49:56 +0100 Subject: [PATCH 1/5] [ticket/17465] Start implementation of unit tests for webpush controller PHPBB-17465 --- tests/ucp/controller_webpush_test.php | 104 ++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 tests/ucp/controller_webpush_test.php diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php new file mode 100644 index 0000000000..9e84522239 --- /dev/null +++ b/tests/ucp/controller_webpush_test.php @@ -0,0 +1,104 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\exception\http_exception; +use phpbb\request\request_interface; +use phpbb\ucp\controller\webpush; + +class test_ucp_controller_webpush_test extends phpbb_test_case +{ + protected $config; + protected $controller; + protected $controller_helper; + protected $db; + protected $form_helper; + protected $language; + protected $notification; + protected $notification_manager; + protected $path_helper; + protected $request; + protected $template; + protected $user; + protected $user_loader; + + protected function setUp(): void + { + parent::setUp(); + + $this->config = $this->createMock(\phpbb\config\config::class); + $this->controller_helper = $this->createMock(\phpbb\controller\helper::class); + $this->db = $this->createMock(\phpbb\db\driver\driver_interface::class); + $this->form_helper = $this->createMock(\phpbb\form\form_helper::class); + $this->language = $this->createMock(\phpbb\language\language::class); + $this->notification = $this->createMock(\phpbb\notification\type\type_interface::class); + $this->notification_manager = $this->createMock(\phpbb\notification\manager::class); + $this->path_helper = $this->createMock(\phpbb\path_helper::class); + $this->request = $this->createMock(\phpbb\request\request_interface::class); + $this->template = $this->createMock(\Twig\Environment::class); + $this->user = $this->createMock(\phpbb\user::class); + $this->user_loader = $this->createMock(\phpbb\user_loader::class); + + $this->controller = new webpush( + $this->config, + $this->controller_helper, + $this->db, + $this->form_helper, + $this->language, + $this->notification_manager, + $this->path_helper, + $this->request, + $this->user_loader, + $this->user, + $this->template, + 'webpush_table', + 'subscription_table' + ); + } + + public function data_notification_no_data(): array + { + return [ + 'logged_in_user' => [ + USER_NORMAL, + 2, + [], + ], + 'anonymous_user' => [ + USER_NORMAL, + ANONYMOUS, + [ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ], + ], + ]; + } + + /** + * @dataProvider data_notification_no_data + */ + public function test_notification_no_data($user_type, $user_id, $request_data) + { + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap($request_data)); + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = $user_type; + $this->user->method('id')->willReturn($user_id); + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('AJAX_ERROR_TEXT'); + + $this->controller->notification(); + } +} From ac3e9f64d81cbba5f3f111db389863f904ca499e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Jan 2025 20:50:29 +0100 Subject: [PATCH 2/5] [ticket/17465] Throw bad request exceptions on invalid data requests PHPBB-17465 --- phpBB/phpbb/ucp/controller/webpush.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 50d3eb3739..c36f67d129 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -165,6 +165,11 @@ class webpush $notification_data = $this->db->sql_fetchfield('push_data'); $this->db->sql_freeresult($result); + if (!$notification_data) + { + throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT'); + } + return $this->get_notification_data($notification_data); } @@ -192,6 +197,11 @@ class webpush $notification_row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); + if (!$notification_row || !isset($notification_row['push_data']) || !isset($notification_row['push_token'])) + { + throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT'); + } + $notification_data = $notification_row['push_data']; $push_token = $notification_row['push_token']; From c5c6c96a50947cea9c8f04a0a7d3b42c0ce28802 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Jan 2025 21:15:33 +0100 Subject: [PATCH 3/5] [ticket/17465] Cover more exceptions when handling notification PHPBB-17465 --- tests/ucp/controller_webpush_test.php | 62 +++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index 9e84522239..d4b63f0983 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -65,39 +65,85 @@ class test_ucp_controller_webpush_test extends phpbb_test_case ); } - public function data_notification_no_data(): array + public function data_notification_exceptions(): array { return [ - 'logged_in_user' => [ + 'not_ajax' => [ + false, + false, USER_NORMAL, 2, [], + 'NO_AUTH_OPERATION', ], - 'anonymous_user' => [ + 'is_bot' => [ + true, + true, + USER_NORMAL, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'inactive_user' => [ + true, + false, + USER_INACTIVE, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'ignore_user' => [ + true, + false, + USER_IGNORE, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'no_notification' => [ + true, + false, + USER_NORMAL, + 2, + [], + 'AJAX_ERROR_TEXT', + ], + 'no_notification_anonymous' => [ + true, + false, USER_NORMAL, ANONYMOUS, [ ['token', '', false, request_interface::REQUEST, 'foobar'], ], + 'AJAX_ERROR_TEXT', + ], + 'no_notification_anonymous_no_token' => [ + true, + false, + USER_NORMAL, + ANONYMOUS, + [], + 'NO_AUTH_OPERATION', ], ]; } /** - * @dataProvider data_notification_no_data + * @dataProvider data_notification_exceptions */ - public function test_notification_no_data($user_type, $user_id, $request_data) + public function test_notification_no_data($is_ajax, $is_bot, $user_type, $user_id, $request_data, $expected_message) { - $this->request->method('is_ajax')->willReturn(true); + $this->request->method('is_ajax')->willReturn($is_ajax); $this->request->expects($this->any()) ->method('variable') ->will($this->returnValueMap($request_data)); - $this->user->data['is_bot'] = false; + $this->user->data['is_bot'] = $is_bot; $this->user->data['user_type'] = $user_type; $this->user->method('id')->willReturn($user_id); $this->expectException(http_exception::class); - $this->expectExceptionMessage('AJAX_ERROR_TEXT'); + $this->expectExceptionMessage($expected_message); $this->controller->notification(); } From c937b8f7ab8be7beee5067e592e0bb8085bdbcbc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 2 Feb 2025 17:15:34 +0100 Subject: [PATCH 4/5] [ticket/17465] Add unit tests for all functions in webpush controller PHPBB-17465 --- phpBB/phpbb/ucp/controller/webpush.php | 1 - tests/ucp/controller_webpush_test.php | 423 ++++++++++++++++++++++++- tests/ucp/fixtures/webpush.xml | 65 ++++ 3 files changed, 474 insertions(+), 15 deletions(-) create mode 100644 tests/ucp/fixtures/webpush.xml diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index c36f67d129..95406840d4 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -135,7 +135,6 @@ class webpush // Decode and return data if everything is fine $data = json_decode($notification_data, true); - $data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : ''; return new JsonResponse($data); } diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index d4b63f0983..e68d50341c 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -12,41 +12,67 @@ */ use phpbb\exception\http_exception; +use phpbb\notification\type\quote; use phpbb\request\request_interface; use phpbb\ucp\controller\webpush; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Response; -class test_ucp_controller_webpush_test extends phpbb_test_case +class test_ucp_controller_webpush_test extends phpbb_database_test_case { + protected $auth; + protected $avatar_helper; protected $config; protected $controller; protected $controller_helper; protected $db; protected $form_helper; protected $language; - protected $notification; protected $notification_manager; protected $path_helper; + protected $phpbb_root_path; + protected $php_ext; protected $request; protected $template; protected $user; protected $user_loader; + protected function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush.xml'); + } + protected function setUp(): void { + global $auth, $config, $phpbb_dispatcher, $user, $phpbb_root_path, $phpEx; + parent::setUp(); - $this->config = $this->createMock(\phpbb\config\config::class); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + $this->auth = $this->createMock(\phpbb\auth\auth::class); + $auth = $this->auth; + $this->avatar_helper = $this->createMock(\phpbb\avatar\helper::class); + $this->config = new \phpbb\config\config([ + 'allow_nocensors' => false, + 'sitename' => 'yourdomain.com', + ]); + $config = $this->config; $this->controller_helper = $this->createMock(\phpbb\controller\helper::class); - $this->db = $this->createMock(\phpbb\db\driver\driver_interface::class); + $this->db = $this->new_dbal(); $this->form_helper = $this->createMock(\phpbb\form\form_helper::class); - $this->language = $this->createMock(\phpbb\language\language::class); - $this->notification = $this->createMock(\phpbb\notification\type\type_interface::class); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->language = new \phpbb\language\language($lang_loader); $this->notification_manager = $this->createMock(\phpbb\notification\manager::class); - $this->path_helper = $this->createMock(\phpbb\path_helper::class); + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + $symfony_request = $this->createMock(\phpbb\symfony_request::class); $this->request = $this->createMock(\phpbb\request\request_interface::class); $this->template = $this->createMock(\Twig\Environment::class); - $this->user = $this->createMock(\phpbb\user::class); - $this->user_loader = $this->createMock(\phpbb\user_loader::class); + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); + $user = $this->user; + $this->user_loader = new \phpbb\user_loader($this->avatar_helper, $this->db, $this->phpbb_root_path, $this->php_ext, 'phpbb_users'); + $this->path_helper = new \phpbb\path_helper($symfony_request, $this->request, $phpbb_root_path, $phpEx); $this->controller = new webpush( $this->config, @@ -60,8 +86,8 @@ class test_ucp_controller_webpush_test extends phpbb_test_case $this->user_loader, $this->user, $this->template, - 'webpush_table', - 'subscription_table' + 'phpbb_notification_push', + 'phpbb_push_subscriptions' ); } @@ -138,13 +164,382 @@ class test_ucp_controller_webpush_test extends phpbb_test_case $this->request->expects($this->any()) ->method('variable') ->will($this->returnValueMap($request_data)); - $this->user->data['is_bot'] = $is_bot; - $this->user->data['user_type'] = $user_type; - $this->user->method('id')->willReturn($user_id); + $this->user->data = [ + 'is_bot' => $is_bot, + 'user_type' => $user_type, + 'user_id' => $user_id, + ]; $this->expectException(http_exception::class); $this->expectExceptionMessage($expected_message); $this->controller->notification(); } + + public function test_get_user_notification() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => 2, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB3"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_get_user_notification_anonymous() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, '0ccf8fcd96a66297b77b66109cbe9870e1a6fa66e42b9bf36d1f2c7263240058'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ['user_id', 0, false, request_interface::REQUEST, 2], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => ANONYMOUS, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB3"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_get_user_notification_anonymous_invalid_token() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, '488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ['user_id', 0, false, request_interface::REQUEST, 2], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => ANONYMOUS, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NO_AUTH_OPERATION'); + + $this->controller->notification(); + } + + public function test_get_user_notification_legacy() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ['item_id', 0, false, request_interface::REQUEST, 2], + ['type_id', 0, false, request_interface::REQUEST, 4], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => 2, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB3"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_worker() + { + $this->template->method('render')->willReturn('rendered_content'); + $this->controller_helper->method('route')->willReturn('test_route'); + $this->config['assets_version'] = '1.0'; + + $response = $this->controller->worker(); + + $this->assertInstanceOf(Response::class, $response); + $this->assertEquals('text/javascript; charset=UTF-8', $response->headers->get('Content-Type')); + $this->assertEquals('rendered_content', $response->getContent()); + $this->assertNull($response->headers->get('X-PHPBB-IS-BOT')); + } + + public function test_worker_bot() + { + $this->template->method('render')->willReturn('rendered_content'); + $this->controller_helper->method('route')->willReturn('test_route'); + $this->config['assets_version'] = '1.0'; + $this->user->data['is_bot'] = true; + + $response = $this->controller->worker(); + + $this->assertEquals('yes', $response->headers->get('X-PHPBB-IS-BOT')); + } + + public function test_check_subscribe_requests_invalid_form_token() + { + $this->form_helper->method('check_form_tokens')->willReturn(false); + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('FORM_INVALID'); + + $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); + $check_subscribe_reflection->setAccessible(true); + $check_subscribe_reflection->invoke($this->controller); + } + + public function test_check_subscribe_requests_anonymous_user() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = ANONYMOUS; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NO_AUTH_OPERATION'); + + $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); + $check_subscribe_reflection->setAccessible(true); + $check_subscribe_reflection->invoke($this->controller); + } + + public function test_subscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->method('get')->willReturn(json_encode([ + 'endpoint' => 'test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => '1', + ], $row); + } + + public function test_unsubscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->method('get')->willReturn(json_encode([ + 'endpoint' => 'test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => '1', + ], $row); + + // Now unsubscribe + $response = $this->controller->unsubscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEmpty($row); + } } diff --git a/tests/ucp/fixtures/webpush.xml b/tests/ucp/fixtures/webpush.xml new file mode 100644 index 0000000000..3e209be391 --- /dev/null +++ b/tests/ucp/fixtures/webpush.xml @@ -0,0 +1,65 @@ + + + + item_id + push_data + push_token + user_id + notification_type_id + notification_time + + 1 + + 488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967 + 2 + 4 + 1738437884 + + + 2 + + 488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967 + 2 + 4 + 1738437884 + +
+ + notification_type_id + notification_type_name + notification_type_enabled + + 4 + notification.type.quote + 1 + +
+ + user_id + username_clean + user_permissions + user_sig + user_form_salt + + 1 + Anonymous + + + + + + 2 + poster + + + sua0m6f0ektt1g9z + + + 3 + test + + + abcdef + +
+ From e75d7a841006fab143757c8baf2e54fe29bdb47d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 6 Feb 2025 19:48:42 +0100 Subject: [PATCH 5/5] [ticket/17465] Remove obsolete json_decode PHPBB-17465 --- phpBB/phpbb/ucp/controller/webpush.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 95406840d4..01111f9ca4 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -133,10 +133,7 @@ class webpush $notification_data = $this->get_anonymous_notifications(); } - // Decode and return data if everything is fine - $data = json_decode($notification_data, true); - - return new JsonResponse($data); + return new JsonResponse($notification_data, 200, [], true); } /**