Merge pull request #1122 from nextcloud/fix/cleanup-tests-bootstrap

chore(tests): Cleanup bootstrap.php to be forward-compatible

Author: julien-nc

.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

.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

tests/bootstrap.php

@@ -1,17 +1,21 @@
 <?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');
-
-OC_Hook::clear();
+Server::get(IAppManager::class)->loadApp('user_oidc');