1 files changed, 12 insertions, 20 deletions

diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
index 9699c146c8a..7117637a000 100644
--- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
+++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
@@ -1,27 +1,25 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2017 ownCloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-namespace OCA\DAV\Tests\Unit\Avatars;
+namespace OCA\DAV\Tests\unit\Avatars;
 
 use OCA\DAV\Avatars\AvatarHome;
 use OCA\DAV\Avatars\AvatarNode;
 use OCP\IAvatar;
 use OCP\IAvatarManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
 use Test\TestCase;
 
 class AvatarHomeTest extends TestCase {
-
-	/** @var AvatarHome */
-	private $home;
-
-	/** @var IAvatarManager | \PHPUnit\Framework\MockObject\MockObject */
-	private $avatarManager;
+	private AvatarHome $home;
+	private IAvatarManager&MockObject $avatarManager;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -29,16 +27,14 @@ class AvatarHomeTest extends TestCase {
 		$this->home = new AvatarHome(['uri' => 'principals/users/admin'], $this->avatarManager);
 	}
 
-	/**
-	 * @dataProvider providesForbiddenMethods
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesForbiddenMethods')]
 	public function testForbiddenMethods($method): void {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
 		$this->home->$method('');
 	}
 
-	public function providesForbiddenMethods() {
+	public static function providesForbiddenMethods(): array {
 		return [
 			['createFile'],
 			['createDirectory'],
@@ -52,7 +48,7 @@ class AvatarHomeTest extends TestCase {
 		self::assertEquals('admin', $n);
 	}
 
-	public function providesTestGetChild() {
+	public static function providesTestGetChild(): array {
 		return [
 			[MethodNotAllowed::class, false, ''],
 			[MethodNotAllowed::class, false, 'bla.foo'],
@@ -62,10 +58,8 @@ class AvatarHomeTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider providesTestGetChild
-	 */
-	public function testGetChild($expectedException, $hasAvatar, $path): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesTestGetChild')]
+	public function testGetChild(?string $expectedException, bool $hasAvatar, string $path): void {
 		if ($expectedException !== null) {
 			$this->expectException($expectedException);
 		}
@@ -89,10 +83,8 @@ class AvatarHomeTest extends TestCase {
 		self::assertEquals(1, count($avatarNodes));
 	}
 
-	/**
-	 * @dataProvider providesTestGetChild
-	 */
-	public function testChildExists($expectedException, $hasAvatar, $path): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('providesTestGetChild')]
+	public function testChildExists(?string $expectedException, bool $hasAvatar, string $path): void {
 		$avatar = $this->createMock(IAvatar::class);
 		$avatar->method('exists')->willReturn($hasAvatar);