From 7f0d8aebe740fd2fe359fc3503111571fb814050 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 14 Sep 2025 13:38:44 -0700
Subject: [PATCH 1/4] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a437012..420bc13 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
 	],
 	"require": {
 		"php": ">=8.1",
-		"composer/installers": "~1.0"
+		"composer/installers": "^1.0 || ^2.0"
 	},
 	"extra": {
 		"display-name": "Team Security Measures",

From 2073a740f7516acbd91605dd725cca2b9330e22d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 15 Sep 2025 14:19:43 -0700
Subject: [PATCH 2/4] Update local test files

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cd8d13a..aec3735 100644
--- a/phpunit.xml.dist
+++ b/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"

From 5546b2228f09828ddda2b6b0f64b90ee12577c21 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 16 Sep 2025 14:03:26 -0700
Subject: [PATCH 3/4] Fix deprecations

---
 phpunit.xml.dist                              | 26 ++++++++-----------
 tests/event/delete_log_security_test.php      |  2 +-
 .../event/email_change_notification_test.php  |  2 +-
 tests/event/failed_logins_test.php            |  2 +-
 tests/event/load_language_test.php            |  2 +-
 tests/event/login_notification_test.php       |  2 +-
 tests/event/team_passwords_test.php           |  2 +-
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index aec3735..ec9468f 100644
--- 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/event/delete_log_security_test.php b/tests/event/delete_log_security_test.php
index 1754f82..5600e5e 100644
--- a/tests/event/delete_log_security_test.php
+++ b/tests/event/delete_log_security_test.php
@@ -17,7 +17,7 @@ class delete_log_security_test extends listener_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function delete_logs_security_data()
+	public static function delete_logs_security_data()
 	{
 		return [
 			['admin', LOG_ADMIN, [], false],
diff --git a/tests/event/email_change_notification_test.php b/tests/event/email_change_notification_test.php
index 151823d..947a182 100644
--- a/tests/event/email_change_notification_test.php
+++ b/tests/event/email_change_notification_test.php
@@ -17,7 +17,7 @@ class email_change_notification_test extends listener_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function email_change_notification_data()
+	public static function email_change_notification_data()
 	{
 		return array(
 			array(
diff --git a/tests/event/failed_logins_test.php b/tests/event/failed_logins_test.php
index 41d3ab9..591e165 100644
--- a/tests/event/failed_logins_test.php
+++ b/tests/event/failed_logins_test.php
@@ -17,7 +17,7 @@ class failed_logins_test extends listener_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function log_failed_login_attempts_data()
+	public static function log_failed_login_attempts_data()
 	{
 		return array(
 			array(true, true, array('user_row' => array('user_id' => 2))),
diff --git a/tests/event/load_language_test.php b/tests/event/load_language_test.php
index d71e8a9..f121814 100644
--- a/tests/event/load_language_test.php
+++ b/tests/event/load_language_test.php
@@ -17,7 +17,7 @@ class load_language_test extends listener_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function load_language_on_setup_data()
+	public static function load_language_on_setup_data()
 	{
 		return array(
 			array(
diff --git a/tests/event/login_notification_test.php b/tests/event/login_notification_test.php
index 1fc7784..d0a04ed 100644
--- a/tests/event/login_notification_test.php
+++ b/tests/event/login_notification_test.php
@@ -17,7 +17,7 @@ class login_notification_test extends listener_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function acp_login_notification_data()
+	public static function acp_login_notification_data()
 	{
 		return array(
 			array(true, true, 'foo', '1:1:1', array(
diff --git a/tests/event/team_passwords_test.php b/tests/event/team_passwords_test.php
index 5764bb7..839b2cd 100644
--- a/tests/event/team_passwords_test.php
+++ b/tests/event/team_passwords_test.php
@@ -17,7 +17,7 @@ class team_passwords_test extends listener_base
 	 *
 	 * @return array Array of test data
 	 */
-	public function set_team_password_configs_data()
+	public static function set_team_password_configs_data()
 	{
 		return array(
 			array('core.acp_users_overview_before', 'reg_details',	array(), true, true, 30, 'PASS_TYPE_SYMBOL',),

From 1bf2d093bd58c65718f86eae78cc81925bbb07c4 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 17 Sep 2025 08:20:56 -0700
Subject: [PATCH 4/4] Ignore vendor deprecations and noise [ci skip]

---
 phpunit.xml.dist | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ec9468f..6f6f695 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,7 +17,9 @@
 			<directory suffix="_test.php">./tests/functional/</directory>
 		</testsuite>
 	</testsuites>
-	<source>
+	<source restrictDeprecations="true"
+			restrictNotices="true"
+			restrictWarnings="true">
 		<include>
 			<directory suffix=".php">./</directory>
 		</include>