Merge pull request #53359 from nextcloud/backport/53323/stable30

AndyScherzinger · web-flow · commit 50d11fa7cf7d · 2025-06-12T19:05:47.000+02:00
[stable30] docs(caldav): improve documentation of CalDavBackend::getCalendarsForUserCount
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -211,15 +211,13 @@ public function __construct(
 	}
 
 	/**
-	 * Return the number of calendars for a principal
+	 * Return the number of calendars owned by the given principal.
 	 *
-	 * By default this excludes the automatically generated birthday calendar
+	 * Calendars shared with the given principal are not counted!
 	 *
-	 * @param $principalUri
-	 * @param bool $excludeBirthday
-	 * @return int
+	 * By default, this excludes the automatically generated birthday calendar.
 	 */
-	public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
+	public function getCalendarsForUserCount(string $principalUri, bool $excludeBirthday = true): int {
 		$principalUri = $this->convertPrincipal($principalUri, true);
 		$query = $this->db->getQueryBuilder();
 		$query->select($query->func()->count('*'))

Original file line number	Diff line number	Diff line change
`@@ -211,15 +211,13 @@ public function __construct(`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`/**`
`214`		`- * Return the number of calendars for a principal`
	`214`	`+ * Return the number of calendars owned by the given principal.`
`215`	`215`	`*`
`216`		`- * By default this excludes the automatically generated birthday calendar`
	`216`	`+ * Calendars shared with the given principal are not counted!`
`217`	`217`	`*`
`218`		`- * @param $principalUri`
`219`		`- * @param bool $excludeBirthday`
`220`		`- * @return int`
	`218`	`+ * By default, this excludes the automatically generated birthday calendar.`
`221`	`219`	`*/`
`222`		`- public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {`
	`220`	`+ public function getCalendarsForUserCount(string $principalUri, bool $excludeBirthday = true): int {`
`223`	`221`	`$principalUri = $this->convertPrincipal($principalUri, true);`
`224`	`222`	`$query = $this->db->getQueryBuilder();`
`225`	`223`	`$query->select($query->func()->count('*'))`