1 files changed, 15 insertions, 8 deletions

diff --git a/tests/lib/UtilCheckServerTest.php b/tests/lib/UtilCheckServerTest.php
index ca4cd7d108f..087c67120a3 100644
--- a/tests/lib/UtilCheckServerTest.php
+++ b/tests/lib/UtilCheckServerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -7,6 +8,12 @@
 
 namespace Test;
 
+use OC\SystemConfig;
+use OCP\ISession;
+use OCP\ITempManager;
+use OCP\Server;
+use OCP\Util;
+
 /**
  * Tests for server check functions
  *
@@ -17,7 +24,7 @@ class UtilCheckServerTest extends \Test\TestCase {
 
 	/**
 	 * @param array $systemOptions
-	 * @return \OC\SystemConfig | \PHPUnit\Framework\MockObject\MockObject
+	 * @return SystemConfig|\PHPUnit\Framework\MockObject\MockObject
 	 */
 	protected function getConfig($systemOptions) {
 		$systemOptions['datadirectory'] = $this->datadir;
@@ -37,10 +44,10 @@ class UtilCheckServerTest extends \Test\TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->datadir = \OC::$server->getTempManager()->getTemporaryFolder();
+		$this->datadir = Server::get(ITempManager::class)->getTemporaryFolder();
 
 		file_put_contents($this->datadir . '/.ncdata', '# Nextcloud data directory');
-		\OC::$server->getSession()->set('checkServer_succeeded', false);
+		Server::get(ISession::class)->set('checkServer_succeeded', false);
 	}
 
 	protected function tearDown(): void {
@@ -85,7 +92,7 @@ class UtilCheckServerTest extends \Test\TestCase {
 		// simulate old version that didn't have it
 		unlink($this->datadir . '/.ncdata');
 
-		$session = \OC::$server->getSession();
+		$session = Server::get(ISession::class);
 		$oldCurrentVersion = $session->get('OC_Version');
 
 		// upgrade condition to simulate needUpgrade() === true
@@ -123,7 +130,7 @@ class UtilCheckServerTest extends \Test\TestCase {
 
 		$result = \OC_Util::checkServer($this->getConfig([
 			'installed' => true,
-			'version' => implode('.', \OCP\Util::getVersion())
+			'version' => implode('.', Util::getVersion())
 		]));
 		$this->assertCount(1, $result);
 	}
@@ -134,7 +141,7 @@ class UtilCheckServerTest extends \Test\TestCase {
 	public function testDataDirWritable(): void {
 		$result = \OC_Util::checkServer($this->getConfig([
 			'installed' => true,
-			'version' => implode('.', \OCP\Util::getVersion())
+			'version' => implode('.', Util::getVersion())
 		]));
 		$this->assertEmpty($result);
 	}
@@ -148,7 +155,7 @@ class UtilCheckServerTest extends \Test\TestCase {
 		chmod($this->datadir, 0300);
 		$result = \OC_Util::checkServer($this->getConfig([
 			'installed' => true,
-			'version' => implode('.', \OCP\Util::getVersion())
+			'version' => implode('.', Util::getVersion())
 		]));
 		$this->assertCount(1, $result);
 	}
@@ -160,7 +167,7 @@ class UtilCheckServerTest extends \Test\TestCase {
 		chmod($this->datadir, 0300);
 		$result = \OC_Util::checkServer($this->getConfig([
 			'installed' => false,
-			'version' => implode('.', \OCP\Util::getVersion())
+			'version' => implode('.', Util::getVersion())
 		]));
 		chmod($this->datadir, 0700); //needed for cleanup
 		$this->assertEmpty($result);