1 files changed, 16 insertions, 64 deletions

diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php
index 423fd855a9e..ba93fa0efdf 100644
--- a/apps/files/tests/HelperTest.php
+++ b/apps/files/tests/HelperTest.php
@@ -1,32 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author brumsel <brumsel@losecatcher.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @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
  */
+
+use OC\Files\FileInfo;
+use OCA\Files\Helper;
+
 class HelperTest extends \Test\TestCase {
-	private function makeFileInfo($name, $size, $mtime, $isDir = false) {
-		return new \OC\Files\FileInfo(
+	private static function makeFileInfo($name, $size, $mtime, $isDir = false): FileInfo {
+		return new FileInfo(
 			'/' . $name,
 			null,
 			'/',
@@ -44,7 +30,7 @@ class HelperTest extends \Test\TestCase {
 	/**
 	 * Returns a file list for testing
 	 */
-	private function getTestFileList() {
+	private static function getTestFileList(): array {
 		return [
 			self::makeFileInfo('a.txt', 4, 2.3 * pow(10, 9)),
 			self::makeFileInfo('q.txt', 5, 150),
@@ -55,7 +41,7 @@ class HelperTest extends \Test\TestCase {
 		];
 	}
 
-	public function sortDataProvider() {
+	public static function sortDataProvider(): array {
 		return [
 			[
 				'name',
@@ -90,15 +76,13 @@ class HelperTest extends \Test\TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider sortDataProvider
-	 */
-	public function testSortByName(string $sort, bool $sortDescending, array $expectedOrder) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('sortDataProvider')]
+	public function testSortByName(string $sort, bool $sortDescending, array $expectedOrder): void {
 		if (($sort === 'mtime') && (PHP_INT_SIZE < 8)) {
 			$this->markTestSkipped('Skip mtime sorting on 32bit');
 		}
 		$files = self::getTestFileList();
-		$files = \OCA\Files\Helper::sortFiles($files, $sort, $sortDescending);
+		$files = Helper::sortFiles($files, $sort, $sortDescending);
 		$fileNames = [];
 		foreach ($files as $fileInfo) {
 			$fileNames[] = $fileInfo->getName();
@@ -108,36 +92,4 @@ class HelperTest extends \Test\TestCase {
 			$fileNames
 		);
 	}
-
-	public function testPopulateTags() {
-		$tagManager = $this->createMock(\OCP\ITagManager::class);
-		$tagger = $this->createMock(\OCP\ITags::class);
-
-		$tagManager->method('load')
-			->with('files')
-			->willReturn($tagger);
-
-		$data = [
-			['id' => 10],
-			['id' => 22, 'foo' => 'bar'],
-			['id' => 42, 'x' => 'y'],
-		];
-
-		$tags = [
-			10 => ['tag3'],
-			42 => ['tag1', 'tag2'],
-		];
-
-		$tagger->method('getTagsForObjects')
-			->with([10, 22, 42])
-			->willReturn($tags);
-
-		$result = \OCA\Files\Helper::populateTags($data, 'id', $tagManager);
-
-		$this->assertSame([
-			['id' => 10, 'tags' => ['tag3']],
-			['id' => 22, 'foo' => 'bar', 'tags' => []],
-			['id' => 42, 'x' => 'y', 'tags' => ['tag1', 'tag2']],
-		], $result);
-	}
 }