Merge pull request #108 from iMattPro/fixes

Fix tests

Author: iMattPro

.github/workflows/tests.yml

@@ -347,7 +347,7 @@ jobs:
 
     # START Other Tests Job (SQLite 3 and mssql)
     other-tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include:

tests/notification/notification_method_webpush_test.php

@@ -328,9 +328,7 @@ public function test_notification_webpush($notification_type, $post_data, $expec
 			'post_subject' => '',
 			'post_username' => '',
 			'forum_name' => '',
-		],
-
-			$post_data);
+		], $post_data);
 		$notification_options = [
 			'item_id'			=> $post_data['post_id'],
 			'item_parent_id'	=> $post_data['topic_id'],
@@ -379,9 +377,7 @@ public function test_get_subscription($notification_type, $post_data, $expected_
 			'post_subject' => '',
 			'post_username' => '',
 			'forum_name' => '',
-		],
-
-			$post_data);
+		], $post_data);
 		$notification_options = [
 			'item_id'			=> $post_data['post_id'],
 			'item_parent_id'	=> $post_data['topic_id'],
@@ -425,9 +421,7 @@ public function test_notify_empty_queue($notification_type, $post_data, $expecte
 			'post_subject' => '',
 			'post_username' => '',
 			'forum_name' => '',
-		],
-
-			$post_data);
+		], $post_data);
 		$notification_options = [
 			'item_id'			=> $post_data['post_id'],
 			'item_parent_id'	=> $post_data['topic_id'],
@@ -477,9 +471,7 @@ public function test_notify_invalid_endpoint($notification_type, $post_data, $ex
 			'post_subject' => '',
 			'post_username' => '',
 			'forum_name' => '',
-		],
-
-			$post_data);
+		], $post_data);
 		$notification_options = [
 			'item_id'			=> $post_data['post_id'],
 			'item_parent_id'	=> $post_data['topic_id'],
@@ -534,7 +526,6 @@ public function test_notify_expired($notification_type, $post_data, $expected_us
 		// Expire subscriptions for first user
 		if (count($expected_users))
 		{
-
 			$first_user_id = array_key_first($expected_users);
 			$first_user_subs = $subscription_info[$first_user_id];
 			unset($expected_delivered_users[$first_user_id]);
@@ -548,9 +539,7 @@ public function test_notify_expired($notification_type, $post_data, $expected_us
 			'post_subject' => '',
 			'post_username' => '',
 			'forum_name' => '',
-		],
-
-			$post_data);
+		], $post_data);
 		$notification_options = [
 			'item_id'			=> $post_data['post_id'],
 			'item_parent_id'	=> $post_data['topic_id'],
@@ -607,9 +596,7 @@ public function test_prune_notifications($notification_type, $post_data, $expect
 			'post_subject' => '',
 			'post_username' => '',
 			'forum_name' => '',
-		],
-
-			$post_data);
+		], $post_data);
 		$notification_options = [
 			'item_id'			=> $post_data['post_id'],
 			'item_parent_id'	=> $post_data['topic_id'],