From 6e9ad1dd66228d5541ce8adb327a2f7da711c73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 19 May 2025 18:03:26 +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/Unit/bootstrap.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
index 9d19afa64..71992570b 100644
--- a/tests/Unit/bootstrap.php
+++ b/tests/Unit/bootstrap.php
@@ -1,19 +1,23 @@
 <?php
+
+declare(strict_types=1);
+
 /**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+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';
 
-// Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-
-// Fix for "Autoload path not allowed: .../notifications/tests/testcase.php"
-\OC_App::loadApp('notifications');
+Server::get(IAppManager::class)->loadApp('notifications');
 
 OC_Hook::clear();

From 933d19754fe96e1e703705723b5e7032f1bb0124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 19 May 2025 18:04:11 +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/Unit/bootstrap.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
index 71992570b..4204078bd 100644
--- a/tests/Unit/bootstrap.php
+++ b/tests/Unit/bootstrap.php
@@ -19,5 +19,3 @@
 require_once __DIR__ . '/../../../../tests/autoload.php';
 
 Server::get(IAppManager::class)->loadApp('notifications');
-
-OC_Hook::clear();