Fix deprecations

iMattPro · iMattPro · commit 4bb2c79fa866 · 2025-09-16T14:05:42.000-07:00
diff --git a/controller/admin_controller.php b/controller/admin_controller.php
@@ -342,12 +342,9 @@ protected function get_forum_info($forum_id)
 	 */
 	protected function send_json_response(bool $content): void
 	{
-		if ($this->request->is_ajax())
-		{
-			$json_response = new json_response;
-			$json_response->send([
-				'success' => (bool) $content,
-			]);
-		}
+		$json_response = new json_response;
+		$json_response->send([
+			'success' => (bool) $content,
+		]);
 	}
 }
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/acp/acp_module_test.php b/tests/acp/acp_module_test.php
@@ -62,7 +62,7 @@ public function test_module_info()
 		], $this->module_manager->get_module_infos('acp', 'acp_topic_prefixes_module'));
 	}
 
-	public function module_auth_test_data()
+	public static function module_auth_test_data()
 	{
 		return [
 			// module_auth, expected result
diff --git a/tests/controller/add_prefix_test.php b/tests/controller/add_prefix_test.php
@@ -23,7 +23,7 @@ class add_prefix_test extends admin_controller_base
 	 *
 	 * @return array
 	 */
-	public function data_add_prefix()
+	public static function data_add_prefix()
 	{
 		return [
 			['', true, true],
diff --git a/tests/controller/delete_prefix_test.php b/tests/controller/delete_prefix_test.php
@@ -23,7 +23,7 @@ class delete_prefix_test extends admin_controller_base
 	 *
 	 * @return array
 	 */
-	public function data_delete_prefix()
+	public static function data_delete_prefix()
 	{
 		return array(
 			array(1, false), // valid prefix, not confirmed
diff --git a/tests/controller/display_settings_test.php b/tests/controller/display_settings_test.php
@@ -23,7 +23,7 @@ class display_settings_test extends admin_controller_base
 	 *
 	 * @return array
 	 */
-	public function data_display_settings()
+	public static function data_display_settings()
 	{
 		return [
 			[[], 1],
diff --git a/tests/controller/edit_prefix_test.php b/tests/controller/edit_prefix_test.php
@@ -23,7 +23,7 @@ class edit_prefix_test extends admin_controller_base
 	 *
 	 * @return array
 	 */
-	public function data_edit_prefix()
+	public static function data_edit_prefix()
 	{
 		return array(
 			array(1, true, false), // valid prefix, valid form/hash, not ajax
@@ -77,7 +77,7 @@ public function test_edit_prefix($prefix_id, $valid_form, $is_ajax)
 			$this->manager->expects(self::once())
 				->method('update_prefix');
 
-			$this->request->expects(self::atMost(2))
+			$this->request->expects(self::atMost(1))
 				->method('is_ajax')
 				->willReturn($is_ajax);
 
diff --git a/tests/controller/main_test.php b/tests/controller/main_test.php
@@ -44,7 +44,7 @@ protected function setUp(): void
 	 *
 	 * @return array
 	 */
-	public function data_main()
+	public static function data_main()
 	{
 		return array(
 			array('add', 'add_prefix'),
diff --git a/tests/controller/move_prefix_test.php b/tests/controller/move_prefix_test.php
@@ -23,7 +23,7 @@ class move_prefix_test extends admin_controller_base
 	 *
 	 * @return array
 	 */
-	public function data_move_prefix()
+	public static function data_move_prefix()
 	{
 		return array(
 			// prefix id, direction, valid form/hash, is ajax
@@ -72,7 +72,7 @@ public function test_move_prefix($prefix_id, $direction, $valid_form, $is_ajax)
 		}
 		else
 		{
-			$this->request->expects(static::atMost(2))
+			$this->request->expects(static::once())
 				->method('is_ajax')
 				->willReturn($is_ajax);
 
diff --git a/tests/dbal/manager_add_prefix_test.php b/tests/dbal/manager_add_prefix_test.php
@@ -17,7 +17,7 @@ class manager_add_prefix_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_add_prefix()
+	public static function data_add_prefix()
 	{
 		return array(
 			array('[TEST 1]', 2, 6),
diff --git a/tests/dbal/manager_delete_prefix_test.php b/tests/dbal/manager_delete_prefix_test.php
@@ -25,7 +25,7 @@ public function test_delete_prefix()
 	 *
 	 * @return array
 	 */
-	public function data_delete_prefix_fails()
+	public static function data_delete_prefix_fails()
 	{
 		return array(
 			array(0),
diff --git a/tests/dbal/manager_get_active_prefixes_test.php b/tests/dbal/manager_get_active_prefixes_test.php
@@ -17,7 +17,7 @@ class manager_get_active_prefixes_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_get_active_prefixes()
+	public static function data_get_active_prefixes()
 	{
 		return array(
 			array(null, array('[TAG 1]', '[TAG 2]', '[TAG 3]')),
diff --git a/tests/dbal/manager_get_prefix_test.php b/tests/dbal/manager_get_prefix_test.php
@@ -17,7 +17,7 @@ class manager_get_prefix_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_get_prefix()
+	public static function data_get_prefix()
 	{
 		return array(
 			array(0, false),
diff --git a/tests/dbal/manager_get_prefixes_test.php b/tests/dbal/manager_get_prefixes_test.php
@@ -17,7 +17,7 @@ class manager_get_prefixes_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_get_prefixes()
+	public static function data_get_prefixes()
 	{
 		return array(
 			array(null, array('[TAG 1]', '[TAG 2]', '[TAG 3]', '[TAG 4]', '[TAG 5]')),
diff --git a/tests/dbal/manager_move_prefix_test.php b/tests/dbal/manager_move_prefix_test.php
@@ -17,7 +17,7 @@ class manager_move_prefix_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_move_prefix()
+	public static function data_move_prefix()
 	{
 		return array(
 			array(
diff --git a/tests/dbal/manager_prepend_prefix_test.php b/tests/dbal/manager_prepend_prefix_test.php
@@ -17,7 +17,7 @@ class manager_prepend_prefix_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_prepend_prefix()
+	public static function data_prepend_prefix()
 	{
 		return array(
 			array('[FOO]', 'Test subject', '[FOO] Test subject'),
diff --git a/tests/dbal/manager_update_prefix_test.php b/tests/dbal/manager_update_prefix_test.php
@@ -17,7 +17,7 @@ class manager_update_prefix_test extends manager_base
 	 *
 	 * @return array
 	 */
-	public function data_update_prefix()
+	public static function data_update_prefix()
 	{
 		return array(
 			array(1, array('prefix_enabled' => 0), 1),
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
@@ -110,7 +110,7 @@ public function test_getSubscribedEvents()
 	 *
 	 * @return array
 	 */
-	public function data_add_to_posting_form()
+	public static function data_add_to_posting_form()
 	{
 		$prefix_data = array(
 			1 => array(
@@ -310,7 +310,7 @@ public function test_add_to_posting_form($prefixes, $parameters, $selected, $exp
 	 *
 	 * @return array
 	 */
-	public function data_submit_prefix_data()
+	public static function data_submit_prefix_data()
 	{
 		return array(
 			array( // test adding prefix to a subject when posting
@@ -427,7 +427,7 @@ public function test_submit_prefix_data($prefix, $parameters, $expected)
 	 *
 	 * @return array
 	 */
-	public function data_save_prefix_to_topic()
+	public static function data_save_prefix_to_topic()
 	{
 		return array(
 			array( // test updating the sql when posting new topic

Original file line number	Diff line number	Diff line change
`@@ -342,12 +342,9 @@ protected function get_forum_info($forum_id)`
`342`	`342`	`*/`
`343`	`343`	`protected function send_json_response(bool $content): void`
`344`	`344`	`{`
`345`		`- if ($this->request->is_ajax())`
`346`		`- {`
`347`		`- $json_response = new json_response;`
`348`		`- $json_response->send([`
`349`		`- 'success' => (bool) $content,`
`350`		`- ]);`
`351`		`- }`
	`345`	`+ $json_response = new json_response;`
	`346`	`+ $json_response->send([`
	`347`	`+ 'success' => (bool) $content,`
	`348`	`+ ]);`
`352`	`349`	`}`
`353`	`350`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function test_module_info()`
`62`	`62`	`], $this->module_manager->get_module_infos('acp', 'acp_topic_prefixes_module'));`
`63`	`63`	`}`
`64`	`64`
`65`		`- public function module_auth_test_data()`
	`65`	`+ public static function module_auth_test_data()`
`66`	`66`	`{`
`67`	`67`	`return [`
`68`	`68`	`// module_auth, expected result`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class add_prefix_test extends admin_controller_base`
`23`	`23`	`*`
`24`	`24`	`* @return array`
`25`	`25`	`*/`
`26`		`- public function data_add_prefix()`
	`26`	`+ public static function data_add_prefix()`
`27`	`27`	`{`
`28`	`28`	`return [`
`29`	`29`	`['', true, true],`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class delete_prefix_test extends admin_controller_base`
`23`	`23`	`*`
`24`	`24`	`* @return array`
`25`	`25`	`*/`
`26`		`- public function data_delete_prefix()`
	`26`	`+ public static function data_delete_prefix()`
`27`	`27`	`{`
`28`	`28`	`return array(`
`29`	`29`	`array(1, false), // valid prefix, not confirmed`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class display_settings_test extends admin_controller_base`
`23`	`23`	`*`
`24`	`24`	`* @return array`
`25`	`25`	`*/`
`26`		`- public function data_display_settings()`
	`26`	`+ public static function data_display_settings()`
`27`	`27`	`{`
`28`	`28`	`return [`
`29`	`29`	`[[], 1],`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected function setUp(): void`
`44`	`44`	`*`
`45`	`45`	`* @return array`
`46`	`46`	`*/`
`47`		`- public function data_main()`
	`47`	`+ public static function data_main()`
`48`	`48`	`{`
`49`	`49`	`return array(`
`50`	`50`	`array('add', 'add_prefix'),`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class move_prefix_test extends admin_controller_base`
`23`	`23`	`*`
`24`	`24`	`* @return array`
`25`	`25`	`*/`
`26`		`- public function data_move_prefix()`
	`26`	`+ public static function data_move_prefix()`
`27`	`27`	`{`
`28`	`28`	`return array(`
`29`	`29`	`// prefix id, direction, valid form/hash, is ajax`
`@@ -72,7 +72,7 @@ public function test_move_prefix($prefix_id, $direction, $valid_form, $is_ajax)`
`72`	`72`	`}`
`73`	`73`	`else`
`74`	`74`	`{`
`75`		`- $this->request->expects(static::atMost(2))`
	`75`	`+ $this->request->expects(static::once())`
`76`	`76`	`->method('is_ajax')`
`77`	`77`	`->willReturn($is_ajax);`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class manager_add_prefix_test extends manager_base`
`17`	`17`	`*`
`18`	`18`	`* @return array`
`19`	`19`	`*/`
`20`		`- public function data_add_prefix()`
	`20`	`+ public static function data_add_prefix()`
`21`	`21`	`{`
`22`	`22`	`return array(`
`23`	`23`	`array('[TEST 1]', 2, 6),`