aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/Avatar/AvatarManagerTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/Avatar/AvatarManagerTest.php')
-rw-r--r--tests/lib/Avatar/AvatarManagerTest.php31
1 files changed, 15 insertions, 16 deletions
diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php
index 16754f7125c..495d7099d59 100644
--- a/tests/lib/Avatar/AvatarManagerTest.php
+++ b/tests/lib/Avatar/AvatarManagerTest.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -71,7 +72,7 @@ class AvatarManagerTest extends \Test\TestCase {
);
}
- public function testGetAvatarInvalidUser() {
+ public function testGetAvatarInvalidUser(): void {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('user does not exist');
@@ -84,7 +85,7 @@ class AvatarManagerTest extends \Test\TestCase {
$this->avatarManager->getAvatar('invalidUser');
}
- public function testGetAvatarForSelf() {
+ public function testGetAvatarForSelf(): void {
$user = $this->createMock(User::class);
$user
->expects($this->any())
@@ -124,9 +125,9 @@ class AvatarManagerTest extends \Test\TestCase {
->willReturn(IAccountManager::SCOPE_PRIVATE);
$this->knownUserService->expects($this->any())
- ->method('isKnownToUser')
- ->with('valid-user', 'valid-user')
- ->willReturn(true);
+ ->method('isKnownToUser')
+ ->with('valid-user', 'valid-user')
+ ->willReturn(true);
$folder = $this->createMock(ISimpleFolder::class);
$this->appData
@@ -139,7 +140,7 @@ class AvatarManagerTest extends \Test\TestCase {
$this->assertEquals($expected, $this->avatarManager->getAvatar('valid-user'));
}
- public function testGetAvatarValidUserDifferentCasing() {
+ public function testGetAvatarValidUserDifferentCasing(): void {
$user = $this->createMock(User::class);
$this->userManager->expects($this->once())
->method('get')
@@ -186,7 +187,7 @@ class AvatarManagerTest extends \Test\TestCase {
$this->assertEquals($expected, $this->avatarManager->getAvatar('vaLid-USER'));
}
- public function dataGetAvatarScopes() {
+ public static function dataGetAvatarScopes(): array {
return [
// public access cannot see real avatar
[IAccountManager::SCOPE_PRIVATE, true, false, true],
@@ -203,10 +204,8 @@ class AvatarManagerTest extends \Test\TestCase {
];
}
- /**
- * @dataProvider dataGetAvatarScopes
- */
- public function testGetAvatarScopes($avatarScope, $isPublicCall, $isKnownUser, $expectedPlaceholder) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataGetAvatarScopes')]
+ public function testGetAvatarScopes($avatarScope, $isPublicCall, $isKnownUser, $expectedPlaceholder): void {
if ($isPublicCall) {
$requestingUser = null;
} else {
@@ -261,16 +260,16 @@ class AvatarManagerTest extends \Test\TestCase {
if (!$isPublicCall) {
$this->knownUserService->expects($this->any())
- ->method('isKnownToUser')
- ->with('requesting-user', 'valid-user')
- ->willReturn($isKnownUser);
+ ->method('isKnownToUser')
+ ->with('requesting-user', 'valid-user')
+ ->willReturn($isKnownUser);
} else {
$this->knownUserService->expects($this->never())
- ->method('isKnownToUser');
+ ->method('isKnownToUser');
}
if ($expectedPlaceholder) {
- $expected = new PlaceholderAvatar($folder, $user, $this->createMock(LoggerInterface::class));
+ $expected = new PlaceholderAvatar($folder, $user, $this->config, $this->logger);
} else {
$expected = new UserAvatar($folder, $this->l10n, $user, $this->logger, $this->config);
}