Merge pull request #54651 from nextcloud/backport/54650/stable30

kesselb · web-flow · commit 65250e5cccec · 2025-08-26T16:08:21.000+02:00
[stable30] fix(carddav): IAddressBook::getKey() should return a string
diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -66,7 +66,7 @@ public function __construct(
 	 * @since 5.0.0
 	 */
 	public function getKey() {
-		return $this->addressBookInfo['id'];
+		return (string) $this->addressBookInfo['id'];
 	}
 
 	/**
diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -67,7 +67,8 @@ protected function setUp(): void {
 	}
 
 	public function testGetKey(): void {
-		$this->assertSame($this->addressBookInfo['id'],
+		$this->assertIsString($this->addressBookImpl->getKey());
+		$this->assertSame((string) $this->addressBookInfo['id'],
 			$this->addressBookImpl->getKey());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function __construct(`
`66`	`66`	`* @since 5.0.0`
`67`	`67`	`*/`
`68`	`68`	`public function getKey() {`
`69`		`- return $this->addressBookInfo['id'];`
	`69`	`+ return (string) $this->addressBookInfo['id'];`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ protected function setUp(): void {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function testGetKey(): void {`
`70`		`- $this->assertSame($this->addressBookInfo['id'],`
	`70`	`+ $this->assertIsString($this->addressBookImpl->getKey());`
	`71`	`+ $this->assertSame((string) $this->addressBookInfo['id'],`
`71`	`72`	`$this->addressBookImpl->getKey());`
`72`	`73`	`}`
`73`	`74`