Fix deprecations

Author: iMattPro

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>

tests/unit/acp_module_test.php

@@ -79,7 +79,7 @@ public function test_module_info(): void
 		);
 	}
 
-	public function module_auth_test_data(): array
+	public static function module_auth_test_data(): array
 	{
 		return [
 			'invalid auth' => ['ext_foo/bar', false],
@@ -95,7 +95,7 @@ public function test_module_auth(string $module_auth, bool $expected): void
 		$this->assertEquals($expected, p_master::module_auth($module_auth, 0));
 	}
 
-	public function main_module_test_data(): array
+	public static function main_module_test_data(): array
 	{
 		return [
 			'valid mode' => ['settings'],

tests/unit/admin_controller_test.php

@@ -40,6 +40,7 @@ class admin_controller_test extends phpbb_database_test_case
 	protected helper $helper;
 	protected upload $upload;
 	protected string $phpbb_root_path;
+	protected admin_controller $admin_controller;
 
 	protected static function setup_extensions(): array
 	{
@@ -110,7 +111,7 @@ protected function setUp(): void
 		);
 	}
 
-	public function module_access_test_data(): array
+	public static function module_access_test_data(): array
 	{
 		return [
 			'correct mode' => ['settings', true],
@@ -133,7 +134,7 @@ public function test_module_access($mode, $expected)
 		$this->call_admin_controller($mode);
 	}
 
-	public function form_checks_data(): array
+	public static function form_checks_data(): array
 	{
 		return [
 			'submit test' => ['submit'],
@@ -157,7 +158,7 @@ public function test_form_checks($action)
 		$this->call_admin_controller();
 	}
 
-	public function display_settings_test_data(): array
+	public static function display_settings_test_data(): array
 	{
 		return [
 			'site name and short name' => [
@@ -258,7 +259,7 @@ public function test_display_settings($configs, $expected)
 		$this->call_admin_controller();
 	}
 
-	public function submit_test_data(): array
+	public static function submit_test_data(): array
 	{
 		return [
 			'all good inputs' => [
@@ -441,7 +442,7 @@ public function test_resync()
 		$this->call_admin_controller();
 	}
 
-	public function delete_test_data(): array
+	public static function delete_test_data(): array
 	{
 		return [
 			'not confirmed' => [

tests/unit/event_listener_test.php

@@ -84,7 +84,7 @@ public function test_getSubscribedEvents()
 		], $events);
 	}
 
-	public function header_updates_test_data(): array
+	public static function header_updates_test_data(): array
 	{
 		return [
 			'valid hex colors' => [
@@ -182,7 +182,7 @@ public function test_header_updates($configs, $icons, $expected)
 		$this->assertEquals($configs['pwa_bg_color'], $this->user->style['pwa_bg_color']);
 	}
 
-	public function manifest_updates_test_data(): array
+	public static function manifest_updates_test_data(): array
 	{
 		return [
 			'root path, no color options' => [

tests/unit/ext_test.php

@@ -47,7 +47,7 @@ protected function setUp(): void
 	 *
 	 * @return array
 	 */
-	public function ext_test_data(): array
+	public static function ext_test_data(): array
 	{
 		return [
 			'current version' => [
@@ -93,7 +93,7 @@ public function test_ext($version, $expected)
 		self::assertSame($expected, $ext->is_enableable());
 	}
 
-	public function enable_test_data(): array
+	public static function enable_test_data(): array
 	{
 		return [
 			'dir exists' => [

tests/unit/helper_test.php

@@ -176,7 +176,7 @@ public function test_get_icons_empty()
 		$this->assertCount(0, array_column($this->helper->get_icons(), 'src'));
 	}
 
-	public function delete_icon_test_data(): array
+	public static function delete_icon_test_data(): array
 	{
 		return [
 			'empty icon name' => [

tests/unit/upload_test.php

@@ -49,7 +49,7 @@ public function get_upload(): upload
 		);
 	}
 
-	public function upload_data(): array
+	public static function upload_data(): array
 	{
 		return [
 			'upload failed' => [false],