From f447c7fe83c2251bc723505de8a57f1f5f6b1e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Tue, 20 May 2025 10:19:08 +0200
Subject: [PATCH 1/3] chore(tests): Cleanup bootstrap.php to be
 forward-compatible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 tests/bootstrap.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9d13effa..ecb01a10 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,17 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+use OCP\App\IAppManager;
+use OCP\Server;
+
 if (!defined('PHPUNIT_RUN')) {
 	define('PHPUNIT_RUN', 1);
 }
+
 require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../../../tests/autoload.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-\OC_App::loadApp('user_oidc');
+Server::get(IAppManager::class)->loadApp('user_oidc');
 
 OC_Hook::clear();

From 33dda0c660921d0e99502ff70dee502ece4155c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Tue, 20 May 2025 10:19:17 +0200
Subject: [PATCH 2/3] chore(tests): Do not clear hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 tests/bootstrap.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index ecb01a10..942fe846 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -19,5 +19,3 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 
 Server::get(IAppManager::class)->loadApp('user_oidc');
-
-OC_Hook::clear();

From c6c46503fe0a8da200d8c88206e30e11d2b2da90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 26 May 2025 14:21:38 +0200
Subject: [PATCH 3/3] chore(tests): Drop stable28 from CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 .github/workflows/integration.yml | 3 ---
 .github/workflows/phpunit.yml     | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b641a03f..8496088e 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -24,9 +24,6 @@ jobs:
         databases: ['sqlite', 'mysql', 'pgsql']
         server-versions: ['master']
         include:
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable28
             - php-versions: 8.1
               databases: mysql
               server-versions: stable29
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 23497403..aad928d9 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         php-versions: ['8.0', '8.1', '8.2']
         databases: ['mysql']
-        server-versions: ['stable28', 'stable29', 'stable30', 'stable31', 'master']
+        server-versions: ['stable29', 'stable30', 'stable31', 'master']
         exclude:
           - php-versions: 8.0
             server-versions: master
@@ -32,9 +32,6 @@ jobs:
           - php-versions: 8.0
             server-versions: stable30
         include:
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: stable28
           - php-versions: 8.3
             databases: mysql
             server-versions: stable29