From 8e5ab65ed9347370afe42bcbe8992a50caf35dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Tue, 20 May 2025 09:59:06 +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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 5db2bfd8c..aca11fc1a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Nextcloud - maps
  *
@@ -10,11 +12,13 @@
  * @copyright Julien Veyssier 2019
  */
 
+use OCP\App\IAppManager;
+use OCP\Server;
+
 require_once __DIR__ . '/../../../tests/bootstrap.php';
 require_once __DIR__ . '/../../../lib/base.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-\OC_App::loadApp('maps');
+Server::get(IAppManager::class)->loadApp('maps');
 
 OC_Hook::clear();

From 758b577ba0d18644ff4157d24b26d1169d5db699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Tue, 20 May 2025 09:59:15 +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 aca11fc1a..e9f1c940f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -20,5 +20,3 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 
 Server::get(IAppManager::class)->loadApp('maps');
-
-OC_Hook::clear();