Fix deprecations

iMattPro · iMattPro · commit 30b773dfb2bd · 2025-09-16T13:55:45.000-07:00
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,26 +2,12 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 		 backupGlobals="true"
-		 backupStaticAttributes="false"
 		 colors="true"
-		 convertErrorsToExceptions="true"
-		 convertNoticesToExceptions="true"
-		 convertWarningsToExceptions="true"
 		 processIsolation="false"
 		 stopOnFailure="false"
 		 cacheResult="false"
 		 bootstrap="../../../../tests/bootstrap.php"
->
-	<coverage>
-		<include>
-			<directory suffix=".php">./</directory>
-		</include>
-		<exclude>
-			<directory suffix=".php">./language/</directory>
-			<directory suffix=".php">./migrations/</directory>
-			<directory suffix=".php">./tests/</directory>
-		</exclude>
-	</coverage>
+		 backupStaticProperties="false">
 	<testsuites>
 		<testsuite name="Extension Test Suite">
 			<directory suffix="_test.php">./tests</directory>
@@ -31,4 +17,14 @@
 			<directory suffix="_test.php">./tests/functional/</directory>
 		</testsuite>
 	</testsuites>
+	<source>
+		<include>
+			<directory suffix=".php">./</directory>
+		</include>
+		<exclude>
+			<directory suffix=".php">./language/</directory>
+			<directory suffix=".php">./migrations/</directory>
+			<directory suffix=".php">./tests/</directory>
+		</exclude>
+	</source>
 </phpunit>
diff --git a/tests/conditions/base_test.php b/tests/conditions/base_test.php
@@ -37,7 +37,7 @@ public function get_condition()
 	/**
 	 * Data for test_get_group_rules
 	 */
-	public function get_group_rules_test_data()
+	public static function get_group_rules_test_data()
 	{
 		return array(
 			array(
@@ -109,7 +109,7 @@ public function test_get_group_rules($type, $expected)
 	/**
 	 * Data for test_add_users_to_group
 	 */
-	public function add_users_to_group_test_data()
+	public static function add_users_to_group_test_data()
 	{
 		return array(
 			array(
@@ -187,7 +187,7 @@ public function test_add_users_to_group($user_id_ary, $group_id, $default, $expe
 	/**
 	 * Data for test_remove_users_from_group
 	 */
-	public function remove_users_from_group_test_data()
+	public static function remove_users_from_group_test_data()
 	{
 		return array(
 			array(
diff --git a/tests/conditions/birthdays_test.php b/tests/conditions/birthdays_test.php
@@ -42,7 +42,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public function check_condition_test_data()
+	public static function check_condition_test_data()
 	{
 		return array(
 			array(
diff --git a/tests/conditions/helper_test.php b/tests/conditions/helper_test.php
@@ -20,7 +20,7 @@ class helper_test extends base
 	/**
 	 * Data for test_get_users_groups
 	 */
-	public function get_users_groups_test_data()
+	public static function get_users_groups_test_data()
 	{
 		return array(
 			array(
@@ -80,7 +80,7 @@ public function test_get_default_exempt_users()
 	/**
 	 * Data for test_prepare_users_for_query
 	 */
-	public function prepare_users_for_query_test_data()
+	public static function prepare_users_for_query_test_data()
 	{
 		return array(
 			array(1, array(1)),
@@ -105,10 +105,8 @@ public function test_prepare_users_for_query($user_ids, $expected)
 	/**
 	 * Data for test_send_notifications
 	 */
-	public function send_notifications_data()
+	public static function send_notifications_data()
 	{
-		$language = $this->get_lang();
-
 		return array(
 			array(
 				'posts',
@@ -131,7 +129,7 @@ public function send_notifications_data()
 				array(
 					'user_ids' => array(),
 					'group_id' => 4,
-					'group_name' => $language->lang('G_GLOBAL_MODERATORS'),
+					'group_name' => 'Global moderators',
 				),
 			),
 		);
diff --git a/tests/conditions/lastvisit_test.php b/tests/conditions/lastvisit_test.php
@@ -43,7 +43,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public function check_condition_test_data()
+	public static function check_condition_test_data()
 	{
 		return array(
 			array(
diff --git a/tests/conditions/membership_test.php b/tests/conditions/membership_test.php
@@ -43,7 +43,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public function check_condition_test_data()
+	public static function check_condition_test_data()
 	{
 		return array(
 			array(
diff --git a/tests/conditions/posts_test.php b/tests/conditions/posts_test.php
@@ -42,7 +42,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public function check_condition_test_data()
+	public static function check_condition_test_data()
 	{
 		return array(
 			array(
@@ -191,7 +191,7 @@ public function check_condition_test_data()
 	 *
 	 * @return array Array of test data
 	 */
-	public function check_no_options_test_data()
+	public static function check_no_options_test_data()
 	{
 		return array(
 			array(1, 10, array(1, 5)),
diff --git a/tests/conditions/warnings_test.php b/tests/conditions/warnings_test.php
@@ -43,7 +43,7 @@ public function get_condition()
 	 *
 	 * @return array Array of test data
 	 */
-	public function check_condition_test_data()
+	public static function check_condition_test_data()
 	{
 		return array(
 			array(
diff --git a/tests/controller/delete_autogroup_rule_test.php b/tests/controller/delete_autogroup_rule_test.php
@@ -19,7 +19,7 @@ class delete_autogroup_rule_test extends admin_controller_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function delete_autogroup_rule_data()
+	public static function delete_autogroup_rule_data()
 	{
 		return array(
 			// id, exists in db
diff --git a/tests/controller/resync_autogroup_rule_test.php b/tests/controller/resync_autogroup_rule_test.php
@@ -19,7 +19,7 @@ class resync_autogroup_rule_test extends admin_controller_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function resync_autogroup_rule_data()
+	public static function resync_autogroup_rule_data()
 	{
 		return array(
 			array(0),
diff --git a/tests/controller/save_autogroup_rule_test.php b/tests/controller/save_autogroup_rule_test.php
@@ -18,7 +18,7 @@ class save_autogroup_rule_test extends admin_controller_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function save_autogroup_rule_data()
+	public static function save_autogroup_rule_data()
 	{
 		return array(
 			array(0, 0, 0, false, false, false, false, false), // with no existing rule, zero out the options
diff --git a/tests/controller/submit_autogroup_rule_test.php b/tests/controller/submit_autogroup_rule_test.php
@@ -19,7 +19,7 @@ class submit_autogroup_rule_test extends admin_controller_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function submit_autogroup_rule_data()
+	public static function submit_autogroup_rule_data()
 	{
 		return array(
 			array(
diff --git a/tests/cron_test.php b/tests/cron_test.php
@@ -57,7 +57,7 @@ public function test_run()
 	 *
 	 * @return array Array of test data
 	 */
-	public function should_run_data()
+	public static function should_run_data()
 	{
 		return array(
 			array(time(), false),
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
@@ -87,7 +87,7 @@ public function test_delete_group_rules()
 	*
 	* @return array Array of test data
 	*/
-	public function load_language_on_setup_data()
+	public static function load_language_on_setup_data()
 	{
 		return array(
 			array(
@@ -147,7 +147,7 @@ public function test_load_language_on_setup($lang_set_ext, $expected_contains)
 	 *
 	 * @return array Array of test data
 	 */
-	public function autogroup_listeners_data()
+	public static function autogroup_listeners_data()
 	{
 		return array(
 			array(
@@ -262,7 +262,7 @@ public function test_autogroup_listeners($type_class, $event_method, $event_list
 	 *
 	 * @return array Array of test data
 	 */
-	public function autogroup_listener_limits_data()
+	public static function autogroup_listener_limits_data()
 	{
 		return [
 			[
diff --git a/tests/extension/ext_test.php b/tests/extension/ext_test.php
@@ -14,6 +14,9 @@ class ext_test extends \phpbb_database_test_case
 {
 	protected const EXTENSION = 'phpbb/autogroups';
 
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
 	/** @var \phpbb\extension\manager \phpbb\extension\manager */
 	protected $extension_manager;
 
diff --git a/tests/manager/add_autogroups_type_test.php b/tests/manager/add_autogroups_type_test.php
@@ -17,7 +17,7 @@ class add_autogroups_type_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function add_autogroups_type_test_data()
+	public static function add_autogroups_type_test_data()
 	{
 		// The database insertion does not persist between tests,
 		// so the expected ID of each insertion will always be 3.
diff --git a/tests/manager/get_autogroups_type_id_test.php b/tests/manager/get_autogroups_type_id_test.php
@@ -17,7 +17,7 @@ class get_autogroups_type_id_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function get_autogroups_type_id_from_db_test_data()
+	public static function get_autogroups_type_id_from_db_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.sample1', 1),
@@ -41,7 +41,7 @@ public function test_get_autogroups_type_id_from_db($type_name, $expected)
 	 *
 	 * @return array Array of test data
 	 */
-	public function get_autogroups_type_id_from_service_test_data()
+	public static function get_autogroups_type_id_from_service_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.sample3', 3),
@@ -65,7 +65,7 @@ public function test_get_autogroups_type_id_from_service($type_name, $expected)
 	 *
 	 * @return array Array of test data
 	 */
-	public function get_autogroups_type_id_fails_test_data()
+	public static function get_autogroups_type_id_fails_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.sample'),
diff --git a/tests/manager/get_autogroups_type_name_test.php b/tests/manager/get_autogroups_type_name_test.php
@@ -17,7 +17,7 @@ class get_autogroups_type_name_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function get_autogroups_type_name_test_data()
+	public static function get_autogroups_type_name_test_data()
 	{
 		return array(
 			array(1, 0, 'phpbb.autogroups.type.sample1'),
diff --git a/tests/manager/get_condition_lang_test.php b/tests/manager/get_condition_lang_test.php
@@ -17,7 +17,7 @@ class get_condition_lang_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function get_condition_lang_test_data()
+	public static function get_condition_lang_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.birthdays', 'AUTOGROUPS_TYPE_BIRTHDAYS'),
@@ -69,7 +69,7 @@ public function test_get_condition_lang($type_name, $expected)
 	 *
 	 * @return array Array of test data
 	 */
-	public function get_condition_lang_fails_test_data()
+	public static function get_condition_lang_fails_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.sample', 'AUTOGROUPS_TYPE_NOT_EXIST'),
diff --git a/tests/manager/purge_autogroups_group_test.php b/tests/manager/purge_autogroups_group_test.php
@@ -17,7 +17,7 @@ class purge_autogroups_group_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function purge_autogroups_group_test_data()
+	public static function purge_autogroups_group_test_data()
 	{
 		// In the fixture we have the following settings:
 		// Rule 1 applies to group 1
diff --git a/tests/manager/purge_autogroups_type_test.php b/tests/manager/purge_autogroups_type_test.php
@@ -17,7 +17,7 @@ class purge_autogroups_type_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function purge_autogroups_type_test_data()
+	public static function purge_autogroups_type_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.sample1'),
diff --git a/tests/manager/sync_autogroups_test.php b/tests/manager/sync_autogroups_test.php
@@ -17,7 +17,7 @@ class sync_autogroups_test extends base_manager
 	 *
 	 * @return array Array of test data
 	 */
-	public function sync_autogroups_test_data()
+	public static function sync_autogroups_test_data()
 	{
 		return array(
 			array('phpbb.autogroups.type.sample1', 1),

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function get_condition()`
`42`	`42`	`*`
`43`	`43`	`* @return array Array of test data`
`44`	`44`	`*/`
`45`		`- public function check_condition_test_data()`
	`45`	`+ public static function check_condition_test_data()`
`46`	`46`	`{`
`47`	`47`	`return array(`
`48`	`48`	`array(`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function get_condition()`
`43`	`43`	`*`
`44`	`44`	`* @return array Array of test data`
`45`	`45`	`*/`
`46`		`- public function check_condition_test_data()`
	`46`	`+ public static function check_condition_test_data()`
`47`	`47`	`{`
`48`	`48`	`return array(`
`49`	`49`	`array(`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class delete_autogroup_rule_test extends admin_controller_base`
`19`	`19`	`*`
`20`	`20`	`* @return array Array of test data`
`21`	`21`	`*/`
`22`		`- public function delete_autogroup_rule_data()`
	`22`	`+ public static function delete_autogroup_rule_data()`
`23`	`23`	`{`
`24`	`24`	`return array(`
`25`	`25`	`// id, exists in db`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class resync_autogroup_rule_test extends admin_controller_base`
`19`	`19`	`*`
`20`	`20`	`* @return array Array of test data`
`21`	`21`	`*/`
`22`		`- public function resync_autogroup_rule_data()`
	`22`	`+ public static function resync_autogroup_rule_data()`
`23`	`23`	`{`
`24`	`24`	`return array(`
`25`	`25`	`array(0),`