1 files changed, 27 insertions, 18 deletions

diff --git a/tests/lib/InfoXmlTest.php b/tests/lib/InfoXmlTest.php
index 702eca4c0ce..e92ee5b9c09 100644
--- a/tests/lib/InfoXmlTest.php
+++ b/tests/lib/InfoXmlTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -7,6 +8,8 @@
 namespace Test;
 
 use OCP\App\IAppManager;
+use OCP\AppFramework\App;
+use OCP\Server;
 
 /**
  * Class InfoXmlTest
@@ -15,7 +18,14 @@ use OCP\App\IAppManager;
  * @package Test
  */
 class InfoXmlTest extends TestCase {
-	public function dataApps() {
+	private IAppManager $appManager;
+
+	protected function setUp(): void {
+		parent::setUp();
+		$this->appManager = Server::get(IAppManager::class);
+	}
+
+	public static function dataApps(): array {
 		return [
 			['admin_audit'],
 			['comments'],
@@ -40,85 +50,84 @@ class InfoXmlTest extends TestCase {
 	}
 
 	/**
-	 * @dataProvider dataApps
-	 *
 	 * @param string $app
 	 */
-	public function testClasses($app) {
-		$appInfo = \OCP\Server::get(IAppManager::class)->getAppInfo($app);
-		$appPath = \OC_App::getAppPath($app);
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataApps')]
+	public function testClasses($app): void {
+		$appInfo = $this->appManager->getAppInfo($app);
+		$appPath = $this->appManager->getAppPath($app);
 		\OC_App::registerAutoloading($app, $appPath);
 
 		//Add the appcontainer
-		$applicationClassName = \OCP\AppFramework\App::buildAppNamespace($app) . '\\AppInfo\\Application';
+		$applicationClassName = App::buildAppNamespace($app) . '\\AppInfo\\Application';
 		if (class_exists($applicationClassName)) {
 			$application = new $applicationClassName();
 			$this->addToAssertionCount(1);
 		} else {
-			$application = new \OCP\AppFramework\App($app);
+			$application = new App($app);
 			$this->addToAssertionCount(1);
 		}
 
 		if (isset($appInfo['background-jobs'])) {
 			foreach ($appInfo['background-jobs'] as $job) {
 				$this->assertTrue(class_exists($job), 'Asserting background job "' . $job . '" exists');
-				$this->assertInstanceOf($job, \OC::$server->query($job));
+				$this->assertInstanceOf($job, Server::get($job));
 			}
 		}
 
 		if (isset($appInfo['two-factor-providers'])) {
 			foreach ($appInfo['two-factor-providers'] as $provider) {
 				$this->assertTrue(class_exists($provider), 'Asserting two-factor providers "' . $provider . '" exists');
-				$this->assertInstanceOf($provider, \OC::$server->query($provider));
+				$this->assertInstanceOf($provider, Server::get($provider));
 			}
 		}
 
 		if (isset($appInfo['commands'])) {
 			foreach ($appInfo['commands'] as $command) {
 				$this->assertTrue(class_exists($command), 'Asserting command "' . $command . '" exists');
-				$this->assertInstanceOf($command, \OC::$server->query($command));
+				$this->assertInstanceOf($command, Server::get($command));
 			}
 		}
 
 		if (isset($appInfo['repair-steps']['pre-migration'])) {
 			foreach ($appInfo['repair-steps']['pre-migration'] as $migration) {
 				$this->assertTrue(class_exists($migration), 'Asserting pre-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
+				$this->assertInstanceOf($migration, Server::get($migration));
 			}
 		}
 
 		if (isset($appInfo['repair-steps']['post-migration'])) {
 			foreach ($appInfo['repair-steps']['post-migration'] as $migration) {
 				$this->assertTrue(class_exists($migration), 'Asserting post-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
+				$this->assertInstanceOf($migration, Server::get($migration));
 			}
 		}
 
 		if (isset($appInfo['repair-steps']['live-migration'])) {
 			foreach ($appInfo['repair-steps']['live-migration'] as $migration) {
 				$this->assertTrue(class_exists($migration), 'Asserting live-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
+				$this->assertInstanceOf($migration, Server::get($migration));
 			}
 		}
 
 		if (isset($appInfo['repair-steps']['install'])) {
 			foreach ($appInfo['repair-steps']['install'] as $migration) {
 				$this->assertTrue(class_exists($migration), 'Asserting install-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
+				$this->assertInstanceOf($migration, Server::get($migration));
 			}
 		}
 
 		if (isset($appInfo['repair-steps']['uninstall'])) {
 			foreach ($appInfo['repair-steps']['uninstall'] as $migration) {
 				$this->assertTrue(class_exists($migration), 'Asserting uninstall-migration "' . $migration . '" exists');
-				$this->assertInstanceOf($migration, \OC::$server->query($migration));
+				$this->assertInstanceOf($migration, Server::get($migration));
 			}
 		}
 
 		if (isset($appInfo['commands'])) {
 			foreach ($appInfo['commands'] as $command) {
-				$this->assertTrue(class_exists($command), 'Asserting command "'. $command . '"exists');
-				$this->assertInstanceOf($command, \OC::$server->query($command));
+				$this->assertTrue(class_exists($command), 'Asserting command "' . $command . '"exists');
+				$this->assertInstanceOf($command, Server::get($command));
 			}
 		}
 	}