diff --git a/apps/dav/lib/BulkUpload/MultipartRequestParser.php b/apps/dav/lib/BulkUpload/MultipartRequestParser.php
index 96a90f82cdea1..f23aca580cc26 100644
--- a/apps/dav/lib/BulkUpload/MultipartRequestParser.php
+++ b/apps/dav/lib/BulkUpload/MultipartRequestParser.php
@@ -57,7 +57,13 @@ public function __construct(
 	 */
 	private function parseBoundaryFromHeaders(string $contentType): string {
 		try {
+			if (!str_contains($contentType, ';')) {
+				throw new \InvalidArgumentException('No semicolon in header');
+			}
 			[$mimeType, $boundary] = explode(';', $contentType);
+			if (!str_contains($boundary, '=')) {
+				throw new \InvalidArgumentException('No equal in boundary header');
+			}
 			[$boundaryKey, $boundaryValue] = explode('=', $boundary);
 		} catch (\Exception $e) {
 			throw new BadRequest('Error while parsing boundary in Content-Type header.', Http::STATUS_BAD_REQUEST, $e);
diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
index c0c19192ba9e3..aaa930b6c191e 100644
--- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
+++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
@@ -6,7 +6,7 @@
  * 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;
diff --git a/apps/dav/tests/unit/Avatars/AvatarNodeTest.php b/apps/dav/tests/unit/Avatars/AvatarNodeTest.php
index 01634e77ed666..0ca147a1f3ba3 100644
--- a/apps/dav/tests/unit/Avatars/AvatarNodeTest.php
+++ b/apps/dav/tests/unit/Avatars/AvatarNodeTest.php
@@ -6,7 +6,7 @@
  * 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\AvatarNode;
 use OCP\IAvatar;
diff --git a/apps/dav/tests/unit/Command/DeleteCalendarTest.php b/apps/dav/tests/unit/Command/DeleteCalendarTest.php
index 5cdb86d123df2..2bd269de6dc86 100644
--- a/apps/dav/tests/unit/Command/DeleteCalendarTest.php
+++ b/apps/dav/tests/unit/Command/DeleteCalendarTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Command;
+namespace OCA\DAV\Tests\unit\Command;
 
 use OCA\DAV\CalDAV\BirthdayService;
 use OCA\DAV\CalDAV\CalDavBackend;
diff --git a/apps/dav/tests/unit/Command/ListAddressbooksTest.php b/apps/dav/tests/unit/Command/ListAddressbooksTest.php
index ab4ce49b84048..624b0050bc540 100644
--- a/apps/dav/tests/unit/Command/ListAddressbooksTest.php
+++ b/apps/dav/tests/unit/Command/ListAddressbooksTest.php
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Command;
+namespace OCA\DAV\Tests\unit\Command;
 
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCA\DAV\Command\ListAddressbooks;
diff --git a/apps/dav/tests/unit/Command/ListCalendarSharesTest.php b/apps/dav/tests/unit/Command/ListCalendarSharesTest.php
index 3b3f3a1519ea8..e5d4251cbf974 100644
--- a/apps/dav/tests/unit/Command/ListCalendarSharesTest.php
+++ b/apps/dav/tests/unit/Command/ListCalendarSharesTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Command;
+namespace OCA\DAV\Tests\unit\Command;
 
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\Command\ListCalendarShares;
diff --git a/apps/dav/tests/unit/Command/ListCalendarsTest.php b/apps/dav/tests/unit/Command/ListCalendarsTest.php
index 961d2ce0850e9..247487433ebfe 100644
--- a/apps/dav/tests/unit/Command/ListCalendarsTest.php
+++ b/apps/dav/tests/unit/Command/ListCalendarsTest.php
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Command;
+namespace OCA\DAV\Tests\unit\Command;
 
 use OCA\DAV\CalDAV\BirthdayService;
 use OCA\DAV\CalDAV\CalDavBackend;
diff --git a/apps/dav/tests/unit/Command/MoveCalendarTest.php b/apps/dav/tests/unit/Command/MoveCalendarTest.php
index 0c38541c185ce..c481f5cf15b3b 100644
--- a/apps/dav/tests/unit/Command/MoveCalendarTest.php
+++ b/apps/dav/tests/unit/Command/MoveCalendarTest.php
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Command;
+namespace OCA\DAV\Tests\unit\Command;
 
 use InvalidArgumentException;
 use OCA\DAV\CalDAV\CalDavBackend;
diff --git a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
index b7860a12452f4..ec56aa64eb221 100644
--- a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
+++ b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2018 ownCloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-namespace OCA\DAV\Tests\Unit\Command;
+namespace OCA\DAV\Tests\unit\Command;
 
 use OCA\DAV\Command\RemoveInvalidShares;
 use OCA\DAV\Connector\Sabre\Principal;
diff --git a/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php b/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php
index 2bb683741627e..8b8c775c8ecf6 100644
--- a/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php
+++ b/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -14,6 +15,7 @@
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class LegacyPublicAuthTest
@@ -23,36 +25,20 @@
  * @package OCA\DAV\Tests\unit\Connector
  */
 class LegacyPublicAuthTest extends \Test\TestCase {
-
-	/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
-	private $session;
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $shareManager;
-	/** @var LegacyPublicAuth */
-	private $auth;
-	/** @var IThrottler|\PHPUnit\Framework\MockObject\MockObject */
-	private $throttler;
-
-	/** @var string */
-	private $oldUser;
+	private ISession&MockObject $session;
+	private IRequest&MockObject $request;
+	private IManager&MockObject $shareManager;
+	private IThrottler&MockObject $throttler;
+	private LegacyPublicAuth $auth;
+	private string|false $oldUser;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->session = $this->getMockBuilder(ISession::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->request = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->shareManager = $this->getMockBuilder(IManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->throttler = $this->getMockBuilder(IThrottler::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->session = $this->createMock(ISession::class);
+		$this->request = $this->createMock(IRequest::class);
+		$this->shareManager = $this->createMock(IManager::class);
+		$this->throttler = $this->createMock(IThrottler::class);
 
 		$this->auth = new LegacyPublicAuth(
 			$this->request,
@@ -70,7 +56,9 @@ protected function tearDown(): void {
 
 		// Set old user
 		\OC_User::setUserId($this->oldUser);
-		\OC_Util::setupFS($this->oldUser);
+		if ($this->oldUser !== false) {
+			\OC_Util::setupFS($this->oldUser);
+		}
 
 		parent::tearDown();
 	}
@@ -86,9 +74,7 @@ public function testNoShare(): void {
 	}
 
 	public function testShareNoPassword(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn(null);
 
 		$this->shareManager->expects($this->once())
@@ -101,9 +87,7 @@ public function testShareNoPassword(): void {
 	}
 
 	public function testSharePasswordFancyShareType(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(42);
 
@@ -118,9 +102,7 @@ public function testSharePasswordFancyShareType(): void {
 
 
 	public function testSharePasswordRemote(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_REMOTE);
 
@@ -134,9 +116,7 @@ public function testSharePasswordRemote(): void {
 	}
 
 	public function testSharePasswordLinkValidPassword(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 
@@ -156,9 +136,7 @@ public function testSharePasswordLinkValidPassword(): void {
 	}
 
 	public function testSharePasswordMailValidPassword(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
 
@@ -178,9 +156,7 @@ public function testSharePasswordMailValidPassword(): void {
 	}
 
 	public function testInvalidSharePasswordLinkValidSession(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 		$share->method('getId')->willReturn('42');
@@ -204,9 +180,7 @@ public function testInvalidSharePasswordLinkValidSession(): void {
 	}
 
 	public function testSharePasswordLinkInvalidSession(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 		$share->method('getId')->willReturn('42');
@@ -231,9 +205,7 @@ public function testSharePasswordLinkInvalidSession(): void {
 
 
 	public function testSharePasswordMailInvalidSession(): void {
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
 		$share->method('getId')->willReturn('42');
diff --git a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
index c6d247b395167..501ef3ef1d1f2 100644
--- a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -29,33 +30,20 @@
  * @group DB
  */
 class AuthTest extends TestCase {
-	/** @var ISession&MockObject */
-	private $session;
-	/** @var Auth */
-	private $auth;
-	/** @var Session&MockObject */
-	private $userSession;
-	/** @var IRequest&MockObject */
-	private $request;
-	/** @var Manager&MockObject */
-	private $twoFactorManager;
-	/** @var IThrottler&MockObject */
-	private $throttler;
+	private ISession&MockObject $session;
+	private Session&MockObject $userSession;
+	private IRequest&MockObject $request;
+	private Manager&MockObject $twoFactorManager;
+	private IThrottler&MockObject $throttler;
+	private Auth $auth;
 
 	protected function setUp(): void {
 		parent::setUp();
-		$this->session = $this->getMockBuilder(ISession::class)
-			->disableOriginalConstructor()->getMock();
-		$this->userSession = $this->getMockBuilder(Session::class)
-			->disableOriginalConstructor()->getMock();
-		$this->request = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()->getMock();
-		$this->twoFactorManager = $this->getMockBuilder(Manager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->throttler = $this->getMockBuilder(IThrottler::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->session = $this->createMock(ISession::class);
+		$this->userSession = $this->createMock(Session::class);
+		$this->request = $this->createMock(IRequest::class);
+		$this->twoFactorManager = $this->createMock(Manager::class);
+		$this->throttler = $this->createMock(IThrottler::class);
 		$this->auth = new Auth(
 			$this->session,
 			$this->userSession,
@@ -72,7 +60,7 @@ public function testIsDavAuthenticatedWithoutDavSession(): void {
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn(null);
 
-		$this->assertFalse($this->invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
+		$this->assertFalse(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
 	}
 
 	public function testIsDavAuthenticatedWithWrongDavSession(): void {
@@ -82,7 +70,7 @@ public function testIsDavAuthenticatedWithWrongDavSession(): void {
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn('AnotherUser');
 
-		$this->assertFalse($this->invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
+		$this->assertFalse(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
 	}
 
 	public function testIsDavAuthenticatedWithCorrectDavSession(): void {
@@ -92,13 +80,11 @@ public function testIsDavAuthenticatedWithCorrectDavSession(): void {
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn('MyTestUser');
 
-		$this->assertTrue($this->invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
+		$this->assertTrue(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
 	}
 
 	public function testValidateUserPassOfAlreadyDAVAuthenticatedUser(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->exactly(1))
 			->method('getUID')
 			->willReturn('MyTestUser');
@@ -119,13 +105,11 @@ public function testValidateUserPassOfAlreadyDAVAuthenticatedUser(): void {
 			->expects($this->once())
 			->method('close');
 
-		$this->assertTrue($this->invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+		$this->assertTrue(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
 	}
 
 	public function testValidateUserPassOfInvalidDAVAuthenticatedUser(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())
 			->method('getUID')
 			->willReturn('MyTestUser');
@@ -146,13 +130,11 @@ public function testValidateUserPassOfInvalidDAVAuthenticatedUser(): void {
 			->expects($this->once())
 			->method('close');
 
-		$this->assertFalse($this->invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+		$this->assertFalse(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
 	}
 
 	public function testValidateUserPassOfInvalidDAVAuthenticatedUserWithValidPassword(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->exactly(2))
 			->method('getUID')
 			->willReturn('MyTestUser');
@@ -182,7 +164,7 @@ public function testValidateUserPassOfInvalidDAVAuthenticatedUserWithValidPasswo
 			->expects($this->once())
 			->method('close');
 
-		$this->assertTrue($this->invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+		$this->assertTrue(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
 	}
 
 	public function testValidateUserPassWithInvalidPassword(): void {
@@ -199,7 +181,7 @@ public function testValidateUserPassWithInvalidPassword(): void {
 			->expects($this->once())
 			->method('close');
 
-		$this->assertFalse($this->invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+		$this->assertFalse(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
 	}
 
 
@@ -219,16 +201,12 @@ public function testValidateUserPassWithPasswordLoginForbidden(): void {
 			->expects($this->once())
 			->method('close');
 
-		$this->invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']);
+		self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']);
 	}
 
 	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGet(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -242,9 +220,7 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGet(): void
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn(null);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('MyWrongDavUser');
@@ -266,12 +242,8 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGet(): void
 	}
 
 	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndCorrectlyDavAuthenticated(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -289,9 +261,7 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndCorrectlyDavAu
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn('LoggedInUser');
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('LoggedInUser');
@@ -311,12 +281,8 @@ public function testAuthenticateAlreadyLoggedInWithoutTwoFactorChallengePassed()
 		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
 		$this->expectExceptionMessage('2FA challenge not passed.');
 
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -334,9 +300,7 @@ public function testAuthenticateAlreadyLoggedInWithoutTwoFactorChallengePassed()
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn('LoggedInUser');
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('LoggedInUser');
@@ -360,12 +324,8 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndIncorrectlyDav
 		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
 		$this->expectExceptionMessage('CSRF check not passed.');
 
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -383,9 +343,7 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndIncorrectlyDav
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn('AnotherUser');
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('LoggedInUser');
@@ -401,12 +359,8 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndIncorrectlyDav
 	}
 
 	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGetAndDesktopClient(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -424,9 +378,7 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGetAndDeskt
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn(null);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('MyWrongDavUser');
@@ -443,12 +395,8 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGetAndDeskt
 	}
 
 	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForGet(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -458,9 +406,7 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForGet(): void {
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn(null);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('MyWrongDavUser');
@@ -478,12 +424,8 @@ public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForGet(): void {
 	}
 
 	public function testAuthenticateAlreadyLoggedInWithCsrfTokenForGet(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -493,9 +435,7 @@ public function testAuthenticateAlreadyLoggedInWithCsrfTokenForGet(): void {
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
 			->willReturn(null);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('MyWrongDavUser');
@@ -513,15 +453,9 @@ public function testAuthenticateAlreadyLoggedInWithCsrfTokenForGet(): void {
 	}
 
 	public function testAuthenticateNoBasicAuthenticateHeadersProvided(): void {
-		$server = $this->getMockBuilder(Server::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$server->httpRequest = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$server->httpResponse = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$server = $this->createMock(Server::class);
+		$server->httpRequest = $this->createMock(RequestInterface::class);
+		$server->httpResponse = $this->createMock(ResponseInterface::class);
 		$response = $this->auth->check($server->httpRequest, $server->httpResponse);
 		$this->assertEquals([false, 'No \'Authorization: Basic\' header found. Either the client didn\'t send one, or the server is misconfigured'], $response);
 	}
@@ -532,13 +466,9 @@ public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjax(): vo
 		$this->expectExceptionMessage('Cannot authenticate over ajax calls');
 
 		/** @var \Sabre\HTTP\RequestInterface&MockObject $httpRequest */
-		$httpRequest = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$httpRequest = $this->createMock(RequestInterface::class);
 		/** @var \Sabre\HTTP\ResponseInterface&MockObject $httpResponse */
-		$httpResponse = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$httpResponse = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
@@ -562,13 +492,9 @@ public function testAuthenticateWithBasicAuthenticateHeadersProvidedWithAjax():
 			->willReturn(false);
 
 		/** @var \Sabre\HTTP\RequestInterface&MockObject $httpRequest */
-		$httpRequest = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$httpRequest = $this->createMock(RequestInterface::class);
 		/** @var \Sabre\HTTP\ResponseInterface&MockObject $httpResponse */
-		$httpResponse = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$httpResponse = $this->createMock(ResponseInterface::class);
 		$httpRequest
 			->expects($this->any())
 			->method('getHeader')
@@ -577,9 +503,7 @@ public function testAuthenticateWithBasicAuthenticateHeadersProvidedWithAjax():
 				['Authorization', 'basic dXNlcm5hbWU6cGFzc3dvcmQ='],
 			]);
 
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('MyDavUser');
@@ -602,17 +526,10 @@ public function testAuthenticateWithBasicAuthenticateHeadersProvidedWithAjax():
 
 	public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjaxButUserIsStillLoggedIn(): void {
 		/** @var \Sabre\HTTP\RequestInterface $httpRequest */
-		$httpRequest = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$httpRequest = $this->createMock(RequestInterface::class);
 		/** @var \Sabre\HTTP\ResponseInterface $httpResponse */
-		$httpResponse = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		/** @var IUser */
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$httpResponse = $this->createMock(ResponseInterface::class);
+		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('MyTestUser');
 		$this->userSession
 			->expects($this->any())
@@ -643,29 +560,21 @@ public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjaxButUse
 	}
 
 	public function testAuthenticateValidCredentials(): void {
-		$server = $this->getMockBuilder(Server::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$server->httpRequest = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$server = $this->createMock(Server::class);
+		$server->httpRequest = $this->createMock(RequestInterface::class);
 		$server->httpRequest
 			->expects($this->once())
 			->method('getHeader')
 			->with('Authorization')
 			->willReturn('basic dXNlcm5hbWU6cGFzc3dvcmQ=');
 
-		$server->httpResponse = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$server->httpResponse = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->once())
 			->method('logClientIn')
 			->with('username', 'password')
 			->willReturn(true);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->exactly(2))
 			->method('getUID')
 			->willReturn('MyTestUser');
@@ -678,12 +587,8 @@ public function testAuthenticateValidCredentials(): void {
 	}
 
 	public function testAuthenticateInvalidCredentials(): void {
-		$server = $this->getMockBuilder(Server::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$server->httpRequest = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$server = $this->createMock(Server::class);
+		$server->httpRequest = $this->createMock(RequestInterface::class);
 		$server->httpRequest
 			->expects($this->exactly(2))
 			->method('getHeader')
@@ -691,9 +596,7 @@ public function testAuthenticateInvalidCredentials(): void {
 				['Authorization', 'basic dXNlcm5hbWU6cGFzc3dvcmQ='],
 				['X-Requested-With', null],
 			]);
-		$server->httpResponse = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$server->httpResponse = $this->createMock(ResponseInterface::class);
 		$this->userSession
 			->expects($this->once())
 			->method('logClientIn')
diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
index 99c2a461557ed..1e6267d4cbbe9 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -21,14 +23,10 @@
  * @group DB
  */
 class BearerAuthTest extends TestCase {
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	private $userSession;
-	/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
-	private $session;
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-	/** @var BearerAuth */
-	private $bearerAuth;
+	private IUserSession&MockObject $userSession;
+	private ISession&MockObject $session;
+	private IRequest&MockObject $request;
+	private BearerAuth $bearerAuth;
 
 	private IConfig&MockObject $config;
 
@@ -74,9 +72,9 @@ public function testValidateBearerToken(): void {
 	}
 
 	public function testChallenge(): void {
-		/** @var \PHPUnit\Framework\MockObject\MockObject|RequestInterface $request */
+		/** @var RequestInterface&MockObject $request */
 		$request = $this->createMock(RequestInterface::class);
-		/** @var \PHPUnit\Framework\MockObject\MockObject|ResponseInterface $response */
+		/** @var ResponseInterface&MockObject $response */
 		$response = $this->createMock(ResponseInterface::class);
 		$result = $this->bearerAuth->challenge($request, $response);
 		$this->assertEmpty($result);
diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
index 072dd1a3b589d..27ddd3f4a1f4c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
@@ -83,7 +83,7 @@ public function testBeforeHandlerException(string $userAgent, ERROR_TYPE $errorT
 		}
 
 		/** @var RequestInterface|MockObject $request */
-		$request = $this->createMock('\Sabre\HTTP\RequestInterface');
+		$request = $this->createMock(RequestInterface::class);
 		$request
 			->expects($this->once())
 			->method('getHeader')
diff --git a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
index 1cda0e4dbdb08..6606dcd5717c4 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,62 +9,45 @@
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OCA\DAV\Connector\Sabre\CommentPropertiesPlugin as CommentPropertiesPluginImplementation;
+use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\File;
 use OCP\Comments\ICommentsManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\PropFind;
+use Sabre\DAV\Server;
 
 class CommentsPropertiesPluginTest extends \Test\TestCase {
-
-	/** @var CommentPropertiesPluginImplementation */
-	protected $plugin;
-	protected $commentsManager;
-	protected $userSession;
-	protected $server;
+	protected CommentPropertiesPluginImplementation $plugin;
+	protected ICommentsManager&MockObject $commentsManager;
+	protected IUserSession&MockObject $userSession;
+	protected Server&MockObject $server;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession = $this->getMockBuilder(IUserSession::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
-			->disableOriginalConstructor()
-			->getMock();
+		$this->commentsManager = $this->createMock(ICommentsManager::class);
+		$this->userSession = $this->createMock(IUserSession::class);
+		$this->server = $this->createMock(Server::class);
 
 		$this->plugin = new CommentPropertiesPluginImplementation($this->commentsManager, $this->userSession);
 		$this->plugin->initialize($this->server);
 	}
 
-	public function nodeProvider() {
-		$mocks = [];
-		foreach (['\OCA\DAV\Connector\Sabre\File', '\OCA\DAV\Connector\Sabre\Directory', '\Sabre\DAV\INode'] as $class) {
-			$mocks[] = $this->getMockBuilder($class)
-				->disableOriginalConstructor()
-				->getMock();
-		}
-
+	public static function nodeProvider(): array {
 		return [
-			[$mocks[0], true],
-			[$mocks[1], true],
-			[$mocks[2], false]
+			[File::class, true],
+			[Directory::class, true],
+			[\Sabre\DAV\INode::class, false]
 		];
 	}
 
 	/**
 	 * @dataProvider nodeProvider
-	 * @param $node
-	 * @param $expectedSuccessful
 	 */
-	public function testHandleGetProperties($node, $expectedSuccessful): void {
-		$propFind = $this->getMockBuilder(PropFind::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testHandleGetProperties(string $class, bool $expectedSuccessful): void {
+		$propFind = $this->createMock(PropFind::class);
 
 		if ($expectedSuccessful) {
 			$propFind->expects($this->exactly(3))
@@ -73,10 +57,11 @@ public function testHandleGetProperties($node, $expectedSuccessful): void {
 				->method('handle');
 		}
 
+		$node = $this->createMock($class);
 		$this->plugin->handleGetProperties($propFind, $node);
 	}
 
-	public function baseUriProvider() {
+	public static function baseUriProvider(): array {
 		return [
 			['owncloud/remote.php/webdav/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
 			['owncloud/remote.php/files/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
@@ -86,14 +71,9 @@ public function baseUriProvider() {
 
 	/**
 	 * @dataProvider baseUriProvider
-	 * @param $baseUri
-	 * @param $fid
-	 * @param $expectedHref
 	 */
-	public function testGetCommentsLink($baseUri, $fid, $expectedHref): void {
-		$node = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testGetCommentsLink(string $baseUri, string $fid, ?string $expectedHref): void {
+		$node = $this->createMock(File::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn($fid);
@@ -106,29 +86,25 @@ public function testGetCommentsLink($baseUri, $fid, $expectedHref): void {
 		$this->assertSame($expectedHref, $href);
 	}
 
-	public function userProvider() {
+	public static function userProvider(): array {
 		return [
-			[
-				$this->getMockBuilder(IUser::class)
-					->disableOriginalConstructor()
-					->getMock()
-			],
+			[IUser::class],
 			[null]
 		];
 	}
 
 	/**
 	 * @dataProvider userProvider
-	 * @param $user
 	 */
-	public function testGetUnreadCount($user): void {
-		$node = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testGetUnreadCount(?string $user): void {
+		$node = $this->createMock(File::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn('4567');
 
+		if ($user !== null) {
+			$user = $this->createMock($user);
+		}
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->willReturn($user);
diff --git a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
index bc19e071ee791..7067cf335ede4 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -15,12 +16,8 @@
 use Test\TestCase;
 
 class CopyEtagHeaderPluginTest extends TestCase {
-
-	/** @var CopyEtagHeaderPlugin */
-	private $plugin;
-
-	/** @var Server */
-	private $server;
+	private CopyEtagHeaderPlugin $plugin;
+	private Server $server;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -62,15 +59,11 @@ public function testAfterMoveNodeNotFound(): void {
 	}
 
 	public function testAfterMove(): void {
-		$node = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(File::class);
 		$node->expects($this->once())
 			->method('getETag')
 			->willReturn('123456');
-		$tree = $this->getMockBuilder(Tree::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$tree = $this->createMock(Tree::class);
 		$tree->expects($this->once())
 			->method('getNodeForPath')
 			->with('test.txt')
diff --git a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
index eb3f291e9c06a..381206e336e78 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -25,42 +26,21 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class CustomPropertiesBackendTest extends \Test\TestCase {
-
-	/**
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var CustomPropertiesBackend
-	 */
-	private $plugin;
-
-	/**
-	 * @var IUser
-	 */
-	private $user;
-
-	/** @property MockObject|DefaultCalendarValidator */
-	private $defaultCalendarValidator;
+	private \Sabre\DAV\Server $server;
+	private \Sabre\DAV\Tree&MockObject $tree;
+	private IUser&MockObject $user;
+	private DefaultCalendarValidator&MockObject $defaultCalendarValidator;
+	private CustomPropertiesBackend $plugin;
 
 	protected function setUp(): void {
 		parent::setUp();
+
 		$this->server = new \Sabre\DAV\Server();
-		$this->tree = $this->getMockBuilder(Tree::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->tree = $this->createMock(Tree::class);
 
-		$userId = $this->getUniqueID('testcustompropertiesuser');
+		$userId = self::getUniqueID('testcustompropertiesuser');
 
-		$this->user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->user = $this->createMock(IUser::class);
 		$this->user->expects($this->any())
 			->method('getUID')
 			->willReturn($userId);
@@ -88,12 +68,12 @@ protected function tearDown(): void {
 			]
 		);
 		$deleteStatement->closeCursor();
+
+		parent::tearDown();
 	}
 
-	private function createTestNode($class) {
-		$node = $this->getMockBuilder($class)
-			->disableOriginalConstructor()
-			->getMock();
+	private function createTestNode(string $class) {
+		$node = $this->createMock($class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn(123);
diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
index 7fefe3e06da2f..85890c0f98723 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -1,11 +1,12 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-namespace OCA\DAV\Tests\Unit\Connector\Sabre;
+namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OC\Files\FileInfo;
 use OC\Files\Filesystem;
@@ -21,6 +22,7 @@
 use OCP\Files\InvalidPathException;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\StorageNotAvailableException;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\Traits\UserTrait;
 
 class TestViewDirectory extends View {
@@ -43,7 +45,7 @@ public function isDeletable($path) {
 		return $this->deletables[$path];
 	}
 
-	public function rename($path1, $path2, array $options = []) {
+	public function rename($source, $target, array $options = []) {
 		return $this->canRename;
 	}
 
@@ -59,16 +61,14 @@ public function getRelativePath($path): ?string {
 class DirectoryTest extends \Test\TestCase {
 	use UserTrait;
 
-	/** @var View|\PHPUnit\Framework\MockObject\MockObject */
-	private $view;
-	/** @var FileInfo|\PHPUnit\Framework\MockObject\MockObject */
-	private $info;
+	private View&MockObject $view;
+	private FileInfo&MockObject $info;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->view = $this->createMock('OC\Files\View');
-		$this->info = $this->createMock('OC\Files\FileInfo');
+		$this->view = $this->createMock(View::class);
+		$this->info = $this->createMock(FileInfo::class);
 		$this->info->method('isReadable')
 			->willReturn(true);
 		$this->info->method('getType')
@@ -81,7 +81,7 @@ protected function setUp(): void {
 			->willReturn(Constants::PERMISSION_READ);
 	}
 
-	private function getDir($path = '/') {
+	private function getDir(string $path = '/'): Directory {
 		$this->view->expects($this->once())
 			->method('getRelativePath')
 			->willReturn($path);
@@ -174,12 +174,8 @@ public function testDeleteFolderThrowsWhenDeletionFailed(): void {
 	}
 
 	public function testGetChildren(): void {
-		$info1 = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$info2 = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$info1 = $this->createMock(FileInfo::class);
+		$info2 = $this->createMock(FileInfo::class);
 		$info1->method('getName')
 			->willReturn('first');
 		$info1->method('getPath')
@@ -214,7 +210,7 @@ public function testGetChildren(): void {
 		$dir = new Directory($this->view, $this->info);
 		$nodes = $dir->getChildren();
 
-		$this->assertEquals(2, count($nodes));
+		$this->assertCount(2, $nodes);
 
 		// calling a second time just returns the cached values,
 		// does not call getDirectoryContents again
@@ -273,12 +269,10 @@ public function testGetChildThrowInvalidPath(): void {
 	}
 
 	public function testGetQuotaInfoUnlimited(): void {
-		self::createUser('user', 'password');
+		$this->createUser('user', 'password');
 		self::loginAsUser('user');
 		$mountPoint = $this->createMock(IMountPoint::class);
-		$storage = $this->getMockBuilder(Quota::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$storage = $this->createMock(Quota::class);
 		$mountPoint->method('getStorage')
 			->willReturn($storage);
 
@@ -329,12 +323,10 @@ public function testGetQuotaInfoUnlimited(): void {
 	}
 
 	public function testGetQuotaInfoSpecific(): void {
-		self::createUser('user', 'password');
+		$this->createUser('user', 'password');
 		self::loginAsUser('user');
 		$mountPoint = $this->createMock(IMountPoint::class);
-		$storage = $this->getMockBuilder(Quota::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$storage = $this->createMock(Quota::class);
 		$mountPoint->method('getStorage')
 			->willReturn($storage);
 
@@ -384,7 +376,7 @@ public function testGetQuotaInfoSpecific(): void {
 	/**
 	 * @dataProvider moveFailedProvider
 	 */
-	public function testMoveFailed($source, $destination, $updatables, $deletables): void {
+	public function testMoveFailed(string $source, string $destination, array $updatables, array $deletables): void {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
 		$this->moveTest($source, $destination, $updatables, $deletables);
@@ -393,7 +385,7 @@ public function testMoveFailed($source, $destination, $updatables, $deletables):
 	/**
 	 * @dataProvider moveSuccessProvider
 	 */
-	public function testMoveSuccess($source, $destination, $updatables, $deletables): void {
+	public function testMoveSuccess(string $source, string $destination, array $updatables, array $deletables): void {
 		$this->moveTest($source, $destination, $updatables, $deletables);
 		$this->addToAssertionCount(1);
 	}
@@ -401,19 +393,19 @@ public function testMoveSuccess($source, $destination, $updatables, $deletables)
 	/**
 	 * @dataProvider moveFailedInvalidCharsProvider
 	 */
-	public function testMoveFailedInvalidChars($source, $destination, $updatables, $deletables): void {
+	public function testMoveFailedInvalidChars(string $source, string $destination, array $updatables, array $deletables): void {
 		$this->expectException(InvalidPath::class);
 
 		$this->moveTest($source, $destination, $updatables, $deletables);
 	}
 
-	public function moveFailedInvalidCharsProvider() {
+	public static function moveFailedInvalidCharsProvider(): array {
 		return [
 			['a/valid', "a/i\nvalid", ['a' => true, 'a/valid' => true, 'a/c*' => false], []],
 		];
 	}
 
-	public function moveFailedProvider() {
+	public static function moveFailedProvider(): array {
 		return [
 			['a/b', 'a/c', ['a' => false, 'a/b' => false, 'a/c' => false], []],
 			['a/b', 'b/b', ['a' => false, 'a/b' => false, 'b' => false, 'b/b' => false], []],
@@ -424,7 +416,7 @@ public function moveFailedProvider() {
 		];
 	}
 
-	public function moveSuccessProvider() {
+	public static function moveSuccessProvider(): array {
 		return [
 			['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => true, 'b/b' => false], ['a/b' => true]],
 			// older files with special chars can still be renamed to valid names
@@ -432,12 +424,7 @@ public function moveSuccessProvider() {
 		];
 	}
 
-	/**
-	 * @param $source
-	 * @param $destination
-	 * @param $updatables
-	 */
-	private function moveTest($source, $destination, $updatables, $deletables): void {
+	private function moveTest(string $source, string $destination, array $updatables, array $deletables): void {
 		$view = new TestViewDirectory($updatables, $deletables);
 
 		$sourceInfo = new FileInfo($source, null, null, [
@@ -449,7 +436,7 @@ private function moveTest($source, $destination, $updatables, $deletables): void
 
 		$sourceNode = new Directory($view, $sourceInfo);
 		$targetNode = $this->getMockBuilder(Directory::class)
-			->setMethods(['childExists'])
+			->onlyMethods(['childExists'])
 			->setConstructorArgs([$view, $targetInfo])
 			->getMock();
 		$targetNode->expects($this->any())->method('childExists')
diff --git a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
index 03c31dc47f817..2d688d6460063 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -19,8 +20,7 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class DummyGetResponsePluginTest extends TestCase {
-	/** @var DummyGetResponsePlugin */
-	private $dummyGetResponsePlugin;
+	private DummyGetResponsePlugin $dummyGetResponsePlugin;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -29,10 +29,7 @@ protected function setUp(): void {
 	}
 
 	public function testInitialize(): void {
-		/** @var Server $server */
-		$server = $this->getMockBuilder(Server::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$server = $this->createMock(Server::class);
 		$server
 			->expects($this->once())
 			->method('on')
@@ -44,13 +41,9 @@ public function testInitialize(): void {
 
 	public function testHttpGet(): void {
 		/** @var \Sabre\HTTP\RequestInterface $request */
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
 		/** @var \Sabre\HTTP\ResponseInterface $response */
-		$response = $server = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$response = $this->createMock(ResponseInterface::class);
 		$response
 			->expects($this->once())
 			->method('setBody');
diff --git a/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php b/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php
index c7fb6066ed41b..2f9e0ae91964e 100644
--- a/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/Exception/ForbiddenTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,7 @@
 namespace OCA\DAV\Tests\unit\Connector\Sabre\Exception;
 
 use OCA\DAV\Connector\Sabre\Exception\Forbidden;
+use Sabre\DAV\Server;
 
 class ForbiddenTest extends \Test\TestCase {
 	public function testSerialization(): void {
@@ -32,9 +34,7 @@ public function testSerialization(): void {
 EOD;
 
 		$ex = new Forbidden($message, $retry);
-		$server = $this->getMockBuilder('Sabre\DAV\Server')
-			->disableOriginalConstructor()
-			->getMock();
+		$server = $this->createMock(Server::class);
 		$ex->serialize($server, $error);
 
 		// assert
diff --git a/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php b/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php
index 98921d735fa2d..6f62bef86a3b1 100644
--- a/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/Exception/InvalidPathTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,7 @@
 namespace OCA\DAV\Tests\unit\Connector\Sabre\Exception;
 
 use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
+use Sabre\DAV\Server;
 
 class InvalidPathTest extends \Test\TestCase {
 	public function testSerialization(): void {
@@ -32,9 +34,7 @@ public function testSerialization(): void {
 EOD;
 
 		$ex = new InvalidPath($message, $retry);
-		$server = $this->getMockBuilder('Sabre\DAV\Server')
-			->disableOriginalConstructor()
-			->getMock();
+		$server = $this->createMock(Server::class);
 		$ex->serialize($server, $error);
 
 		// assert
diff --git a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
index 1d50fb2fb9a1a..a330a885b1f22 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -11,21 +12,16 @@
 use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use OCA\DAV\Exception\ServerMaintenanceMode;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\Server;
 use Test\TestCase;
 
 class ExceptionLoggerPluginTest extends TestCase {
-
-	/** @var Server */
-	private $server;
-
-	/** @var ExceptionLoggerPlugin */
-	private $plugin;
-
-	/** @var LoggerInterface | \PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
+	private Server $server;
+	private ExceptionLoggerPlugin $plugin;
+	private LoggerInterface&MockObject $logger;
 
 	private function init(): void {
 		$config = $this->createMock(SystemConfig::class);
@@ -59,7 +55,7 @@ public function testLogging(string $expectedLogLevel, \Throwable $e): void {
 		$this->plugin->logException($e);
 	}
 
-	public function providesExceptions() {
+	public static function providesExceptions(): array {
 		return [
 			['debug', new NotFound()],
 			['debug', new ServerMaintenanceMode('System is in maintenance mode.')],
diff --git a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
index 18165b79cb266..ef744d13e6a36 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -22,8 +23,7 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class FakeLockerPluginTest extends TestCase {
-	/** @var FakeLockerPlugin */
-	private $fakeLockerPlugin;
+	private FakeLockerPlugin $fakeLockerPlugin;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -32,18 +32,19 @@ protected function setUp(): void {
 
 	public function testInitialize(): void {
 		/** @var Server $server */
-		$server = $this->getMockBuilder(Server::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$server
-			->expects($this->exactly(4))
+		$server = $this->createMock(Server::class);
+		$calls = [
+			['method:LOCK', [$this->fakeLockerPlugin, 'fakeLockProvider'], 1],
+			['method:UNLOCK', [$this->fakeLockerPlugin, 'fakeUnlockProvider'], 1],
+			['propFind', [$this->fakeLockerPlugin, 'propFind'], 100],
+			['validateTokens', [$this->fakeLockerPlugin, 'validateTokens'], 100],
+		];
+		$server->expects($this->exactly(count($calls)))
 			->method('on')
-			->withConsecutive(
-				['method:LOCK', [$this->fakeLockerPlugin, 'fakeLockProvider'], 1],
-				['method:UNLOCK', [$this->fakeLockerPlugin, 'fakeUnlockProvider'], 1],
-				['propFind', [$this->fakeLockerPlugin, 'propFind']],
-				['validateTokens', [$this->fakeLockerPlugin, 'validateTokens']],
-			);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		$this->fakeLockerPlugin->initialize($server);
 	}
@@ -64,24 +65,24 @@ public function testGetFeatures(): void {
 	}
 
 	public function testPropFind(): void {
-		$propFind = $this->getMockBuilder(PropFind::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$node = $this->getMockBuilder(INode::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$propFind = $this->createMock(PropFind::class);
+		$node = $this->createMock(INode::class);
 
-		$propFind->expects($this->exactly(2))
+		$calls = [
+			'{DAV:}supportedlock',
+			'{DAV:}lockdiscovery',
+		];
+		$propFind->expects($this->exactly(count($calls)))
 			->method('handle')
-			->withConsecutive(
-				['{DAV:}supportedlock'],
-				['{DAV:}lockdiscovery'],
-			);
+			->willReturnCallback(function ($propertyName) use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, $propertyName);
+			});
 
 		$this->fakeLockerPlugin->propFind($propFind, $node);
 	}
 
-	public function tokenDataProvider() {
+	public static function tokenDataProvider(): array {
 		return [
 			[
 				[
@@ -120,21 +121,15 @@ public function tokenDataProvider() {
 
 	/**
 	 * @dataProvider tokenDataProvider
-	 * @param array $input
-	 * @param array $expected
 	 */
 	public function testValidateTokens(array $input, array $expected): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
 		$this->fakeLockerPlugin->validateTokens($request, $input);
 		$this->assertSame($expected, $input);
 	}
 
 	public function testFakeLockProvider(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
 		$response = new Response();
 		$server = $this->getMockBuilder(Server::class)
 			->getMock();
@@ -152,12 +147,8 @@ public function testFakeLockProvider(): void {
 	}
 
 	public function testFakeUnlockProvider(): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 
 		$response->expects($this->once())
 			->method('setStatus')
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
index ef02f14537533..4a7ddad71159e 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -53,16 +54,9 @@ class FileTest extends TestCase {
 	use MountProviderTrait;
 	use UserTrait;
 
-	/**
-	 * @var string
-	 */
-	private $user;
-
-	/** @var IConfig|MockObject */
-	protected $config;
-
-	/** @var IRequestId|MockObject */
-	protected $requestId;
+	private string $user;
+	protected IConfig&MockObject $config;
+	protected IRequestId&MockObject $requestId;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -72,7 +66,7 @@ protected function setUp(): void {
 		$this->user = 'test_user';
 		$this->createUser($this->user, 'pass');
 
-		$this->loginAsUser($this->user);
+		self::loginAsUser($this->user);
 
 		$this->config = $this->createMock(IConfig::class);
 		$this->requestId = $this->createMock(IRequestId::class);
@@ -86,9 +80,7 @@ protected function tearDown(): void {
 	}
 
 	private function getMockStorage(): MockObject&IStorage {
-		$storage = $this->getMockBuilder(IStorage::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$storage = $this->createMock(IStorage::class);
 		$storage->method('getId')
 			->willReturn('home::someuser');
 		return $storage;
@@ -102,7 +94,7 @@ private function getStream(string $string) {
 	}
 
 
-	public function fopenFailuresProvider() {
+	public static function fopenFailuresProvider(): array {
 		return [
 			[
 				// return false
@@ -161,14 +153,14 @@ public function fopenFailuresProvider() {
 	/**
 	 * @dataProvider fopenFailuresProvider
 	 */
-	public function testSimplePutFails($thrownException, $expectedException, $checkPreviousClass = true): void {
+	public function testSimplePutFails(?\Throwable $thrownException, string $expectedException, bool $checkPreviousClass = true): void {
 		// setup
 		$storage = $this->getMockBuilder(Local::class)
 			->onlyMethods(['writeStream'])
 			->setConstructorArgs([['datadir' => Server::get(ITempManager::class)->getTemporaryFolder()]])
 			->getMock();
 		Filesystem::mount($storage, [], $this->user . '/');
-		/** @var View | MockObject $view */
+		/** @var View&MockObject $view */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['getRelativePath', 'resolvePath'])
 			->getMock();
@@ -221,12 +213,12 @@ function ($path) use ($storage) {
 	 * Simulate putting a file to the given path.
 	 *
 	 * @param string $path path to put the file into
-	 * @param string $viewRoot root to use for the view
+	 * @param ?string $viewRoot root to use for the view
 	 * @param null|Request $request the HTTP request
 	 *
 	 * @return null|string of the PUT operation which is usually the etag
 	 */
-	private function doPut($path, $viewRoot = null, ?Request $request = null) {
+	private function doPut(string $path, ?string $viewRoot = null, ?Request $request = null) {
 		$view = Filesystem::getView();
 		if (!is_null($viewRoot)) {
 			$view = new View($viewRoot);
@@ -245,7 +237,7 @@ private function doPut($path, $viewRoot = null, ?Request $request = null) {
 			null
 		);
 
-		/** @var File|MockObject $file */
+		/** @var File&MockObject $file */
 		$file = $this->getMockBuilder(File::class)
 			->setConstructorArgs([$view, $info, null, $request])
 			->onlyMethods(['header'])
@@ -269,55 +261,55 @@ public function testPutSingleFile(): void {
 		$this->assertNotEmpty($this->doPut('/foo.txt'));
 	}
 
-	public function legalMtimeProvider() {
+	public static function legalMtimeProvider(): array {
 		return [
 			'string' => [
-				'HTTP_X_OC_MTIME' => 'string',
-				'expected result' => null
+				'requestMtime' => 'string',
+				'resultMtime' => null
 			],
 			'castable string (int)' => [
-				'HTTP_X_OC_MTIME' => '987654321',
-				'expected result' => 987654321
+				'requestMtime' => '987654321',
+				'resultMtime' => 987654321
 			],
 			'castable string (float)' => [
-				'HTTP_X_OC_MTIME' => '123456789.56',
-				'expected result' => 123456789
+				'requestMtime' => '123456789.56',
+				'resultMtime' => 123456789
 			],
 			'float' => [
-				'HTTP_X_OC_MTIME' => 123456789.56,
-				'expected result' => 123456789
+				'requestMtime' => 123456789.56,
+				'resultMtime' => 123456789
 			],
 			'zero' => [
-				'HTTP_X_OC_MTIME' => 0,
-				'expected result' => null
+				'requestMtime' => 0,
+				'resultMtime' => null
 			],
 			'zero string' => [
-				'HTTP_X_OC_MTIME' => '0',
-				'expected result' => null
+				'requestMtime' => '0',
+				'resultMtime' => null
 			],
 			'negative zero string' => [
-				'HTTP_X_OC_MTIME' => '-0',
-				'expected result' => null
+				'requestMtime' => '-0',
+				'resultMtime' => null
 			],
 			'string starting with number following by char' => [
-				'HTTP_X_OC_MTIME' => '2345asdf',
-				'expected result' => null
+				'requestMtime' => '2345asdf',
+				'resultMtime' => null
 			],
 			'string castable hex int' => [
-				'HTTP_X_OC_MTIME' => '0x45adf',
-				'expected result' => null
+				'requestMtime' => '0x45adf',
+				'resultMtime' => null
 			],
 			'string that looks like invalid hex int' => [
-				'HTTP_X_OC_MTIME' => '0x123g',
-				'expected result' => null
+				'requestMtime' => '0x123g',
+				'resultMtime' => null
 			],
 			'negative int' => [
-				'HTTP_X_OC_MTIME' => -34,
-				'expected result' => null
+				'requestMtime' => -34,
+				'resultMtime' => null
 			],
 			'negative float' => [
-				'HTTP_X_OC_MTIME' => -34.43,
-				'expected result' => null
+				'requestMtime' => -34.43,
+				'resultMtime' => null
 			],
 		];
 	}
@@ -326,7 +318,7 @@ public function legalMtimeProvider() {
 	 * Test putting a file with string Mtime
 	 * @dataProvider legalMtimeProvider
 	 */
-	public function testPutSingleFileLegalMtime($requestMtime, $resultMtime): void {
+	public function testPutSingleFileLegalMtime(mixed $requestMtime, ?int $resultMtime): void {
 		$request = new Request([
 			'server' => [
 				'HTTP_X_OC_MTIME' => (string)$requestMtime,
@@ -482,7 +474,7 @@ public function testPutSingleFileCancelPreHook(): void {
 	 */
 	public function testSimplePutFailsSizeCheck(): void {
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['rename', 'getRelativePath', 'filesize'])
 			->getMock();
@@ -569,7 +561,7 @@ public function testSimplePutFailsMoveFromStorage(): void {
 	 */
 	public function testSimplePutInvalidChars(): void {
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['getRelativePath'])
 			->getMock();
@@ -609,7 +601,7 @@ public function testSetNameInvalidChars(): void {
 		$this->expectException(InvalidPath::class);
 
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['getRelativePath'])
 			->getMock();
@@ -630,7 +622,7 @@ public function testSetNameInvalidChars(): void {
 
 	public function testUploadAbort(): void {
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['rename', 'getRelativePath', 'filesize'])
 			->getMock();
@@ -680,7 +672,7 @@ public function testUploadAbort(): void {
 
 	public function testDeleteWhenAllowed(): void {
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
 
@@ -704,7 +696,7 @@ public function testDeleteThrowsWhenDeletionNotAllowed(): void {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
 
@@ -724,7 +716,7 @@ public function testDeleteThrowsWhenDeletionFailed(): void {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
 
@@ -749,7 +741,7 @@ public function testDeleteThrowsWhenDeletionThrows(): void {
 		$this->expectException(Forbidden::class);
 
 		// setup
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->getMock();
 
@@ -923,7 +915,7 @@ private function getFileInfos($path = '', ?View $userView = null) {
 	public function testGetFopenFails(): void {
 		$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
 
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['fopen'])
 			->getMock();
@@ -945,7 +937,7 @@ public function testGetFopenFails(): void {
 	public function testGetFopenThrows(): void {
 		$this->expectException(Forbidden::class);
 
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['fopen'])
 			->getMock();
@@ -967,7 +959,7 @@ public function testGetFopenThrows(): void {
 	public function testGetThrowsIfNoPermission(): void {
 		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
 
-		/** @var View|MockObject */
+		/** @var View&MockObject */
 		$view = $this->getMockBuilder(View::class)
 			->onlyMethods(['fopen'])
 			->getMock();
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index 1352229b1f5f5..d8b32067dda2b 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -73,23 +74,15 @@ protected function setUp(): void {
 			$this->accountManager,
 		);
 
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$response = $this->createMock(ResponseInterface::class);
 		$this->server->httpResponse = $response;
 		$this->server->xml = new Service();
 
 		$this->plugin->initialize($this->server);
 	}
 
-	/**
-	 * @param string $class
-	 * @return \PHPUnit\Framework\MockObject\MockObject
-	 */
-	private function createTestNode($class, $path = '/dummypath') {
-		$node = $this->getMockBuilder($class)
-			->disableOriginalConstructor()
-			->getMock();
+	private function createTestNode(string $class, string $path = '/dummypath'): MockObject {
+		$node = $this->createMock($class);
 
 		$node->expects($this->any())
 			->method('getId')
@@ -129,8 +122,8 @@ private function createTestNode($class, $path = '/dummypath') {
 	}
 
 	public function testGetPropertiesForFile(): void {
-		/** @var File|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		/** @var File&MockObject $node */
+		$node = $this->createTestNode(File::class);
 
 		$propFind = new PropFind(
 			'/dummyPath',
@@ -149,8 +142,7 @@ public function testGetPropertiesForFile(): void {
 			0
 		);
 
-		$user = $this->getMockBuilder(User::class)
-			->disableOriginalConstructor()->getMock();
+		$user = $this->createMock(User::class);
 		$user
 			->expects($this->once())
 			->method('getUID')
@@ -160,8 +152,7 @@ public function testGetPropertiesForFile(): void {
 			->method('getDisplayName')
 			->willReturn('M. Foo');
 
-		$owner = $this->getMockBuilder(Account::class)
-			->disableOriginalConstructor()->getMock();
+		$owner = $this->createMock(Account::class);
 		$this->accountManager->expects($this->once())
 			->method('getAccount')
 			->with($user)
@@ -174,8 +165,7 @@ public function testGetPropertiesForFile(): void {
 			->method('getOwner')
 			->willReturn($user);
 
-		$displayNameProp = $this->getMockBuilder(AccountProperty::class)
-			->disableOriginalConstructor()->getMock();
+		$displayNameProp = $this->createMock(AccountProperty::class);
 		$owner
 			->expects($this->once())
 			->method('getProperty')
@@ -205,9 +195,7 @@ public function testGetPropertiesForFile(): void {
 	}
 
 	public function testGetDisplayNamePropertyWhenNotPublished(): void {
-		/** @var File|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
-
+		$node = $this->createTestNode(File::class);
 		$propFind = new PropFind(
 			'/dummyPath',
 			[
@@ -220,15 +208,12 @@ public function testGetDisplayNamePropertyWhenNotPublished(): void {
 			->method('getUser')
 			->willReturn(null);
 
-		$user = $this->getMockBuilder(User::class)
-			->disableOriginalConstructor()->getMock();
+		$user = $this->createMock(User::class);
 
-		$user
-			->expects($this->never())
+		$user->expects($this->never())
 			->method('getDisplayName');
 
-		$owner = $this->getMockBuilder(Account::class)
-			->disableOriginalConstructor()->getMock();
+		$owner = $this->createMock(Account::class);
 		$this->accountManager->expects($this->once())
 			->method('getAccount')
 			->with($user)
@@ -238,8 +223,7 @@ public function testGetDisplayNamePropertyWhenNotPublished(): void {
 			->method('getOwner')
 			->willReturn($user);
 
-		$displayNameProp = $this->getMockBuilder(AccountProperty::class)
-			->disableOriginalConstructor()->getMock();
+		$displayNameProp = $this->createMock(AccountProperty::class);
 		$owner
 			->expects($this->once())
 			->method('getProperty')
@@ -257,10 +241,9 @@ public function testGetDisplayNamePropertyWhenNotPublished(): void {
 
 		$this->assertEquals(null, $propFind->get(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME));
 	}
-	
+
 	public function testGetDisplayNamePropertyWhenNotPublishedButLoggedIn(): void {
-		/** @var File|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		$node = $this->createTestNode(File::class);
 
 		$propFind = new PropFind(
 			'/dummyPath',
@@ -270,15 +253,13 @@ public function testGetDisplayNamePropertyWhenNotPublishedButLoggedIn(): void {
 			0
 		);
 
-		$user = $this->getMockBuilder(User::class)
-			->disableOriginalConstructor()->getMock();
+		$user = $this->createMock(User::class);
 
 		$node->expects($this->once())
 			->method('getOwner')
 			->willReturn($user);
 
-		$loggedInUser = $this->getMockBuilder(User::class)
-			->disableOriginalConstructor()->getMock();
+		$loggedInUser = $this->createMock(User::class);
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->willReturn($loggedInUser);
@@ -300,8 +281,8 @@ public function testGetDisplayNamePropertyWhenNotPublishedButLoggedIn(): void {
 	}
 
 	public function testGetPropertiesStorageNotAvailable(): void {
-		/** @var File|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		/** @var File&MockObject $node */
+		$node = $this->createTestNode(File::class);
 
 		$propFind = new PropFind(
 			'/dummyPath',
@@ -325,9 +306,7 @@ public function testGetPropertiesStorageNotAvailable(): void {
 
 	public function testGetPublicPermissions(): void {
 		/** @var IRequest&MockObject */
-		$request = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$request = $this->createMock(IRequest::class);
 		$this->plugin = new FilesPlugin(
 			$this->tree,
 			$this->config,
@@ -348,8 +327,8 @@ public function testGetPublicPermissions(): void {
 			0
 		);
 
-		/** @var File|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		/** @var File&MockObject $node */
+		$node = $this->createTestNode(File::class);
 		$node->expects($this->any())
 			->method('getDavPermissions')
 			->willReturn('DWCKMSR');
@@ -363,8 +342,8 @@ public function testGetPublicPermissions(): void {
 	}
 
 	public function testGetPropertiesForDirectory(): void {
-		/** @var Directory|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory');
+		/** @var Directory&MockObject $node */
+		$node = $this->createTestNode(Directory::class);
 
 		$propFind = new PropFind(
 			'/dummyPath',
@@ -398,10 +377,8 @@ public function testGetPropertiesForDirectory(): void {
 	}
 
 	public function testGetPropertiesForRootDirectory(): void {
-		/** @var Directory|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var Directory&MockObject $node */
+		$node = $this->createMock(Directory::class);
 		$node->expects($this->any())->method('getPath')->willReturn('/');
 
 		$fileInfo = $this->createMock(FileInfo::class);
@@ -433,10 +410,8 @@ public function testGetPropertiesWhenNoPermission(): void {
 		// No read permissions can be caused by files access control.
 		// But we still want to load the directory list, so this is okay for us.
 		// $this->expectException(\Sabre\DAV\Exception\NotFound::class);
-		/** @var Directory|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var Directory&MockObject $node */
+		$node = $this->createMock(Directory::class);
 		$node->expects($this->any())->method('getPath')->willReturn('/');
 
 		$fileInfo = $this->createMock(FileInfo::class);
@@ -465,7 +440,7 @@ public function testGetPropertiesWhenNoPermission(): void {
 	}
 
 	public function testUpdateProps(): void {
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		$node = $this->createTestNode(File::class);
 
 		$testDate = 'Fri, 13 Feb 2015 00:01:02 GMT';
 		$testCreationDate = '2007-08-31T16:47+00:00';
@@ -549,16 +524,12 @@ public function testMoveSrcNotDeletable(): void {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 		$this->expectExceptionMessage('FolderA/test.txt cannot be deleted');
 
-		$fileInfoFolderATestTXT = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$fileInfoFolderATestTXT = $this->createMock(FileInfo::class);
 		$fileInfoFolderATestTXT->expects($this->once())
 			->method('isDeletable')
 			->willReturn(false);
 
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Node::class);
 		$node->expects($this->atLeastOnce())
 			->method('getFileInfo')
 			->willReturn($fileInfoFolderATestTXT);
@@ -571,16 +542,12 @@ public function testMoveSrcNotDeletable(): void {
 	}
 
 	public function testMoveSrcDeletable(): void {
-		$fileInfoFolderATestTXT = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$fileInfoFolderATestTXT = $this->createMock(FileInfo::class);
 		$fileInfoFolderATestTXT->expects($this->once())
 			->method('isDeletable')
 			->willReturn(true);
 
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Node::class);
 		$node->expects($this->atLeastOnce())
 			->method('getFileInfo')
 			->willReturn($fileInfoFolderATestTXT);
@@ -596,9 +563,7 @@ public function testMoveSrcNotExist(): void {
 		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
 		$this->expectExceptionMessage('FolderA/test.txt does not exist');
 
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Node::class);
 		$node->expects($this->atLeastOnce())
 			->method('getFileInfo')
 			->willReturn(null);
@@ -674,7 +639,7 @@ public function testCopyDestinationInvalid(): void {
 		$this->plugin->checkCopy('FolderA/test.txt', 'invalid\\path.txt');
 	}
 
-	public function downloadHeadersProvider() {
+	public static function downloadHeadersProvider(): array {
 		return [
 			[
 				false,
@@ -690,22 +655,16 @@ public function downloadHeadersProvider() {
 	/**
 	 * @dataProvider downloadHeadersProvider
 	 */
-	public function testDownloadHeaders($isClumsyAgent, $contentDispositionHeader): void {
-		$request = $this->getMockBuilder(RequestInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testDownloadHeaders(bool $isClumsyAgent, string $contentDispositionHeader): void {
+		$request = $this->createMock(RequestInterface::class);
+		$response = $this->createMock(ResponseInterface::class);
 
 		$request
 			->expects($this->once())
 			->method('getPath')
 			->willReturn('test/somefile.xml');
 
-		$node = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(File::class);
 		$node
 			->expects($this->once())
 			->method('getName')
@@ -722,20 +681,24 @@ public function testDownloadHeaders($isClumsyAgent, $contentDispositionHeader):
 			->method('isUserAgent')
 			->willReturn($isClumsyAgent);
 
+		$calls = [
+			['Content-Disposition', $contentDispositionHeader],
+			['X-Accel-Buffering', 'no'],
+		];
 		$response
-			->expects($this->exactly(2))
+			->expects($this->exactly(count($calls)))
 			->method('addHeader')
-			->withConsecutive(
-				['Content-Disposition', $contentDispositionHeader],
-				['X-Accel-Buffering', 'no']
-			);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertSame($expected, func_get_args());
+			});
 
 		$this->plugin->httpGet($request, $response);
 	}
 
 	public function testHasPreview(): void {
-		/** @var Directory|\PHPUnit\Framework\MockObject\MockObject $node */
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory');
+		/** @var Directory&MockObject $node */
+		$node = $this->createTestNode(Directory::class);
 
 		$propFind = new PropFind(
 			'/dummyPath',
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
index 6a9372ca3fdc0..e6cfb1f67b2f5 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -31,6 +32,7 @@
 use OCP\SystemTag\TagNotFoundException;
 use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\INode;
+use Sabre\DAV\Server;
 use Sabre\DAV\Tree;
 use Sabre\HTTP\ResponseInterface;
 
@@ -52,15 +54,11 @@ class FilesReportPluginTest extends \Test\TestCase {
 
 	protected function setUp(): void {
 		parent::setUp();
-		$this->tree = $this->getMockBuilder(Tree::class)
-			->disableOriginalConstructor()
-			->getMock();
 
-		$this->view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->tree = $this->createMock(Tree::class);
+		$this->view = $this->createMock(View::class);
 
-		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
+		$this->server = $this->getMockBuilder(Server::class)
 			->setConstructorArgs([$this->tree])
 			->onlyMethods(['getRequestUri', 'getBaseUri'])
 			->getMock();
@@ -69,22 +67,10 @@ protected function setUp(): void {
 			->method('getBaseUri')
 			->willReturn('http://example.com/owncloud/remote.php/dav');
 
-		$this->groupManager = $this->getMockBuilder(IGroupManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->userFolder = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->previewManager = $this->getMockBuilder(IPreview::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->appManager = $this->getMockBuilder(IAppManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-
+		$this->groupManager = $this->createMock(IGroupManager::class);
+		$this->userFolder = $this->createMock(Folder::class);
+		$this->previewManager = $this->createMock(IPreview::class);
+		$this->appManager = $this->createMock(IAppManager::class);
 		$this->tagManager = $this->createMock(ISystemTagManager::class);
 		$this->tagMapper = $this->createMock(ISystemTagObjectMapper::class);
 		$this->userSession = $this->createMock(IUserSession::class);
@@ -95,9 +81,7 @@ protected function setUp(): void {
 			->with('files')
 			->willReturn($this->privateTags);
 
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('testuser');
@@ -124,11 +108,7 @@ public function testOnReportInvalidNode(): void {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->willReturn(
-				$this->getMockBuilder(INode::class)
-					->disableOriginalConstructor()
-					->getMock()
-			);
+			->willReturn($this->createMock(INode::class));
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
@@ -182,16 +162,12 @@ public function testOnReport(): void {
 			->method('isAdmin')
 			->willReturn(true);
 
-		$reportTargetNode = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$reportTargetNode = $this->createMock(Directory::class);
 		$reportTargetNode->expects($this->any())
 			->method('getPath')
 			->willReturn('');
 
-		$response = $this->getMockBuilder(ResponseInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$response = $this->createMock(ResponseInterface::class);
 
 		$response->expects($this->once())
 			->method('setHeader')
@@ -240,14 +216,10 @@ public function testOnReport(): void {
 
 		$this->userFolder->expects($this->exactly(2))
 			->method('searchBySystemTag')
-			->withConsecutive(
-				['OneTwoThree'],
-				['FourFiveSix'],
-			)
-			->willReturnOnConsecutiveCalls(
-				[$filesNode1],
-				[$filesNode2],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, [$filesNode1]],
+				['FourFiveSix', 'testuser', 0, 0, [$filesNode2]],
+			]);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
@@ -259,74 +231,56 @@ public function testOnReport(): void {
 	}
 
 	public function testFindNodesByFileIdsRoot(): void {
-		$filesNode1 = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$filesNode1 = $this->createMock(Folder::class);
 		$filesNode1->expects($this->once())
 			->method('getName')
 			->willReturn('first node');
 
-		$filesNode2 = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$filesNode2 = $this->createMock(File::class);
 		$filesNode2->expects($this->once())
 			->method('getName')
 			->willReturn('second node');
 
-		$reportTargetNode = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$reportTargetNode = $this->createMock(Directory::class);
 		$reportTargetNode->expects($this->any())
 			->method('getPath')
 			->willReturn('/');
 
 		$this->userFolder->expects($this->exactly(2))
 			->method('getFirstNodeById')
-			->withConsecutive(
-				['111'],
-				['222'],
-			)
-			->willReturnOnConsecutiveCalls(
-				$filesNode1,
-				$filesNode2,
-			);
+			->willReturnMap([
+				[111, $filesNode1],
+				[222, $filesNode2],
+			]);
 
 		/** @var Directory&MockObject $reportTargetNode */
 		$result = $this->plugin->findNodesByFileIds($reportTargetNode, ['111', '222']);
 
 		$this->assertCount(2, $result);
-		$this->assertInstanceOf('\OCA\DAV\Connector\Sabre\Directory', $result[0]);
+		$this->assertInstanceOf(Directory::class, $result[0]);
 		$this->assertEquals('first node', $result[0]->getName());
-		$this->assertInstanceOf('\OCA\DAV\Connector\Sabre\File', $result[1]);
+		$this->assertInstanceOf(\OCA\DAV\Connector\Sabre\File::class, $result[1]);
 		$this->assertEquals('second node', $result[1]->getName());
 	}
 
 	public function testFindNodesByFileIdsSubDir(): void {
-		$filesNode1 = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$filesNode1 = $this->createMock(Folder::class);
 		$filesNode1->expects($this->once())
 			->method('getName')
 			->willReturn('first node');
 
-		$filesNode2 = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$filesNode2 = $this->createMock(File::class);
 		$filesNode2->expects($this->once())
 			->method('getName')
 			->willReturn('second node');
 
-		$reportTargetNode = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$reportTargetNode = $this->createMock(Directory::class);
 		$reportTargetNode->expects($this->any())
 			->method('getPath')
 			->willReturn('/sub1/sub2');
 
 
-		$subNode = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$subNode = $this->createMock(Folder::class);
 
 		$this->userFolder->expects($this->once())
 			->method('get')
@@ -335,22 +289,18 @@ public function testFindNodesByFileIdsSubDir(): void {
 
 		$subNode->expects($this->exactly(2))
 			->method('getFirstNodeById')
-			->withConsecutive(
-				['111'],
-				['222'],
-			)
-			->willReturnOnConsecutiveCalls(
-				$filesNode1,
-				$filesNode2,
-			);
+			->willReturnMap([
+				[111, $filesNode1],
+				[222, $filesNode2],
+			]);
 
 		/** @var Directory&MockObject $reportTargetNode */
 		$result = $this->plugin->findNodesByFileIds($reportTargetNode, ['111', '222']);
 
 		$this->assertCount(2, $result);
-		$this->assertInstanceOf('\OCA\DAV\Connector\Sabre\Directory', $result[0]);
+		$this->assertInstanceOf(Directory::class, $result[0]);
 		$this->assertEquals('first node', $result[0]->getName());
-		$this->assertInstanceOf('\OCA\DAV\Connector\Sabre\File', $result[1]);
+		$this->assertInstanceOf(\OCA\DAV\Connector\Sabre\File::class, $result[1]);
 		$this->assertEquals('second node', $result[1]->getName());
 	}
 
@@ -360,12 +310,8 @@ public function testPrepareResponses(): void {
 		$fileInfo = $this->createMock(FileInfo::class);
 		$fileInfo->method('isReadable')->willReturn(true);
 
-		$node1 = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$node2 = $this->getMockBuilder(\OCA\DAV\Connector\Sabre\File::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node1 = $this->createMock(Directory::class);
+		$node2 = $this->createMock(\OCA\DAV\Connector\Sabre\File::class);
 
 		$node1->expects($this->once())
 			->method('getInternalFileId')
@@ -385,10 +331,7 @@ public function testPrepareResponses(): void {
 			->willReturn('/sub/node2');
 		$node2->method('getFileInfo')->willReturn($fileInfo);
 
-		$config = $this->getMockBuilder(IConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-
+		$config = $this->createMock(IConfig::class);
 		$validator = $this->createMock(IFilenameValidator::class);
 		$accountManager = $this->createMock(IAccountManager::class);
 
@@ -461,7 +404,7 @@ public function testProcessFilterRulesSingle(): void {
 			->with('OneTwoThree')
 			->willReturn([$filesNode1, $filesNode2]);
 
-		$this->assertEquals([$filesNode1, $filesNode2], $this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, 0, 0]));
+		$this->assertEquals([$filesNode1, $filesNode2], self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, 0, 0]));
 	}
 
 	public function testProcessFilterRulesAndCondition(): void {
@@ -513,21 +456,17 @@ public function testProcessFilterRulesAndCondition(): void {
 
 		$this->userFolder->expects($this->exactly(2))
 			->method('searchBySystemTag')
-			->withConsecutive(
-				['OneTwoThree'],
-				['FourFiveSix'],
-			)
-			->willReturnOnConsecutiveCalls(
-				[$filesNode1, $filesNode2],
-				[$filesNode2, $filesNode3],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, [$filesNode1, $filesNode2]],
+				['FourFiveSix', 'testuser', 0, 0, [$filesNode2, $filesNode3]],
+			]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
 		];
 
-		$this->assertEquals([$filesNode2], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
+		$this->assertEquals([$filesNode2], array_values(self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
 	}
 
 	public function testProcessFilterRulesAndConditionWithOneEmptyResult(): void {
@@ -572,21 +511,17 @@ public function testProcessFilterRulesAndConditionWithOneEmptyResult(): void {
 
 		$this->userFolder->expects($this->exactly(2))
 			->method('searchBySystemTag')
-			->withConsecutive(
-				['OneTwoThree'],
-				['FourFiveSix'],
-			)
-			->willReturnOnConsecutiveCalls(
-				[$filesNode1, $filesNode2],
-				[],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, [$filesNode1, $filesNode2]],
+				['FourFiveSix', 'testuser', 0, 0, []],
+			]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
 		];
 
-		$this->assertEquals([], $this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]));
+		$this->assertEquals([], self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]));
 	}
 
 	public function testProcessFilterRulesAndConditionWithFirstEmptyResult(): void {
@@ -631,18 +566,16 @@ public function testProcessFilterRulesAndConditionWithFirstEmptyResult(): void {
 
 		$this->userFolder->expects($this->once())
 			->method('searchBySystemTag')
-			->with('OneTwoThree')
-			->willReturnOnConsecutiveCalls(
-				[],
-				[$filesNode1, $filesNode2],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, []],
+			]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
 		];
 
-		$this->assertEquals([], $this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]));
+		$this->assertEquals([], self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]));
 	}
 
 	public function testProcessFilterRulesAndConditionWithEmptyMidResult(): void {
@@ -689,7 +622,7 @@ public function testProcessFilterRulesAndConditionWithEmptyMidResult(): void {
 		$tag789 = $this->createMock(ISystemTag::class);
 		$tag789->expects($this->any())
 			->method('getName')
-			->willReturn('SevenEightNein');
+			->willReturn('SevenEightNine');
 		$tag789->expects($this->any())
 			->method('isUserVisible')
 			->willReturn(true);
@@ -701,12 +634,10 @@ public function testProcessFilterRulesAndConditionWithEmptyMidResult(): void {
 
 		$this->userFolder->expects($this->exactly(2))
 			->method('searchBySystemTag')
-			->withConsecutive(['OneTwoThree'], ['FourFiveSix'], ['SevenEightNein'])
-			->willReturnOnConsecutiveCalls(
-				[$filesNode1, $filesNode2],
-				[$filesNode3],
-				[$filesNode1, $filesNode2],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, [$filesNode1, $filesNode2]],
+				['FourFiveSix', 'testuser', 0, 0, [$filesNode3]],
+			]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
@@ -714,7 +645,7 @@ public function testProcessFilterRulesAndConditionWithEmptyMidResult(): void {
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '789'],
 		];
 
-		$this->assertEquals([], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
+		$this->assertEquals([], array_values(self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
 	}
 
 	public function testProcessFilterRulesInvisibleTagAsAdmin(): void {
@@ -766,18 +697,17 @@ public function testProcessFilterRulesInvisibleTagAsAdmin(): void {
 
 		$this->userFolder->expects($this->exactly(2))
 			->method('searchBySystemTag')
-			->withConsecutive(['OneTwoThree'], ['FourFiveSix'])
-			->willReturnOnConsecutiveCalls(
-				[$filesNode1, $filesNode2],
-				[$filesNode2, $filesNode3],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, [$filesNode1, $filesNode2]],
+				['FourFiveSix', 'testuser', 0, 0, [$filesNode2, $filesNode3]],
+			]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
 		];
 
-		$this->assertEquals([$filesNode2], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
+		$this->assertEquals([$filesNode2], array_values(self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
 	}
 
 
@@ -816,7 +746,7 @@ public function testProcessFilterRulesInvisibleTagAsUser(): void {
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
 		];
 
-		$this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]);
+		self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]);
 	}
 
 	public function testProcessFilterRulesVisibleTagAsUser(): void {
@@ -881,18 +811,17 @@ public function testProcessFilterRulesVisibleTagAsUser(): void {
 		// main assertion: only user visible tags are being passed through.
 		$this->userFolder->expects($this->exactly(2))
 			->method('searchBySystemTag')
-			->withConsecutive(['OneTwoThree'], ['FourFiveSix'])
-			->willReturnOnConsecutiveCalls(
-				[$filesNode1, $filesNode2],
-				[$filesNode2, $filesNode3],
-			);
+			->willReturnMap([
+				['OneTwoThree', 'testuser', 0, 0, [$filesNode1, $filesNode2]],
+				['FourFiveSix', 'testuser', 0, 0, [$filesNode2, $filesNode3]],
+			]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
 		];
 
-		$this->assertEquals([$filesNode2], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
+		$this->assertEquals([$filesNode2], array_values(self::invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
 	}
 
 	public function testProcessFavoriteFilter(): void {
@@ -904,10 +833,10 @@ public function testProcessFavoriteFilter(): void {
 			->method('getFavorites')
 			->willReturn(['456', '789']);
 
-		$this->assertEquals(['456', '789'], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileIDs', [$rules])));
+		$this->assertEquals(['456', '789'], array_values(self::invokePrivate($this->plugin, 'processFilterRulesForFileIDs', [$rules])));
 	}
 
-	public function filesBaseUriProvider() {
+	public static function filesBaseUriProvider(): array {
 		return [
 			['', '', ''],
 			['files/username', '', '/files/username'],
@@ -920,7 +849,7 @@ public function filesBaseUriProvider() {
 	/**
 	 * @dataProvider filesBaseUriProvider
 	 */
-	public function testFilesBaseUri($uri, $reportPath, $expectedUri): void {
-		$this->assertEquals($expectedUri, $this->invokePrivate($this->plugin, 'getFilesBaseUri', [$uri, $reportPath]));
+	public function testFilesBaseUri(string $uri, string $reportPath, string $expectedUri): void {
+		$this->assertEquals($expectedUri, self::invokePrivate($this->plugin, 'getFilesBaseUri', [$uri, $reportPath]));
 	}
 }
diff --git a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
index 9ecc49222e939..bc1d50ac41f2d 100644
--- a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -10,6 +11,7 @@
 use OCA\DAV\Connector\Sabre\MaintenancePlugin;
 use OCP\IConfig;
 use OCP\IL10N;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 /**
@@ -18,18 +20,15 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class MaintenancePluginTest extends TestCase {
-	/** @var IConfig */
-	private $config;
-	/** @var \PHPUnit\Framework\MockObject\Builder\InvocationMocker|\PHPUnit_Framework_MockObject_Builder_InvocationMocker|IL10N */
-	private $l10n;
-	/** @var MaintenancePlugin */
-	private $maintenancePlugin;
+	private IConfig&MockObject $config;
+	private IL10N&MockObject $l10n;
+	private MaintenancePlugin $maintenancePlugin;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
-		$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
+		$this->config = $this->createMock(IConfig::class);
+		$this->l10n = $this->createMock(IL10N::class);
 		$this->maintenancePlugin = new MaintenancePlugin($this->config, $this->l10n);
 	}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
index 04cd60fbdaa01..3dea5cf281b4a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -32,7 +33,7 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class NodeTest extends \Test\TestCase {
-	public function davPermissionsProvider() {
+	public static function davPermissionsProvider(): array {
 		return [
 			[Constants::PERMISSION_ALL, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVW'],
 			[Constants::PERMISSION_ALL, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVCK'],
@@ -53,7 +54,7 @@ public function davPermissionsProvider() {
 	/**
 	 * @dataProvider davPermissionsProvider
 	 */
-	public function testDavPermissions($permissions, $type, $shared, $shareRootPermissions, $mounted, $internalPath, $expected): void {
+	public function testDavPermissions(int $permissions, string $type, bool $shared, int $shareRootPermissions, bool $mounted, string $internalPath, string $expected): void {
 		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->onlyMethods(['getPermissions', 'isShared', 'isMounted', 'getType', 'getInternalPath', 'getStorage', 'getMountPoint'])
@@ -94,15 +95,13 @@ public function testDavPermissions($permissions, $type, $shared, $shareRootPermi
 		}
 		$info->method('getStorage')
 			->willReturn($storage);
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$view = $this->createMock(View::class);
 
 		$node = new  File($view, $info);
 		$this->assertEquals($expected, $node->getDavPermissions());
 	}
 
-	public function sharePermissionsProvider() {
+	public static function sharePermissionsProvider(): array {
 		return [
 			[\OCP\Files\FileInfo::TYPE_FILE, null, 1, 1],
 			[\OCP\Files\FileInfo::TYPE_FILE, null, 3, 3],
@@ -145,18 +144,14 @@ public function sharePermissionsProvider() {
 	/**
 	 * @dataProvider sharePermissionsProvider
 	 */
-	public function testSharePermissions($type, $user, $permissions, $expected): void {
-		$storage = $this->getMockBuilder(IStorage::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testSharePermissions(string $type, ?string $user, int $permissions, int $expected): void {
+		$storage = $this->createMock(IStorage::class);
 		$storage->method('getPermissions')->willReturn($permissions);
 
-		$mountpoint = $this->getMockBuilder(IMountPoint::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$mountpoint = $this->createMock(IMountPoint::class);
 		$mountpoint->method('getMountPoint')->willReturn('myPath');
-		$shareManager = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock();
-		$share = $this->getMockBuilder(IShare::class)->disableOriginalConstructor()->getMock();
+		$shareManager = $this->createMock(IManager::class);
+		$share = $this->createMock(IShare::class);
 
 		if ($user === null) {
 			$shareManager->expects($this->never())->method('getShareByToken');
@@ -169,7 +164,7 @@ public function testSharePermissions($type, $user, $permissions, $expected): voi
 
 		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
-			->setMethods(['getStorage', 'getType', 'getMountPoint', 'getPermissions'])
+			->onlyMethods(['getStorage', 'getType', 'getMountPoint', 'getPermissions'])
 			->getMock();
 
 		$info->method('getStorage')->willReturn($storage);
@@ -177,9 +172,7 @@ public function testSharePermissions($type, $user, $permissions, $expected): voi
 		$info->method('getMountPoint')->willReturn($mountpoint);
 		$info->method('getPermissions')->willReturn($permissions);
 
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$view = $this->createMock(View::class);
 
 		$node = new File($view, $info);
 		$this->invokePrivate($node, 'shareManager', [$shareManager]);
@@ -189,11 +182,11 @@ public function testSharePermissions($type, $user, $permissions, $expected): voi
 	public function testShareAttributes(): void {
 		$storage = $this->getMockBuilder(SharedStorage::class)
 			->disableOriginalConstructor()
-			->setMethods(['getShare'])
+			->onlyMethods(['getShare'])
 			->getMock();
 
-		$shareManager = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock();
-		$share = $this->getMockBuilder(IShare::class)->disableOriginalConstructor()->getMock();
+		$shareManager = $this->createMock(IManager::class);
+		$share = $this->createMock(IShare::class);
 
 		$storage->expects($this->once())
 			->method('getShare')
@@ -214,9 +207,7 @@ public function testShareAttributes(): void {
 		$info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
 
 		/** @var View&MockObject $view */
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$view = $this->createMock(View::class);
 
 		$node = new File($view, $info);
 		$this->invokePrivate($node, 'shareManager', [$shareManager]);
@@ -224,11 +215,8 @@ public function testShareAttributes(): void {
 	}
 
 	public function testShareAttributesNonShare(): void {
-		$storage = $this->getMockBuilder(IStorage::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$shareManager = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock();
+		$storage = $this->createMock(IStorage::class);
+		$shareManager = $this->createMock(IManager::class);
 
 		/** @var Folder&MockObject */
 		$info = $this->getMockBuilder(Folder::class)
@@ -240,16 +228,14 @@ public function testShareAttributesNonShare(): void {
 		$info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
 
 		/** @var View&MockObject */
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$view = $this->createMock(View::class);
 
 		$node = new File($view, $info);
 		$this->invokePrivate($node, 'shareManager', [$shareManager]);
 		$this->assertEquals([], $node->getShareAttributes());
 	}
 
-	public function sanitizeMtimeProvider() {
+	public static function sanitizeMtimeProvider(): array {
 		return [
 			[123456789, 123456789],
 			['987654321', 987654321],
@@ -259,7 +245,7 @@ public function sanitizeMtimeProvider() {
 	/**
 	 * @dataProvider sanitizeMtimeProvider
 	 */
-	public function testSanitizeMtime($mtime, $expected): void {
+	public function testSanitizeMtime(string|int $mtime, int $expected): void {
 		$view = $this->getMockBuilder(View::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -272,7 +258,7 @@ public function testSanitizeMtime($mtime, $expected): void {
 		$this->assertEquals($expected, $result);
 	}
 
-	public function invalidSanitizeMtimeProvider() {
+	public static function invalidSanitizeMtimeProvider(): array {
 		return [
 			[-1337], [0], ['abcdef'], ['-1337'], ['0'], [12321], [24 * 60 * 60 - 1],
 		];
@@ -281,17 +267,13 @@ public function invalidSanitizeMtimeProvider() {
 	/**
 	 * @dataProvider invalidSanitizeMtimeProvider
 	 */
-	public function testInvalidSanitizeMtime($mtime): void {
+	public function testInvalidSanitizeMtime(int|string $mtime): void {
 		$this->expectException(\InvalidArgumentException::class);
 
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$info = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$view = $this->createMock(View::class);
+		$info = $this->createMock(FileInfo::class);
 
 		$node = new File($view, $info);
-		$result = $this->invokePrivate($node, 'sanitizeMtime', [$mtime]);
+		self::invokePrivate($node, 'sanitizeMtime', [$mtime]);
 	}
 }
diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index 393f3c72c205b..4a5937e365b30 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -27,7 +28,7 @@
  * @package OCA\DAV\Tests\Unit\Connector\Sabre
  */
 class ObjectTreeTest extends \Test\TestCase {
-	public function copyDataProvider() {
+	public static function copyDataProvider(): array {
 		return [
 			// copy into same dir
 			['a', 'b', ''],
@@ -41,7 +42,7 @@ public function copyDataProvider() {
 	/**
 	 * @dataProvider copyDataProvider
 	 */
-	public function testCopy($sourcePath, $targetPath, $targetParent): void {
+	public function testCopy(string $sourcePath, string $targetPath, string $targetParent): void {
 		$view = $this->createMock(View::class);
 		$view->expects($this->once())
 			->method('verifyPath')
@@ -67,7 +68,7 @@ public function testCopy($sourcePath, $targetPath, $targetParent): void {
 
 		$rootDir = new Directory($view, $info);
 		$objectTree = $this->getMockBuilder(ObjectTree::class)
-			->setMethods(['nodeExists', 'getNodeForPath'])
+			->onlyMethods(['nodeExists', 'getNodeForPath'])
 			->setConstructorArgs([$rootDir, $view])
 			->getMock();
 
@@ -110,7 +111,7 @@ public function testCopyFailNotCreatable($sourcePath, $targetPath, $targetParent
 
 		$rootDir = new Directory($view, $info);
 		$objectTree = $this->getMockBuilder(ObjectTree::class)
-			->setMethods(['nodeExists', 'getNodeForPath'])
+			->onlyMethods(['nodeExists', 'getNodeForPath'])
 			->setConstructorArgs([$rootDir, $view])
 			->getMock();
 
@@ -127,23 +128,15 @@ public function testCopyFailNotCreatable($sourcePath, $targetPath, $targetParent
 	 * @dataProvider nodeForPathProvider
 	 */
 	public function testGetNodeForPath(
-		$inputFileName,
-		$fileInfoQueryPath,
-		$outputFileName,
-		$type,
+		string $inputFileName,
+		string $fileInfoQueryPath,
+		string $outputFileName,
+		string $type,
 	): void {
-		$rootNode = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$mountManager = $this->getMockBuilder(Manager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$fileInfo = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$rootNode = $this->createMock(Directory::class);
+		$mountManager = $this->createMock(Manager::class);
+		$view = $this->createMock(View::class);
+		$fileInfo = $this->createMock(FileInfo::class);
 		$fileInfo->method('getType')
 			->willReturn($type);
 		$fileInfo->method('getName')
@@ -164,13 +157,13 @@ public function testGetNodeForPath(
 		$this->assertEquals($outputFileName, $node->getName());
 
 		if ($type === 'file') {
-			$this->assertTrue($node instanceof File);
+			$this->assertInstanceOf(File::class, $node);
 		} else {
-			$this->assertTrue($node instanceof Directory);
+			$this->assertInstanceOf(Directory::class, $node);
 		}
 	}
 
-	public function nodeForPathProvider() {
+	public static function nodeForPathProvider(): array {
 		return [
 			// regular file
 			[
@@ -213,7 +206,7 @@ public function testGetNodeForPathInvalidPath(): void {
 		$storage = new Temporary([]);
 
 		$view = $this->getMockBuilder(View::class)
-			->setMethods(['resolvePath'])
+			->onlyMethods(['resolvePath'])
 			->getMock();
 		$view->expects($this->once())
 			->method('resolvePath')
@@ -221,9 +214,7 @@ public function testGetNodeForPathInvalidPath(): void {
 				return [$storage, ltrim($path, '/')];
 			});
 
-		$rootNode = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$rootNode = $this->createMock(Directory::class);
 		$mountManager = $this->createMock(IMountManager::class);
 
 		$tree = new ObjectTree();
@@ -239,7 +230,7 @@ public function testGetNodeForPathRoot(): void {
 		$storage = new Temporary([]);
 
 		$view = $this->getMockBuilder(View::class)
-			->setMethods(['resolvePath'])
+			->onlyMethods(['resolvePath'])
 			->getMock();
 		$view->expects($this->any())
 			->method('resolvePath')
@@ -247,9 +238,7 @@ public function testGetNodeForPathRoot(): void {
 				return [$storage, ltrim($path, '/')];
 			});
 
-		$rootNode = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$rootNode = $this->createMock(Directory::class);
 		$mountManager = $this->createMock(IMountManager::class);
 
 		$tree = new ObjectTree();
diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
index 30e2c995d1811..087bbd661071c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -30,38 +32,21 @@
 use Test\TestCase;
 
 class PrincipalTest extends TestCase {
-	/** @var IUserManager | MockObject */
-	private $userManager;
-
-	/** @var Principal */
-	private $connector;
-
-	/** @var IGroupManager | MockObject */
-	private $groupManager;
-
-	/** @var IAccountManager|MockObject */
-	private $accountManager;
-
-	/** @var IManager | MockObject */
-	private $shareManager;
-
-	/** @var IUserSession | MockObject */
-	private $userSession;
-
-	/** @var IAppManager | MockObject */
-	private $appManager;
-
-	/** @var ProxyMapper | MockObject */
-	private $proxyMapper;
-
-	/** @var KnownUserService|MockObject */
-	private $knownUserService;
-	/** @var IConfig | MockObject */
-	private $config;
-	/** @var IFactory|MockObject */
-	private $languageFactory;
+	private IUserManager&MockObject $userManager;
+	private IGroupManager&MockObject $groupManager;
+	private IAccountManager&MockObject $accountManager;
+	private IManager&MockObject $shareManager;
+	private IUserSession&MockObject $userSession;
+	private IAppManager&MockObject $appManager;
+	private ProxyMapper&MockObject $proxyMapper;
+	private KnownUserService&MockObject $knownUserService;
+	private IConfig&MockObject $config;
+	private IFactory&MockObject $languageFactory;
+	private Principal $connector;
 
 	protected function setUp(): void {
+		parent::setUp();
+
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->accountManager = $this->createMock(IAccountManager::class);
@@ -85,7 +70,6 @@ protected function setUp(): void {
 			$this->config,
 			$this->languageFactory
 		);
-		parent::setUp();
 	}
 
 	public function testGetPrincipalsByPrefixWithoutPrefix(): void {
@@ -125,13 +109,14 @@ public function testGetPrincipalsByPrefixWithUsers(): void {
 		$this->languageFactory
 			->expects($this->exactly(2))
 			->method('getUserLanguage')
-			->withConsecutive([$fooUser], [$barUser])
-			->willReturnOnConsecutiveCalls('de', 'en');
+			->willReturnMap([
+				[$fooUser, 'de'],
+				[$barUser, 'en'],
+			]);
 
 		$fooAccountPropertyCollection = $this->createMock(IAccountPropertyCollection::class);
 		$fooAccountPropertyCollection->expects($this->once())
 			->method('getProperties')
-			->with()
 			->willReturn([]);
 		$fooAccount = $this->createMock(IAccount::class);
 		$fooAccount->expects($this->once())
@@ -142,18 +127,15 @@ public function testGetPrincipalsByPrefixWithUsers(): void {
 		$emailPropertyOne = $this->createMock(IAccountProperty::class);
 		$emailPropertyOne->expects($this->once())
 			->method('getValue')
-			->with()
 			->willReturn('alias@nextcloud.com');
 		$emailPropertyTwo = $this->createMock(IAccountProperty::class);
 		$emailPropertyTwo->expects($this->once())
 			->method('getValue')
-			->with()
 			->willReturn('alias2@nextcloud.com');
 
 		$barAccountPropertyCollection = $this->createMock(IAccountPropertyCollection::class);
 		$barAccountPropertyCollection->expects($this->once())
 			->method('getProperties')
-			->with()
 			->willReturn([$emailPropertyOne, $emailPropertyTwo]);
 		$barAccount = $this->createMock(IAccount::class);
 		$barAccount->expects($this->once())
@@ -164,8 +146,10 @@ public function testGetPrincipalsByPrefixWithUsers(): void {
 		$this->accountManager
 			->expects($this->exactly(2))
 			->method('getAccount')
-			->withConsecutive([$fooUser], [$barUser])
-			->willReturnOnConsecutiveCalls($fooAccount, $barAccount);
+			->willReturnMap([
+				[$fooUser, $fooAccount],
+				[$barUser, $barAccount],
+			]);
 
 		$expectedResponse = [
 			0 => [
@@ -482,7 +466,7 @@ public function testSearchPrincipalsWithWrongPrefixPath(): void {
 	/**
 	 * @dataProvider searchPrincipalsDataProvider
 	 */
-	public function testSearchPrincipals($sharingEnabled, $groupsOnly, $test, $result): void {
+	public function testSearchPrincipals(bool $sharingEnabled, bool $groupsOnly, string $test, array $result): void {
 		$this->shareManager->expects($this->once())
 			->method('shareAPIEnabled')
 			->willReturn($sharingEnabled);
@@ -556,7 +540,7 @@ public function testSearchPrincipals($sharingEnabled, $groupsOnly, $test, $resul
 				'{DAV:}displayname' => 'User 12'], $test));
 	}
 
-	public function searchPrincipalsDataProvider(): array {
+	public static function searchPrincipalsDataProvider(): array {
 		return [
 			[true, false, 'allof', ['principals/users/user3']],
 			[true, false, 'anyof', ['principals/users/user2', 'principals/users/user3', 'principals/users/user4']],
@@ -845,7 +829,7 @@ public function testFindByUriSharingApiDisabled(): void {
 	/**
 	 * @dataProvider findByUriWithGroupRestrictionDataProvider
 	 */
-	public function testFindByUriWithGroupRestriction($uri, $email, $expects): void {
+	public function testFindByUriWithGroupRestriction(string $uri, string $email, ?string $expects): void {
 		$this->shareManager->expects($this->once())
 			->method('shareApiEnabled')
 			->willReturn(true);
@@ -872,31 +856,23 @@ public function testFindByUriWithGroupRestriction($uri, $email, $expects): void
 		if ($email === 'user2@foo.bar') {
 			$this->groupManager->expects($this->exactly(2))
 				->method('getUserGroupIds')
-				->withConsecutive(
-					[$user],
-					[$user2],
-				)
-				->willReturnOnConsecutiveCalls(
-					['group1', 'group2'],
-					['group1', 'group3'],
-				);
+				->willReturnMap([
+					[$user, ['group1', 'group2']],
+					[$user2, ['group1', 'group3']],
+				]);
 		} else {
 			$this->groupManager->expects($this->exactly(2))
 				->method('getUserGroupIds')
-				->withConsecutive(
-					[$user],
-					[$user3],
-				)
-				->willReturnOnConsecutiveCalls(
-					['group1', 'group2'],
-					['group3', 'group3'],
-				);
+				->willReturnMap([
+					[$user, ['group1', 'group2']],
+					[$user3, ['group3', 'group3']],
+				]);
 		}
 
 		$this->assertEquals($expects, $this->connector->findByUri($uri, 'principals/users'));
 	}
 
-	public function findByUriWithGroupRestrictionDataProvider(): array {
+	public static function findByUriWithGroupRestrictionDataProvider(): array {
 		return [
 			['mailto:user2@foo.bar', 'user2@foo.bar', 'principals/users/user2'],
 			['mailto:user3@foo.bar', 'user3@foo.bar', null],
@@ -906,7 +882,7 @@ public function findByUriWithGroupRestrictionDataProvider(): array {
 	/**
 	 * @dataProvider findByUriWithoutGroupRestrictionDataProvider
 	 */
-	public function testFindByUriWithoutGroupRestriction($uri, $email, $expects): void {
+	public function testFindByUriWithoutGroupRestriction(string $uri, string $email, string $expects): void {
 		$this->shareManager->expects($this->once())
 			->method('shareApiEnabled')
 			->willReturn(true);
@@ -928,7 +904,7 @@ public function testFindByUriWithoutGroupRestriction($uri, $email, $expects): vo
 		$this->assertEquals($expects, $this->connector->findByUri($uri, 'principals/users'));
 	}
 
-	public function findByUriWithoutGroupRestrictionDataProvider(): array {
+	public static function findByUriWithoutGroupRestrictionDataProvider(): array {
 		return [
 			['mailto:user2@foo.bar', 'user2@foo.bar', 'principals/users/user2'],
 			['mailto:user3@foo.bar', 'user3@foo.bar', 'principals/users/user3'],
diff --git a/apps/dav/tests/unit/Connector/Sabre/PropfindCompressionPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/PropfindCompressionPluginTest.php
index 42414ad6efb46..e6f696ed16080 100644
--- a/apps/dav/tests/unit/Connector/Sabre/PropfindCompressionPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/PropfindCompressionPluginTest.php
@@ -14,8 +14,7 @@
 use Test\TestCase;
 
 class PropfindCompressionPluginTest extends TestCase {
-	/** @var PropfindCompressionPlugin */
-	private $plugin;
+	private PropfindCompressionPlugin $plugin;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php
index 67e7f6af675b9..2340890ae5aba 100644
--- a/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -30,12 +31,12 @@ class PublicAuthTest extends \Test\TestCase {
 	private ISession&MockObject $session;
 	private IRequest&MockObject $request;
 	private IManager&MockObject $shareManager;
-	private PublicAuth $auth;
 	private IThrottler&MockObject $throttler;
 	private LoggerInterface&MockObject $logger;
 	private IURLGenerator&MockObject $urlGenerator;
+	private PublicAuth $auth;
 
-	private string $oldUser;
+	private bool|string $oldUser;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -65,7 +66,9 @@ protected function tearDown(): void {
 
 		// Set old user
 		\OC_User::setUserId($this->oldUser);
-		\OC_Util::setupFS($this->oldUser);
+		if ($this->oldUser !== false) {
+			\OC_Util::setupFS($this->oldUser);
+		}
 
 		parent::tearDown();
 	}
@@ -74,7 +77,7 @@ public function testGetToken(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$result = $this->invokePrivate($this->auth, 'getToken');
+		$result = self::invokePrivate($this->auth, 'getToken');
 
 		$this->assertSame('GX9HSGQrGE', $result);
 	}
@@ -84,16 +87,14 @@ public function testGetTokenInvalid(): void {
 			->willReturn('/dav/files');
 
 		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
-		$this->invokePrivate($this->auth, 'getToken');
+		self::invokePrivate($this->auth, 'getToken');
 	}
 
 	public function testCheckTokenValidShare(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn(null);
 
 		$this->shareManager->expects($this->once())
@@ -101,7 +102,7 @@ public function testCheckTokenValidShare(): void {
 			->with('GX9HSGQrGE')
 			->willReturn($share);
 
-		$result = $this->invokePrivate($this->auth, 'checkToken');
+		$result = self::invokePrivate($this->auth, 'checkToken');
 		$this->assertSame([true, 'principals/GX9HSGQrGE'], $result);
 	}
 
@@ -116,16 +117,14 @@ public function testCheckTokenInvalidShare(): void {
 			->will($this->throwException(new ShareNotFound()));
 
 		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
-		$this->invokePrivate($this->auth, 'checkToken');
+		self::invokePrivate($this->auth, 'checkToken');
 	}
 
 	public function testCheckTokenAlreadyAuthenticated(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getShareType')->willReturn(42);
 
 		$this->shareManager->expects($this->once())
@@ -136,7 +135,7 @@ public function testCheckTokenAlreadyAuthenticated(): void {
 		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
 		$this->session->method('get')->with('public_link_authenticated')->willReturn('42');
 
-		$result = $this->invokePrivate($this->auth, 'checkToken');
+		$result = self::invokePrivate($this->auth, 'checkToken');
 		$this->assertSame([true, 'principals/GX9HSGQrGE'], $result);
 	}
 
@@ -144,9 +143,7 @@ public function testCheckTokenPasswordNotAuthenticated(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(42);
 
@@ -158,16 +155,14 @@ public function testCheckTokenPasswordNotAuthenticated(): void {
 		$this->session->method('exists')->with('public_link_authenticated')->willReturn(false);
 
 		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		$this->invokePrivate($this->auth, 'checkToken');
+		self::invokePrivate($this->auth, 'checkToken');
 	}
 
 	public function testCheckTokenPasswordAuthenticatedWrongShare(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(42);
 
@@ -180,7 +175,7 @@ public function testCheckTokenPasswordAuthenticatedWrongShare(): void {
 		$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
 
 		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		$this->invokePrivate($this->auth, 'checkToken');
+		self::invokePrivate($this->auth, 'checkToken');
 	}
 
 	public function testNoShare(): void {
@@ -192,7 +187,7 @@ public function testNoShare(): void {
 			->with('GX9HSGQrGE')
 			->willThrowException(new ShareNotFound());
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertFalse($result);
 	}
@@ -201,9 +196,7 @@ public function testShareNoPassword(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn(null);
 
 		$this->shareManager->expects($this->once())
@@ -211,7 +204,7 @@ public function testShareNoPassword(): void {
 			->with('GX9HSGQrGE')
 			->willReturn($share);
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertTrue($result);
 	}
@@ -220,9 +213,7 @@ public function testSharePasswordFancyShareType(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(42);
 
@@ -231,7 +222,7 @@ public function testSharePasswordFancyShareType(): void {
 			->with('GX9HSGQrGE')
 			->willReturn($share);
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertFalse($result);
 	}
@@ -241,9 +232,7 @@ public function testSharePasswordRemote(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_REMOTE);
 
@@ -252,7 +241,7 @@ public function testSharePasswordRemote(): void {
 			->with('GX9HSGQrGE')
 			->willReturn($share);
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertTrue($result);
 	}
@@ -261,9 +250,7 @@ public function testSharePasswordLinkValidPassword(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 
@@ -278,7 +265,7 @@ public function testSharePasswordLinkValidPassword(): void {
 				$this->equalTo('password')
 			)->willReturn(true);
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertTrue($result);
 	}
@@ -287,9 +274,7 @@ public function testSharePasswordMailValidPassword(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
 
@@ -304,7 +289,7 @@ public function testSharePasswordMailValidPassword(): void {
 				$this->equalTo('password')
 			)->willReturn(true);
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertTrue($result);
 	}
@@ -313,9 +298,7 @@ public function testInvalidSharePasswordLinkValidSession(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 		$share->method('getId')->willReturn('42');
@@ -335,7 +318,7 @@ public function testInvalidSharePasswordLinkValidSession(): void {
 		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
 		$this->session->method('get')->with('public_link_authenticated')->willReturn('42');
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertTrue($result);
 	}
@@ -344,9 +327,7 @@ public function testSharePasswordLinkInvalidSession(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 		$share->method('getId')->willReturn('42');
@@ -366,7 +347,7 @@ public function testSharePasswordLinkInvalidSession(): void {
 		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
 		$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertFalse($result);
 	}
@@ -376,9 +357,7 @@ public function testSharePasswordMailInvalidSession(): void {
 		$this->request->method('getPathInfo')
 			->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->getMockBuilder(IShare::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$share = $this->createMock(IShare::class);
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
 		$share->method('getId')->willReturn('42');
@@ -398,7 +377,7 @@ public function testSharePasswordMailInvalidSession(): void {
 		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
 		$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
 
-		$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
 		$this->assertFalse($result);
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index c370e0fb0f762..a78a1a223c5a6 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2013-2016 ownCloud, Inc.
@@ -13,29 +14,23 @@
 use Test\TestCase;
 
 class QuotaPluginTest extends TestCase {
-	/** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject */
-	private $server;
+	private \Sabre\DAV\Server $server;
 
-	/** @var QuotaPlugin|\PHPUnit\Framework\MockObject\MockObject */
-	private $plugin;
+	private QuotaPlugin $plugin;
 
-	private function init($quota, $checkedPath = ''): void {
-		$view = $this->buildFileViewMock($quota, $checkedPath);
+	private function init(int $quota, string $checkedPath = ''): void {
+		$view = $this->buildFileViewMock((string)$quota, $checkedPath);
 		$this->server = new \Sabre\DAV\Server();
-		$this->plugin = $this->getMockBuilder(QuotaPlugin::class)
-			->setConstructorArgs([$view])
-			->setMethods(['getFileChunking'])
-			->getMock();
+		$this->plugin = new QuotaPlugin($view);
 		$this->plugin->initialize($this->server);
 	}
 
 	/**
 	 * @dataProvider lengthProvider
 	 */
-	public function testLength($expected, $headers): void {
+	public function testLength(?int $expected, array $headers): void {
 		$this->init(0);
-		$this->plugin->expects($this->never())
-			->method('getFileChunking');
+
 		$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
 		$length = $this->plugin->getLength();
 		$this->assertEquals($expected, $length);
@@ -44,10 +39,8 @@ public function testLength($expected, $headers): void {
 	/**
 	 * @dataProvider quotaOkayProvider
 	 */
-	public function testCheckQuota($quota, $headers): void {
+	public function testCheckQuota(int $quota, array $headers): void {
 		$this->init($quota);
-		$this->plugin->expects($this->never())
-			->method('getFileChunking');
 
 		$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
 		$result = $this->plugin->checkQuota('');
@@ -57,12 +50,10 @@ public function testCheckQuota($quota, $headers): void {
 	/**
 	 * @dataProvider quotaExceededProvider
 	 */
-	public function testCheckExceededQuota($quota, $headers): void {
+	public function testCheckExceededQuota(int $quota, array $headers): void {
 		$this->expectException(\Sabre\DAV\Exception\InsufficientStorage::class);
 
 		$this->init($quota);
-		$this->plugin->expects($this->never())
-			->method('getFileChunking');
 
 		$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
 		$this->plugin->checkQuota('');
@@ -71,17 +62,15 @@ public function testCheckExceededQuota($quota, $headers): void {
 	/**
 	 * @dataProvider quotaOkayProvider
 	 */
-	public function testCheckQuotaOnPath($quota, $headers): void {
+	public function testCheckQuotaOnPath(int $quota, array $headers): void {
 		$this->init($quota, 'sub/test.txt');
-		$this->plugin->expects($this->never())
-			->method('getFileChunking');
 
 		$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
 		$result = $this->plugin->checkQuota('/sub/test.txt');
 		$this->assertTrue($result);
 	}
 
-	public function quotaOkayProvider() {
+	public static function quotaOkayProvider(): array {
 		return [
 			[1024, []],
 			[1024, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
@@ -100,7 +89,7 @@ public function quotaOkayProvider() {
 		];
 	}
 
-	public function quotaExceededProvider() {
+	public static function quotaExceededProvider(): array {
 		return [
 			[1023, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
 			[511, ['CONTENT-LENGTH' => '512']],
@@ -108,7 +97,7 @@ public function quotaExceededProvider() {
 		];
 	}
 
-	public function lengthProvider() {
+	public static function lengthProvider(): array {
 		return [
 			[null, []],
 			[1024, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
@@ -124,7 +113,7 @@ public function lengthProvider() {
 		];
 	}
 
-	public function quotaChunkedOkProvider() {
+	public static function quotaChunkedOkProvider(): array {
 		return [
 			[1024, 0, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
 			[1024, 0, ['CONTENT-LENGTH' => '512']],
@@ -143,7 +132,7 @@ public function quotaChunkedOkProvider() {
 		];
 	}
 
-	public function quotaChunkedFailProvider() {
+	public static function quotaChunkedFailProvider(): array {
 		return [
 			[400, 0, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
 			[400, 0, ['CONTENT-LENGTH' => '512']],
@@ -155,15 +144,15 @@ public function quotaChunkedFailProvider() {
 		];
 	}
 
-	private function buildFileViewMock($quota, $checkedPath) {
-		// mock filesysten
+	private function buildFileViewMock(string $quota, string $checkedPath): View {
+		// mock filesystem
 		$view = $this->getMockBuilder(View::class)
-			->setMethods(['free_space'])
+			->onlyMethods(['free_space'])
 			->disableOriginalConstructor()
 			->getMock();
 		$view->expects($this->any())
 			->method('free_space')
-			->with($this->identicalTo($checkedPath))
+			->with($checkedPath)
 			->willReturn($quota);
 
 		return $view;
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php
index 836766b366d76..b01807d5bbba3 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
index e7f20fbadfac6..c5c7e99c7e516 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -18,7 +19,7 @@
  */
 class DeleteTest extends RequestTestCase {
 	public function testBasicUpload(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$view->file_put_contents('foo.txt', 'asd');
@@ -29,7 +30,7 @@ public function testBasicUpload(): void {
 		$mount->getStorage()->unlink($mount->getInternalPath($internalPath));
 
 		// cache entry still exists
-		$this->assertInstanceOf('\OCP\Files\FileInfo', $view->getFileInfo('foo.txt'));
+		$this->assertInstanceOf(\OCP\Files\FileInfo::class, $view->getFileInfo('foo.txt'));
 
 		$response = $this->request($view, $user, 'pass', 'DELETE', '/foo.txt');
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php
index bec4cd9967b6e..34171963ef06d 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -19,7 +20,7 @@
  */
 class DownloadTest extends RequestTestCase {
 	public function testDownload(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$view->file_put_contents('foo.txt', 'bar');
@@ -30,7 +31,7 @@ public function testDownload(): void {
 	}
 
 	public function testDownloadWriteLocked(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$view->file_put_contents('foo.txt', 'bar');
@@ -42,7 +43,7 @@ public function testDownloadWriteLocked(): void {
 	}
 
 	public function testDownloadReadLocked(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$view->file_put_contents('foo.txt', 'bar');
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php
index 92d89d7753aa2..615490ddc9260 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -23,7 +24,7 @@
 class EncryptionMasterKeyUploadTest extends UploadTest {
 	use EncryptionTrait;
 
-	protected function setupUser($name, $password) {
+	protected function setupUser($name, $password): View {
 		$this->createUser($name, $password);
 		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
 		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php
index 935ef6d9464f1..efa7bb54cf890 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -23,7 +24,7 @@
 class EncryptionUploadTest extends UploadTest {
 	use EncryptionTrait;
 
-	protected function setupUser($name, $password) {
+	protected function setupUser($name, $password): View {
 		$this->createUser($name, $password);
 		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
 		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php
index b1e68f9597b22..0c53e4b1009a6 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
index 5f3dc6f4e32de..e6fa489fb2418 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
@@ -21,9 +21,7 @@
 class PartFileInRootUploadTest extends UploadTest {
 	protected function setUp(): void {
 		$config = Server::get(IConfig::class);
-		$mockConfig = $this->getMockBuilder(IConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$mockConfig = $this->createMock(IConfig::class);
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) use ($config) {
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php
index d02f1d76cace2..404dc7fa5d7b4 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -20,6 +21,7 @@
 use OCP\ITagManager;
 use OCP\ITempManager;
 use OCP\IUserSession;
+use OCP\L10N\IFactory;
 use Psr\Log\LoggerInterface;
 use Sabre\HTTP\Request;
 use Test\TestCase;
@@ -29,11 +31,7 @@
 abstract class RequestTestCase extends TestCase {
 	use UserTrait;
 	use MountProviderTrait;
-
-	/**
-	 * @var ServerFactory
-	 */
-	protected $serverFactory;
+	protected ServerFactory $serverFactory;
 
 	protected function getStream($string) {
 		$stream = fopen('php://temp', 'r+');
@@ -52,20 +50,18 @@ protected function setUp(): void {
 			\OCP\Server::get(IUserSession::class),
 			\OCP\Server::get(IMountManager::class),
 			\OCP\Server::get(ITagManager::class),
-			$this->getMockBuilder(IRequest::class)
-				->disableOriginalConstructor()
-				->getMock(),
+			$this->createMock(IRequest::class),
 			\OCP\Server::get(IPreview::class),
 			\OCP\Server::get(IEventDispatcher::class),
-			\OC::$server->getL10N('dav')
+			\OCP\Server::get(IFactory::class)->get('dav'),
 		);
 	}
 
-	protected function setupUser($name, $password) {
+	protected function setupUser($name, $password): View {
 		$this->createUser($name, $password);
 		$tmpFolder = \OCP\Server::get(ITempManager::class)->getTemporaryFolder();
 		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-		$this->loginAsUser($name);
+		self::loginAsUser($name);
 		return new View('/' . $name . '/files');
 	}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php
index f12c93468ff4a..08d774e56b82a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Sapi.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
index 60decd4c8461e..5c6d0f03334bf 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -19,7 +20,7 @@
  */
 class UploadTest extends RequestTestCase {
 	public function testBasicUpload(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$this->assertFalse($view->file_exists('foo.txt'));
@@ -35,7 +36,7 @@ public function testBasicUpload(): void {
 	}
 
 	public function testUploadOverWrite(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$view->file_put_contents('foo.txt', 'foobar');
@@ -51,7 +52,7 @@ public function testUploadOverWrite(): void {
 	}
 
 	public function testUploadOverWriteReadLocked(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
 		$view->file_put_contents('foo.txt', 'bar');
@@ -63,7 +64,7 @@ public function testUploadOverWriteReadLocked(): void {
 	}
 
 	public function testUploadOverWriteWriteLocked(): void {
-		$user = $this->getUniqueID();
+		$user = self::getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 		$this->loginAsUser($user);
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
index 97d3ba7904664..00ac5b5543fbd 100644
--- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -17,35 +18,17 @@
 use OCP\IUserSession;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Tree;
 
 class SharesPluginTest extends \Test\TestCase {
 	public const SHARETYPES_PROPERTYNAME = SharesPlugin::SHARETYPES_PROPERTYNAME;
 
-	/**
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var \OCP\Share\IManager
-	 */
-	private $shareManager;
-
-	/**
-	 * @var Folder
-	 */
-	private $userFolder;
-
-	/**
-	 * @var SharesPlugin
-	 */
-	private $plugin;
+	private \Sabre\DAV\Server $server;
+	private \Sabre\DAV\Tree&MockObject $tree;
+	private \OCP\Share\IManager&MockObject $shareManager;
+	private Folder&MockObject $userFolder;
+	private SharesPlugin $plugin;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -74,10 +57,8 @@ protected function setUp(): void {
 	/**
 	 * @dataProvider sharesGetPropertiesDataProvider
 	 */
-	public function testGetProperties($shareTypes): void {
-		$sabreNode = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testGetProperties(array $shareTypes): void {
+		$sabreNode = $this->createMock(Node::class);
 		$sabreNode->expects($this->any())
 			->method('getId')
 			->willReturn(123);
@@ -86,9 +67,7 @@ public function testGetProperties($shareTypes): void {
 			->willReturn('/subdir');
 
 		// node API nodes
-		$node = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Folder::class);
 
 		$sabreNode->method('getNode')
 			->willReturn($node);
@@ -143,7 +122,7 @@ public function testGetProperties($shareTypes): void {
 	/**
 	 * @dataProvider sharesGetPropertiesDataProvider
 	 */
-	public function testPreloadThenGetProperties($shareTypes): void {
+	public function testPreloadThenGetProperties(array $shareTypes): void {
 		$sabreNode1 = $this->createMock(File::class);
 		$sabreNode1->method('getId')
 			->willReturn(111);
@@ -182,7 +161,7 @@ public function testPreloadThenGetProperties($shareTypes): void {
 			->willReturn($node2);
 
 		$dummyShares = array_map(function ($type) {
-			$share = $this->getMockBuilder(IShare::class)->getMock();
+			$share = $this->createMock(IShare::class);
 			$share->expects($this->any())
 				->method('getShareType')
 				->willReturn($type);
@@ -268,7 +247,7 @@ public function testPreloadThenGetProperties($shareTypes): void {
 		$this->assertEquals($shareTypes, $result[200][self::SHARETYPES_PROPERTYNAME]->getShareTypes());
 	}
 
-	public function sharesGetPropertiesDataProvider() {
+	public static function sharesGetPropertiesDataProvider(): array {
 		return [
 			[[]],
 			[[IShare::TYPE_USER]],
@@ -287,9 +266,7 @@ public function sharesGetPropertiesDataProvider() {
 	}
 
 	public function testGetPropertiesSkipChunks(): void {
-		$sabreNode = $this->getMockBuilder(UploadFile::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$sabreNode = $this->createMock(UploadFile::class);
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/dummyPath',
diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
index 43c08a1a61cad..bef508e08ca16 100644
--- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc.
@@ -18,6 +19,7 @@
 use OCP\ITags;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Tree;
 
 class TagsPluginTest extends \Test\TestCase {
@@ -25,61 +27,24 @@ class TagsPluginTest extends \Test\TestCase {
 	public const FAVORITE_PROPERTYNAME = TagsPlugin::FAVORITE_PROPERTYNAME;
 	public const TAG_FAVORITE = TagsPlugin::TAG_FAVORITE;
 
-	/**
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var ITagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ITags
-	 */
-	private $tagger;
-
-	/**
-	 * @var IEventDispatcher
-	 */
-	private $eventDispatcher;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var TagsPlugin
-	 */
-	private $plugin;
+	private \Sabre\DAV\Server $server;
+	private Tree&MockObject $tree;
+	private ITagManager&MockObject $tagManager;
+	private ITags&MockObject $tagger;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private IUserSession&MockObject $userSession;
+	private TagsPlugin $plugin;
 
 	protected function setUp(): void {
 		parent::setUp();
+
 		$this->server = new \Sabre\DAV\Server();
-		$this->tree = $this->getMockBuilder(Tree::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->tagger = $this->getMockBuilder(ITags::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->tagManager = $this->getMockBuilder(ITagManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->eventDispatcher = $this->getMockBuilder(IEventDispatcher::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->tree = $this->createMock(Tree::class);
+		$this->tagger = $this->createMock(ITags::class);
+		$this->tagManager = $this->createMock(ITagManager::class);
+		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 		$user = $this->createMock(IUser::class);
-		/**
-		 * @var IUserSession
-		 */
+
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->userSession->expects($this->any())
 			->method('getUser')
@@ -96,10 +61,8 @@ protected function setUp(): void {
 	/**
 	 * @dataProvider tagsGetPropertiesDataProvider
 	 */
-	public function testGetProperties($tags, $requestedProperties, $expectedProperties): void {
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testGetProperties(array $tags, array $requestedProperties, array $expectedProperties): void {
+		$node = $this->createMock(Node::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn(123);
@@ -135,16 +98,12 @@ public function testGetProperties($tags, $requestedProperties, $expectedProperti
 	/**
 	 * @dataProvider tagsGetPropertiesDataProvider
 	 */
-	public function testPreloadThenGetProperties($tags, $requestedProperties, $expectedProperties): void {
-		$node1 = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function testPreloadThenGetProperties(array $tags, array $requestedProperties, array $expectedProperties): void {
+		$node1 = $this->createMock(File::class);
 		$node1->expects($this->any())
 			->method('getId')
 			->willReturn(111);
-		$node2 = $this->getMockBuilder(File::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node2 = $this->createMock(File::class);
 		$node2->expects($this->any())
 			->method('getId')
 			->willReturn(222);
@@ -157,9 +116,7 @@ public function testPreloadThenGetProperties($tags, $requestedProperties, $expec
 			$expectedCallCount = 1;
 		}
 
-		$node = $this->getMockBuilder(Directory::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Directory::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn(123);
@@ -214,7 +171,7 @@ public function testPreloadThenGetProperties($tags, $requestedProperties, $expec
 		$this->assertEquals($expectedProperties, $result);
 	}
 
-	public function tagsGetPropertiesDataProvider() {
+	public static function tagsGetPropertiesDataProvider(): array {
 		return [
 			// request both, receive both
 			[
@@ -270,9 +227,7 @@ public function tagsGetPropertiesDataProvider() {
 	}
 
 	public function testGetPropertiesSkipChunks(): void {
-		$sabreNode = $this->getMockBuilder(UploadFile::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$sabreNode = $this->createMock(UploadFile::class);
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/dummyPath',
@@ -292,9 +247,7 @@ public function testGetPropertiesSkipChunks(): void {
 	public function testUpdateTags(): void {
 		// this test will replace the existing tags "tagremove" with "tag1" and "tag2"
 		// and keep "tagkeep"
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Node::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn(123);
@@ -310,12 +263,16 @@ public function testUpdateTags(): void {
 			->willReturn([123 => ['tagkeep', 'tagremove', self::TAG_FAVORITE]]);
 
 		// then tag as tag1 and tag2
-		$this->tagger->expects($this->exactly(2))
+		$calls = [
+			[123, 'tag1'],
+			[123, 'tag2'],
+		];
+		$this->tagger->expects($this->exactly(count($calls)))
 			->method('tagAs')
-			->withConsecutive(
-				[123, 'tag1'],
-				[123, 'tag2'],
-			);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		// it will untag tag3
 		$this->tagger->expects($this->once())
@@ -339,13 +296,11 @@ public function testUpdateTags(): void {
 
 		$result = $propPatch->getResult();
 		$this->assertEquals(200, $result[self::TAGS_PROPERTYNAME]);
-		$this->assertFalse(isset($result[self::FAVORITE_PROPERTYNAME]));
+		$this->assertArrayNotHasKey(self::FAVORITE_PROPERTYNAME, $result);
 	}
 
 	public function testUpdateTagsFromScratch(): void {
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Node::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn(123);
@@ -361,12 +316,16 @@ public function testUpdateTagsFromScratch(): void {
 			->willReturn([]);
 
 		// then tag as tag1 and tag2
-		$this->tagger->expects($this->exactly(2))
+		$calls = [
+			[123, 'tag1'],
+			[123, 'tag2'],
+		];
+		$this->tagger->expects($this->exactly(count($calls)))
 			->method('tagAs')
-			->withConsecutive(
-				[123, 'tag1'],
-				[123, 'tag2'],
-			);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		// properties to set
 		$propPatch = new \Sabre\DAV\PropPatch([
@@ -385,15 +344,13 @@ public function testUpdateTagsFromScratch(): void {
 
 		$result = $propPatch->getResult();
 		$this->assertEquals(200, $result[self::TAGS_PROPERTYNAME]);
-		$this->assertFalse(false, isset($result[self::FAVORITE_PROPERTYNAME]));
+		$this->assertArrayNotHasKey(self::FAVORITE_PROPERTYNAME, $result);
 	}
 
 	public function testUpdateFav(): void {
 		// this test will replace the existing tags "tagremove" with "tag1" and "tag2"
 		// and keep "tagkeep"
-		$node = $this->getMockBuilder(Node::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$node = $this->createMock(Node::class);
 		$node->expects($this->any())
 			->method('getId')
 			->willReturn(123);
@@ -424,8 +381,8 @@ public function testUpdateFav(): void {
 		$this->assertEmpty($propPatch->getRemainingMutations());
 
 		$result = $propPatch->getResult();
-		$this->assertFalse(false, isset($result[self::TAGS_PROPERTYNAME]));
-		$this->assertEquals(200, isset($result[self::FAVORITE_PROPERTYNAME]));
+		$this->assertArrayNotHasKey(self::TAGS_PROPERTYNAME, $result);
+		$this->assertEquals(200, $result[self::FAVORITE_PROPERTYNAME]);
 
 		// unfavorite now
 		// set favorite tag
@@ -449,7 +406,7 @@ public function testUpdateFav(): void {
 		$this->assertEmpty($propPatch->getRemainingMutations());
 
 		$result = $propPatch->getResult();
-		$this->assertFalse(false, isset($result[self::TAGS_PROPERTYNAME]));
-		$this->assertEquals(200, isset($result[self::FAVORITE_PROPERTYNAME]));
+		$this->assertArrayNotHasKey(self::TAGS_PROPERTYNAME, $result);
+		$this->assertEquals(200, $result[self::FAVORITE_PROPERTYNAME]);
 	}
 }
diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
index c7c2bf0e43168..9aa0ef3a2a7e7 100644
--- a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
+++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
@@ -1,43 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\DAV\Controller;
+namespace OCA\DAV\Tests\unit\DAV\Controller;
 
 use OCA\DAV\BackgroundJob\GenerateBirthdayCalendarBackgroundJob;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\Controller\BirthdayCalendarController;
+use OCP\AppFramework\Http\JSONResponse;
 use OCP\BackgroundJob\IJobList;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class BirthdayCalendarControllerTest extends TestCase {
-
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-
-	/** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */
-	private $db;
-
-	/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-
-	/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject */
-	private $caldav;
-
-	/** @var BirthdayCalendarController|\PHPUnit\Framework\MockObject\MockObject */
-	private $controller;
+	private IConfig&MockObject $config;
+	private IRequest&MockObject $request;
+	private IDBConnection&MockObject $db;
+	private IJobList&MockObject $jobList;
+	private IUserManager&MockObject $userManager;
+	private CalDavBackend&MockObject $caldav;
+	private BirthdayCalendarController $controller;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -74,16 +64,20 @@ public function testEnable(): void {
 				$closure($user3);
 			});
 
+		$calls = [
+			[GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid1']],
+			[GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid2']],
+			[GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid3']],
+		];
 		$this->jobList->expects($this->exactly(3))
 			->method('add')
-			->withConsecutive(
-				[GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid1']],
-				[GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid2']],
-				[GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid3']],
-			);
+			->willReturnCallback(function () use (&$calls): void {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		$response = $this->controller->enable();
-		$this->assertInstanceOf('OCP\AppFramework\Http\JSONResponse', $response);
+		$this->assertInstanceOf(JSONResponse::class, $response);
 	}
 
 	public function testDisable(): void {
@@ -97,6 +91,6 @@ public function testDisable(): void {
 			->method('deleteAllBirthdayCalendars');
 
 		$response = $this->controller->disable();
-		$this->assertInstanceOf('OCP\AppFramework\Http\JSONResponse', $response);
+		$this->assertInstanceOf(JSONResponse::class, $response);
 	}
 }
diff --git a/apps/dav/tests/unit/Controller/DirectControllerTest.php b/apps/dav/tests/unit/Controller/DirectControllerTest.php
index faaf67d266b24..837adde1da7fd 100644
--- a/apps/dav/tests/unit/Controller/DirectControllerTest.php
+++ b/apps/dav/tests/unit/Controller/DirectControllerTest.php
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\DAV\Controller;
+namespace OCA\DAV\Tests\unit\DAV\Controller;
 
 use OCA\DAV\Controller\DirectController;
 use OCA\DAV\Db\Direct;
@@ -20,29 +20,18 @@
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
-use OCP\IUrlGenerator;
+use OCP\IURLGenerator;
 use OCP\Security\ISecureRandom;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class DirectControllerTest extends TestCase {
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var DirectMapper|\PHPUnit\Framework\MockObject\MockObject */
-	private $directMapper;
-
-	/** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */
-	private $random;
-
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-
-	/** @var IUrlGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $urlGenerator;
-
-	/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
-	private $eventDispatcher;
+	private IRootFolder&MockObject $rootFolder;
+	private DirectMapper&MockObject $directMapper;
+	private ISecureRandom&MockObject $random;
+	private ITimeFactory&MockObject $timeFactory;
+	private IURLGenerator&MockObject $urlGenerator;
+	private IEventDispatcher&MockObject $eventDispatcher;
 
 	private DirectController $controller;
 
@@ -53,7 +42,7 @@ protected function setUp(): void {
 		$this->directMapper = $this->createMock(DirectMapper::class);
 		$this->random = $this->createMock(ISecureRandom::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->urlGenerator = $this->createMock(IUrlGenerator::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 
 		$this->controller = new DirectController(
diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
index 640c66b75e515..895a84b840423 100644
--- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
+++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Unit\DAV\Controller;
+namespace OCA\DAV\Tests\unit\DAV\Controller;
 
 use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
 use OCA\DAV\Controller\InvitationResponseController;
@@ -18,24 +18,16 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IRequest;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\ITip\Message;
 use Test\TestCase;
 
 class InvitationResponseControllerTest extends TestCase {
-	/** @var InvitationResponseController */
-	private $controller;
-
-	/** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */
-	private $dbConnection;
-
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-
-	/** @var InvitationResponseServer|\PHPUnit\Framework\MockObject\MockObject */
-	private $responseServer;
+	private IDBConnection&MockObject $dbConnection;
+	private IRequest&MockObject $request;
+	private ITimeFactory&MockObject $timeFactory;
+	private InvitationResponseServer&MockObject $responseServer;
+	private InvitationResponseController $controller;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -43,9 +35,7 @@ protected function setUp(): void {
 		$this->dbConnection = $this->createMock(IDBConnection::class);
 		$this->request = $this->createMock(IRequest::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->responseServer = $this->getMockBuilder(InvitationResponseServer::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->responseServer = $this->createMock(InvitationResponseServer::class);
 
 		$this->controller = new InvitationResponseController(
 			'appName',
@@ -56,7 +46,7 @@ protected function setUp(): void {
 		);
 	}
 
-	public function attendeeProvider(): array {
+	public static function attendeeProvider(): array {
 		return [
 			'local attendee' => [false],
 			'external attendee' => [true]
@@ -424,7 +414,7 @@ public function testProcessMoreOptionsResult(bool $isExternalAttendee): void {
 		$this->assertTrue($called);
 	}
 
-	private function buildQueryExpects($token, $return, $time): void {
+	private function buildQueryExpects(string $token, ?array $return, int $time): void {
 		$queryBuilder = $this->createMock(IQueryBuilder::class);
 		$stmt = $this->createMock(IResult::class);
 		$expr = $this->createMock(IExpressionBuilder::class);
diff --git a/apps/dav/tests/unit/Controller/UpcomingEventsControllerTest.php b/apps/dav/tests/unit/Controller/UpcomingEventsControllerTest.php
index bab0ef77bd0b0..527943e52212e 100644
--- a/apps/dav/tests/unit/Controller/UpcomingEventsControllerTest.php
+++ b/apps/dav/tests/unit/Controller/UpcomingEventsControllerTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Unit\DAV\Service;
+namespace OCA\DAV\Tests\unit\DAV\Service;
 
 use OCA\DAV\CalDAV\UpcomingEvent;
 use OCA\DAV\CalDAV\UpcomingEventsService;
@@ -17,9 +17,8 @@
 use PHPUnit\Framework\TestCase;
 
 class UpcomingEventsControllerTest extends TestCase {
-
-	private IRequest|MockObject $request;
-	private UpcomingEventsService|MockObject $service;
+	private IRequest&MockObject $request;
+	private UpcomingEventsService&MockObject $service;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php b/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php
index ea5450391e8ca..c99ebf327c88a 100644
--- a/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php
+++ b/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\tests\unit\DAV;
+namespace OCA\DAV\Tests\unit\DAV;
 
 use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin;
 use Sabre\DAV\Auth\Backend\BasicCallBack;
@@ -14,7 +16,7 @@
 use Test\TestCase;
 
 class AnonymousOptionsTest extends TestCase {
-	private function sendRequest($method, $path, $userAgent = '') {
+	private function sendRequest(string $method, string $path, string $userAgent = '') {
 		$server = new Server();
 		$server->addPlugin(new AnonymousOptionsPlugin());
 		$server->addPlugin(new Plugin(new BasicCallBack(function () {
diff --git a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
index 088330cecff82..23ee2b66f7798 100644
--- a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
+++ b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,7 @@
 namespace OCA\DAV\Tests\unit\DAV;
 
 use OCA\DAV\Files\BrowserErrorPagePlugin;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\HTTP\Response;
 
@@ -15,18 +17,16 @@ class BrowserErrorPagePluginTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesExceptions
-	 * @param $expectedCode
-	 * @param $exception
 	 */
-	public function test($expectedCode, $exception): void {
-		/** @var BrowserErrorPagePlugin | \PHPUnit\Framework\MockObject\MockObject $plugin */
-		$plugin = $this->getMockBuilder(BrowserErrorPagePlugin::class)->setMethods(['sendResponse', 'generateBody'])->getMock();
+	public function test(int $expectedCode, \Throwable $exception): void {
+		/** @var BrowserErrorPagePlugin&MockObject $plugin */
+		$plugin = $this->getMockBuilder(BrowserErrorPagePlugin::class)->onlyMethods(['sendResponse', 'generateBody'])->getMock();
 		$plugin->expects($this->once())->method('generateBody')->willReturn(':boom:');
 		$plugin->expects($this->once())->method('sendResponse');
-		/** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject $server */
-		$server = $this->getMockBuilder('Sabre\DAV\Server')->disableOriginalConstructor()->getMock();
+		/** @var \Sabre\DAV\Server&MockObject $server */
+		$server = $this->createMock('Sabre\DAV\Server');
 		$server->expects($this->once())->method('on');
-		$httpResponse = $this->getMockBuilder(Response::class)->disableOriginalConstructor()->getMock();
+		$httpResponse = $this->createMock(Response::class);
 		$httpResponse->expects($this->once())->method('addHeaders');
 		$httpResponse->expects($this->once())->method('setStatus')->with($expectedCode);
 		$httpResponse->expects($this->once())->method('setBody')->with(':boom:');
@@ -35,7 +35,7 @@ public function test($expectedCode, $exception): void {
 		$plugin->logException($exception);
 	}
 
-	public function providesExceptions() {
+	public static function providesExceptions(): array {
 		return [
 			[ 404, new NotFound()],
 			[ 500, new \RuntimeException()],
diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
index 5590e8c1ff064..7c77b3fcb28f1 100644
--- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\DAV;
+namespace OCA\DAV\Tests\unit\DAV;
 
 use OCA\DAV\CalDAV\Calendar;
 use OCA\DAV\CalDAV\DefaultCalendarValidator;
@@ -12,6 +13,7 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\PropPatch;
@@ -28,23 +30,12 @@
 class CustomPropertiesBackendTest extends TestCase {
 	private const BASE_URI = '/remote.php/dav/';
 
-	/** @var Server | \PHPUnit\Framework\MockObject\MockObject */
-	private $server;
-
-	/** @var Tree | \PHPUnit\Framework\MockObject\MockObject */
-	private $tree;
-
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var IUser | \PHPUnit\Framework\MockObject\MockObject */
-	private $user;
-
-	/** @var CustomPropertiesBackend | \PHPUnit\Framework\MockObject\MockObject */
-	private $backend;
-
-	/** @property DefaultCalendarValidator | \PHPUnit\Framework\MockObject\MockObject */
-	private $defaultCalendarValidator;
+	private Server&MockObject $server;
+	private Tree&MockObject $tree;
+	private IDBConnection $dbConnection;
+	private IUser&MockObject $user;
+	private DefaultCalendarValidator&MockObject $defaultCalendarValidator;
+	private CustomPropertiesBackend $backend;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -85,13 +76,13 @@ private function formatPath(string $path): string {
 		}
 	}
 
-	protected function insertProps(string $user, string $path, array $props) {
+	protected function insertProps(string $user, string $path, array $props): void {
 		foreach ($props as $name => $value) {
 			$this->insertProp($user, $path, $name, $value);
 		}
 	}
 
-	protected function insertProp(string $user, string $path, string $name, mixed $value) {
+	protected function insertProp(string $user, string $path, string $name, mixed $value): void {
 		$type = CustomPropertiesBackend::PROPERTY_TYPE_STRING;
 		if ($value instanceof Href) {
 			$value = $value->getHref();
@@ -110,7 +101,7 @@ protected function insertProp(string $user, string $path, string $name, mixed $v
 		$query->execute();
 	}
 
-	protected function getProps(string $user, string $path) {
+	protected function getProps(string $user, string $path): array {
 		$query = $this->dbConnection->getQueryBuilder();
 		$query->select('propertyname', 'propertyvalue', 'valuetype')
 			->from('properties')
@@ -245,7 +236,7 @@ public function testPropFindPrincipalCall(): void {
 		$this->assertEquals($props, $setProps);
 	}
 
-	public function propFindPrincipalScheduleDefaultCalendarProviderUrlProvider(): array {
+	public static function propFindPrincipalScheduleDefaultCalendarProviderUrlProvider(): array {
 		// [ user, nodes, existingProps, requestedProps, returnedProps ]
 		return [
 			[ // Exists
@@ -373,7 +364,7 @@ public function testPropPatch(string $path, array $existing, array $props, array
 		$this->assertEquals($result, $storedProps);
 	}
 
-	public function propPatchProvider() {
+	public static function propPatchProvider(): array {
 		$longPath = str_repeat('long_path', 100);
 		return [
 			['foo_bar_path_1337', [], ['{DAV:}displayname' => 'anything'], ['{DAV:}displayname' => 'anything']],
@@ -436,7 +427,7 @@ public function testDelete(string $path): void {
 		$this->assertEquals([], $this->getProps('dummy_user_42', $path));
 	}
 
-	public function deleteProvider() {
+	public static function deleteProvider(): array {
 		return [
 			['foo_bar_path_1337'],
 			[str_repeat('long_path', 100)]
@@ -453,7 +444,7 @@ public function testMove(string $source, string $target): void {
 		$this->assertEquals(['foo' => 'bar'], $this->getProps('dummy_user_42', $target));
 	}
 
-	public function moveProvider() {
+	public static function moveProvider(): array {
 		return [
 			['foo_bar_path_1337', 'foo_bar_path_7333'],
 			[str_repeat('long_path1', 100), str_repeat('long_path2', 100)]
@@ -475,5 +466,4 @@ public function testDecodeValueFromDatabaseObjectLegacy(): void {
 		$this->assertInstanceOf(\Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp::class, $decodeValue);
 		$this->assertEquals('opaque', $decodeValue->getValue());
 	}
-
 }
diff --git a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
index bfc4c5b24930b..2ede450c36b5e 100644
--- a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
+++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -18,20 +20,11 @@
 use Sabre\DAV\PropPatch;
 
 class GroupPrincipalTest extends \Test\TestCase {
-	/** @var IConfig|MockObject */
-	private $config;
-
-	/** @var IGroupManager | MockObject */
-	private $groupManager;
-
-	/** @var IUserSession | MockObject */
-	private $userSession;
-
-	/** @var IManager | MockObject */
-	private $shareManager;
-
-	/** @var GroupPrincipalBackend */
-	private $connector;
+	private IConfig&MockObject $config;
+	private IGroupManager&MockObject $groupManager;
+	private IUserSession&MockObject $userSession;
+	private IManager&MockObject $shareManager;
+	private GroupPrincipalBackend $connector;
 
 	protected function setUp(): void {
 		$this->groupManager = $this->createMock(IGroupManager::class);
@@ -201,11 +194,6 @@ public function testSearchPrincipalsWithWrongPrefixPath(): void {
 
 	/**
 	 * @dataProvider searchPrincipalsDataProvider
-	 * @param bool $sharingEnabled
-	 * @param bool $groupSharingEnabled
-	 * @param bool $groupsOnly
-	 * @param string $test
-	 * @param array $result
 	 */
 	public function testSearchPrincipals(bool $sharingEnabled, bool $groupSharingEnabled, bool $groupsOnly, string $test, array $result): void {
 		$this->shareManager->expects($this->once())
@@ -264,7 +252,7 @@ public function testSearchPrincipals(bool $sharingEnabled, bool $groupSharingEna
 			['{DAV:}displayname' => 'Foo'], $test));
 	}
 
-	public function searchPrincipalsDataProvider() {
+	public static function searchPrincipalsDataProvider(): array {
 		return [
 			[true, true, false, 'allof', ['principals/groups/group1', 'principals/groups/group2', 'principals/groups/group3', 'principals/groups/group4', 'principals/groups/group5']],
 			[true, true, false, 'anyof', ['principals/groups/group1', 'principals/groups/group2', 'principals/groups/group3', 'principals/groups/group4', 'principals/groups/group5']],
@@ -279,11 +267,6 @@ public function searchPrincipalsDataProvider() {
 
 	/**
 	 * @dataProvider findByUriDataProvider
-	 * @param bool $sharingEnabled
-	 * @param bool $groupSharingEnabled
-	 * @param bool $groupsOnly
-	 * @param string $findUri
-	 * @param string|null $result
 	 */
 	public function testFindByUri(bool $sharingEnabled, bool $groupSharingEnabled, bool $groupsOnly, string $findUri, ?string $result): void {
 		$this->shareManager->expects($this->once())
@@ -320,7 +303,7 @@ public function testFindByUri(bool $sharingEnabled, bool $groupSharingEnabled, b
 		$this->assertEquals($result, $this->connector->findByUri($findUri, 'principals/groups'));
 	}
 
-	public function findByUriDataProvider() {
+	public static function findByUriDataProvider(): array {
 		return [
 			[false, false, false, 'principal:principals/groups/group1', null],
 			[false, false, false, 'principal:principals/groups/group3', null],
@@ -337,10 +320,7 @@ public function findByUriDataProvider() {
 		];
 	}
 
-	/**
-	 * @return Group|MockObject
-	 */
-	private function mockGroup($gid) {
+	private function mockGroup(string $gid): Group&MockObject {
 		$fooGroup = $this->createMock(Group::class);
 		$fooGroup
 			->expects($this->exactly(1))
diff --git a/apps/dav/tests/unit/DAV/Listener/UserEventsListenerTest.php b/apps/dav/tests/unit/DAV/Listener/UserEventsListenerTest.php
index a0876d8e48308..420f0a0d93745 100644
--- a/apps/dav/tests/unit/DAV/Listener/UserEventsListenerTest.php
+++ b/apps/dav/tests/unit/DAV/Listener/UserEventsListenerTest.php
@@ -51,9 +51,7 @@ protected function setUp(): void {
 	}
 
 	public function test(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())->method('getUID')->willReturn('newUser');
 
 		$this->defaults->expects($this->once())->method('getColorPrimary')->willReturn('#745bca');
@@ -76,9 +74,7 @@ public function test(): void {
 	}
 
 	public function testWithExisting(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())->method('getUID')->willReturn('newUser');
 
 		$this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1);
@@ -91,9 +87,7 @@ public function testWithExisting(): void {
 	}
 
 	public function testWithBirthdayCalendar(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())->method('getUID')->willReturn('newUser');
 
 		$this->defaults->expects($this->once())->method('getColorPrimary')->willReturn('#745bca');
@@ -116,9 +110,7 @@ public function testWithBirthdayCalendar(): void {
 	}
 
 	public function testDeleteCalendar(): void {
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())->method('getUID')->willReturn('newUser');
 
 		$this->syncService->expects($this->once())
diff --git a/apps/dav/tests/unit/DAV/Sharing/BackendTest.php b/apps/dav/tests/unit/DAV/Sharing/BackendTest.php
index dd2681d149f7f..556a623a73f31 100644
--- a/apps/dav/tests/unit/DAV/Sharing/BackendTest.php
+++ b/apps/dav/tests/unit/DAV/Sharing/BackendTest.php
@@ -24,14 +24,14 @@
 
 class BackendTest extends TestCase {
 
-	private IDBConnection|MockObject $db;
-	private IUserManager|MockObject $userManager;
-	private IGroupManager|MockObject $groupManager;
-	private MockObject|Principal $principalBackend;
-	private MockObject|ICache $shareCache;
-	private LoggerInterface|MockObject $logger;
-	private MockObject|ICacheFactory $cacheFactory;
-	private Service|MockObject $calendarService;
+	private IDBConnection&MockObject $db;
+	private IUserManager&MockObject $userManager;
+	private IGroupManager&MockObject $groupManager;
+	private Principal&MockObject $principalBackend;
+	private ICache&MockObject $shareCache;
+	private LoggerInterface&MockObject $logger;
+	private ICacheFactory&MockObject $cacheFactory;
+	private Service&MockObject $calendarService;
 	private CalendarSharingBackend $backend;
 
 	protected function setUp(): void {
diff --git a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
index 9c6950f19e818..7a88f7cc5ddde 100644
--- a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
+++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,6 +13,7 @@
 use OCA\DAV\DAV\Sharing\Plugin;
 use OCP\IConfig;
 use OCP\IRequest;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Server;
 use Sabre\DAV\SimpleCollection;
 use Sabre\HTTP\Request;
@@ -19,32 +21,24 @@
 use Test\TestCase;
 
 class PluginTest extends TestCase {
-
-	/** @var Plugin */
-	private $plugin;
-	/** @var Server */
-	private $server;
-	/** @var IShareable | \PHPUnit\Framework\MockObject\MockObject */
-	private $book;
+	private Plugin $plugin;
+	private Server $server;
+	private IShareable&MockObject $book;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		/** @var Auth | \PHPUnit\Framework\MockObject\MockObject $authBackend */
-		$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock();
+		$authBackend = $this->createMock(Auth::class);
 		$authBackend->method('isDavAuthenticated')->willReturn(true);
 
-		/** @var IRequest $request */
-		$request = $this->getMockBuilder(IRequest::class)->disableOriginalConstructor()->getMock();
+		$request = $this->createMock(IRequest::class);
 		$config = $this->createMock(IConfig::class);
 		$this->plugin = new Plugin($authBackend, $request, $config);
 
 		$root = new SimpleCollection('root');
 		$this->server = new \Sabre\DAV\Server($root);
 		/** @var SimpleCollection $node */
-		$this->book = $this->getMockBuilder(IShareable::class)->
-			disableOriginalConstructor()->
-			getMock();
+		$this->book = $this->createMock(IShareable::class);
 		$this->book->method('getName')->willReturn('addressbook1.vcf');
 		$root->addChild($this->book);
 		$this->plugin->initialize($this->server);
diff --git a/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php
index 329168040808d..127de1ede0a46 100644
--- a/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php
+++ b/apps/dav/tests/unit/DAV/SystemPrincipalBackendTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,22 +9,21 @@
 namespace OCA\DAV\Tests\unit\DAV;
 
 use OCA\DAV\DAV\SystemPrincipalBackend;
+use Sabre\DAV\Exception;
 use Test\TestCase;
 
 class SystemPrincipalBackendTest extends TestCase {
 
 	/**
 	 * @dataProvider providesPrefix
-	 * @param $expected
-	 * @param $prefix
 	 */
-	public function testGetPrincipalsByPrefix($expected, $prefix): void {
+	public function testGetPrincipalsByPrefix(array $expected, string $prefix): void {
 		$backend = new SystemPrincipalBackend();
 		$result = $backend->getPrincipalsByPrefix($prefix);
 		$this->assertEquals($expected, $result);
 	}
 
-	public function providesPrefix() {
+	public static function providesPrefix(): array {
 		return [
 			[[], ''],
 			[[[
@@ -40,16 +40,14 @@ public function providesPrefix() {
 
 	/**
 	 * @dataProvider providesPath
-	 * @param $expected
-	 * @param $path
 	 */
-	public function testGetPrincipalByPath($expected, $path): void {
+	public function testGetPrincipalByPath(?array $expected, string $path): void {
 		$backend = new SystemPrincipalBackend();
 		$result = $backend->getPrincipalByPath($path);
 		$this->assertEquals($expected, $result);
 	}
 
-	public function providesPath() {
+	public static function providesPath(): array {
 		return [
 			[null, ''],
 			[null, 'principals'],
@@ -63,28 +61,22 @@ public function providesPath() {
 
 	/**
 	 * @dataProvider providesPrincipalForGetGroupMemberSet
-	 *
-	 * @param string $principal
-	 * @throws \Sabre\DAV\Exception
 	 */
-	public function testGetGroupMemberSetExceptional($principal): void {
-		$this->expectException(\Sabre\DAV\Exception::class);
+	public function testGetGroupMemberSetExceptional(?string $principal): void {
+		$this->expectException(Exception::class);
 		$this->expectExceptionMessage('Principal not found');
 
 		$backend = new SystemPrincipalBackend();
 		$backend->getGroupMemberSet($principal);
 	}
 
-	public function providesPrincipalForGetGroupMemberSet() {
+	public static function providesPrincipalForGetGroupMemberSet(): array {
 		return [
 			[null],
 			['principals/system'],
 		];
 	}
 
-	/**
-	 * @throws \Sabre\DAV\Exception
-	 */
 	public function testGetGroupMemberSet(): void {
 		$backend = new SystemPrincipalBackend();
 		$result = $backend->getGroupMemberSet('principals/system/system');
@@ -93,27 +85,21 @@ public function testGetGroupMemberSet(): void {
 
 	/**
 	 * @dataProvider providesPrincipalForGetGroupMembership
-	 *
-	 * @param string $principal
-	 * @throws \Sabre\DAV\Exception
 	 */
-	public function testGetGroupMembershipExceptional($principal): void {
-		$this->expectException(\Sabre\DAV\Exception::class);
+	public function testGetGroupMembershipExceptional(string $principal): void {
+		$this->expectException(Exception::class);
 		$this->expectExceptionMessage('Principal not found');
 
 		$backend = new SystemPrincipalBackend();
 		$backend->getGroupMembership($principal);
 	}
 
-	public function providesPrincipalForGetGroupMembership() {
+	public static function providesPrincipalForGetGroupMembership(): array {
 		return [
 			['principals/system/a'],
 		];
 	}
 
-	/**
-	 * @throws \Sabre\DAV\Exception
-	 */
 	public function testGetGroupMembership(): void {
 		$backend = new SystemPrincipalBackend();
 		$result = $backend->getGroupMembership('principals/system/system');
diff --git a/apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php b/apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php
index 7a4828dd2de53..9227d34b30f4b 100644
--- a/apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php
+++ b/apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2019 ownCloud GmbH
@@ -20,30 +21,29 @@
 use OCP\IUser;
 use OCP\Share\IAttributes;
 use OCP\Share\IShare;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Server;
 use Sabre\DAV\Tree;
 use Sabre\HTTP\RequestInterface;
 use Test\TestCase;
 
 class ViewOnlyPluginTest extends TestCase {
-
+	private Tree&MockObject $tree;
+	private RequestInterface&MockObject $request;
+	private Folder&MockObject $userFolder;
 	private ViewOnlyPlugin $plugin;
-	/** @var Tree | \PHPUnit\Framework\MockObject\MockObject */
-	private $tree;
-	/** @var RequestInterface | \PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-	/** @var Folder | \PHPUnit\Framework\MockObject\MockObject */
-	private $userFolder;
 
 	public function setUp(): void {
+		parent::setUp();
+
 		$this->userFolder = $this->createMock(Folder::class);
-		$this->plugin = new ViewOnlyPlugin(
-			$this->userFolder,
-		);
 		$this->request = $this->createMock(RequestInterface::class);
 		$this->tree = $this->createMock(Tree::class);
-
 		$server = $this->createMock(Server::class);
+
+		$this->plugin = new ViewOnlyPlugin(
+			$this->userFolder,
+		);
 		$server->tree = $this->tree;
 
 		$this->plugin->initialize($server);
@@ -71,7 +71,7 @@ public function testCanGetNonShared(): void {
 		$this->assertTrue($this->plugin->checkViewOnly($this->request));
 	}
 
-	public function providesDataForCanGet(): array {
+	public static function providesDataForCanGet(): array {
 		return [
 			// has attribute permissions-download enabled - can get file
 			[false, true, true],
diff --git a/apps/dav/tests/unit/Direct/DirectFileTest.php b/apps/dav/tests/unit/Direct/DirectFileTest.php
index 07d19807ef02d..f6f0f49fa8c37 100644
--- a/apps/dav/tests/unit/Direct/DirectFileTest.php
+++ b/apps/dav/tests/unit/Direct/DirectFileTest.php
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\Direct;
+namespace OCA\DAV\Tests\unit\Direct;
 
 use OCA\DAV\Db\Direct;
 use OCA\DAV\Direct\DirectFile;
@@ -14,28 +14,17 @@
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Exception\Forbidden;
 use Test\TestCase;
 
 class DirectFileTest extends TestCase {
-
-	/** @var Direct */
-	private $direct;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */
-	private $userFolder;
-
-	/** @var File|\PHPUnit\Framework\MockObject\MockObject */
-	private $file;
-
-	/** @var DirectFile */
-	private $directFile;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+	private Direct $direct;
+	private IRootFolder&MockObject $rootFolder;
+	private Folder&MockObject $userFolder;
+	private File&MockObject $file;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private DirectFile $directFile;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/Direct/DirectHomeTest.php b/apps/dav/tests/unit/Direct/DirectHomeTest.php
index 06fb48a64d807..94c82c2b7c5b9 100644
--- a/apps/dav/tests/unit/Direct/DirectHomeTest.php
+++ b/apps/dav/tests/unit/Direct/DirectHomeTest.php
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\Direct;
+namespace OCA\DAV\Tests\unit\Direct;
 
 use OCA\DAV\Db\Direct;
 use OCA\DAV\Db\DirectMapper;
@@ -18,33 +18,20 @@
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
 use OCP\Security\Bruteforce\IThrottler;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
 use Test\TestCase;
 
 class DirectHomeTest extends TestCase {
-
-	/** @var DirectMapper|\PHPUnit\Framework\MockObject\MockObject */
-	private $directMapper;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-
-	/** @var IThrottler|\PHPUnit\Framework\MockObject\MockObject */
-	private $throttler;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var DirectHome */
-	private $directHome;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+	private DirectMapper&MockObject $directMapper;
+	private IRootFolder&MockObject $rootFolder;
+	private ITimeFactory&MockObject $timeFactory;
+	private IThrottler&MockObject $throttler;
+	private IRequest&MockObject $request;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private DirectHome $directHome;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
index aaa3d8c147ee8..ce56dde5fbdd0 100644
--- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php
+++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
@@ -1,10 +1,12 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Files;
+namespace OCA\DAV\Tests\unit\Files;
 
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
@@ -23,42 +25,26 @@
 use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IUser;
 use OCP\Share\IManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use SearchDAV\Backend\SearchPropertyDefinition;
 use SearchDAV\Query\Limit;
+use SearchDAV\Query\Literal;
 use SearchDAV\Query\Operator;
 use SearchDAV\Query\Query;
+use SearchDAV\Query\Scope;
 use Test\TestCase;
 
 class FileSearchBackendTest extends TestCase {
-	/** @var ObjectTree|\PHPUnit\Framework\MockObject\MockObject */
-	private $tree;
-
-	/** @var IUser */
-	private $user;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $shareManager;
-
-	/** @var View|\PHPUnit\Framework\MockObject\MockObject */
-	private $view;
-
-	/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */
-	private $searchFolder;
-
-	/** @var FileSearchBackend */
-	private $search;
-
-	/** @var Directory|\PHPUnit\Framework\MockObject\MockObject */
-	private $davFolder;
+	private ObjectTree&MockObject $tree;
+	private IUser&MockObject $user;
+	private IRootFolder&MockObject $rootFolder;
+	private IManager&MockObject $shareManager;
+	private View&MockObject $view;
+	private Folder&MockObject $searchFolder;
+	private Directory&MockObject $davFolder;
+	private FileSearchBackend $search;
 
 	protected function setUp(): void {
-		if (PHP_VERSION_ID >= 80400) {
-			$this->markTestSkipped('SearchDAV is not yet PHP 8.4 compatible');
-		}
-
 		parent::setUp();
 
 		$this->user = $this->createMock(IUser::class);
@@ -66,11 +52,13 @@ protected function setUp(): void {
 			->method('getUID')
 			->willReturn('test');
 
-		$this->tree = $this->getMockBuilder(ObjectTree::class)
-			->disableOriginalConstructor()
-			->getMock();
-
+		$this->tree = $this->createMock(ObjectTree::class);
 		$this->view = $this->createMock(View::class);
+		$this->rootFolder = $this->createMock(IRootFolder::class);
+		$this->shareManager = $this->createMock(IManager::class);
+		$this->searchFolder = $this->createMock(Folder::class);
+		$fileInfo = $this->createMock(FileInfo::class);
+		$this->davFolder = $this->createMock(Directory::class);
 
 		$this->view->expects($this->any())
 			->method('getRoot')
@@ -80,16 +68,6 @@ protected function setUp(): void {
 			->method('getRelativePath')
 			->willReturnArgument(0);
 
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-
-		$this->shareManager = $this->createMock(IManager::class);
-
-		$this->searchFolder = $this->createMock(Folder::class);
-
-		$fileInfo = $this->createMock(FileInfo::class);
-
-		$this->davFolder = $this->createMock(Directory::class);
-
 		$this->davFolder->expects($this->any())
 			->method('getFileInfo')
 			->willReturn($fileInfo);
@@ -263,8 +241,8 @@ public function testSearchInvalidProp(): void {
 		$this->search->search($query);
 	}
 
-	private function getBasicQuery($type, $property, $value = null) {
-		$scope = new \SearchDAV\Query\Scope('/', 'infinite');
+	private function getBasicQuery(string $type, string $property, int|string|null $value = null) {
+		$scope = new Scope('/', 'infinite');
 		$scope->path = '/';
 		$from = [$scope];
 		$orderBy = [];
@@ -272,12 +250,12 @@ private function getBasicQuery($type, $property, $value = null) {
 		if (is_null($value)) {
 			$where = new Operator(
 				$type,
-				[new \SearchDAV\Query\Literal($property)]
+				[new Literal($property)]
 			);
 		} else {
 			$where = new Operator(
 				$type,
-				[new SearchPropertyDefinition($property, true, true, true), new \SearchDAV\Query\Literal($value)]
+				[new SearchPropertyDefinition($property, true, true, true), new Literal($value)]
 			);
 		}
 		$limit = new Limit();
@@ -350,11 +328,11 @@ public function testSearchLimitOwnerNested(): void {
 			[
 				new Operator(
 					Operator::OPERATION_EQUAL,
-					[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new \SearchDAV\Query\Literal('image/png')]
+					[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
 				),
 				new Operator(
 					Operator::OPERATION_EQUAL,
-					[new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, true), new \SearchDAV\Query\Literal($this->user->getUID())]
+					[new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, true), new Literal($this->user->getUID())]
 				),
 			]
 		);
@@ -383,7 +361,7 @@ public function testSearchOperatorLimit(): void {
 
 		$innerOperator = new Operator(
 			Operator::OPERATION_EQUAL,
-			[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new \SearchDAV\Query\Literal('image/png')]
+			[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
 		);
 		// 5 child operators
 		$level1Operator = new Operator(
diff --git a/apps/dav/tests/unit/Files/MultipartRequestParserTest.php b/apps/dav/tests/unit/Files/MultipartRequestParserTest.php
index 40880bdca9cc4..dc0e884f07c04 100644
--- a/apps/dav/tests/unit/Files/MultipartRequestParserTest.php
+++ b/apps/dav/tests/unit/Files/MultipartRequestParserTest.php
@@ -1,10 +1,12 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-namespace OCA\DAV\Tests\unit\DAV;
+namespace OCA\DAV\Tests\unit\Files;
 
 use OCA\DAV\BulkUpload\MultipartRequestParser;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -17,10 +19,11 @@ class MultipartRequestParserTest extends TestCase {
 	protected LoggerInterface&MockObject $logger;
 
 	protected function setUp(): void {
+		parent::setUp();
 		$this->logger = $this->createMock(LoggerInterface::class);
 	}
 
-	private function getValidBodyObject() {
+	private static function getValidBodyObject(): array {
 		return [
 			[
 				'headers' => [
@@ -99,7 +102,7 @@ public function testBodyTypeValidation(): void {
 	 * - valid file path
 	 */
 	public function testValidRequest(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		unset($bodyObject['0']['headers']['X-File-MD5']);
 
 		$multipartParser = $this->getMultipartParser($bodyObject);
@@ -122,7 +125,7 @@ public function testValidRequest(): void {
 	 * - valid file path
 	 */
 	public function testValidRequestWithMd5(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		unset($bodyObject['0']['headers']['OC-Checksum']);
 
 		$multipartParser = $this->getMultipartParser($bodyObject);
@@ -140,7 +143,7 @@ public function testValidRequestWithMd5(): void {
 	 * Test with invalid hash.
 	 */
 	public function testInvalidHash(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$bodyObject['0']['headers']['OC-Checksum'] = 'md5:f2377b4d911f7ec46325fe603c3af03';
 		unset($bodyObject['0']['headers']['X-File-MD5']);
 		$multipartParser = $this->getMultipartParser(
@@ -155,7 +158,7 @@ public function testInvalidHash(): void {
 	 * Test with invalid md5 hash.
 	 */
 	public function testInvalidMd5Hash(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		unset($bodyObject['0']['headers']['OC-Checksum']);
 		$bodyObject['0']['headers']['X-File-MD5'] = 'f2377b4d911f7ec46325fe603c3af03';
 		$multipartParser = $this->getMultipartParser(
@@ -170,7 +173,7 @@ public function testInvalidMd5Hash(): void {
 	 * Test with a null hash headers.
 	 */
 	public function testNullHash(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		unset($bodyObject['0']['headers']['OC-Checksum']);
 		unset($bodyObject['0']['headers']['X-File-MD5']);
 		$multipartParser = $this->getMultipartParser(
@@ -185,7 +188,7 @@ public function testNullHash(): void {
 	 * Test with a null Content-Length.
 	 */
 	public function testNullContentLength(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		unset($bodyObject['0']['headers']['Content-Length']);
 		$multipartParser = $this->getMultipartParser(
 			$bodyObject
@@ -199,7 +202,7 @@ public function testNullContentLength(): void {
 	 * Test with a lower Content-Length.
 	 */
 	public function testLowerContentLength(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$bodyObject['0']['headers']['Content-Length'] = 6;
 		$multipartParser = $this->getMultipartParser(
 			$bodyObject
@@ -213,7 +216,7 @@ public function testLowerContentLength(): void {
 	 * Test with a higher Content-Length.
 	 */
 	public function testHigherContentLength(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$bodyObject['0']['headers']['Content-Length'] = 8;
 		$multipartParser = $this->getMultipartParser(
 			$bodyObject
@@ -227,7 +230,7 @@ public function testHigherContentLength(): void {
 	 * Test with wrong boundary in body.
 	 */
 	public function testWrongBoundary(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$multipartParser = $this->getMultipartParser(
 			$bodyObject,
 			['Content-Type' => 'multipart/related; boundary=boundary_poiuytreza']
@@ -241,7 +244,7 @@ public function testWrongBoundary(): void {
 	 * Test with no boundary in request headers.
 	 */
 	public function testNoBoundaryInHeader(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$this->expectExceptionMessage('Error while parsing boundary in Content-Type header.');
 		$this->getMultipartParser(
 			$bodyObject,
@@ -253,7 +256,7 @@ public function testNoBoundaryInHeader(): void {
 	 * Test with no boundary in the request's headers.
 	 */
 	public function testNoBoundaryInBody(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$multipartParser = $this->getMultipartParser(
 			$bodyObject,
 			['Content-Type' => 'multipart/related; boundary=boundary_azertyuiop'],
@@ -268,7 +271,7 @@ public function testNoBoundaryInBody(): void {
 	 * Test with a boundary with quotes in the request's headers.
 	 */
 	public function testBoundaryWithQuotes(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$multipartParser = $this->getMultipartParser(
 			$bodyObject,
 			['Content-Type' => 'multipart/related; boundary="boundary_azertyuiop"'],
@@ -284,7 +287,7 @@ public function testBoundaryWithQuotes(): void {
 	 * Test with a wrong Content-Type in the request's headers.
 	 */
 	public function testWrongContentType(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$this->expectExceptionMessage('Content-Type must be multipart/related');
 		$this->getMultipartParser(
 			$bodyObject,
@@ -296,7 +299,7 @@ public function testWrongContentType(): void {
 	 * Test with a wrong key after the content type in the request's headers.
 	 */
 	public function testWrongKeyInContentType(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$this->expectExceptionMessage('Boundary is invalid');
 		$this->getMultipartParser(
 			$bodyObject,
@@ -308,7 +311,7 @@ public function testWrongKeyInContentType(): void {
 	 * Test with a null Content-Type in the request's headers.
 	 */
 	public function testNullContentType(): void {
-		$bodyObject = $this->getValidBodyObject();
+		$bodyObject = self::getValidBodyObject();
 		$this->expectExceptionMessage('Content-Type can not be null');
 		$this->getMultipartParser(
 			$bodyObject,
diff --git a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
index 16891ced3d0b1..545bea9a40691 100644
--- a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
+++ b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Files\Sharing;
+namespace OCA\DAV\Tests\unit\Files\Sharing;
 
 use OCA\DAV\Files\Sharing\FilesDropPlugin;
 use OCP\Files\Folder;
@@ -205,7 +207,7 @@ public function testRecursiveFolderCreation(): void {
 		$this->request->method('getHeader')
 			->with('X-NC-Nickname')
 			->willReturn('nickname');
-		
+
 		$this->request->method('getPath')
 			->willReturn('/files/token/folder/subfolder/file.txt');
 		$this->request->method('getBaseUrl')
diff --git a/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php b/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php
index 78769c7fb4779..7bd7bdc21673d 100644
--- a/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php
+++ b/apps/dav/tests/unit/Listener/ActivityUpdaterListenerTest.php
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\Listener;
+namespace OCA\DAV\Tests\unit\Listener;
 
 use OCA\DAV\CalDAV\Activity\Backend as ActivityBackend;
 use OCA\DAV\CalDAV\Activity\Provider\Event;
@@ -20,10 +20,8 @@
 
 class ActivityUpdaterListenerTest extends TestCase {
 
-	/** @var ActivityBackend|MockObject */
-	private $activityBackend;
-	/** @var LoggerInterface|MockObject */
-	private $logger;
+	private ActivityBackend&MockObject $activityBackend;
+	private LoggerInterface&MockObject $logger;
 	private ActivityUpdaterListener $listener;
 
 	protected function setUp(): void {
@@ -55,7 +53,7 @@ public function testHandleCalendarObjectDeletedEvent(int $calendarId, array $cal
 		$this->listener->handle($event);
 	}
 
-	public function dataForTestHandleCalendarObjectDeletedEvent(): array {
+	public static function dataForTestHandleCalendarObjectDeletedEvent(): array {
 		return [
 			[1, [], [], [], true],
 			[1, [], [], ['{' . SharingPlugin::NS_NEXTCLOUD . '}deleted-at' => 120], false],
@@ -77,7 +75,7 @@ public function testHandleCalendarDeletedEvent(int $calendarId, array $calendarD
 		$this->listener->handle($event);
 	}
 
-	public function dataForTestHandleCalendarDeletedEvent(): array {
+	public static function dataForTestHandleCalendarDeletedEvent(): array {
 		return [
 			[1, [], [], true],
 			[1, ['{' . SharingPlugin::NS_NEXTCLOUD . '}deleted-at' => 120], [], false],
diff --git a/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php b/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php
index 96d8514da41a5..dc3dce8a62fc7 100644
--- a/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php
+++ b/apps/dav/tests/unit/Listener/CalendarContactInteractionListenerTest.php
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\Listener;
+namespace OCA\DAV\Tests\unit\Listener;
 
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\Events\CalendarShareUpdatedEvent;
@@ -23,24 +23,12 @@
 use Test\TestCase;
 
 class CalendarContactInteractionListenerTest extends TestCase {
-
-	/** @var IEventDispatcher|MockObject */
-	private $eventDispatcher;
-
-	/** @var IUserSession|MockObject */
-	private $userSession;
-
-	/** @var Principal|MockObject */
-	private $principalConnector;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var IMailer|MockObject */
-	private $mailer;
-
-	/** @var CalendarContactInteractionListener */
-	private $listener;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private IUserSession&MockObject $userSession;
+	private Principal&MockObject $principalConnector;
+	private LoggerInterface&MockObject $logger;
+	private IMailer&MockObject $mailer;
+	private CalendarContactInteractionListener $listener;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/Listener/OutOfOfficeListenerTest.php b/apps/dav/tests/unit/Listener/OutOfOfficeListenerTest.php
index a21d3a5e928fa..971d113b742c0 100644
--- a/apps/dav/tests/unit/Listener/OutOfOfficeListenerTest.php
+++ b/apps/dav/tests/unit/Listener/OutOfOfficeListenerTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Unit\Listener;
+namespace OCA\DAV\Tests\unit\Listener;
 
 use DateTimeImmutable;
 use InvalidArgumentException;
@@ -27,7 +27,6 @@
 use OCP\User\Events\OutOfOfficeClearedEvent;
 use OCP\User\Events\OutOfOfficeScheduledEvent;
 use OCP\User\IOutOfOfficeData;
-use OCP\UserStatus\IManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Exception\NotFound;
@@ -42,11 +41,10 @@
  */
 class OutOfOfficeListenerTest extends TestCase {
 
-	private ServerFactory|MockObject $serverFactory;
-	private IConfig|MockObject $appConfig;
-	private LoggerInterface|MockObject $loggerInterface;
-	private MockObject|TimezoneService $timezoneService;
-	private IManager|MockObject $manager;
+	private ServerFactory&MockObject $serverFactory;
+	private IConfig&MockObject $appConfig;
+	private LoggerInterface&MockObject $loggerInterface;
+	private TimezoneService&MockObject $timezoneService;
 	private OutOfOfficeListener $listener;
 
 	protected function setUp(): void {
@@ -56,14 +54,12 @@ protected function setUp(): void {
 		$this->appConfig = $this->createMock(IConfig::class);
 		$this->timezoneService = $this->createMock(TimezoneService::class);
 		$this->loggerInterface = $this->createMock(LoggerInterface::class);
-		$this->manager = $this->createMock(IManager::class);
 
 		$this->listener = new OutOfOfficeListener(
 			$this->serverFactory,
 			$this->appConfig,
 			$this->timezoneService,
 			$this->loggerInterface,
-			$this->manager
 		);
 	}
 
@@ -453,8 +449,6 @@ public function testHandleClearNoCalendarHome(): void {
 			->method('getPlugin')
 			->with('caldav')
 			->willReturn($caldavPlugin);
-		$this->manager->expects(self::never())
-			->method('revertUserStatus');
 		$event = new OutOfOfficeClearedEvent($data);
 
 		$this->listener->handle($event);
@@ -483,8 +477,6 @@ public function testHandleClearNoCalendarHomeNode(): void {
 			->method('getNodeForPath')
 			->with('/home/calendar')
 			->willThrowException(new NotFound('nope'));
-		$this->manager->expects(self::never())
-			->method('revertUserStatus');
 		$event = new OutOfOfficeClearedEvent($data);
 
 		$this->listener->handle($event);
@@ -522,8 +514,6 @@ public function testHandleClearPersonalCalendarNotFound(): void {
 			->method('getChild')
 			->with('personal-1')
 			->willThrowException(new NotFound('nope'));
-		$this->manager->expects(self::never())
-			->method('revertUserStatus');
 		$event = new OutOfOfficeClearedEvent($data);
 
 		$this->listener->handle($event);
@@ -565,8 +555,6 @@ public function testHandleClearRecreate(): void {
 		$calendar->expects(self::once())
 			->method('getChild')
 			->willThrowException(new NotFound());
-		$this->manager->expects(self::never())
-			->method('revertUserStatus');
 		$event = new OutOfOfficeClearedEvent($data);
 
 		$this->listener->handle($event);
diff --git a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
index be2c64c47a4b3..1852d2709c19d 100644
--- a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
+++ b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
@@ -1,15 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\DAV\Migration;
+namespace OCA\DAV\Tests\unit\DAV\Migration;
 
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\Migration\CalDAVRemoveEmptyValue;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Server;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Sabre\VObject\InvalidDataException;
 use Test\TestCase;
@@ -21,18 +24,10 @@
  * @group DB
  */
 class CalDAVRemoveEmptyValueTest extends TestCase {
-
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-
-	/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject */
-	private $backend;
-
-	/** @var IOutput|\PHPUnit\Framework\MockObject\MockObject */
-	private $output;
-
-	/** @var string */
-	private $invalid = 'BEGIN:VCALENDAR
+	private LoggerInterface&MockObject $logger;
+	private CalDavBackend&MockObject $backend;
+	private IOutput&MockObject $output;
+	private string $invalid = 'BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Apple Inc.//Mac OS X 10.11.2//EN
 CALSCALE:GREGORIAN
@@ -52,8 +47,7 @@ class CalDAVRemoveEmptyValueTest extends TestCase {
 END:VEVENT
 END:VCALENDAR';
 
-	/** @var string */
-	private $valid = 'BEGIN:VCALENDAR
+	private string $valid = 'BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Apple Inc.//Mac OS X 10.11.2//EN
 CALSCALE:GREGORIAN
@@ -82,14 +76,14 @@ protected function setUp(): void {
 	}
 
 	public function testRunAllValid(): void {
-		/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */
+		/** @var CalDAVRemoveEmptyValue&MockObject $step */
 		$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class)
 			->setConstructorArgs([
 				Server::get(IDBConnection::class),
 				$this->backend,
 				$this->logger
 			])
-			->setMethods(['getInvalidObjects'])
+			->onlyMethods(['getInvalidObjects'])
 			->getMock();
 
 		$step->expects($this->once())
@@ -106,14 +100,14 @@ public function testRunAllValid(): void {
 	}
 
 	public function testRunInvalid(): void {
-		/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */
+		/** @var CalDAVRemoveEmptyValue&MockObject $step */
 		$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class)
 			->setConstructorArgs([
 				Server::get(IDBConnection::class),
 				$this->backend,
 				$this->logger
 			])
-			->setMethods(['getInvalidObjects'])
+			->onlyMethods(['getInvalidObjects'])
 			->getMock();
 
 		$step->expects($this->once())
@@ -149,14 +143,14 @@ public function testRunInvalid(): void {
 	}
 
 	public function testRunValid(): void {
-		/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */
+		/** @var CalDAVRemoveEmptyValue&MockObject $step */
 		$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class)
 			->setConstructorArgs([
 				Server::get(IDBConnection::class),
 				$this->backend,
 				$this->logger
 			])
-			->setMethods(['getInvalidObjects'])
+			->onlyMethods(['getInvalidObjects'])
 			->getMock();
 
 		$step->expects($this->once())
@@ -191,14 +185,14 @@ public function testRunValid(): void {
 	}
 
 	public function testRunStillInvalid(): void {
-		/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */
+		/** @var CalDAVRemoveEmptyValue&MockObject $step */
 		$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class)
 			->setConstructorArgs([
 				Server::get(IDBConnection::class),
 				$this->backend,
 				$this->logger
 			])
-			->setMethods(['getInvalidObjects'])
+			->onlyMethods(['getInvalidObjects'])
 			->getMock();
 
 		$step->expects($this->once())
diff --git a/apps/dav/tests/unit/Migration/CreateSystemAddressBookStepTest.php b/apps/dav/tests/unit/Migration/CreateSystemAddressBookStepTest.php
index bbecd0607b495..667d2e39d3a98 100644
--- a/apps/dav/tests/unit/Migration/CreateSystemAddressBookStepTest.php
+++ b/apps/dav/tests/unit/Migration/CreateSystemAddressBookStepTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Unit\Migration;
+namespace OCA\DAV\Tests\unit\Migration;
 
 use OCA\DAV\CardDAV\SyncService;
 use OCA\DAV\Migration\CreateSystemAddressBookStep;
@@ -17,7 +17,7 @@
 
 class CreateSystemAddressBookStepTest extends TestCase {
 
-	private SyncService|MockObject $syncService;
+	private SyncService&MockObject $syncService;
 	private CreateSystemAddressBookStep $step;
 
 	protected function setUp(): void {
diff --git a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
index bf4c60b3cf11d..73d9c1efd2960 100644
--- a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
+++ b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,17 +14,13 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class RefreshWebcalJobRegistrarTest extends TestCase {
-	/** @var IDBConnection | \PHPUnit\Framework\MockObject\MockObject */
-	private $db;
-
-	/** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var RefreshWebcalJobRegistrar */
-	private $migration;
+	private IDBConnection&MockObject $db;
+	private IJobList&MockObject $jobList;
+	private RefreshWebcalJobRegistrar $migration;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -80,35 +78,37 @@ public function testRun(): void {
 
 		$this->jobList->expects($this->exactly(3))
 			->method('has')
-			->withConsecutive(
+			->willReturnMap([
 				[RefreshWebcalJob::class, [
 					'principaluri' => 'foo1',
 					'uri' => 'bar1',
-				]],
+				], false],
 				[RefreshWebcalJob::class, [
 					'principaluri' => 'foo2',
 					'uri' => 'bar2',
-				]],
+				], true ],
 				[RefreshWebcalJob::class, [
 					'principaluri' => 'foo3',
 					'uri' => 'bar3',
-				]])
-			->willReturnOnConsecutiveCalls(
-				false,
-				true,
-				false,
-			);
+				], false],
+			]);
+
+		$calls = [
+			[RefreshWebcalJob::class, [
+				'principaluri' => 'foo1',
+				'uri' => 'bar1',
+			]],
+			[RefreshWebcalJob::class, [
+				'principaluri' => 'foo3',
+				'uri' => 'bar3',
+			]]
+		];
 		$this->jobList->expects($this->exactly(2))
 			->method('add')
-			->withConsecutive(
-				[RefreshWebcalJob::class, [
-					'principaluri' => 'foo1',
-					'uri' => 'bar1',
-				]],
-				[RefreshWebcalJob::class, [
-					'principaluri' => 'foo3',
-					'uri' => 'bar3',
-				]]);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		$output->expects($this->once())
 			->method('info')
diff --git a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
index e2ac45526d2a7..6f681badb8bfc 100644
--- a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
+++ b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,18 +12,13 @@
 use OCP\BackgroundJob\IJobList;
 use OCP\IConfig;
 use OCP\Migration\IOutput;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class RegenerateBirthdayCalendarsTest extends TestCase {
-
-	/** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-
-	/** @var RegenerateBirthdayCalendars */
-	private $migration;
+	private IJobList&MockObject $jobList;
+	private IConfig&MockObject $config;
+	private RegenerateBirthdayCalendars $migration;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/Migration/RemoveDeletedUsersCalendarSubscriptionsTest.php b/apps/dav/tests/unit/Migration/RemoveDeletedUsersCalendarSubscriptionsTest.php
index a3daf1c918a83..0a646e91602c8 100644
--- a/apps/dav/tests/unit/Migration/RemoveDeletedUsersCalendarSubscriptionsTest.php
+++ b/apps/dav/tests/unit/Migration/RemoveDeletedUsersCalendarSubscriptionsTest.php
@@ -22,23 +22,10 @@
 use Test\TestCase;
 
 class RemoveDeletedUsersCalendarSubscriptionsTest extends TestCase {
-	/**
-	 * @var IDBConnection|MockObject
-	 */
-	private $dbConnection;
-	/**
-	 * @var IUserManager|MockObject
-	 */
-	private $userManager;
-
-	/**
-	 * @var IOutput|MockObject
-	 */
-	private $output;
-	/**
-	 * @var RemoveDeletedUsersCalendarSubscriptions
-	 */
-	private $migration;
+	private IDBConnection&MockObject $dbConnection;
+	private IUserManager&MockObject $userManager;
+	private IOutput&MockObject $output;
+	private RemoveDeletedUsersCalendarSubscriptions $migration;
 
 
 	protected function setUp(): void {
@@ -60,10 +47,6 @@ public function testGetName(): void {
 
 	/**
 	 * @dataProvider dataTestRun
-	 * @param array $subscriptions
-	 * @param array $userExists
-	 * @param int $deletions
-	 * @throws \Exception
 	 */
 	public function testRun(array $subscriptions, array $userExists, int $deletions): void {
 		$qb = $this->createMock(IQueryBuilder::class);
@@ -132,21 +115,28 @@ public function testRun(array $subscriptions, array $userExists, int $deletions)
 		$this->migration->run($this->output);
 	}
 
-	public function dataTestRun(): array {
+	public static function dataTestRun(): array {
 		return [
 			[[], [], 0],
-			[[[
-				'id' => 1,
-				'principaluri' => 'users/principals/foo1',
-			],
+			[
 				[
-					'id' => 2,
-					'principaluri' => 'users/principals/bar1',
+					[
+						'id' => 1,
+						'principaluri' => 'users/principals/foo1',
+					],
+					[
+						'id' => 2,
+						'principaluri' => 'users/principals/bar1',
+					],
+					[
+						'id' => 3,
+						'principaluri' => 'users/principals/bar1',
+					],
+					[],
 				],
-				[
-					'id' => 3,
-					'principaluri' => 'users/principals/bar1',
-				]], ['foo1' => true, 'bar1' => false], 2]
+				['foo1' => true, 'bar1' => false],
+				2
+			],
 		];
 	}
 }
diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
index 0979aff8a81b8..53de908ca2709 100644
--- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
+++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -7,15 +9,13 @@
 
 use OCA\DAV\Provisioning\Apple\AppleProvisioningNode;
 use OCP\AppFramework\Utility\ITimeFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\DAV\PropPatch;
 use Test\TestCase;
 
 class AppleProvisioningNodeTest extends TestCase {
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-
-	/** @var AppleProvisioningNode */
-	private $node;
+	private ITimeFactory&MockObject $timeFactory;
+	private AppleProvisioningNode $node;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -28,7 +28,6 @@ public function testGetName(): void {
 		$this->assertEquals('apple-provisioning.mobileconfig', $this->node->getName());
 	}
 
-
 	public function testSetName(): void {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 		$this->expectExceptionMessage('Renaming apple-provisioning.mobileconfig is forbidden');
diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
index dbb399ea7a6a6..ba44efe742196 100644
--- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
+++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,40 +14,27 @@
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
+use Sabre\DAV\Server;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 use Test\TestCase;
 
 class AppleProvisioningPluginTest extends TestCase {
-	/** @var \Sabre\DAV\Server|\PHPUnit\Framework\MockObject\MockObject */
-	protected $server;
-
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	protected $userSession;
-
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	protected $urlGenerator;
-
-	/** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */
-	protected $themingDefaults;
-
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	protected $request;
-
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	protected $l10n;
-
-	/** @var \Sabre\HTTP\RequestInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $sabreRequest;
-
-	/** @var \Sabre\HTTP\ResponseInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $sabreResponse;
-
-	/** @var AppleProvisioningPlugin */
-	protected $plugin;
+	protected Server&MockObject $server;
+	protected IUserSession&MockObject $userSession;
+	protected IURLGenerator&MockObject $urlGenerator;
+	protected ThemingDefaults&MockObject $themingDefaults;
+	protected IRequest&MockObject $request;
+	protected IL10N&MockObject $l10n;
+	protected RequestInterface&MockObject $sabreRequest;
+	protected ResponseInterface&MockObject $sabreResponse;
+	protected AppleProvisioningPlugin $plugin;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->server = $this->createMock(\Sabre\DAV\Server::class);
+		$this->server = $this->createMock(Server::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
@@ -62,12 +51,12 @@ function () {
 			}
 		);
 
-		$this->sabreRequest = $this->createMock(\Sabre\HTTP\RequestInterface::class);
-		$this->sabreResponse = $this->createMock(\Sabre\HTTP\ResponseInterface::class);
+		$this->sabreRequest = $this->createMock(RequestInterface::class);
+		$this->sabreResponse = $this->createMock(ResponseInterface::class);
 	}
 
 	public function testInitialize(): void {
-		$server = $this->createMock(\Sabre\DAV\Server::class);
+		$server = $this->createMock(Server::class);
 
 		$plugin = new AppleProvisioningPlugin($this->userSession,
 			$this->urlGenerator, $this->themingDefaults, $this->request, $this->l10n,
@@ -149,24 +138,25 @@ public function testHttpGetOnHttps(): void {
 
 		$this->l10n->expects($this->exactly(2))
 			->method('t')
-			->withConsecutive(
-				['Configures a CalDAV account'],
-				['Configures a CardDAV account'],
-			)
-			->willReturnOnConsecutiveCalls(
-				'LocalizedConfiguresCalDAV',
-				'LocalizedConfiguresCardDAV',
-			);
+			->willReturnMap([
+				['Configures a CalDAV account', [], 'LocalizedConfiguresCalDAV'],
+				['Configures a CardDAV account', [], 'LocalizedConfiguresCardDAV'],
+			]);
 
 		$this->sabreResponse->expects($this->once())
 			->method('setStatus')
 			->with(200);
+
+		$calls = [
+			['Content-Disposition', 'attachment; filename="userName-apple-provisioning.mobileconfig"'],
+			['Content-Type', 'application/xml; charset=utf-8'],
+		];
 		$this->sabreResponse->expects($this->exactly(2))
 			->method('setHeader')
-			->withConsecutive(
-				['Content-Disposition', 'attachment; filename="userName-apple-provisioning.mobileconfig"'],
-				['Content-Type', 'application/xml; charset=utf-8'],
-			);
+			->willReturnCallback(function () use (&$calls) {
+				$expected = array_shift($calls);
+				$this->assertEquals($expected, func_get_args());
+			});
 		$this->sabreResponse->expects($this->once())
 			->method('setBody')
 			->with(<<<EOF
diff --git a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
index 0a83d238f0f5d..f0e5a5ea354bd 100644
--- a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
@@ -17,27 +17,18 @@
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\Reader;
 use Test\TestCase;
 
 class ContactsSearchProviderTest extends TestCase {
+	private IAppManager&MockObject $appManager;
+	private IL10N&MockObject $l10n;
+	private IURLGenerator&MockObject $urlGenerator;
+	private CardDavBackend&MockObject $backend;
+	private ContactsSearchProvider $provider;
 
-	/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $appManager;
-
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
-
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $urlGenerator;
-
-	/** @var CardDavBackend|\PHPUnit\Framework\MockObject\MockObject */
-	private $backend;
-
-	/** @var ContactsSearchProvider */
-	private $provider;
-
-	private $vcardTest0 = 'BEGIN:VCARD' . PHP_EOL .
+	private string $vcardTest0 = 'BEGIN:VCARD' . PHP_EOL .
 		'VERSION:3.0' . PHP_EOL .
 		'PRODID:-//Sabre//Sabre VObject 4.1.2//EN' . PHP_EOL .
 		'UID:Test' . PHP_EOL .
@@ -46,7 +37,7 @@ class ContactsSearchProviderTest extends TestCase {
 		'EMAIL:forrestgump@example.com' . PHP_EOL .
 		'END:VCARD';
 
-	private $vcardTest1 = 'BEGIN:VCARD' . PHP_EOL .
+	private string $vcardTest1 = 'BEGIN:VCARD' . PHP_EOL .
 		'VERSION:3.0' . PHP_EOL .
 		'PRODID:-//Sabre//Sabre VObject 4.1.2//EN' . PHP_EOL .
 		'PHOTO;ENCODING=b;TYPE=image/jpeg:' . PHP_EOL .
@@ -174,7 +165,7 @@ public function testSearch(): void {
 				$this->urlGenerator,
 				$this->backend,
 			])
-			->setMethods([
+			->onlyMethods([
 				'getDavUrlForContact',
 				'getDeepLinkToContactsApp',
 				'generateSubline',
@@ -191,11 +182,10 @@ public function testSearch(): void {
 			->willReturn('subline');
 		$provider->expects($this->exactly(2))
 			->method('getDeepLinkToContactsApp')
-			->withConsecutive(
-				['addressbook-uri-99', 'Test'],
-				['addressbook-uri-123', 'Test2']
-			)
-			->willReturn('deep-link-to-contacts');
+			->willReturnMap([
+				['addressbook-uri-99', 'Test', 'deep-link-to-contacts'],
+				['addressbook-uri-123', 'Test2', 'deep-link-to-contacts'],
+			]);
 
 		$actual = $provider->search($user, $query);
 		$data = $actual->jsonSerialize();
diff --git a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
index 0eafe0782e5a9..7c0b74e8ff319 100644
--- a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
@@ -18,27 +18,19 @@
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\Reader;
 use Test\TestCase;
 
 class EventsSearchProviderTest extends TestCase {
-	/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $appManager;
-
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
-
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $urlGenerator;
-
-	/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject */
-	private $backend;
-
-	/** @var EventsSearchProvider */
-	private $provider;
+	private IAppManager&MockObject $appManager;
+	private IL10N&MockObject $l10n;
+	private IURLGenerator&MockObject $urlGenerator;
+	private CalDavBackend&MockObject $backend;
+	private EventsSearchProvider $provider;
 
 	// NO SUMMARY
-	private $vEvent0 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent0 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -54,7 +46,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// TIMED SAME DAY
-	private $vEvent1 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent1 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Tests//' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -88,7 +80,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// TIMED DIFFERENT DAY
-	private $vEvent2 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent2 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Tests//' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -122,7 +114,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// ALL-DAY ONE-DAY
-	private $vEvent3 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent3 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -138,7 +130,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// ALL-DAY MULTIPLE DAYS
-	private $vEvent4 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent4 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -154,7 +146,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// DURATION
-	private $vEvent5 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent5 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -170,7 +162,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// NO DTEND - DATE
-	private $vEvent6 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent6 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Apple Inc.//Mac OS X 10.11.6//EN' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -185,7 +177,7 @@ class EventsSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// NO DTEND - DATE-TIME
-	private $vEvent7 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vEvent7 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'PRODID:-//Tests//' . PHP_EOL .
 		'CALSCALE:GREGORIAN' . PHP_EOL .
@@ -327,19 +319,19 @@ public function testSearch(): void {
 					'calendarid' => 99,
 					'calendartype' => CalDavBackend::CALENDAR_TYPE_CALENDAR,
 					'uri' => 'event0.ics',
-					'calendardata' => $this->vEvent0,
+					'calendardata' => self::$vEvent0,
 				],
 				[
 					'calendarid' => 123,
 					'calendartype' => CalDavBackend::CALENDAR_TYPE_CALENDAR,
 					'uri' => 'event1.ics',
-					'calendardata' => $this->vEvent1,
+					'calendardata' => self::$vEvent1,
 				],
 				[
 					'calendarid' => 1337,
 					'calendartype' => CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION,
 					'uri' => 'event2.ics',
-					'calendardata' => $this->vEvent2,
+					'calendardata' => self::$vEvent2,
 				]
 			]);
 
@@ -350,7 +342,7 @@ public function testSearch(): void {
 				$this->urlGenerator,
 				$this->backend,
 			])
-			->setMethods([
+			->onlyMethods([
 				'getDeepLinkToCalendarApp',
 				'generateSubline',
 			])
@@ -361,12 +353,11 @@ public function testSearch(): void {
 			->willReturn('subline');
 		$provider->expects($this->exactly(3))
 			->method('getDeepLinkToCalendarApp')
-			->withConsecutive(
-				['principals/users/john.doe', 'calendar-uri-99', 'event0.ics'],
-				['principals/users/john.doe', 'calendar-uri-123', 'event1.ics'],
-				['principals/users/john.doe', 'subscription-uri-1337', 'event2.ics']
-			)
-			->willReturn('deep-link-to-calendar');
+			->willReturnMap([
+				['principals/users/john.doe', 'calendar-uri-99', 'event0.ics', 'deep-link-to-calendar'],
+				['principals/users/john.doe', 'calendar-uri-123', 'event1.ics', 'deep-link-to-calendar'],
+				['principals/users/john.doe', 'subscription-uri-1337', 'event2.ics', 'deep-link-to-calendar']
+			]);
 
 		$actual = $provider->search($user, $query);
 		$data = $actual->jsonSerialize();
@@ -428,9 +419,6 @@ public function testGetDeepLinkToCalendarApp(): void {
 	}
 
 	/**
-	 * @param string $ics
-	 * @param string $expectedSubline
-	 *
 	 * @dataProvider generateSublineDataProvider
 	 */
 	public function testGenerateSubline(string $ics, string $expectedSubline): void {
@@ -450,15 +438,15 @@ public function testGenerateSubline(string $ics, string $expectedSubline): void
 		$this->assertEquals($expectedSubline, $actual);
 	}
 
-	public function generateSublineDataProvider(): array {
+	public static function generateSublineDataProvider(): array {
 		return [
-			[$this->vEvent1, '08-16 09:00 - 10:00'],
-			[$this->vEvent2, '08-16 09:00 - 08-17 10:00'],
-			[$this->vEvent3, '10-05'],
-			[$this->vEvent4, '10-05 - 10-07'],
-			[$this->vEvent5, '10-05 - 10-09'],
-			[$this->vEvent6, '10-05'],
-			[$this->vEvent7, '08-16 09:00 - 09:00'],
+			[self::$vEvent1, '08-16 09:00 - 10:00'],
+			[self::$vEvent2, '08-16 09:00 - 08-17 10:00'],
+			[self::$vEvent3, '10-05'],
+			[self::$vEvent4, '10-05 - 10-07'],
+			[self::$vEvent5, '10-05 - 10-09'],
+			[self::$vEvent6, '10-05'],
+			[self::$vEvent7, '08-16 09:00 - 09:00'],
 		];
 	}
 }
diff --git a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
index de4e29058daea..bd2420805473c 100644
--- a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php
@@ -17,28 +17,19 @@
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
+use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\Reader;
 use Test\TestCase;
 
 class TasksSearchProviderTest extends TestCase {
-
-	/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $appManager;
-
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
-
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $urlGenerator;
-
-	/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject */
-	private $backend;
-
-	/** @var TasksSearchProvider */
-	private $provider;
+	private IAppManager&MockObject $appManager;
+	private IL10N&MockObject $l10n;
+	private IURLGenerator&MockObject $urlGenerator;
+	private CalDavBackend&MockObject $backend;
+	private TasksSearchProvider $provider;
 
 	// NO DUE NOR COMPLETED NOR SUMMARY
-	private $vTodo0 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vTodo0 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'PRODID:TEST' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'BEGIN:VTODO' . PHP_EOL .
@@ -49,7 +40,7 @@ class TasksSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// DUE AND COMPLETED
-	private $vTodo1 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vTodo1 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'PRODID:TEST' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'BEGIN:VTODO' . PHP_EOL .
@@ -63,7 +54,7 @@ class TasksSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// COMPLETED ONLY
-	private $vTodo2 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vTodo2 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'PRODID:TEST' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'BEGIN:VTODO' . PHP_EOL .
@@ -76,7 +67,7 @@ class TasksSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// DUE DATE
-	private $vTodo3 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vTodo3 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'PRODID:TEST' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'BEGIN:VTODO' . PHP_EOL .
@@ -89,7 +80,7 @@ class TasksSearchProviderTest extends TestCase {
 		'END:VCALENDAR';
 
 	// DUE DATETIME
-	private $vTodo4 = 'BEGIN:VCALENDAR' . PHP_EOL .
+	private static string $vTodo4 = 'BEGIN:VCALENDAR' . PHP_EOL .
 		'PRODID:TEST' . PHP_EOL .
 		'VERSION:2.0' . PHP_EOL .
 		'BEGIN:VTODO' . PHP_EOL .
@@ -204,19 +195,19 @@ public function testSearch(): void {
 					'calendarid' => 99,
 					'calendartype' => CalDavBackend::CALENDAR_TYPE_CALENDAR,
 					'uri' => 'todo0.ics',
-					'calendardata' => $this->vTodo0,
+					'calendardata' => self::$vTodo0,
 				],
 				[
 					'calendarid' => 123,
 					'calendartype' => CalDavBackend::CALENDAR_TYPE_CALENDAR,
 					'uri' => 'todo1.ics',
-					'calendardata' => $this->vTodo1,
+					'calendardata' => self::$vTodo1,
 				],
 				[
 					'calendarid' => 1337,
 					'calendartype' => CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION,
 					'uri' => 'todo2.ics',
-					'calendardata' => $this->vTodo2,
+					'calendardata' => self::$vTodo2,
 				]
 			]);
 
@@ -227,7 +218,7 @@ public function testSearch(): void {
 				$this->urlGenerator,
 				$this->backend,
 			])
-			->setMethods([
+			->onlyMethods([
 				'getDeepLinkToTasksApp',
 				'generateSubline',
 			])
@@ -238,12 +229,11 @@ public function testSearch(): void {
 			->willReturn('subline');
 		$provider->expects($this->exactly(3))
 			->method('getDeepLinkToTasksApp')
-			->withConsecutive(
-				['calendar-uri-99', 'todo0.ics'],
-				['calendar-uri-123', 'todo1.ics'],
-				['subscription-uri-1337', 'todo2.ics']
-			)
-			->willReturn('deep-link-to-tasks');
+			->willReturnMap([
+				['calendar-uri-99', 'todo0.ics', 'deep-link-to-tasks'],
+				['calendar-uri-123', 'todo1.ics', 'deep-link-to-tasks'],
+				['subscription-uri-1337', 'todo2.ics', 'deep-link-to-tasks']
+			]);
 
 		$actual = $provider->search($user, $query);
 		$data = $actual->jsonSerialize();
@@ -300,9 +290,6 @@ public function testGetDeepLinkToTasksApp(): void {
 	}
 
 	/**
-	 * @param string $ics
-	 * @param string $expectedSubline
-	 *
 	 * @dataProvider generateSublineDataProvider
 	 */
 	public function testGenerateSubline(string $ics, string $expectedSubline): void {
@@ -310,19 +297,19 @@ public function testGenerateSubline(string $ics, string $expectedSubline): void
 		$taskComponent = $vCalendar->VTODO;
 
 		$this->l10n->method('t')->willReturnArgument(0);
-		$this->l10n->method('l')->willReturnArgument('');
+		$this->l10n->method('l')->willReturnArgument(0);
 
 		$actual = self::invokePrivate($this->provider, 'generateSubline', [$taskComponent]);
 		$this->assertEquals($expectedSubline, $actual);
 	}
 
-	public function generateSublineDataProvider(): array {
+	public static function generateSublineDataProvider(): array {
 		return [
-			[$this->vTodo0, ''],
-			[$this->vTodo1, 'Completed on %s'],
-			[$this->vTodo2, 'Completed on %s'],
-			[$this->vTodo3, 'Due on %s'],
-			[$this->vTodo4, 'Due on %s by %s'],
+			[self::$vTodo0, ''],
+			[self::$vTodo1, 'Completed on %s'],
+			[self::$vTodo2, 'Completed on %s'],
+			[self::$vTodo3, 'Due on %s'],
+			[self::$vTodo4, 'Due on %s by %s'],
 		];
 	}
 }
diff --git a/apps/dav/tests/unit/Service/AbsenceServiceTest.php b/apps/dav/tests/unit/Service/AbsenceServiceTest.php
index 5cff29a6f61ac..c16c715d5c2aa 100644
--- a/apps/dav/tests/unit/Service/AbsenceServiceTest.php
+++ b/apps/dav/tests/unit/Service/AbsenceServiceTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\dav\tests\unit\Service;
+namespace OCA\DAV\Tests\unit\Service;
 
 use DateTimeImmutable;
 use DateTimeZone;
@@ -24,25 +24,16 @@
 use OCP\IUser;
 use OCP\User\Events\OutOfOfficeChangedEvent;
 use OCP\User\Events\OutOfOfficeScheduledEvent;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AbsenceServiceTest extends TestCase {
 	private AbsenceService $absenceService;
-
-	/** @var MockObject|AbsenceMapper */
-	private $absenceMapper;
-
-	/** @var MockObject|IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var MockObject|IJobList */
-	private $jobList;
-
-	/** @var MockObject|TimezoneService */
-	private $timezoneService;
-
-	/** @var MockObject|ITimeFactory */
-	private $timeFactory;
+	private AbsenceMapper&MockObject $absenceMapper;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private IJobList&MockObject $jobList;
+	private TimezoneService&MockObject $timezoneService;
+	private ITimeFactory&MockObject $timeFactory;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/dav/tests/unit/Service/DefaultContactServiceTest.php b/apps/dav/tests/unit/Service/DefaultContactServiceTest.php
index 68bbc02ed08d9..3bd8c9cb6f662 100644
--- a/apps/dav/tests/unit/Service/DefaultContactServiceTest.php
+++ b/apps/dav/tests/unit/Service/DefaultContactServiceTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Unit\Service;
+namespace OCA\DAV\Tests\unit\Service;
 
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCA\DAV\Service\DefaultContactService;
@@ -24,12 +24,12 @@
 use Test\TestCase;
 
 class DefaultContactServiceTest extends TestCase {
-	private DefaultContactService $service;
-	private MockObject|CardDavBackend $cardDav;
-	private MockObject|IAppManager $appManager;
-	private MockObject|IAppDataFactory $appDataFactory;
-	private MockObject|LoggerInterface $logger;
-	private MockObject|IAppConfig $config;
+	protected DefaultContactService $service;
+	protected CardDavBackend&MockObject $cardDav;
+	protected IAppManager&MockObject $appManager;
+	protected IAppDataFactory&MockObject $appDataFactory;
+	protected LoggerInterface&MockObject $logger;
+	protected IAppConfig&MockObject $config;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -84,7 +84,7 @@ public function testUidAndRevAreUpdated(): void {
 		$folder->method('getFile')->willReturn($file);
 		$appData->method('getFolder')->willReturn($folder);
 		$this->appDataFactory->method('get')->willReturn($appData);
-		
+
 		$capturedCardData = null;
 		$this->cardDav->expects($this->once())
 			->method('createCard')
@@ -97,9 +97,9 @@ public function testUidAndRevAreUpdated(): void {
 				}),
 				$this->anything()
 			)->willReturn(null);
-		
+
 		$this->service->createDefaultContact(123);
-		
+
 		$vcard = \Sabre\VObject\Reader::read($capturedCardData);
 		$this->assertNotEquals($originalUid, $vcard->UID->getValue());
 		$this->assertTrue(Uuid::isValid($vcard->UID->getValue()));
diff --git a/apps/dav/tests/unit/Service/UpcomingEventsServiceTest.php b/apps/dav/tests/unit/Service/UpcomingEventsServiceTest.php
index ecb0268c8c262..fdfe37d8918af 100644
--- a/apps/dav/tests/unit/Service/UpcomingEventsServiceTest.php
+++ b/apps/dav/tests/unit/Service/UpcomingEventsServiceTest.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Unit\DAV\Service;
+namespace OCA\DAV\Tests\unit\DAV\Service;
 
 use DateTimeImmutable;
 use OCA\DAV\CalDAV\UpcomingEventsService;
@@ -22,11 +22,11 @@
 
 class UpcomingEventsServiceTest extends TestCase {
 
-	private MockObject|IManager $calendarManager;
-	private ITimeFactory|MockObject $timeFactory;
-	private IUserManager|MockObject $userManager;
-	private IAppManager|MockObject $appManager;
-	private IURLGenerator|MockObject $urlGenerator;
+	private IManager&MockObject $calendarManager;
+	private ITimeFactory&MockObject $timeFactory;
+	private IUserManager&MockObject $userManager;
+	private IAppManager&MockObject $appManager;
+	private IURLGenerator&MockObject $urlGenerator;
 	private UpcomingEventsService $service;
 
 	protected function setUp(): void {
diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
index 7497275316041..df7a08d5d0817 100644
--- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
+++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\DAV\Tests\Unit\DAV\Settings;
+namespace OCA\DAV\Tests\unit\DAV\Settings;
 
 use OCA\DAV\Settings\CalDAVSettings;
 use OCP\App\IAppManager;