10 files changed, 173 insertions, 256 deletions

diff --git a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php
new file mode 100644
index 00000000000..aa3925899f3
--- /dev/null
+++ b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Files_External\Tests\Storage;
+
+use OCA\Files_External\Lib\Storage\AmazonS3;
+
+/**
+ * Class Amazons3Test
+ *
+ * @group DB
+ * @group S3
+ *
+ * @package OCA\Files_External\Tests\Storage
+ */
+class Amazons3MultiPartTest extends \Test\Files\Storage\Storage {
+	private $config;
+	/** @var AmazonS3 */
+	protected $instance;
+
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->config = include('files_external/tests/config.amazons3.php');
+		if (!is_array($this->config) || !$this->config['run']) {
+			$this->markTestSkipped('AmazonS3 backend not configured');
+		}
+		$this->instance = new AmazonS3($this->config + [
+			'putSizeLimit' => 1,
+			'copySizeLimit' => 1,
+		]);
+	}
+
+	protected function tearDown(): void {
+		if ($this->instance) {
+			$this->instance->rmdir('');
+		}
+
+		parent::tearDown();
+	}
+
+	public function testStat(): void {
+		$this->markTestSkipped('S3 doesn\'t update the parents folder mtime');
+	}
+}
diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php
index d231539fb54..d02dec0230c 100644
--- a/apps/files_external/tests/Storage/Amazons3Test.php
+++ b/apps/files_external/tests/Storage/Amazons3Test.php
@@ -1,29 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
@@ -33,11 +14,12 @@ use OCA\Files_External\Lib\Storage\AmazonS3;
  * Class Amazons3Test
  *
  * @group DB
+ * @group S3
  *
  * @package OCA\Files_External\Tests\Storage
  */
 class Amazons3Test extends \Test\Files\Storage\Storage {
-	private $config;
+	protected $config;
 	/** @var AmazonS3 */
 	protected $instance;
 
@@ -45,7 +27,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
 		parent::setUp();
 
 		$this->config = include('files_external/tests/config.amazons3.php');
-		if (! is_array($this->config) or ! $this->config['run']) {
+		if (!is_array($this->config) || !$this->config['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
 		$this->instance = new AmazonS3($this->config);
@@ -59,11 +41,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	public function testStat() {
+	public function testStat(): void {
 		$this->markTestSkipped('S3 doesn\'t update the parents folder mtime');
 	}
-
-	public function testHashInFileName() {
-		$this->markTestSkipped('Localstack has a bug with hashes in filename');
-	}
 }
diff --git a/apps/files_external/tests/Storage/FtpTest.php b/apps/files_external/tests/Storage/FtpTest.php
index 9ca06f15112..095a5236049 100644
--- a/apps/files_external/tests/Storage/FtpTest.php
+++ b/apps/files_external/tests/Storage/FtpTest.php
@@ -1,30 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
@@ -67,7 +47,7 @@ class FtpTest extends \Test\Files\Storage\Storage {
 	/**
 	 * ftp has no proper way to handle spaces at the end of file names
 	 */
-	public function directoryProvider() {
+	public static function directoryProvider(): array {
 		return array_filter(parent::directoryProvider(), function ($item) {
 			return substr($item[0], -1) !== ' ';
 		});
@@ -77,7 +57,7 @@ class FtpTest extends \Test\Files\Storage\Storage {
 	/**
 	 * mtime for folders is only with a minute resolution
 	 */
-	public function testStat() {
+	public function testStat(): void {
 		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
 		$ctimeStart = time();
 		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php
index 88f6277c06a..ab6cd443dba 100644
--- a/apps/files_external/tests/Storage/OwncloudTest.php
+++ b/apps/files_external/tests/Storage/OwncloudTest.php
@@ -1,29 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
diff --git a/apps/files_external/tests/Storage/SFTP_KeyTest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php
index 558b24f0914..17e2087f91b 100644
--- a/apps/files_external/tests/Storage/SFTP_KeyTest.php
+++ b/apps/files_external/tests/Storage/SFTP_KeyTest.php
@@ -1,28 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Ross Nicoll <jrn@jrn.me.uk>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Viktor Szépe <viktor@szepe.net>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
@@ -60,40 +42,40 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	
-	public function testInvalidAddressShouldThrowException() {
+
+	public function testInvalidAddressShouldThrowException(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		// I'd use example.com for this, but someone decided to break the spec and make it resolve
 		$this->instance->assertHostAddressValid('notarealaddress...');
 	}
 
-	public function testValidAddressShouldPass() {
+	public function testValidAddressShouldPass(): void {
 		$this->assertTrue($this->instance->assertHostAddressValid('localhost'));
 	}
 
-	
-	public function testNegativePortNumberShouldThrowException() {
+
+	public function testNegativePortNumberShouldThrowException(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$this->instance->assertPortNumberValid('-1');
 	}
 
-	
-	public function testNonNumericalPortNumberShouldThrowException() {
+
+	public function testNonNumericalPortNumberShouldThrowException(): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$this->instance->assertPortNumberValid('a');
 	}
 
-	
-	public function testHighPortNumberShouldThrowException() {
+
+	public function testHighPortNumberShouldThrowException(): void {
 		$this->expectException(\InvalidArgumentException::class);
- 
+
 		$this->instance->assertPortNumberValid('65536');
 	}
 
-	public function testValidPortNumberShouldPass() {
+	public function testValidPortNumberShouldPass(): void {
 		$this->assertTrue($this->instance->assertPortNumberValid('22222'));
 	}
 }
diff --git a/apps/files_external/tests/Storage/SftpTest.php b/apps/files_external/tests/Storage/SftpTest.php
index 70e93ada2f2..ebfc8ab3c1f 100644
--- a/apps/files_external/tests/Storage/SftpTest.php
+++ b/apps/files_external/tests/Storage/SftpTest.php
@@ -1,30 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author hkjolhede <hkjolhede@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
@@ -66,15 +46,13 @@ class SftpTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	/**
-	 * @dataProvider configProvider
-	 */
-	public function testStorageId($config, $expectedStorageId) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('configProvider')]
+	public function testStorageId($config, $expectedStorageId): void {
 		$instance = new SFTP($config);
 		$this->assertEquals($expectedStorageId, $instance->getId());
 	}
 
-	public function configProvider() {
+	public static function configProvider(): array {
 		return [
 			[
 				// no root path
diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php
index 17948c5275a..afcb5c1034f 100644
--- a/apps/files_external/tests/Storage/SmbTest.php
+++ b/apps/files_external/tests/Storage/SmbTest.php
@@ -1,31 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Juan Pablo Villafáñez <jvillafanez@solidgear.es>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
@@ -33,6 +12,7 @@ use OC\Files\Notify\Change;
 use OC\Files\Notify\RenameChange;
 use OCA\Files_External\Lib\Storage\SMB;
 use OCP\Files\Notify\IChange;
+use PHPUnit\Framework\ExpectationFailedException;
 
 /**
  * Class SmbTest
@@ -71,19 +51,19 @@ class SmbTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	public function directoryProvider() {
+	public static function directoryProvider(): array {
 		// doesn't support leading/trailing spaces
 		return [['folder']];
 	}
 
-	public function testRenameWithSpaces() {
+	public function testRenameWithSpaces(): void {
 		$this->instance->mkdir('with spaces');
 		$result = $this->instance->rename('with spaces', 'foo bar');
 		$this->assertTrue($result);
 		$this->assertTrue($this->instance->is_dir('foo bar'));
 	}
 
-	public function testStorageId() {
+	public function testStorageId(): void {
 		$this->instance = new SMB([
 			'host' => 'testhost',
 			'user' => 'testuser',
@@ -95,7 +75,23 @@ class SmbTest extends \Test\Files\Storage\Storage {
 		$this->instance = null;
 	}
 
-	public function testNotifyGetChanges() {
+	public function testNotifyGetChanges(): void {
+		$lastError = null;
+		for ($i = 0; $i < 5; $i++) {
+			try {
+				$this->tryTestNotifyGetChanges();
+				return;
+			} catch (ExpectationFailedException $e) {
+				$lastError = $e;
+				$this->tearDown();
+				$this->setUp();
+				sleep(1);
+			}
+		}
+		throw $lastError;
+	}
+
+	private function tryTestNotifyGetChanges(): void {
 		$notifyHandler = $this->instance->notify('');
 		sleep(1); //give time for the notify to start
 		$this->instance->file_put_contents('/newfile.txt', 'test content');
@@ -105,6 +101,7 @@ class SmbTest extends \Test\Files\Storage\Storage {
 		$this->instance->unlink('/renamed.txt');
 		sleep(1); //time for all changes to be processed
 
+		/** @var IChange[] $changes */
 		$changes = [];
 		$count = 0;
 		// wait up to 10 seconds for incoming changes
@@ -115,18 +112,27 @@ class SmbTest extends \Test\Files\Storage\Storage {
 		}
 		$notifyHandler->stop();
 
-		$expected = [
-			new Change(IChange::ADDED, 'newfile.txt'),
-			new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
-			new Change(IChange::REMOVED, 'renamed.txt')
-		];
+		// depending on the server environment, the initial create might be detected as a change instead
+		if ($changes[0]->getType() === IChange::MODIFIED) {
+			$expected = [
+				new Change(IChange::MODIFIED, 'newfile.txt'),
+				new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
+				new Change(IChange::REMOVED, 'renamed.txt')
+			];
+		} else {
+			$expected = [
+				new Change(IChange::ADDED, 'newfile.txt'),
+				new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
+				new Change(IChange::REMOVED, 'renamed.txt')
+			];
+		}
 
 		foreach ($expected as $expectedChange) {
-			$this->assertContains($expectedChange, $changes, 'Actual changes are:' . PHP_EOL . print_r($expected, true), false, false); // dont check object identity
+			$this->assertTrue(in_array($expectedChange, $changes), "Expected changes are:\n" . print_r($expected, true) . PHP_EOL . 'Expected to find: ' . PHP_EOL . print_r($expectedChange, true) . "\nGot:\n" . print_r($changes, true));
 		}
 	}
 
-	public function testNotifyListen() {
+	public function testNotifyListen(): void {
 		$notifyHandler = $this->instance->notify('');
 		usleep(100 * 1000); //give time for the notify to start
 		$this->instance->file_put_contents('/newfile.txt', 'test content');
@@ -135,16 +141,21 @@ class SmbTest extends \Test\Files\Storage\Storage {
 
 		$result = null;
 
-		// since the notify handler buffers untill we start listening we will get the above changes
+		// since the notify handler buffers until we start listening we will get the above changes
 		$notifyHandler->listen(function (IChange $change) use (&$result) {
 			$result = $change;
 			return false;//stop listening
 		});
 
-		$this->assertEquals(new Change(IChange::ADDED, 'newfile.txt'), $result);
+		// depending on the server environment, the initial create might be detected as a change instead
+		if ($result->getType() === IChange::ADDED) {
+			$this->assertEquals(new Change(IChange::ADDED, 'newfile.txt'), $result);
+		} else {
+			$this->assertEquals(new Change(IChange::MODIFIED, 'newfile.txt'), $result);
+		}
 	}
 
-	public function testRenameRoot() {
+	public function testRenameRoot(): void {
 		// root can't be renamed
 		$this->assertFalse($this->instance->rename('', 'foo1'));
 
@@ -153,12 +164,12 @@ class SmbTest extends \Test\Files\Storage\Storage {
 		$this->instance->rmdir('foo2');
 	}
 
-	public function testUnlinkRoot() {
+	public function testUnlinkRoot(): void {
 		// root can't be deleted
 		$this->assertFalse($this->instance->unlink(''));
 	}
 
-	public function testRmdirRoot() {
+	public function testRmdirRoot(): void {
 		// root can't be deleted
 		$this->assertFalse($this->instance->rmdir(''));
 	}
diff --git a/apps/files_external/tests/Storage/SwiftTest.php b/apps/files_external/tests/Storage/SwiftTest.php
index 98a184f37b5..17037e76ee3 100644
--- a/apps/files_external/tests/Storage/SwiftTest.php
+++ b/apps/files_external/tests/Storage/SwiftTest.php
@@ -1,29 +1,10 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christian Berendt <berendt@b1-systems.de>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
@@ -74,7 +55,7 @@ class SwiftTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	public function testStat() {
+	public function testStat(): void {
 		$this->markTestSkipped('Swift doesn\'t update the parents folder mtime');
 	}
 }
diff --git a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
index a16a9944d57..9d413620292 100644
--- a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
+++ b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
@@ -2,29 +2,15 @@
 
 declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2021 Robin Appelman <robin@icewind.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OCA\Files_External\Tests\Storage;
 
 /**
  * @group DB
+ * @group S3
  */
 class VersionedAmazonS3Test extends Amazons3Test {
 	protected function setUp(): void {
@@ -40,4 +26,12 @@ class VersionedAmazonS3Test extends Amazons3Test {
 			$this->markTestSkipped("s3 backend doesn't seem to support versioning");
 		}
 	}
+
+	public function testCopyOverWriteDirectory(): void {
+		if (isset($this->config['minio'])) {
+			$this->markTestSkipped('MinIO has a bug with batch deletion on versioned storages, see https://github.com/minio/minio/issues/21366');
+		}
+
+		parent::testCopyOverWriteDirectory();
+	}
 }
diff --git a/apps/files_external/tests/Storage/WebdavTest.php b/apps/files_external/tests/Storage/WebdavTest.php
index bf3eb64a63c..a8de178effd 100644
--- a/apps/files_external/tests/Storage/WebdavTest.php
+++ b/apps/files_external/tests/Storage/WebdavTest.php
@@ -1,34 +1,17 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Files_External\Tests\Storage;
 
 use OC\Files\Storage\DAV;
 use OC\Files\Type\Detection;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Server;
 
 /**
  * Class WebdavTest
@@ -62,11 +45,11 @@ class WebdavTest extends \Test\Files\Storage\Storage {
 		parent::tearDown();
 	}
 
-	public function testMimetypeFallback() {
+	public function testMimetypeFallback(): void {
 		$this->instance->file_put_contents('foo.bar', 'asd');
 
 		/** @var Detection $mimeDetector */
-		$mimeDetector = \OC::$server->getMimeTypeDetector();
+		$mimeDetector = Server::get(IMimeTypeDetector::class);
 		$mimeDetector->registerType('bar', 'application/x-bar');
 
 		$this->assertEquals('application/x-bar', $this->instance->getMimeType('foo.bar'));