3 files changed, 21 insertions, 6 deletions

diff --git a/tests/lib/Archive/TARTest.php b/tests/lib/Archive/TARTest.php
index 36629a0273f..e77f97ac8e1 100644
--- a/tests/lib/Archive/TARTest.php
+++ b/tests/lib/Archive/TARTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,8 @@
 namespace Test\Archive;
 
 use OC\Archive\TAR;
+use OCP\ITempManager;
+use OCP\Server;
 
 class TARTest extends TestBase {
 	protected function getExisting() {
@@ -16,6 +19,6 @@ class TARTest extends TestBase {
 	}
 
 	protected function getNew() {
-		return new TAR(\OC::$server->getTempManager()->getTemporaryFile('.tar.gz'));
+		return new TAR(Server::get(ITempManager::class)->getTemporaryFile('.tar.gz'));
 	}
 }
diff --git a/tests/lib/Archive/TestBase.php b/tests/lib/Archive/TestBase.php
index fda485d2dc1..1b7f7d3325a 100644
--- a/tests/lib/Archive/TestBase.php
+++ b/tests/lib/Archive/TestBase.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -7,6 +8,10 @@
 
 namespace Test\Archive;
 
+use OCP\Files;
+use OCP\ITempManager;
+use OCP\Server;
+
 abstract class TestBase extends \Test\TestCase {
 	/**
 	 * @var \OC\Archive\Archive
@@ -56,7 +61,7 @@ abstract class TestBase extends \Test\TestCase {
 		$textFile = $dir . '/lorem.txt';
 		$this->assertEquals(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
 
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('.txt');
+		$tmpFile = Server::get(ITempManager::class)->getTemporaryFile('.txt');
 		$this->instance->extractFile('lorem.txt', $tmpFile);
 		$this->assertEquals(file_get_contents($textFile), file_get_contents($tmpFile));
 	}
@@ -90,7 +95,7 @@ abstract class TestBase extends \Test\TestCase {
 		$this->instance = $this->getNew();
 		$fh = $this->instance->getStream('lorem.txt', 'w');
 		$source = fopen($dir . '/lorem.txt', 'r');
-		\OCP\Files::streamCopy($source, $fh);
+		Files::streamCopy($source, $fh);
 		fclose($source);
 		fclose($fh);
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
@@ -110,13 +115,13 @@ abstract class TestBase extends \Test\TestCase {
 	public function testExtract(): void {
 		$dir = \OC::$SERVERROOT . '/tests/data';
 		$this->instance = $this->getExisting();
-		$tmpDir = \OC::$server->getTempManager()->getTemporaryFolder();
+		$tmpDir = Server::get(ITempManager::class)->getTemporaryFolder();
 		$this->instance->extract($tmpDir);
 		$this->assertEquals(true, file_exists($tmpDir . 'lorem.txt'));
 		$this->assertEquals(true, file_exists($tmpDir . 'dir/lorem.txt'));
 		$this->assertEquals(true, file_exists($tmpDir . 'logo-wide.png'));
 		$this->assertEquals(file_get_contents($dir . '/lorem.txt'), file_get_contents($tmpDir . 'lorem.txt'));
-		\OCP\Files::rmdirr($tmpDir);
+		Files::rmdirr($tmpDir);
 	}
 	public function testMoveRemove(): void {
 		$dir = \OC::$SERVERROOT . '/tests/data';
diff --git a/tests/lib/Archive/ZIPTest.php b/tests/lib/Archive/ZIPTest.php
index 25707e4b051..0996d5abf61 100644
--- a/tests/lib/Archive/ZIPTest.php
+++ b/tests/lib/Archive/ZIPTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,8 @@
 namespace Test\Archive;
 
 use OC\Archive\ZIP;
+use OCP\ITempManager;
+use OCP\Server;
 
 class ZIPTest extends TestBase {
 	protected function getExisting() {
@@ -16,6 +19,10 @@ class ZIPTest extends TestBase {
 	}
 
 	protected function getNew() {
-		return new ZIP(\OC::$server->getTempManager()->getTempBaseDir() . '/newArchive.zip');
+		$newZip = Server::get(ITempManager::class)->getTempBaseDir() . '/newArchive.zip';
+		if (file_exists($newZip)) {
+			unlink($newZip);
+		}
+		return new ZIP($newZip);
 	}
 }