1 files changed, 12 insertions, 19 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Base.php b/apps/dav/lib/CalDAV/Activity/Provider/Base.php
index a063a31d015..558abe0ca1a 100644
--- a/apps/dav/lib/CalDAV/Activity/Provider/Base.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Base.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -15,27 +16,19 @@ use OCP\IURLGenerator;
 use OCP\IUserManager;
 
 abstract class Base implements IProvider {
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
 	/** @var string[] */
 	protected $groupDisplayNames = [];
 
-	/** @var IURLGenerator */
-	protected $url;
-
 	/**
 	 * @param IUserManager $userManager
 	 * @param IGroupManager $groupManager
-	 * @param IURLGenerator $urlGenerator
+	 * @param IURLGenerator $url
 	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IURLGenerator $urlGenerator) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->url = $urlGenerator;
+	public function __construct(
+		protected IUserManager $userManager,
+		protected IGroupManager $groupManager,
+		protected IURLGenerator $url,
+	) {
 	}
 
 	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
@@ -48,18 +41,18 @@ abstract class Base implements IProvider {
 	 * @return array
 	 */
 	protected function generateCalendarParameter($data, IL10N $l) {
-		if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+		if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI
+			&& $data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
 			return [
 				'type' => 'calendar',
-				'id' => $data['id'],
+				'id' => (string)$data['id'],
 				'name' => $l->t('Personal'),
 			];
 		}
 
 		return [
 			'type' => 'calendar',
-			'id' => $data['id'],
+			'id' => (string)$data['id'],
 			'name' => $data['name'],
 		];
 	}
@@ -72,7 +65,7 @@ abstract class Base implements IProvider {
 	protected function generateLegacyCalendarParameter($id, $name) {
 		return [
 			'type' => 'calendar',
-			'id' => $id,
+			'id' => (string)$id,
 			'name' => $name,
 		];
 	}