nextcloud / server

apps/files/tests/Controller/ViewControllerTest.php

Indentation +241 added lines, -241 removed lines

@@ -45,245 +45,245 @@
  * @package OCA\Files\Tests\Controller
  */
 class ViewControllerTest extends TestCase {
-	private ContainerInterface&MockObject $container;
-	private IAppManager&MockObject $appManager;
-	private ICacheFactory&MockObject $cacheFactory;
-	private IConfig&MockObject $config;
-	private IEventDispatcher $eventDispatcher;
-	private IEventLogger&MockObject $eventLogger;
-	private IInitialState&MockObject $initialState;
-	private IL10N&MockObject $l10n;
-	private IRequest&MockObject $request;
-	private IRootFolder&MockObject $rootFolder;
-	private ITemplateManager&MockObject $templateManager;
-	private IURLGenerator $urlGenerator;
-	private IUser&MockObject $user;
-	private IUserSession&MockObject $userSession;
-	private LoggerInterface&MockObject $logger;
-	private UserConfig&MockObject $userConfig;
-	private ViewConfig&MockObject $viewConfig;
-	private Router $router;
-
-	private ViewController&MockObject $viewController;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->initialState = $this->createMock(IInitialState::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->request = $this->createMock(IRequest::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->templateManager = $this->createMock(ITemplateManager::class);
-		$this->userConfig = $this->createMock(UserConfig::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->viewConfig = $this->createMock(ViewConfig::class);
-
-		$this->user = $this->getMockBuilder(IUser::class)->getMock();
-		$this->user->expects($this->any())
-			->method('getUID')
-			->willReturn('testuser1');
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		// Make sure we know the app is enabled
-		$this->appManager->expects($this->any())
-			->method('cleanAppId')
-			->willReturnArgument(0);
-		$this->appManager->expects($this->any())
-			->method('getAppPath')
-			->willReturnCallback(fn (string $appid): string => \OC::$SERVERROOT . '/apps/' . $appid);
-		$this->appManager->expects($this->any())
-			->method('isAppLoaded')
-			->willReturn(true);
-
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->eventLogger = $this->createMock(IEventLogger::class);
-		$this->container = $this->createMock(ContainerInterface::class);
-		$this->router = new Router(
-			$this->logger,
-			$this->request,
-			$this->config,
-			$this->eventLogger,
-			$this->container,
-			$this->appManager,
-		);
-
-		// Create a real URLGenerator instance to generate URLs
-		$this->urlGenerator = new URLGenerator(
-			$this->config,
-			$this->userSession,
-			$this->cacheFactory,
-			$this->request,
-			$this->router
-		);
-
-		$filenameValidator = $this->createMock(FilenameValidator::class);
-		$this->viewController = $this->getMockBuilder(ViewController::class)
-			->setConstructorArgs([
-				'files',
-				$this->request,
-				$this->urlGenerator,
-				$this->l10n,
-				$this->config,
-				$this->eventDispatcher,
-				$this->userSession,
-				$this->appManager,
-				$this->rootFolder,
-				$this->initialState,
-				$this->templateManager,
-				$this->userConfig,
-				$this->viewConfig,
-				$filenameValidator,
-			])
-			->onlyMethods([
-				'getStorageInfo',
-			])
-			->getMock();
-	}
-
-	public function testIndexWithRegularBrowser(): void {
-		$this->viewController
-			->expects($this->any())
-			->method('getStorageInfo')
-			->willReturn([
-				'used' => 123,
-				'quota' => 100,
-				'total' => 100,
-				'relative' => 123,
-				'owner' => 'MyName',
-				'ownerDisplayName' => 'MyDisplayName',
-			]);
-
-		$this->config
-			->method('getUserValue')
-			->willReturnMap([
-				[$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'],
-				[$this->user->getUID(), 'files', 'file_sorting_direction', 'asc', 'asc'],
-				[$this->user->getUID(), 'files', 'files_sorting_configs', '{}', '{}'],
-				[$this->user->getUID(), 'files', 'show_hidden', false, false],
-				[$this->user->getUID(), 'files', 'crop_image_previews', true, true],
-				[$this->user->getUID(), 'files', 'show_grid', true],
-			]);
-
-		$baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
-
-		$this->rootFolder->expects($this->any())
-			->method('getUserFolder')
-			->with('testuser1')
-			->willReturn($baseFolderFiles);
-
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->willReturnArgument(2);
-
-		$expected = new TemplateResponse(
-			'files',
-			'index',
-		);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedWorkerSrcDomain('\'self\'');
-		$policy->addAllowedFrameDomain('\'self\'');
-		$expected->setContentSecurityPolicy($policy);
-
-		$this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView'));
-	}
-
-	public static function dataTestShortRedirect(): array {
-		// openfile is true by default
-		// opendetails is undefined by default
-		// both will be evaluated as truthy
-		return [
-			[null,		null,		'/index.php/apps/files/files/123456?openfile=true'],
-			['',		null,		'/index.php/apps/files/files/123456?openfile=true'],
-			[null,		'',			'/index.php/apps/files/files/123456?openfile=true&opendetails=true'],
-			['',		'', 		'/index.php/apps/files/files/123456?openfile=true&opendetails=true'],
-			['false',	'',			'/index.php/apps/files/files/123456?openfile=false'],
-			[null,		'false',	'/index.php/apps/files/files/123456?openfile=true&opendetails=false'],
-			['true',	'false',	'/index.php/apps/files/files/123456?openfile=true&opendetails=false'],
-			['false',	'true',		'/index.php/apps/files/files/123456?openfile=false&opendetails=true'],
-			['false',	'false',	'/index.php/apps/files/files/123456?openfile=false&opendetails=false'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestShortRedirect')]
-	public function testShortRedirect(?string $openfile, ?string $opendetails, string $result): void {
-		$this->appManager->expects($this->any())
-			->method('isEnabledForUser')
-			->with('files')
-			->willReturn(true);
-
-		$baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
-		$this->rootFolder->expects($this->any())
-			->method('getUserFolder')
-			->with('testuser1')
-			->willReturn($baseFolderFiles);
-
-		$parentNode = $this->getMockBuilder(Folder::class)->getMock();
-		$parentNode->expects($this->once())
-			->method('getPath')
-			->willReturn('testuser1/files/Folder');
-
-		$node = $this->getMockBuilder(File::class)->getMock();
-		$node->expects($this->once())
-			->method('getParent')
-			->willReturn($parentNode);
-
-		$baseFolderFiles->expects($this->any())
-			->method('getFirstNodeById')
-			->with(123456)
-			->willReturn($node);
-
-		$response = $this->viewController->showFile('123456', $opendetails, $openfile);
-		$this->assertStringContainsString($result, $response->getHeaders()['Location']);
-	}
-
-	public function testShowFileRouteWithTrashedFile(): void {
-		$this->appManager->expects($this->exactly(2))
-			->method('isEnabledForUser')
-			->willReturn(true);
-
-		$parentNode = $this->createMock(Folder::class);
-		$parentNode->expects($this->once())
-			->method('getPath')
-			->willReturn('testuser1/files_trashbin/files/test.d1462861890/sub');
-
-		$baseFolderFiles = $this->createMock(Folder::class);
-		$baseFolderTrash = $this->createMock(Folder::class);
-
-		$this->rootFolder->expects($this->any())
-			->method('getUserFolder')
-			->with('testuser1')
-			->willReturn($baseFolderFiles);
-		$this->rootFolder->expects($this->once())
-			->method('get')
-			->with('testuser1/files_trashbin/files/')
-			->willReturn($baseFolderTrash);
-
-		$baseFolderFiles->expects($this->any())
-			->method('getFirstNodeById')
-			->with(123)
-			->willReturn(null);
-
-		$node = $this->createMock(File::class);
-		$node->expects($this->once())
-			->method('getParent')
-			->willReturn($parentNode);
-
-		$baseFolderTrash->expects($this->once())
-			->method('getFirstNodeById')
-			->with(123)
-			->willReturn($node);
-		$baseFolderTrash->expects($this->once())
-			->method('getRelativePath')
-			->with('testuser1/files_trashbin/files/test.d1462861890/sub')
-			->willReturn('/test.d1462861890/sub');
-
-		$expected = new RedirectResponse('/index.php/apps/files/trashbin/123?dir=/test.d1462861890/sub');
-		$this->assertEquals($expected, $this->viewController->index('', '', '123'));
-	}
+    private ContainerInterface&MockObject $container;
+    private IAppManager&MockObject $appManager;
+    private ICacheFactory&MockObject $cacheFactory;
+    private IConfig&MockObject $config;
+    private IEventDispatcher $eventDispatcher;
+    private IEventLogger&MockObject $eventLogger;
+    private IInitialState&MockObject $initialState;
+    private IL10N&MockObject $l10n;
+    private IRequest&MockObject $request;
+    private IRootFolder&MockObject $rootFolder;
+    private ITemplateManager&MockObject $templateManager;
+    private IURLGenerator $urlGenerator;
+    private IUser&MockObject $user;
+    private IUserSession&MockObject $userSession;
+    private LoggerInterface&MockObject $logger;
+    private UserConfig&MockObject $userConfig;
+    private ViewConfig&MockObject $viewConfig;
+    private Router $router;
+
+    private ViewController&MockObject $viewController;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->initialState = $this->createMock(IInitialState::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+        $this->templateManager = $this->createMock(ITemplateManager::class);
+        $this->userConfig = $this->createMock(UserConfig::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->viewConfig = $this->createMock(ViewConfig::class);
+
+        $this->user = $this->getMockBuilder(IUser::class)->getMock();
+        $this->user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('testuser1');
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        // Make sure we know the app is enabled
+        $this->appManager->expects($this->any())
+            ->method('cleanAppId')
+            ->willReturnArgument(0);
+        $this->appManager->expects($this->any())
+            ->method('getAppPath')
+            ->willReturnCallback(fn (string $appid): string => \OC::$SERVERROOT . '/apps/' . $appid);
+        $this->appManager->expects($this->any())
+            ->method('isAppLoaded')
+            ->willReturn(true);
+
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->eventLogger = $this->createMock(IEventLogger::class);
+        $this->container = $this->createMock(ContainerInterface::class);
+        $this->router = new Router(
+            $this->logger,
+            $this->request,
+            $this->config,
+            $this->eventLogger,
+            $this->container,
+            $this->appManager,
+        );
+
+        // Create a real URLGenerator instance to generate URLs
+        $this->urlGenerator = new URLGenerator(
+            $this->config,
+            $this->userSession,
+            $this->cacheFactory,
+            $this->request,
+            $this->router
+        );
+
+        $filenameValidator = $this->createMock(FilenameValidator::class);
+        $this->viewController = $this->getMockBuilder(ViewController::class)
+            ->setConstructorArgs([
+                'files',
+                $this->request,
+                $this->urlGenerator,
+                $this->l10n,
+                $this->config,
+                $this->eventDispatcher,
+                $this->userSession,
+                $this->appManager,
+                $this->rootFolder,
+                $this->initialState,
+                $this->templateManager,
+                $this->userConfig,
+                $this->viewConfig,
+                $filenameValidator,
+            ])
+            ->onlyMethods([
+                'getStorageInfo',
+            ])
+            ->getMock();
+    }
+
+    public function testIndexWithRegularBrowser(): void {
+        $this->viewController
+            ->expects($this->any())
+            ->method('getStorageInfo')
+            ->willReturn([
+                'used' => 123,
+                'quota' => 100,
+                'total' => 100,
+                'relative' => 123,
+                'owner' => 'MyName',
+                'ownerDisplayName' => 'MyDisplayName',
+            ]);
+
+        $this->config
+            ->method('getUserValue')
+            ->willReturnMap([
+                [$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'],
+                [$this->user->getUID(), 'files', 'file_sorting_direction', 'asc', 'asc'],
+                [$this->user->getUID(), 'files', 'files_sorting_configs', '{}', '{}'],
+                [$this->user->getUID(), 'files', 'show_hidden', false, false],
+                [$this->user->getUID(), 'files', 'crop_image_previews', true, true],
+                [$this->user->getUID(), 'files', 'show_grid', true],
+            ]);
+
+        $baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
+
+        $this->rootFolder->expects($this->any())
+            ->method('getUserFolder')
+            ->with('testuser1')
+            ->willReturn($baseFolderFiles);
+
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnArgument(2);
+
+        $expected = new TemplateResponse(
+            'files',
+            'index',
+        );
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedWorkerSrcDomain('\'self\'');
+        $policy->addAllowedFrameDomain('\'self\'');
+        $expected->setContentSecurityPolicy($policy);
+
+        $this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView'));
+    }
+
+    public static function dataTestShortRedirect(): array {
+        // openfile is true by default
+        // opendetails is undefined by default
+        // both will be evaluated as truthy
+        return [
+            [null,		null,		'/index.php/apps/files/files/123456?openfile=true'],
+            ['',		null,		'/index.php/apps/files/files/123456?openfile=true'],
+            [null,		'',			'/index.php/apps/files/files/123456?openfile=true&opendetails=true'],
+            ['',		'', 		'/index.php/apps/files/files/123456?openfile=true&opendetails=true'],
+            ['false',	'',			'/index.php/apps/files/files/123456?openfile=false'],
+            [null,		'false',	'/index.php/apps/files/files/123456?openfile=true&opendetails=false'],
+            ['true',	'false',	'/index.php/apps/files/files/123456?openfile=true&opendetails=false'],
+            ['false',	'true',		'/index.php/apps/files/files/123456?openfile=false&opendetails=true'],
+            ['false',	'false',	'/index.php/apps/files/files/123456?openfile=false&opendetails=false'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestShortRedirect')]
+    public function testShortRedirect(?string $openfile, ?string $opendetails, string $result): void {
+        $this->appManager->expects($this->any())
+            ->method('isEnabledForUser')
+            ->with('files')
+            ->willReturn(true);
+
+        $baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
+        $this->rootFolder->expects($this->any())
+            ->method('getUserFolder')
+            ->with('testuser1')
+            ->willReturn($baseFolderFiles);
+
+        $parentNode = $this->getMockBuilder(Folder::class)->getMock();
+        $parentNode->expects($this->once())
+            ->method('getPath')
+            ->willReturn('testuser1/files/Folder');
+
+        $node = $this->getMockBuilder(File::class)->getMock();
+        $node->expects($this->once())
+            ->method('getParent')
+            ->willReturn($parentNode);
+
+        $baseFolderFiles->expects($this->any())
+            ->method('getFirstNodeById')
+            ->with(123456)
+            ->willReturn($node);
+
+        $response = $this->viewController->showFile('123456', $opendetails, $openfile);
+        $this->assertStringContainsString($result, $response->getHeaders()['Location']);
+    }
+
+    public function testShowFileRouteWithTrashedFile(): void {
+        $this->appManager->expects($this->exactly(2))
+            ->method('isEnabledForUser')
+            ->willReturn(true);
+
+        $parentNode = $this->createMock(Folder::class);
+        $parentNode->expects($this->once())
+            ->method('getPath')
+            ->willReturn('testuser1/files_trashbin/files/test.d1462861890/sub');
+
+        $baseFolderFiles = $this->createMock(Folder::class);
+        $baseFolderTrash = $this->createMock(Folder::class);
+
+        $this->rootFolder->expects($this->any())
+            ->method('getUserFolder')
+            ->with('testuser1')
+            ->willReturn($baseFolderFiles);
+        $this->rootFolder->expects($this->once())
+            ->method('get')
+            ->with('testuser1/files_trashbin/files/')
+            ->willReturn($baseFolderTrash);
+
+        $baseFolderFiles->expects($this->any())
+            ->method('getFirstNodeById')
+            ->with(123)
+            ->willReturn(null);
+
+        $node = $this->createMock(File::class);
+        $node->expects($this->once())
+            ->method('getParent')
+            ->willReturn($parentNode);
+
+        $baseFolderTrash->expects($this->once())
+            ->method('getFirstNodeById')
+            ->with(123)
+            ->willReturn($node);
+        $baseFolderTrash->expects($this->once())
+            ->method('getRelativePath')
+            ->with('testuser1/files_trashbin/files/test.d1462861890/sub')
+            ->willReturn('/test.d1462861890/sub');
+
+        $expected = new RedirectResponse('/index.php/apps/files/trashbin/123?dir=/test.d1462861890/sub');
+        $this->assertEquals($expected, $this->viewController->index('', '', '123'));
+    }
 }

apps/files/tests/AdvancedCapabilitiesTest.php

Indentation +29 added lines, -29 removed lines

@@ -14,33 +14,33 @@
 
 class AdvancedCapabilitiesTest extends TestCase {
 
-	protected SettingsService&MockObject $service;
-	protected AdvancedCapabilities $capabilities;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->service = $this->createMock(SettingsService::class);
-		$this->capabilities = new AdvancedCapabilities($this->service);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetCapabilities')]
-	public function testGetCapabilities(bool $wcf): void {
-		$this->service
-			->expects(self::once())
-			->method('hasFilesWindowsSupport')
-			->willReturn($wcf);
-
-		self::assertEqualsCanonicalizing(['files' => [ 'windows_compatible_filenames' => $wcf ]], $this->capabilities->getCapabilities());
-	}
-
-	public static function dataGetCapabilities(): array {
-		return [
-			'WCF enabled' => [
-				true,
-			],
-			'WCF disabled' => [
-				false,
-			],
-		];
-	}
+    protected SettingsService&MockObject $service;
+    protected AdvancedCapabilities $capabilities;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->service = $this->createMock(SettingsService::class);
+        $this->capabilities = new AdvancedCapabilities($this->service);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetCapabilities')]
+    public function testGetCapabilities(bool $wcf): void {
+        $this->service
+            ->expects(self::once())
+            ->method('hasFilesWindowsSupport')
+            ->willReturn($wcf);
+
+        self::assertEqualsCanonicalizing(['files' => [ 'windows_compatible_filenames' => $wcf ]], $this->capabilities->getCapabilities());
+    }
+
+    public static function dataGetCapabilities(): array {
+        return [
+            'WCF enabled' => [
+                true,
+            ],
+            'WCF disabled' => [
+                false,
+            ],
+        ];
+    }
 }

apps/files/tests/Service/TagServiceTest.php

Indentation +89 added lines, -89 removed lines

@@ -29,93 +29,93 @@
  * @package OCA\Files
  */
 class TagServiceTest extends \Test\TestCase {
-	private string $user;
-	private IUserSession&MockObject $userSession;
-	private IManager&MockObject $activityManager;
-	private Folder $root;
-	private TagService&MockObject $tagService;
-	private ITags $tagger;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->user = static::getUniqueID('user');
-		$this->activityManager = $this->createMock(IManager::class);
-		Server::get(IUserManager::class)->createUser($this->user, 'test');
-		\OC_User::setUserId($this->user);
-		\OC_Util::setupFS($this->user);
-		$user = $this->createMock(IUser::class);
-		/**
-		 * @var IUserSession
-		 */
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->withAnyParameters()
-			->willReturn($user);
-
-		$this->root = Server::get(IRootFolder::class)->getUserFolder($this->user);
-
-		$this->tagger = Server::get(ITagManager::class)->load('files');
-		$this->tagService = $this->getTagService();
-	}
-
-	protected function getTagService(array $methods = []): TagService&MockObject {
-		return $this->getMockBuilder(TagService::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->activityManager,
-				$this->tagger,
-				$this->root,
-			])
-			->onlyMethods($methods)
-			->getMock();
-	}
-
-	protected function tearDown(): void {
-		\OC_User::setUserId('');
-		$user = Server::get(IUserManager::class)->get($this->user);
-		if ($user !== null) {
-			$user->delete();
-		}
-
-		parent::tearDown();
-	}
-
-	public function testUpdateFileTags(): void {
-		$tag1 = 'tag1';
-		$tag2 = 'tag2';
-
-		$subdir = $this->root->newFolder('subdir');
-		$testFile = $subdir->newFile('test.txt');
-		$testFile->putContent('test contents');
-
-		$fileId = $testFile->getId();
-
-		// set tags
-		$this->tagService->updateFileTags('subdir/test.txt', [$tag1, $tag2]);
-
-		$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag1));
-		$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));
-
-		// remove tag
-		$this->tagService->updateFileTags('subdir/test.txt', [$tag2]);
-		$this->assertEquals([], $this->tagger->getIdsForTag($tag1));
-		$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));
-
-		// clear tags
-		$this->tagService->updateFileTags('subdir/test.txt', []);
-		$this->assertEquals([], $this->tagger->getIdsForTag($tag1));
-		$this->assertEquals([], $this->tagger->getIdsForTag($tag2));
-
-		// non-existing file
-		$caught = false;
-		try {
-			$this->tagService->updateFileTags('subdir/unexist.txt', [$tag1]);
-		} catch (NotFoundException $e) {
-			$caught = true;
-		}
-		$this->assertTrue($caught);
-
-		$subdir->delete();
-	}
+    private string $user;
+    private IUserSession&MockObject $userSession;
+    private IManager&MockObject $activityManager;
+    private Folder $root;
+    private TagService&MockObject $tagService;
+    private ITags $tagger;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->user = static::getUniqueID('user');
+        $this->activityManager = $this->createMock(IManager::class);
+        Server::get(IUserManager::class)->createUser($this->user, 'test');
+        \OC_User::setUserId($this->user);
+        \OC_Util::setupFS($this->user);
+        $user = $this->createMock(IUser::class);
+        /**
+         * @var IUserSession
+         */
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->withAnyParameters()
+            ->willReturn($user);
+
+        $this->root = Server::get(IRootFolder::class)->getUserFolder($this->user);
+
+        $this->tagger = Server::get(ITagManager::class)->load('files');
+        $this->tagService = $this->getTagService();
+    }
+
+    protected function getTagService(array $methods = []): TagService&MockObject {
+        return $this->getMockBuilder(TagService::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->activityManager,
+                $this->tagger,
+                $this->root,
+            ])
+            ->onlyMethods($methods)
+            ->getMock();
+    }
+
+    protected function tearDown(): void {
+        \OC_User::setUserId('');
+        $user = Server::get(IUserManager::class)->get($this->user);
+        if ($user !== null) {
+            $user->delete();
+        }
+
+        parent::tearDown();
+    }
+
+    public function testUpdateFileTags(): void {
+        $tag1 = 'tag1';
+        $tag2 = 'tag2';
+
+        $subdir = $this->root->newFolder('subdir');
+        $testFile = $subdir->newFile('test.txt');
+        $testFile->putContent('test contents');
+
+        $fileId = $testFile->getId();
+
+        // set tags
+        $this->tagService->updateFileTags('subdir/test.txt', [$tag1, $tag2]);
+
+        $this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag1));
+        $this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));
+
+        // remove tag
+        $this->tagService->updateFileTags('subdir/test.txt', [$tag2]);
+        $this->assertEquals([], $this->tagger->getIdsForTag($tag1));
+        $this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));
+
+        // clear tags
+        $this->tagService->updateFileTags('subdir/test.txt', []);
+        $this->assertEquals([], $this->tagger->getIdsForTag($tag1));
+        $this->assertEquals([], $this->tagger->getIdsForTag($tag2));
+
+        // non-existing file
+        $caught = false;
+        try {
+            $this->tagService->updateFileTags('subdir/unexist.txt', [$tag1]);
+        } catch (NotFoundException $e) {
+            $caught = true;
+        }
+        $this->assertTrue($caught);
+
+        $subdir->delete();
+    }
 }

apps/files/tests/HelperTest.php

Indentation +78 added lines, -78 removed lines

@@ -11,85 +11,85 @@
 use OCA\Files\Helper;
 
 class HelperTest extends \Test\TestCase {
-	private static function makeFileInfo($name, $size, $mtime, $isDir = false): FileInfo {
-		return new FileInfo(
-			'/' . $name,
-			null,
-			'/',
-			[
-				'name' => $name,
-				'size' => $size,
-				'mtime' => $mtime,
-				'type' => $isDir ? 'dir' : 'file',
-				'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream'
-			],
-			null
-		);
-	}
+    private static function makeFileInfo($name, $size, $mtime, $isDir = false): FileInfo {
+        return new FileInfo(
+            '/' . $name,
+            null,
+            '/',
+            [
+                'name' => $name,
+                'size' => $size,
+                'mtime' => $mtime,
+                'type' => $isDir ? 'dir' : 'file',
+                'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream'
+            ],
+            null
+        );
+    }
 
-	/**
-	 * Returns a file list for testing
-	 */
-	private static function getTestFileList(): array {
-		return [
-			self::makeFileInfo('a.txt', 4, 2.3 * pow(10, 9)),
-			self::makeFileInfo('q.txt', 5, 150),
-			self::makeFileInfo('subdir2', 87, 128, true),
-			self::makeFileInfo('b.txt', 2.2 * pow(10, 9), 800),
-			self::makeFileInfo('o.txt', 12, 100),
-			self::makeFileInfo('subdir', 88, 125, true),
-		];
-	}
+    /**
+     * Returns a file list for testing
+     */
+    private static function getTestFileList(): array {
+        return [
+            self::makeFileInfo('a.txt', 4, 2.3 * pow(10, 9)),
+            self::makeFileInfo('q.txt', 5, 150),
+            self::makeFileInfo('subdir2', 87, 128, true),
+            self::makeFileInfo('b.txt', 2.2 * pow(10, 9), 800),
+            self::makeFileInfo('o.txt', 12, 100),
+            self::makeFileInfo('subdir', 88, 125, true),
+        ];
+    }
 
-	public static function sortDataProvider(): array {
-		return [
-			[
-				'name',
-				false,
-				['subdir', 'subdir2', 'a.txt', 'b.txt', 'o.txt', 'q.txt'],
-			],
-			[
-				'name',
-				true,
-				['q.txt', 'o.txt', 'b.txt', 'a.txt', 'subdir2', 'subdir'],
-			],
-			[
-				'size',
-				false,
-				['a.txt', 'q.txt', 'o.txt', 'subdir2', 'subdir', 'b.txt'],
-			],
-			[
-				'size',
-				true,
-				['b.txt', 'subdir', 'subdir2', 'o.txt', 'q.txt', 'a.txt'],
-			],
-			[
-				'mtime',
-				false,
-				['o.txt', 'subdir', 'subdir2', 'q.txt', 'b.txt', 'a.txt'],
-			],
-			[
-				'mtime',
-				true,
-				['a.txt', 'b.txt', 'q.txt', 'subdir2', 'subdir', 'o.txt'],
-			],
-		];
-	}
+    public static function sortDataProvider(): array {
+        return [
+            [
+                'name',
+                false,
+                ['subdir', 'subdir2', 'a.txt', 'b.txt', 'o.txt', 'q.txt'],
+            ],
+            [
+                'name',
+                true,
+                ['q.txt', 'o.txt', 'b.txt', 'a.txt', 'subdir2', 'subdir'],
+            ],
+            [
+                'size',
+                false,
+                ['a.txt', 'q.txt', 'o.txt', 'subdir2', 'subdir', 'b.txt'],
+            ],
+            [
+                'size',
+                true,
+                ['b.txt', 'subdir', 'subdir2', 'o.txt', 'q.txt', 'a.txt'],
+            ],
+            [
+                'mtime',
+                false,
+                ['o.txt', 'subdir', 'subdir2', 'q.txt', 'b.txt', 'a.txt'],
+            ],
+            [
+                'mtime',
+                true,
+                ['a.txt', 'b.txt', 'q.txt', 'subdir2', 'subdir', 'o.txt'],
+            ],
+        ];
+    }
 
-	#[\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 = Helper::sortFiles($files, $sort, $sortDescending);
-		$fileNames = [];
-		foreach ($files as $fileInfo) {
-			$fileNames[] = $fileInfo->getName();
-		}
-		$this->assertEquals(
-			$expectedOrder,
-			$fileNames
-		);
-	}
+    #[\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 = Helper::sortFiles($files, $sort, $sortDescending);
+        $fileNames = [];
+        foreach ($files as $fileInfo) {
+            $fileNames[] = $fileInfo->getName();
+        }
+        $this->assertEquals(
+            $expectedOrder,
+            $fileNames
+        );
+    }
 }

apps/files/tests/Activity/ProviderTest.php

Indentation +158 added lines, -158 removed lines

@@ -28,162 +28,162 @@
  * @package OCA\Files\Tests\Activity
  */
 class ProviderTest extends TestCase {
-	protected IFactory&MockObject $l10nFactory;
-	protected IURLGenerator&MockObject $url;
-	protected IManager&MockObject $activityManager;
-	protected IUserManager&MockObject $userManager;
-	protected IRootFolder&MockObject $rootFolder;
-	protected ICloudIdManager&MockObject $cloudIdManager;
-	protected IContactsManager&MockObject $contactsManager;
-	protected IEventMerger&MockObject $eventMerger;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->url = $this->createMock(IURLGenerator::class);
-		$this->activityManager = $this->createMock(IManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
-		$this->contactsManager = $this->createMock(IContactsManager::class);
-		$this->eventMerger = $this->createMock(IEventMerger::class);
-	}
-
-	/**
-	 * @param string[] $methods
-	 * @return Provider|MockObject
-	 */
-	protected function getProvider(array $methods = []) {
-		if (!empty($methods)) {
-			return $this->getMockBuilder(Provider::class)
-				->setConstructorArgs([
-					$this->l10nFactory,
-					$this->url,
-					$this->activityManager,
-					$this->userManager,
-					$this->rootFolder,
-					$this->cloudIdManager,
-					$this->contactsManager,
-					$this->eventMerger,
-				])
-				->onlyMethods($methods)
-				->getMock();
-		}
-		return new Provider(
-			$this->l10nFactory,
-			$this->url,
-			$this->activityManager,
-			$this->userManager,
-			$this->rootFolder,
-			$this->cloudIdManager,
-			$this->contactsManager,
-			$this->eventMerger
-		);
-	}
-
-	public static function dataGetFile(): array {
-		return [
-			[[42 => '/FortyTwo.txt'], null, '42', 'FortyTwo.txt', 'FortyTwo.txt'],
-			[['23' => '/Twenty/Three.txt'], null, '23', 'Three.txt', 'Twenty/Three.txt'],
-			['/Foo/Bar.txt', 128, '128', 'Bar.txt', 'Foo/Bar.txt'], // Legacy from ownCloud 8.2 and before
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetFile')]
-	public function testGetFile(array|string $parameter, ?int $eventId, string $id, string $name, string $path): void {
-		$provider = $this->getProvider();
-
-		if ($eventId !== null) {
-			$event = $this->createMock(IEvent::class);
-			$event->expects($this->once())
-				->method('getObjectId')
-				->willReturn($eventId);
-		} else {
-			$event = null;
-		}
-
-		$this->url->expects($this->once())
-			->method('linkToRouteAbsolute')
-			->with('files.viewcontroller.showFile', ['fileid' => $id])
-			->willReturn('link-' . $id);
-
-		$result = self::invokePrivate($provider, 'getFile', [$parameter, $event]);
-
-		$this->assertSame('file', $result['type']);
-		$this->assertSame($id, $result['id']);
-		$this->assertSame($name, $result['name']);
-		$this->assertSame($path, $result['path']);
-		$this->assertSame('link-' . $id, $result['link']);
-	}
-
-
-	public function testGetFileThrows(): void {
-		$this->expectException(UnknownActivityException::class);
-
-		$provider = $this->getProvider();
-		self::invokePrivate($provider, 'getFile', ['/Foo/Bar.txt', null]);
-	}
-
-	public static function dataGetUser(): array {
-		return [
-			['test', 'Test user', null, ['type' => 'user', 'id' => 'test', 'name' => 'Test user']],
-			['test@http://localhost', null, ['user' => 'test', 'displayId' => 'test@localhost', 'remote' => 'localhost', 'name' => null], ['type' => 'user', 'id' => 'test', 'name' => 'test@localhost', 'server' => 'localhost']],
-			['test@http://localhost', null, ['user' => 'test', 'displayId' => 'test@localhost', 'remote' => 'localhost', 'name' => 'Remote user'], ['type' => 'user', 'id' => 'test', 'name' => 'Remote user (test@localhost)', 'server' => 'localhost']],
-			['test', null, null, ['type' => 'user', 'id' => 'test', 'name' => 'test']],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetUser')]
-	public function testGetUser(string $uid, ?string $userDisplayName, ?array $cloudIdData, array $expected): void {
-		$provider = $this->getProvider();
-
-		if ($userDisplayName !== null) {
-			$this->userManager->expects($this->once())
-				->method('getDisplayName')
-				->with($uid)
-				->willReturn($userDisplayName);
-		}
-		if ($cloudIdData !== null) {
-			$this->cloudIdManager->expects($this->once())
-				->method('isValidCloudId')
-				->willReturn(true);
-
-			$cloudId = $this->createMock(ICloudId::class);
-			$cloudId->expects($this->once())
-				->method('getUser')
-				->willReturn($cloudIdData['user']);
-			$cloudId->expects($this->once())
-				->method('getDisplayId')
-				->willReturn($cloudIdData['displayId']);
-			$cloudId->expects($this->once())
-				->method('getRemote')
-				->willReturn($cloudIdData['remote']);
-
-			$this->cloudIdManager->expects($this->once())
-				->method('resolveCloudId')
-				->with($uid)
-				->willReturn($cloudId);
-
-			if ($cloudIdData['name'] !== null) {
-				$this->contactsManager->expects($this->once())
-					->method('search')
-					->with($cloudIdData['displayId'], ['CLOUD'])
-					->willReturn([
-						[
-							'CLOUD' => $cloudIdData['displayId'],
-							'FN' => $cloudIdData['name'],
-						]
-					]);
-			} else {
-				$this->contactsManager->expects($this->once())
-					->method('search')
-					->with($cloudIdData['displayId'], ['CLOUD'])
-					->willReturn([]);
-			}
-		}
-
-		$result = self::invokePrivate($provider, 'getUser', [$uid]);
-		$this->assertEquals($expected, $result);
-	}
+    protected IFactory&MockObject $l10nFactory;
+    protected IURLGenerator&MockObject $url;
+    protected IManager&MockObject $activityManager;
+    protected IUserManager&MockObject $userManager;
+    protected IRootFolder&MockObject $rootFolder;
+    protected ICloudIdManager&MockObject $cloudIdManager;
+    protected IContactsManager&MockObject $contactsManager;
+    protected IEventMerger&MockObject $eventMerger;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->url = $this->createMock(IURLGenerator::class);
+        $this->activityManager = $this->createMock(IManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+        $this->cloudIdManager = $this->createMock(ICloudIdManager::class);
+        $this->contactsManager = $this->createMock(IContactsManager::class);
+        $this->eventMerger = $this->createMock(IEventMerger::class);
+    }
+
+    /**
+     * @param string[] $methods
+     * @return Provider|MockObject
+     */
+    protected function getProvider(array $methods = []) {
+        if (!empty($methods)) {
+            return $this->getMockBuilder(Provider::class)
+                ->setConstructorArgs([
+                    $this->l10nFactory,
+                    $this->url,
+                    $this->activityManager,
+                    $this->userManager,
+                    $this->rootFolder,
+                    $this->cloudIdManager,
+                    $this->contactsManager,
+                    $this->eventMerger,
+                ])
+                ->onlyMethods($methods)
+                ->getMock();
+        }
+        return new Provider(
+            $this->l10nFactory,
+            $this->url,
+            $this->activityManager,
+            $this->userManager,
+            $this->rootFolder,
+            $this->cloudIdManager,
+            $this->contactsManager,
+            $this->eventMerger
+        );
+    }
+
+    public static function dataGetFile(): array {
+        return [
+            [[42 => '/FortyTwo.txt'], null, '42', 'FortyTwo.txt', 'FortyTwo.txt'],
+            [['23' => '/Twenty/Three.txt'], null, '23', 'Three.txt', 'Twenty/Three.txt'],
+            ['/Foo/Bar.txt', 128, '128', 'Bar.txt', 'Foo/Bar.txt'], // Legacy from ownCloud 8.2 and before
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetFile')]
+    public function testGetFile(array|string $parameter, ?int $eventId, string $id, string $name, string $path): void {
+        $provider = $this->getProvider();
+
+        if ($eventId !== null) {
+            $event = $this->createMock(IEvent::class);
+            $event->expects($this->once())
+                ->method('getObjectId')
+                ->willReturn($eventId);
+        } else {
+            $event = null;
+        }
+
+        $this->url->expects($this->once())
+            ->method('linkToRouteAbsolute')
+            ->with('files.viewcontroller.showFile', ['fileid' => $id])
+            ->willReturn('link-' . $id);
+
+        $result = self::invokePrivate($provider, 'getFile', [$parameter, $event]);
+
+        $this->assertSame('file', $result['type']);
+        $this->assertSame($id, $result['id']);
+        $this->assertSame($name, $result['name']);
+        $this->assertSame($path, $result['path']);
+        $this->assertSame('link-' . $id, $result['link']);
+    }
+
+
+    public function testGetFileThrows(): void {
+        $this->expectException(UnknownActivityException::class);
+
+        $provider = $this->getProvider();
+        self::invokePrivate($provider, 'getFile', ['/Foo/Bar.txt', null]);
+    }
+
+    public static function dataGetUser(): array {
+        return [
+            ['test', 'Test user', null, ['type' => 'user', 'id' => 'test', 'name' => 'Test user']],
+            ['test@http://localhost', null, ['user' => 'test', 'displayId' => 'test@localhost', 'remote' => 'localhost', 'name' => null], ['type' => 'user', 'id' => 'test', 'name' => 'test@localhost', 'server' => 'localhost']],
+            ['test@http://localhost', null, ['user' => 'test', 'displayId' => 'test@localhost', 'remote' => 'localhost', 'name' => 'Remote user'], ['type' => 'user', 'id' => 'test', 'name' => 'Remote user (test@localhost)', 'server' => 'localhost']],
+            ['test', null, null, ['type' => 'user', 'id' => 'test', 'name' => 'test']],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetUser')]
+    public function testGetUser(string $uid, ?string $userDisplayName, ?array $cloudIdData, array $expected): void {
+        $provider = $this->getProvider();
+
+        if ($userDisplayName !== null) {
+            $this->userManager->expects($this->once())
+                ->method('getDisplayName')
+                ->with($uid)
+                ->willReturn($userDisplayName);
+        }
+        if ($cloudIdData !== null) {
+            $this->cloudIdManager->expects($this->once())
+                ->method('isValidCloudId')
+                ->willReturn(true);
+
+            $cloudId = $this->createMock(ICloudId::class);
+            $cloudId->expects($this->once())
+                ->method('getUser')
+                ->willReturn($cloudIdData['user']);
+            $cloudId->expects($this->once())
+                ->method('getDisplayId')
+                ->willReturn($cloudIdData['displayId']);
+            $cloudId->expects($this->once())
+                ->method('getRemote')
+                ->willReturn($cloudIdData['remote']);
+
+            $this->cloudIdManager->expects($this->once())
+                ->method('resolveCloudId')
+                ->with($uid)
+                ->willReturn($cloudId);
+
+            if ($cloudIdData['name'] !== null) {
+                $this->contactsManager->expects($this->once())
+                    ->method('search')
+                    ->with($cloudIdData['displayId'], ['CLOUD'])
+                    ->willReturn([
+                        [
+                            'CLOUD' => $cloudIdData['displayId'],
+                            'FN' => $cloudIdData['name'],
+                        ]
+                    ]);
+            } else {
+                $this->contactsManager->expects($this->once())
+                    ->method('search')
+                    ->with($cloudIdData['displayId'], ['CLOUD'])
+                    ->willReturn([]);
+            }
+        }
+
+        $result = self::invokePrivate($provider, 'getUser', [$uid]);
+        $this->assertEquals($expected, $result);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetFile')]
-	public function testGetFile(array|string $parameter, ?int $eventId, string $id, string $name, string $path): void {
+	public function testGetFile(array | string $parameter, ?int $eventId, string $id, string $name, string $path): void {
 		$provider = $this->getProvider();
 
 		if ($eventId !== null) {
@@ -106,7 +106,7 @@ 
 		$this->url->expects($this->once())
 			->method('linkToRouteAbsolute')
 			->with('files.viewcontroller.showFile', ['fileid' => $id])
-			->willReturn('link-' . $id);
+			->willReturn('link-'.$id);
 
 		$result = self::invokePrivate($provider, 'getFile', [$parameter, $event]);
 
@@ -114,7 +114,7 @@ 
 		$this->assertSame($id, $result['id']);
 		$this->assertSame($name, $result['name']);
 		$this->assertSame($path, $result['path']);
-		$this->assertSame('link-' . $id, $result['link']);
+		$this->assertSame('link-'.$id, $result['link']);
 	}
 
 

apps/files/tests/Activity/Setting/GenericTest.php

Indentation +57 added lines, -57 removed lines

@@ -14,69 +14,69 @@
 use Test\TestCase;
 
 class GenericTest extends TestCase {
-	public static function dataSettings(): array {
-		return [
-			[FavoriteAction::class],
-			[FileChanged::class],
-			[FileChanged::class],
-		];
-	}
+    public static function dataSettings(): array {
+        return [
+            [FavoriteAction::class],
+            [FileChanged::class],
+            [FileChanged::class],
+        ];
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testImplementsInterface(string $settingClass): void {
-		$setting = Server::get($settingClass);
-		$this->assertInstanceOf(ISetting::class, $setting);
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testImplementsInterface(string $settingClass): void {
+        $setting = Server::get($settingClass);
+        $this->assertInstanceOf(ISetting::class, $setting);
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testGetIdentifier(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsString($setting->getIdentifier());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testGetIdentifier(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsString($setting->getIdentifier());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testGetName(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsString($setting->getName());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testGetName(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsString($setting->getName());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testGetPriority(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$priority = $setting->getPriority();
-		$this->assertIsInt($setting->getPriority());
-		$this->assertGreaterThanOrEqual(0, $priority);
-		$this->assertLessThanOrEqual(100, $priority);
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testGetPriority(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $priority = $setting->getPriority();
+        $this->assertIsInt($setting->getPriority());
+        $this->assertGreaterThanOrEqual(0, $priority);
+        $this->assertLessThanOrEqual(100, $priority);
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testCanChangeStream(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->canChangeStream());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testCanChangeStream(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->canChangeStream());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testIsDefaultEnabledStream(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->isDefaultEnabledStream());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testIsDefaultEnabledStream(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->isDefaultEnabledStream());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testCanChangeMail(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->canChangeMail());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testCanChangeMail(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->canChangeMail());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
-	public function testIsDefaultEnabledMail(string $settingClass): void {
-		/** @var ISetting $setting */
-		$setting = Server::get($settingClass);
-		$this->assertIsBool($setting->isDefaultEnabledMail());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSettings')]
+    public function testIsDefaultEnabledMail(string $settingClass): void {
+        /** @var ISetting $setting */
+        $setting = Server::get($settingClass);
+        $this->assertIsBool($setting->isDefaultEnabledMail());
+    }
 }

apps/files/tests/Activity/Filter/GenericTest.php

Indentation +51 added lines, -51 removed lines

@@ -20,62 +20,62 @@
  * @group DB
  */
 class GenericTest extends TestCase {
-	public static function dataFilters(): array {
-		return [
-			[Favorites::class],
-			[FileChanges::class],
-		];
-	}
+    public static function dataFilters(): array {
+        return [
+            [Favorites::class],
+            [FileChanges::class],
+        ];
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testImplementsInterface(string $filterClass): void {
-		$filter = Server::get($filterClass);
-		$this->assertInstanceOf(IFilter::class, $filter);
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testImplementsInterface(string $filterClass): void {
+        $filter = Server::get($filterClass);
+        $this->assertInstanceOf(IFilter::class, $filter);
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testGetIdentifier(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsString($filter->getIdentifier());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testGetIdentifier(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsString($filter->getIdentifier());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testGetName(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsString($filter->getName());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testGetName(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsString($filter->getName());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testGetPriority(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$priority = $filter->getPriority();
-		$this->assertIsInt($filter->getPriority());
-		$this->assertGreaterThanOrEqual(0, $priority);
-		$this->assertLessThanOrEqual(100, $priority);
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testGetPriority(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $priority = $filter->getPriority();
+        $this->assertIsInt($filter->getPriority());
+        $this->assertGreaterThanOrEqual(0, $priority);
+        $this->assertLessThanOrEqual(100, $priority);
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testGetIcon(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsString($filter->getIcon());
-		$this->assertStringStartsWith('http', $filter->getIcon());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testGetIcon(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsString($filter->getIcon());
+        $this->assertStringStartsWith('http', $filter->getIcon());
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testFilterTypes(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsArray($filter->filterTypes([]));
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testFilterTypes(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsArray($filter->filterTypes([]));
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
-	public function testAllowedApps(string $filterClass): void {
-		/** @var IFilter $filter */
-		$filter = Server::get($filterClass);
-		$this->assertIsArray($filter->allowedApps());
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFilters')]
+    public function testAllowedApps(string $filterClass): void {
+        /** @var IFilter $filter */
+        $filter = Server::get($filterClass);
+        $this->assertIsArray($filter->allowedApps());
+    }
 }

apps/provisioning_api/tests/Controller/AppConfigControllerTest.php

Indentation +361 added lines, -361 removed lines

@@ -32,365 +32,365 @@
  * @package OCA\Provisioning_API\Tests
  */
 class AppConfigControllerTest extends TestCase {
-	private IAppConfig&MockObject $appConfig;
-	private IUserSession&MockObject $userSession;
-	private IL10N&MockObject $l10n;
-	private IManager&MockObject $settingManager;
-	private IGroupManager&MockObject $groupManager;
-	private IAppManager $appManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appConfig = $this->createMock(AppConfig::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->settingManager = $this->createMock(IManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->appManager = Server::get(IAppManager::class);
-	}
-
-	/**
-	 * @param string[] $methods
-	 * @return AppConfigController|MockObject
-	 */
-	protected function getInstance(array $methods = []) {
-		$request = $this->createMock(IRequest::class);
-
-		if (empty($methods)) {
-			return new AppConfigController(
-				'provisioning_api',
-				$request,
-				$this->appConfig,
-				$this->userSession,
-				$this->l10n,
-				$this->groupManager,
-				$this->settingManager,
-				$this->appManager,
-			);
-		} else {
-			return $this->getMockBuilder(AppConfigController::class)
-				->setConstructorArgs([
-					'provisioning_api',
-					$request,
-					$this->appConfig,
-					$this->userSession,
-					$this->l10n,
-					$this->groupManager,
-					$this->settingManager,
-					$this->appManager,
-				])
-				->onlyMethods($methods)
-				->getMock();
-		}
-	}
-
-	public function testGetApps(): void {
-		$this->appConfig->expects($this->once())
-			->method('getApps')
-			->willReturn(['apps']);
-
-		$result = $this->getInstance()->getApps();
-		$this->assertInstanceOf(DataResponse::class, $result);
-		$this->assertSame(Http::STATUS_OK, $result->getStatus());
-		$this->assertEquals(['data' => ['apps']], $result->getData());
-	}
-
-	public static function dataGetKeys(): array {
-		return [
-			['app1 ', null, new \InvalidArgumentException('error'), Http::STATUS_FORBIDDEN],
-			['app2', ['keys'], null, Http::STATUS_OK],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetKeys')]
-	public function testGetKeys(string $app, ?array $keys, ?\Throwable $throws, int $status): void {
-		$api = $this->getInstance(['verifyAppId']);
-		if ($throws instanceof \Exception) {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app)
-				->willThrowException($throws);
-
-			$this->appConfig->expects($this->never())
-				->method('getKeys');
-		} else {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app);
-
-			$this->appConfig->expects($this->once())
-				->method('getKeys')
-				->with($app)
-				->willReturn($keys);
-		}
-
-		$result = $api->getKeys($app);
-		$this->assertInstanceOf(DataResponse::class, $result);
-		$this->assertSame($status, $result->getStatus());
-		if ($throws instanceof \Exception) {
-			$this->assertEquals(['data' => ['message' => $throws->getMessage()]], $result->getData());
-		} else {
-			$this->assertEquals(['data' => $keys], $result->getData());
-		}
-	}
-
-	public static function dataGetValue(): array {
-		return [
-			['app1', 'key', 'default', null, new \InvalidArgumentException('error'), Http::STATUS_FORBIDDEN],
-			['app2', 'key', 'default', 'return', null, Http::STATUS_OK],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetValue')]
-	public function testGetValue(string $app, string $key, string $default, ?string $return, ?\Throwable $throws, int $status): void {
-		$api = $this->getInstance(['verifyAppId']);
-		if ($throws instanceof \Exception) {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app)
-				->willThrowException($throws);
-		} else {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app);
-
-			$this->appConfig->expects($this->once())
-				->method('getValueMixed')
-				->with($app, $key, $default)
-				->willReturn($return);
-		}
-
-		$result = $api->getValue($app, $key, $default);
-		$this->assertInstanceOf(DataResponse::class, $result);
-		$this->assertSame($status, $result->getStatus());
-		if ($throws instanceof \Exception) {
-			$this->assertEquals(['data' => ['message' => $throws->getMessage()]], $result->getData());
-		} else {
-			$this->assertEquals(['data' => $return], $result->getData());
-		}
-	}
-
-	public static function dataSetValue(): array {
-		return [
-			['app1', 'key', 'default', new \InvalidArgumentException('error1'), null, Http::STATUS_FORBIDDEN],
-			['app2', 'key', 'default', null, new \InvalidArgumentException('error2'), Http::STATUS_FORBIDDEN],
-			['app2', 'key', 'default', null, null, Http::STATUS_OK],
-			['app2', 'key', '1', null, null, Http::STATUS_OK, IAppConfig::VALUE_BOOL],
-			['app2', 'key', '42', null, null, Http::STATUS_OK, IAppConfig::VALUE_INT],
-			['app2', 'key', '4.2', null, null, Http::STATUS_OK, IAppConfig::VALUE_FLOAT],
-			['app2', 'key', '42', null, null, Http::STATUS_OK, IAppConfig::VALUE_STRING],
-			['app2', 'key', 'secret', null, null, Http::STATUS_OK, IAppConfig::VALUE_STRING | IAppConfig::VALUE_SENSITIVE],
-			['app2', 'key', json_encode([4, 2]), null, null, Http::STATUS_OK, IAppConfig::VALUE_ARRAY],
-			['app2', 'key', json_encode([4, 2]), null, null, Http::STATUS_OK, new AppConfigUnknownKeyException()],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSetValue')]
-	public function testSetValue(string $app, string $key, string $value, ?\Throwable $appThrows, ?\Throwable $keyThrows, int $status, int|\Throwable $type = IAppConfig::VALUE_MIXED): void {
-		$adminUser = $this->createMock(IUser::class);
-		$adminUser->expects($this->once())
-			->method('getUid')
-			->willReturn('admin');
-
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($adminUser);
-		$this->groupManager->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$api = $this->getInstance(['verifyAppId', 'verifyConfigKey']);
-		if ($appThrows instanceof \Exception) {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app)
-				->willThrowException($appThrows);
-
-			$api->expects($this->never())
-				->method('verifyConfigKey');
-			$this->appConfig->expects($this->never())
-				->method('setValueMixed');
-		} elseif ($keyThrows instanceof  \Exception) {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app);
-			$api->expects($this->once())
-				->method('verifyConfigKey')
-				->with($app, $key)
-				->willThrowException($keyThrows);
-
-			$this->appConfig->expects($this->never())
-				->method('setValueMixed');
-		} else {
-			$api->expects($this->once())
-				->method('verifyAppId')
-				->with($app);
-			$api->expects($this->once())
-				->method('verifyConfigKey')
-				->with($app, $key);
-
-			if ($type instanceof \Throwable) {
-				$this->appConfig->expects($this->once())
-					->method('getDetails')
-					->with($app, $key)
-					->willThrowException($type);
-			} else {
-				$this->appConfig->expects($this->once())
-					->method('getDetails')
-					->with($app, $key)
-					->willReturn([
-						'app' => $app,
-						'key' => $key,
-						'value' => '', // 

Spacing +2 added lines, -2 removed lines

@@ -187,7 +187,7 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataSetValue')]
-	public function testSetValue(string $app, string $key, string $value, ?\Throwable $appThrows, ?\Throwable $keyThrows, int $status, int|\Throwable $type = IAppConfig::VALUE_MIXED): void {
+	public function testSetValue(string $app, string $key, string $value, ?\Throwable $appThrows, ?\Throwable $keyThrows, int $status, int | \Throwable $type = IAppConfig::VALUE_MIXED): void {
 		$adminUser = $this->createMock(IUser::class);
 		$adminUser->expects($this->once())
 			->method('getUid')
@@ -245,7 +245,7 @@ 
 						'value' => '', // 

apps/provisioning_api/tests/Controller/GroupsControllerTest.php

Indentation +519 added lines, -519 removed lines

@@ -26,523 +26,523 @@
 use Psr\Log\LoggerInterface;
 
 class GroupsControllerTest extends \Test\TestCase {
-	protected IRequest&MockObject $request;
-	protected IUserManager&MockObject $userManager;
-	protected IConfig&MockObject $config;
-	protected Manager&MockObject $groupManager;
-	protected IUserSession&MockObject $userSession;
-	protected IAccountManager&MockObject $accountManager;
-	protected ISubAdmin&MockObject $subAdminManager;
-	protected IFactory&MockObject $l10nFactory;
-	protected LoggerInterface&MockObject $logger;
-	protected GroupsController&MockObject $api;
-
-	private IRootFolder $rootFolder;
-
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->request = $this->createMock(IRequest::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->groupManager = $this->createMock(Manager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->accountManager = $this->createMock(IAccountManager::class);
-		$this->subAdminManager = $this->createMock(ISubAdmin::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-
-		$this->groupManager
-			->method('getSubAdmin')
-			->willReturn($this->subAdminManager);
-
-		$this->api = $this->getMockBuilder(GroupsController::class)
-			->setConstructorArgs([
-				'provisioning_api',
-				$this->request,
-				$this->userManager,
-				$this->config,
-				$this->groupManager,
-				$this->userSession,
-				$this->accountManager,
-				$this->subAdminManager,
-				$this->l10nFactory,
-				$this->rootFolder,
-				$this->logger
-			])
-			->onlyMethods(['fillStorageInfo'])
-			->getMock();
-	}
-
-	private function createGroup(string $gid): IGroup&MockObject {
-		$group = $this->createMock(IGroup::class);
-		$group
-			->method('getGID')
-			->willReturn($gid);
-		$group
-			->method('getDisplayName')
-			->willReturn($gid . '-name');
-		$group
-			->method('count')
-			->willReturn(123);
-		$group
-			->method('countDisabled')
-			->willReturn(11);
-		$group
-			->method('canAddUser')
-			->willReturn(true);
-		$group
-			->method('canRemoveUser')
-			->willReturn(true);
-
-		return $group;
-	}
-
-	/**
-	 * @param string $uid
-	 * @return IUser&MockObject
-	 */
-	private function createUser($uid) {
-		$user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$user
-			->method('getUID')
-			->willReturn($uid);
-		$backendMock = $this->createMock(UserInterface::class);
-		$user
-			->method('getBackend')
-			->willReturn($backendMock);
-		return $user;
-	}
-
-	private function asUser() {
-		$user = $this->createUser('user');
-		$this->userSession
-			->method('getUser')
-			->willReturn($user);
-	}
-
-	private function asAdmin() {
-		$user = $this->createUser('admin');
-		$this->userSession
-			->method('getUser')
-			->willReturn($user);
-
-		$this->groupManager
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-	}
-
-	private function asSubAdminOfGroup($group) {
-		$user = $this->createUser('subAdmin');
-		$this->userSession
-			->method('getUser')
-			->willReturn($user);
-
-		$this->subAdminManager
-			->method('isSubAdminOfGroup')
-			->willReturnCallback(function ($_user, $_group) use ($user, $group) {
-				if ($_user === $user && $_group === $group) {
-					return true;
-				}
-				return false;
-			});
-	}
-
-	public static function dataGetGroups(): array {
-		return [
-			[null, 0, 0],
-			['foo', 0, 0],
-			[null, 1, 0],
-			[null, 0, 2],
-			['foo', 1, 2],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetGroups')]
-	public function testGetGroups(?string $search, int $limit, int $offset): void {
-		$groups = [$this->createGroup('group1'), $this->createGroup('group2')];
-
-		$search = $search === null ? '' : $search;
-
-		$this->groupManager
-			->expects($this->once())
-			->method('search')
-			->with($search, $limit, $offset)
-			->willReturn($groups);
-
-		$result = $this->api->getGroups($search, $limit, $offset);
-		$this->assertEquals(['groups' => ['group1', 'group2']], $result->getData());
-	}
-
-	/**
-	 *
-	 * @param string|null $search
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetGroups')]
-	public function testGetGroupsDetails($search, $limit, $offset): void {
-		$groups = [$this->createGroup('group1'), $this->createGroup('group2')];
-
-		$search = $search === null ? '' : $search;
-
-		$this->groupManager
-			->expects($this->once())
-			->method('search')
-			->with($search, $limit, $offset)
-			->willReturn($groups);
-
-		$result = $this->api->getGroupsDetails($search, $limit, $offset);
-		$this->assertEquals(['groups' => [
-			[
-				'id' => 'group1',
-				'displayname' => 'group1-name',
-				'usercount' => 123,
-				'disabled' => 11,
-				'canAdd' => true,
-				'canRemove' => true
-			],
-			[
-				'id' => 'group2',
-				'displayname' => 'group2-name',
-				'usercount' => 123,
-				'disabled' => 11,
-				'canAdd' => true,
-				'canRemove' => true
-			]
-		]], $result->getData());
-	}
-
-	public function testGetGroupAsSubadmin(): void {
-		$group = $this->createGroup('group');
-		$this->asSubAdminOfGroup($group);
-
-		$this->groupManager
-			->method('get')
-			->with('group')
-			->willReturn($group);
-		$this->groupManager
-			->method('groupExists')
-			->with('group')
-			->willReturn(true);
-		$group
-			->method('getUsers')
-			->willReturn([
-				$this->createUser('user1'),
-				$this->createUser('user2')
-			]);
-
-		$result = $this->api->getGroup('group');
-
-		$this->assertEquals(['users' => ['user1', 'user2']], $result->getData());
-	}
-
-
-	public function testGetGroupAsIrrelevantSubadmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(403);
-
-		$group = $this->createGroup('group');
-		$otherGroup = $this->createGroup('otherGroup');
-		$this->asSubAdminOfGroup($otherGroup);
-
-		$this->groupManager
-			->method('get')
-			->with('group')
-			->willReturn($group);
-		$this->groupManager
-			->method('groupExists')
-			->with('group')
-			->willReturn(true);
-
-		$this->api->getGroup('group');
-	}
-
-	public function testGetGroupAsAdmin(): void {
-		$group = $this->createGroup('group');
-		$this->asAdmin();
-
-		$this->groupManager
-			->method('get')
-			->with('group')
-			->willReturn($group);
-		$this->groupManager
-			->method('groupExists')
-			->with('group')
-			->willReturn(true);
-		$group
-			->method('getUsers')
-			->willReturn([
-				$this->createUser('user1'),
-				$this->createUser('user2')
-			]);
-
-		$result = $this->api->getGroup('group');
-
-		$this->assertEquals(['users' => ['user1', 'user2']], $result->getData());
-	}
-
-
-	public function testGetGroupNonExisting(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('The requested group could not be found');
-		$this->expectExceptionCode(404);
-
-		$this->asUser();
-
-		$this->api->getGroup($this->getUniqueID());
-	}
-
-
-	public function testGetSubAdminsOfGroupsNotExists(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Group does not exist');
-		$this->expectExceptionCode(101);
-
-		$this->api->getSubAdminsOfGroup('NonExistingGroup');
-	}
-
-	public function testGetSubAdminsOfGroup(): void {
-		$group = $this->createGroup('GroupWithSubAdmins');
-		$this->groupManager
-			->method('get')
-			->with('GroupWithSubAdmins')
-			->willReturn($group);
-
-		$this->subAdminManager
-			->expects($this->once())
-			->method('getGroupsSubAdmins')
-			->with($group)
-			->willReturn([
-				$this->createUser('SubAdmin1'),
-				$this->createUser('SubAdmin2'),
-			]);
-
-		$result = $this->api->getSubAdminsOfGroup('GroupWithSubAdmins');
-		$this->assertEquals(['SubAdmin1', 'SubAdmin2'], $result->getData());
-	}
-
-	public function testGetSubAdminsOfGroupEmptyList(): void {
-		$group = $this->createGroup('GroupWithOutSubAdmins');
-		$this->groupManager
-			->method('get')
-			->with('GroupWithOutSubAdmins')
-			->willReturn($group);
-
-		$this->subAdminManager
-			->expects($this->once())
-			->method('getGroupsSubAdmins')
-			->with($group)
-			->willReturn([
-			]);
-
-		$result = $this->api->getSubAdminsOfGroup('GroupWithOutSubAdmins');
-		$this->assertEquals([], $result->getData());
-	}
-
-
-	public function testAddGroupEmptyGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Invalid group name');
-		$this->expectExceptionCode(101);
-
-		$this->api->addGroup('');
-	}
-
-
-	public function testAddGroupExistingGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(102);
-
-		$this->groupManager
-			->method('groupExists')
-			->with('ExistingGroup')
-			->willReturn(true);
-
-		$this->api->addGroup('ExistingGroup');
-	}
-
-	public function testAddGroup(): void {
-		$this->groupManager
-			->method('groupExists')
-			->with('NewGroup')
-			->willReturn(false);
-
-		$group = $this->createGroup('NewGroup');
-		$this->groupManager
-			->expects($this->once())
-			->method('createGroup')
-			->with('NewGroup')
-			->willReturn($group);
-
-		$this->api->addGroup('NewGroup');
-	}
-
-	public function testAddGroupWithSpecialChar(): void {
-		$this->groupManager
-			->method('groupExists')
-			->with('Iñtërnâtiônàlizætiøn')
-			->willReturn(false);
-
-		$group = $this->createGroup('Iñtërnâtiônàlizætiøn');
-		$this->groupManager
-			->expects($this->once())
-			->method('createGroup')
-			->with('Iñtërnâtiônàlizætiøn')
-			->willReturn($group);
-
-		$this->api->addGroup('Iñtërnâtiônàlizætiøn');
-	}
-
-
-	public function testDeleteGroupNonExisting(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$this->api->deleteGroup('NonExistingGroup');
-	}
-
-
-	public function testDeleteAdminGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(102);
-
-		$this->groupManager
-			->method('groupExists')
-			->with('admin')
-			->willReturn('true');
-
-		$this->api->deleteGroup('admin');
-	}
-
-	public function testDeleteGroup(): void {
-		$this->groupManager
-			->method('groupExists')
-			->with('ExistingGroup')
-			->willReturn('true');
-
-		$group = $this->createGroup('ExistingGroup');
-		$this->groupManager
-			->method('get')
-			->with('ExistingGroup')
-			->willReturn($group);
-		$group
-			->expects($this->once())
-			->method('delete')
-			->willReturn(true);
-
-		$this->api->deleteGroup('ExistingGroup');
-	}
-
-	public function testDeleteGroupEncoding(): void {
-		$this->groupManager
-			->method('groupExists')
-			->with('ExistingGroup A/B')
-			->willReturn('true');
-
-		$group = $this->createGroup('ExistingGroup');
-		$this->groupManager
-			->method('get')
-			->with('ExistingGroup A/B')
-			->willReturn($group);
-		$group
-			->expects($this->once())
-			->method('delete')
-			->willReturn(true);
-
-		$this->api->deleteGroup(urlencode('ExistingGroup A/B'));
-	}
-
-	public function testGetGroupUsersDetails(): void {
-		$gid = 'ncg1';
-
-		$this->asAdmin();
-
-		$users = [
-			'ncu1' => $this->createUser('ncu1'), # regular
-			'ncu2' => $this->createUser('ncu2'), # the zombie
-		];
-		$users['ncu2']->expects($this->atLeastOnce())
-			->method('getHome')
-			->willThrowException(new NoUserException());
-
-		$this->userManager->expects($this->any())
-			->method('get')
-			->willReturnCallback(function (string $uid) use ($users) {
-				return $users[$uid] ?? null;
-			});
-
-		$group = $this->createGroup($gid);
-		$group->expects($this->once())
-			->method('searchUsers')
-			->with('', null, 0)
-			->willReturn(array_values($users));
-
-		$this->groupManager
-			->method('get')
-			->with($gid)
-			->willReturn($group);
-		$this->groupManager->expects($this->any())
-			->method('getUserGroups')
-			->willReturn([$group]);
-
-		/** @var MockObject */
-		$this->subAdminManager->expects($this->any())
-			->method('isSubAdminOfGroup')
-			->willReturn(false);
-		$this->subAdminManager->expects($this->any())
-			->method('getSubAdminsGroups')
-			->willReturn([]);
-
-
-		$this->api->getGroupUsersDetails($gid);
-	}
-
-	public function testGetGroupUsersDetailsEncoded(): void {
-		$gid = 'Department A/B C/D';
-
-		$this->asAdmin();
-
-		$users = [
-			'ncu1' => $this->createUser('ncu1'), # regular
-			'ncu2' => $this->createUser('ncu2'), # the zombie
-		];
-		$users['ncu2']->expects($this->atLeastOnce())
-			->method('getHome')
-			->willThrowException(new NoUserException());
-
-		$this->userManager->expects($this->any())
-			->method('get')
-			->willReturnCallback(function (string $uid) use ($users) {
-				return $users[$uid] ?? null;
-			});
-
-		$group = $this->createGroup($gid);
-		$group->expects($this->once())
-			->method('searchUsers')
-			->with('', null, 0)
-			->willReturn(array_values($users));
-
-		$this->groupManager
-			->method('get')
-			->with($gid)
-			->willReturn($group);
-		$this->groupManager->expects($this->any())
-			->method('getUserGroups')
-			->willReturn([$group]);
-
-		/** @var MockObject */
-		$this->subAdminManager->expects($this->any())
-			->method('isSubAdminOfGroup')
-			->willReturn(false);
-		$this->subAdminManager->expects($this->any())
-			->method('getSubAdminsGroups')
-			->willReturn([]);
-
-
-		$this->api->getGroupUsersDetails(urlencode($gid));
-	}
+    protected IRequest&MockObject $request;
+    protected IUserManager&MockObject $userManager;
+    protected IConfig&MockObject $config;
+    protected Manager&MockObject $groupManager;
+    protected IUserSession&MockObject $userSession;
+    protected IAccountManager&MockObject $accountManager;
+    protected ISubAdmin&MockObject $subAdminManager;
+    protected IFactory&MockObject $l10nFactory;
+    protected LoggerInterface&MockObject $logger;
+    protected GroupsController&MockObject $api;
+
+    private IRootFolder $rootFolder;
+
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->request = $this->createMock(IRequest::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->groupManager = $this->createMock(Manager::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->accountManager = $this->createMock(IAccountManager::class);
+        $this->subAdminManager = $this->createMock(ISubAdmin::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+
+        $this->groupManager
+            ->method('getSubAdmin')
+            ->willReturn($this->subAdminManager);
+
+        $this->api = $this->getMockBuilder(GroupsController::class)
+            ->setConstructorArgs([
+                'provisioning_api',
+                $this->request,
+                $this->userManager,
+                $this->config,
+                $this->groupManager,
+                $this->userSession,
+                $this->accountManager,
+                $this->subAdminManager,
+                $this->l10nFactory,
+                $this->rootFolder,
+                $this->logger
+            ])
+            ->onlyMethods(['fillStorageInfo'])
+            ->getMock();
+    }
+
+    private function createGroup(string $gid): IGroup&MockObject {
+        $group = $this->createMock(IGroup::class);
+        $group
+            ->method('getGID')
+            ->willReturn($gid);
+        $group
+            ->method('getDisplayName')
+            ->willReturn($gid . '-name');
+        $group
+            ->method('count')
+            ->willReturn(123);
+        $group
+            ->method('countDisabled')
+            ->willReturn(11);
+        $group
+            ->method('canAddUser')
+            ->willReturn(true);
+        $group
+            ->method('canRemoveUser')
+            ->willReturn(true);
+
+        return $group;
+    }
+
+    /**
+     * @param string $uid
+     * @return IUser&MockObject
+     */
+    private function createUser($uid) {
+        $user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $user
+            ->method('getUID')
+            ->willReturn($uid);
+        $backendMock = $this->createMock(UserInterface::class);
+        $user
+            ->method('getBackend')
+            ->willReturn($backendMock);
+        return $user;
+    }
+
+    private function asUser() {
+        $user = $this->createUser('user');
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($user);
+    }
+
+    private function asAdmin() {
+        $user = $this->createUser('admin');
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($user);
+
+        $this->groupManager
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+    }
+
+    private function asSubAdminOfGroup($group) {
+        $user = $this->createUser('subAdmin');
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($user);
+
+        $this->subAdminManager
+            ->method('isSubAdminOfGroup')
+            ->willReturnCallback(function ($_user, $_group) use ($user, $group) {
+                if ($_user === $user && $_group === $group) {
+                    return true;
+                }
+                return false;
+            });
+    }
+
+    public static function dataGetGroups(): array {
+        return [
+            [null, 0, 0],
+            ['foo', 0, 0],
+            [null, 1, 0],
+            [null, 0, 2],
+            ['foo', 1, 2],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetGroups')]
+    public function testGetGroups(?string $search, int $limit, int $offset): void {
+        $groups = [$this->createGroup('group1'), $this->createGroup('group2')];
+
+        $search = $search === null ? '' : $search;
+
+        $this->groupManager
+            ->expects($this->once())
+            ->method('search')
+            ->with($search, $limit, $offset)
+            ->willReturn($groups);
+
+        $result = $this->api->getGroups($search, $limit, $offset);
+        $this->assertEquals(['groups' => ['group1', 'group2']], $result->getData());
+    }
+
+    /**
+     *
+     * @param string|null $search
+     * @param int|null $limit
+     * @param int|null $offset
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetGroups')]
+    public function testGetGroupsDetails($search, $limit, $offset): void {
+        $groups = [$this->createGroup('group1'), $this->createGroup('group2')];
+
+        $search = $search === null ? '' : $search;
+
+        $this->groupManager
+            ->expects($this->once())
+            ->method('search')
+            ->with($search, $limit, $offset)
+            ->willReturn($groups);
+
+        $result = $this->api->getGroupsDetails($search, $limit, $offset);
+        $this->assertEquals(['groups' => [
+            [
+                'id' => 'group1',
+                'displayname' => 'group1-name',
+                'usercount' => 123,
+                'disabled' => 11,
+                'canAdd' => true,
+                'canRemove' => true
+            ],
+            [
+                'id' => 'group2',
+                'displayname' => 'group2-name',
+                'usercount' => 123,
+                'disabled' => 11,
+                'canAdd' => true,
+                'canRemove' => true
+            ]
+        ]], $result->getData());
+    }
+
+    public function testGetGroupAsSubadmin(): void {
+        $group = $this->createGroup('group');
+        $this->asSubAdminOfGroup($group);
+
+        $this->groupManager
+            ->method('get')
+            ->with('group')
+            ->willReturn($group);
+        $this->groupManager
+            ->method('groupExists')
+            ->with('group')
+            ->willReturn(true);
+        $group
+            ->method('getUsers')
+            ->willReturn([
+                $this->createUser('user1'),
+                $this->createUser('user2')
+            ]);
+
+        $result = $this->api->getGroup('group');
+
+        $this->assertEquals(['users' => ['user1', 'user2']], $result->getData());
+    }
+
+
+    public function testGetGroupAsIrrelevantSubadmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(403);
+
+        $group = $this->createGroup('group');
+        $otherGroup = $this->createGroup('otherGroup');
+        $this->asSubAdminOfGroup($otherGroup);
+
+        $this->groupManager
+            ->method('get')
+            ->with('group')
+            ->willReturn($group);
+        $this->groupManager
+            ->method('groupExists')
+            ->with('group')
+            ->willReturn(true);
+
+        $this->api->getGroup('group');
+    }
+
+    public function testGetGroupAsAdmin(): void {
+        $group = $this->createGroup('group');
+        $this->asAdmin();
+
+        $this->groupManager
+            ->method('get')
+            ->with('group')
+            ->willReturn($group);
+        $this->groupManager
+            ->method('groupExists')
+            ->with('group')
+            ->willReturn(true);
+        $group
+            ->method('getUsers')
+            ->willReturn([
+                $this->createUser('user1'),
+                $this->createUser('user2')
+            ]);
+
+        $result = $this->api->getGroup('group');
+
+        $this->assertEquals(['users' => ['user1', 'user2']], $result->getData());
+    }
+
+
+    public function testGetGroupNonExisting(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('The requested group could not be found');
+        $this->expectExceptionCode(404);
+
+        $this->asUser();
+
+        $this->api->getGroup($this->getUniqueID());
+    }
+
+
+    public function testGetSubAdminsOfGroupsNotExists(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Group does not exist');
+        $this->expectExceptionCode(101);
+
+        $this->api->getSubAdminsOfGroup('NonExistingGroup');
+    }
+
+    public function testGetSubAdminsOfGroup(): void {
+        $group = $this->createGroup('GroupWithSubAdmins');
+        $this->groupManager
+            ->method('get')
+            ->with('GroupWithSubAdmins')
+            ->willReturn($group);
+
+        $this->subAdminManager
+            ->expects($this->once())
+            ->method('getGroupsSubAdmins')
+            ->with($group)
+            ->willReturn([
+                $this->createUser('SubAdmin1'),
+                $this->createUser('SubAdmin2'),
+            ]);
+
+        $result = $this->api->getSubAdminsOfGroup('GroupWithSubAdmins');
+        $this->assertEquals(['SubAdmin1', 'SubAdmin2'], $result->getData());
+    }
+
+    public function testGetSubAdminsOfGroupEmptyList(): void {
+        $group = $this->createGroup('GroupWithOutSubAdmins');
+        $this->groupManager
+            ->method('get')
+            ->with('GroupWithOutSubAdmins')
+            ->willReturn($group);
+
+        $this->subAdminManager
+            ->expects($this->once())
+            ->method('getGroupsSubAdmins')
+            ->with($group)
+            ->willReturn([
+            ]);
+
+        $result = $this->api->getSubAdminsOfGroup('GroupWithOutSubAdmins');
+        $this->assertEquals([], $result->getData());
+    }
+
+
+    public function testAddGroupEmptyGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Invalid group name');
+        $this->expectExceptionCode(101);
+
+        $this->api->addGroup('');
+    }
+
+
+    public function testAddGroupExistingGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(102);
+
+        $this->groupManager
+            ->method('groupExists')
+            ->with('ExistingGroup')
+            ->willReturn(true);
+
+        $this->api->addGroup('ExistingGroup');
+    }
+
+    public function testAddGroup(): void {
+        $this->groupManager
+            ->method('groupExists')
+            ->with('NewGroup')
+            ->willReturn(false);
+
+        $group = $this->createGroup('NewGroup');
+        $this->groupManager
+            ->expects($this->once())
+            ->method('createGroup')
+            ->with('NewGroup')
+            ->willReturn($group);
+
+        $this->api->addGroup('NewGroup');
+    }
+
+    public function testAddGroupWithSpecialChar(): void {
+        $this->groupManager
+            ->method('groupExists')
+            ->with('Iñtërnâtiônàlizætiøn')
+            ->willReturn(false);
+
+        $group = $this->createGroup('Iñtërnâtiônàlizætiøn');
+        $this->groupManager
+            ->expects($this->once())
+            ->method('createGroup')
+            ->with('Iñtërnâtiônàlizætiøn')
+            ->willReturn($group);
+
+        $this->api->addGroup('Iñtërnâtiônàlizætiøn');
+    }
+
+
+    public function testDeleteGroupNonExisting(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $this->api->deleteGroup('NonExistingGroup');
+    }
+
+
+    public function testDeleteAdminGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(102);
+
+        $this->groupManager
+            ->method('groupExists')
+            ->with('admin')
+            ->willReturn('true');
+
+        $this->api->deleteGroup('admin');
+    }
+
+    public function testDeleteGroup(): void {
+        $this->groupManager
+            ->method('groupExists')
+            ->with('ExistingGroup')
+            ->willReturn('true');
+
+        $group = $this->createGroup('ExistingGroup');
+        $this->groupManager
+            ->method('get')
+            ->with('ExistingGroup')
+            ->willReturn($group);
+        $group
+            ->expects($this->once())
+            ->method('delete')
+            ->willReturn(true);
+
+        $this->api->deleteGroup('ExistingGroup');
+    }
+
+    public function testDeleteGroupEncoding(): void {
+        $this->groupManager
+            ->method('groupExists')
+            ->with('ExistingGroup A/B')
+            ->willReturn('true');
+
+        $group = $this->createGroup('ExistingGroup');
+        $this->groupManager
+            ->method('get')
+            ->with('ExistingGroup A/B')
+            ->willReturn($group);
+        $group
+            ->expects($this->once())
+            ->method('delete')
+            ->willReturn(true);
+
+        $this->api->deleteGroup(urlencode('ExistingGroup A/B'));
+    }
+
+    public function testGetGroupUsersDetails(): void {
+        $gid = 'ncg1';
+
+        $this->asAdmin();
+
+        $users = [
+            'ncu1' => $this->createUser('ncu1'), # regular
+            'ncu2' => $this->createUser('ncu2'), # the zombie
+        ];
+        $users['ncu2']->expects($this->atLeastOnce())
+            ->method('getHome')
+            ->willThrowException(new NoUserException());
+
+        $this->userManager->expects($this->any())
+            ->method('get')
+            ->willReturnCallback(function (string $uid) use ($users) {
+                return $users[$uid] ?? null;
+            });
+
+        $group = $this->createGroup($gid);
+        $group->expects($this->once())
+            ->method('searchUsers')
+            ->with('', null, 0)
+            ->willReturn(array_values($users));
+
+        $this->groupManager
+            ->method('get')
+            ->with($gid)
+            ->willReturn($group);
+        $this->groupManager->expects($this->any())
+            ->method('getUserGroups')
+            ->willReturn([$group]);
+
+        /** @var MockObject */
+        $this->subAdminManager->expects($this->any())
+            ->method('isSubAdminOfGroup')
+            ->willReturn(false);
+        $this->subAdminManager->expects($this->any())
+            ->method('getSubAdminsGroups')
+            ->willReturn([]);
+
+
+        $this->api->getGroupUsersDetails($gid);
+    }
+
+    public function testGetGroupUsersDetailsEncoded(): void {
+        $gid = 'Department A/B C/D';
+
+        $this->asAdmin();
+
+        $users = [
+            'ncu1' => $this->createUser('ncu1'), # regular
+            'ncu2' => $this->createUser('ncu2'), # the zombie
+        ];
+        $users['ncu2']->expects($this->atLeastOnce())
+            ->method('getHome')
+            ->willThrowException(new NoUserException());
+
+        $this->userManager->expects($this->any())
+            ->method('get')
+            ->willReturnCallback(function (string $uid) use ($users) {
+                return $users[$uid] ?? null;
+            });
+
+        $group = $this->createGroup($gid);
+        $group->expects($this->once())
+            ->method('searchUsers')
+            ->with('', null, 0)
+            ->willReturn(array_values($users));
+
+        $this->groupManager
+            ->method('get')
+            ->with($gid)
+            ->willReturn($group);
+        $this->groupManager->expects($this->any())
+            ->method('getUserGroups')
+            ->willReturn([$group]);
+
+        /** @var MockObject */
+        $this->subAdminManager->expects($this->any())
+            ->method('isSubAdminOfGroup')
+            ->willReturn(false);
+        $this->subAdminManager->expects($this->any())
+            ->method('getSubAdminsGroups')
+            ->willReturn([]);
+
+
+        $this->api->getGroupUsersDetails(urlencode($gid));
+    }
 }