1 files changed, 19 insertions, 30 deletions

diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
index 0990cd674dd..680b228766f 100644
--- a/apps/dav/lib/CalDAV/BirthdayService.php
+++ b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -32,28 +32,17 @@ class BirthdayService {
 	public const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
 	public const EXCLUDE_FROM_BIRTHDAY_CALENDAR_PROPERTY_NAME = 'X-NC-EXCLUDE-FROM-BIRTHDAY-CALENDAR';
 
-	private GroupPrincipalBackend $principalBackend;
-	private CalDavBackend $calDavBackEnd;
-	private CardDavBackend $cardDavBackEnd;
-	private IConfig $config;
-	private IDBConnection $dbConnection;
-	private IL10N $l10n;
-
 	/**
 	 * BirthdayService constructor.
 	 */
-	public function __construct(CalDavBackend $calDavBackEnd,
-		CardDavBackend $cardDavBackEnd,
-		GroupPrincipalBackend $principalBackend,
-		IConfig $config,
-		IDBConnection $dbConnection,
-		IL10N $l10n) {
-		$this->calDavBackEnd = $calDavBackEnd;
-		$this->cardDavBackEnd = $cardDavBackEnd;
-		$this->principalBackend = $principalBackend;
-		$this->config = $config;
-		$this->dbConnection = $dbConnection;
-		$this->l10n = $l10n;
+	public function __construct(
+		private CalDavBackend $calDavBackEnd,
+		private CardDavBackend $cardDavBackEnd,
+		private GroupPrincipalBackend $principalBackend,
+		private IConfig $config,
+		private IDBConnection $dbConnection,
+		private IL10N $l10n,
+	) {
 	}
 
 	public function onCardChanged(int $addressBookId,
@@ -87,7 +76,7 @@ class BirthdayService {
 				return;
 			}
 			foreach ($datesToSync as $type) {
-				$this->updateCalendar($cardUri, $cardData, $book, (int) $calendar['id'], $type, $reminderOffset);
+				$this->updateCalendar($cardUri, $cardData, $book, (int)$calendar['id'], $type, $reminderOffset);
 			}
 		}
 	}
@@ -108,7 +97,7 @@ class BirthdayService {
 
 			$calendar = $this->ensureCalendarExists($principalUri);
 			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+				$objectUri = $book['uri'] . '-' . $cardUri . $tag . '.ics';
 				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
 			}
 		}
@@ -139,9 +128,9 @@ class BirthdayService {
 	 * @return VCalendar|null
 	 * @throws InvalidDataException
 	 */
-	public function buildDateFromContact(string  $cardData,
-		string  $dateField,
-		string  $postfix,
+	public function buildDateFromContact(string $cardData,
+		string $dateField,
+		string $postfix,
 		?string $reminderOffset):?VCalendar {
 		if (empty($cardData)) {
 			return null;
@@ -247,7 +236,7 @@ class BirthdayService {
 		$vEvent->{'X-NEXTCLOUD-BC-FIELD-TYPE'} = $dateField;
 		$vEvent->{'X-NEXTCLOUD-BC-UNKNOWN-YEAR'} = $dateParts['year'] === null ? '1' : '0';
 		if ($originalYear !== null) {
-			$vEvent->{'X-NEXTCLOUD-BC-YEAR'} = (string) $originalYear;
+			$vEvent->{'X-NEXTCLOUD-BC-YEAR'} = (string)$originalYear;
 		}
 		if ($reminderOffset) {
 			$alarm = $vCal->createComponent('VALARM');
@@ -264,7 +253,7 @@ class BirthdayService {
 	 * @param string $user
 	 */
 	public function resetForUser(string $user):void {
-		$principal = 'principals/users/'.$user;
+		$principal = 'principals/users/' . $user;
 		$calendar = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
 		if (!$calendar) {
 			return; // The user's birthday calendar doesn't exist, no need to purge it
@@ -281,13 +270,13 @@ class BirthdayService {
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 */
 	public function syncUser(string $user):void {
-		$principal = 'principals/users/'.$user;
+		$principal = 'principals/users/' . $user;
 		$this->ensureCalendarExists($principal);
 		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
 		foreach ($books as $book) {
 			$cards = $this->cardDavBackEnd->getCards($book['id']);
 			foreach ($cards as $card) {
-				$this->onCardChanged((int) $book['id'], $card['uri'], $card['carddata']);
+				$this->onCardChanged((int)$book['id'], $card['uri'], $card['carddata']);
 			}
 		}
 	}
@@ -306,8 +295,8 @@ class BirthdayService {
 		}
 
 		return (
-			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue()
+			|| $newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
 		);
 	}