Update tests and JSON

Author: iMattPro

controller/admin_controller.php

@@ -188,15 +188,14 @@ public function delete_autogroup_rule($autogroups_id)
 		// If AJAX was used, show user a result message
 		if ($this->request->is_ajax())
 		{
-			$json_response = new \phpbb\json_response;
-			$json_response->send(array(
+			return new \Symfony\Component\HttpFoundation\JsonResponse(array(
 				'MESSAGE_TITLE'	=> $this->language->lang('INFORMATION'),
 				'MESSAGE_TEXT'	=> $this->language->lang('ACP_AUTOGROUPS_DELETE_SUCCESS'),
-				'REFRESH_DATA'	=> array(
-					'time'	=> 3
-				)
+				'REFRESH_DATA'	=> ['time' => 3],
 			));
 		}
+
+		return null;
 	}
 
 	/**

controller/admin_interface.php

@@ -38,7 +38,7 @@ public function save_autogroup_rule($autogroups_id);
 	 * Delete the auto group rule
 	 *
 	 * @param int $autogroups_id The auto groups identifier to delete
-	 * @return void
+	 * @return \Symfony\Component\HttpFoundation\JsonResponse|null
 	 * @access public
 	 */
 	public function delete_autogroup_rule($autogroups_id);

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 		 backupGlobals="true"
 		 backupStaticAttributes="false"
 		 colors="true"

tests/conditions/base.php

@@ -22,7 +22,7 @@ class base extends \phpbb_database_test_case
 	*
 	* @return array vendor/name of extension(s) to test
 	*/
-	protected static function setup_extensions()
+	protected static function setup_extensions(): array
 	{
 		return array('phpbb/autogroups');
 	}

tests/controller/delete_autogroup_rule_test.php

@@ -10,6 +10,8 @@
 
 namespace phpbb\autogroups\tests\controller;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 class delete_autogroup_rule_test extends admin_controller_base
 {
 	/**
@@ -69,11 +71,9 @@ public function test_delete_autogroup_rule_ajax()
 			->method('is_ajax')
 			->willReturn(true);
 
-		// Handle trigger_error() output called from json_response
-		$this->setExpectedTriggerError(E_WARNING);
-
 		// Call the delete_autogroup_rule() method
-		$this->admin_controller->delete_autogroup_rule(1);
+		$response = $this->admin_controller->delete_autogroup_rule(1);
+		self::assertInstanceOf(JsonResponse::class, $response);
 
 		// Verify the autogroup rule has been removed
 		self::assertEquals(0, $this->get_autogroup_rule_count(1));