From 913fad55d8c2e421bf3c55ed3cb2224cde054cdc 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:13:48 +0200
Subject: [PATCH 1/2] 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 | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index abec739a..e97c8196 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,18 +1,26 @@
 <?php
 
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+use OCP\App\IAppManager;
+use OCP\Server;
+use PHPUnit\Framework\TestCase;
+
 if (!defined('PHPUNIT_RUN')) {
 	define('PHPUNIT_RUN', 1);
 }
 
 require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../../../tests/autoload.php';
 
-// Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-
-// Fix for "Autoload path not allowed: .../privacy/tests/testcase.php"
-\OC_App::loadApp('privacy');
+Server::get(IAppManager::class)->loadApp('privacy');
 
-if (!class_exists('\PHPUnit\Framework\TestCase')) {
+if (!class_exists(TestCase::class)) {
 	require_once('PHPUnit/Autoload.php');
 }
 

From f7f393d890f998f1c908a8ac0ef805584bcd762b 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:14:03 +0200
Subject: [PATCH 2/2] 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 e97c8196..30e6a47b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -23,5 +23,3 @@
 if (!class_exists(TestCase::class)) {
 	require_once('PHPUnit/Autoload.php');
 }
-
-OC_Hook::clear();