1 files changed, 17 insertions, 15 deletions

diff --git a/apps/dav/tests/unit/CardDAV/AddressBookTest.php b/apps/dav/tests/unit/CardDAV/AddressBookTest.php
index cbdb9a1402c..043b192e2c8 100644
--- a/apps/dav/tests/unit/CardDAV/AddressBookTest.php
+++ b/apps/dav/tests/unit/CardDAV/AddressBookTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -28,19 +29,20 @@ class AddressBookTest extends TestCase {
 			'uri' => 'default',
 		];
 		$l10n = $this->createMock(IL10N::class);
-		$logger = $this->createMock(LoggerInterface::class);
-		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n, $logger);
+		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n);
 
 		$card = new Card($backend, $addressBookInfo, ['id' => 5, 'carddata' => 'RANDOM VCF DATA', 'uri' => 'something', 'addressbookid' => 23]);
 
-		$backend->expects($this->once())->method('moveCard')->with(23, 666, 'something', 'user1')->willReturn(true);
+		$backend->expects($this->once())->method('moveCard')
+			->with(23, 666, 'something', 'user1')
+			->willReturn(true);
 
 		$addressBook->moveInto('new', 'old', $card);
 	}
 
 	public function testDelete(): void {
 		/** @var MockObject | CardDavBackend $backend */
-		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$backend = $this->createMock(CardDavBackend::class);
 		$backend->expects($this->once())->method('updateShares');
 		$backend->expects($this->any())->method('getShares')->willReturn([
 			['href' => 'principal:user2']
@@ -54,7 +56,7 @@ class AddressBookTest extends TestCase {
 		];
 		$l10n = $this->createMock(IL10N::class);
 		$logger = $this->createMock(LoggerInterface::class);
-		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n, $logger);
+		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n);
 		$addressBook->delete();
 	}
 
@@ -63,7 +65,7 @@ class AddressBookTest extends TestCase {
 		$this->expectException(Forbidden::class);
 
 		/** @var MockObject | CardDavBackend $backend */
-		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$backend = $this->createMock(CardDavBackend::class);
 		$backend->expects($this->never())->method('updateShares');
 		$backend->expects($this->any())->method('getShares')->willReturn([
 			['href' => 'principal:group2']
@@ -77,14 +79,14 @@ class AddressBookTest extends TestCase {
 		];
 		$l10n = $this->createMock(IL10N::class);
 		$logger = $this->createMock(LoggerInterface::class);
-		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n, $logger);
+		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n);
 		$addressBook->delete();
 	}
 
 
 	public function testPropPatchShared(): void {
 		/** @var MockObject | CardDavBackend $backend */
-		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$backend = $this->createMock(CardDavBackend::class);
 		$backend->expects($this->never())->method('updateAddressBook');
 		$addressBookInfo = [
 			'{http://owncloud.org/ns}owner-principal' => 'user1',
@@ -95,13 +97,13 @@ class AddressBookTest extends TestCase {
 		];
 		$l10n = $this->createMock(IL10N::class);
 		$logger = $this->createMock(LoggerInterface::class);
-		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n, $logger);
+		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n);
 		$addressBook->propPatch(new PropPatch(['{DAV:}displayname' => 'Test address book']));
 	}
 
 	public function testPropPatchNotShared(): void {
 		/** @var MockObject | CardDavBackend $backend */
-		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$backend = $this->createMock(CardDavBackend::class);
 		$backend->expects($this->atLeast(1))->method('updateAddressBook');
 		$addressBookInfo = [
 			'{DAV:}displayname' => 'Test address book',
@@ -111,16 +113,16 @@ class AddressBookTest extends TestCase {
 		];
 		$l10n = $this->createMock(IL10N::class);
 		$logger = $this->createMock(LoggerInterface::class);
-		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n, $logger);
+		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n);
 		$addressBook->propPatch(new PropPatch(['{DAV:}displayname' => 'Test address book']));
 	}
 
 	/**
 	 * @dataProvider providesReadOnlyInfo
 	 */
-	public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet): void {
+	public function testAcl(bool $expectsWrite, ?bool $readOnlyValue, bool $hasOwnerSet): void {
 		/** @var MockObject | CardDavBackend $backend */
-		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$backend = $this->createMock(CardDavBackend::class);
 		$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
 		$addressBookInfo = [
 			'{DAV:}displayname' => 'Test address book',
@@ -136,7 +138,7 @@ class AddressBookTest extends TestCase {
 		}
 		$l10n = $this->createMock(IL10N::class);
 		$logger = $this->createMock(LoggerInterface::class);
-		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n, $logger);
+		$addressBook = new AddressBook($backend, $addressBookInfo, $l10n);
 		$acl = $addressBook->getACL();
 		$childAcl = $addressBook->getChildACL();
 
@@ -171,7 +173,7 @@ class AddressBookTest extends TestCase {
 		$this->assertEquals($expectedAcl, $childAcl);
 	}
 
-	public function providesReadOnlyInfo(): array {
+	public static function providesReadOnlyInfo(): array {
 		return [
 			'read-only property not set' => [true, null, true],
 			'read-only property is false' => [true, false, true],