nextcloud / server

apps/dav/lib/CalDAV/Activity/Provider/Event.php

Indentation +224 added lines, -224 removed lines

@@ -17,228 +17,228 @@
 use OCP\L10N\IFactory;
 
 class Event extends Base {
-	public const SUBJECT_OBJECT_ADD = 'object_add';
-	public const SUBJECT_OBJECT_UPDATE = 'object_update';
-	public const SUBJECT_OBJECT_MOVE = 'object_move';
-	public const SUBJECT_OBJECT_MOVE_TO_TRASH = 'object_move_to_trash';
-	public const SUBJECT_OBJECT_RESTORE = 'object_restore';
-	public const SUBJECT_OBJECT_DELETE = 'object_delete';
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IEventMerger $eventMerger
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		protected IFactory $languageFactory,
-		IURLGenerator $url,
-		protected IManager $activityManager,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		protected IEventMerger $eventMerger,
-		protected IAppManager $appManager,
-	) {
-		parent::__construct($userManager, $groupManager, $url);
-	}
-
-	/**
-	 * @param array $eventData
-	 * @return array
-	 */
-	protected function generateObjectParameter(array $eventData, string $affectedUser): array {
-		if (!isset($eventData['id']) || !isset($eventData['name'])) {
-			throw new \InvalidArgumentException();
-		}
-
-		$params = [
-			'type' => 'calendar-event',
-			'id' => $eventData['id'],
-			'name' => trim($eventData['name']) !== '' ? $eventData['name'] : $this->l->t('Untitled event'),
-		];
-
-		if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
-			try {
-				// The calendar app needs to be manually loaded for the routes to be loaded
-				$this->appManager->loadApp('calendar');
-				$linkData = $eventData['link'];
-				$calendarUri = $this->urlencodeLowerHex($linkData['calendar_uri']);
-				if ($affectedUser === $linkData['owner']) {
-					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $calendarUri . '/' . $linkData['object_uri']);
-				} else {
-					// Can't use the "real" owner and calendar names here because we create a custom
-					// calendar for incoming shares with the name "<calendar>_shared_by_<sharer>".
-					// Hack: Fix the link by generating it for the incoming shared calendar instead,
-					//       as seen from the affected user.
-					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
-				}
-				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
-					'objectId' => $objectId,
-				]);
-			} catch (\Exception $error) {
-				// Do nothing
-			}
-		}
-		return $params;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws UnknownActivityException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
-			throw new UnknownActivityException();
-		}
-
-		$this->l = $this->languageFactory->get('dav', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
-			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
-			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
-			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
-			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
-			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
-			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event') {
-			$subject = $this->l->t('{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event_self') {
-			$subject = $this->l->t('You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event') {
-			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self') {
-			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event') {
-			$subject = $this->l->t('{actor} restored event {event} of calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
-			$subject = $this->l->t('You restored event {event} of calendar {calendar}');
-		} else {
-			throw new UnknownActivityException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
-				case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event':
-				case self::SUBJECT_OBJECT_RESTORE . '_event':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
-					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-				case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self':
-				case self::SUBJECT_OBJECT_RESTORE . '_event_self':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
-					];
-			}
-		}
-
-		if (isset($parameters['sourceCalendar']) && isset($parameters['targetCalendar'])) {
-			switch ($subject) {
-				case self::SUBJECT_OBJECT_MOVE . '_event':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
-						'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
-					];
-				case self::SUBJECT_OBJECT_MOVE . '_event_self':
-					return [
-						'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
-						'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
-					];
-			}
-		}
-
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
-				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-				return [
-					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
-
-	private function generateClassifiedObjectParameter(array $eventData, string $affectedUser): array {
-		$parameter = $this->generateObjectParameter($eventData, $affectedUser);
-		if (!empty($eventData['classified'])) {
-			$parameter['name'] = $this->l->t('Busy');
-		}
-		return $parameter;
-	}
-
-	/**
-	 * Return urlencoded string but with lower cased hex sequences.
-	 * The remaining casing will be untouched.
-	 */
-	private function urlencodeLowerHex(string $raw): string {
-		return preg_replace_callback(
-			'/%[0-9A-F]{2}/',
-			static fn (array $matches) => strtolower($matches[0]),
-			urlencode($raw),
-		);
-	}
+    public const SUBJECT_OBJECT_ADD = 'object_add';
+    public const SUBJECT_OBJECT_UPDATE = 'object_update';
+    public const SUBJECT_OBJECT_MOVE = 'object_move';
+    public const SUBJECT_OBJECT_MOVE_TO_TRASH = 'object_move_to_trash';
+    public const SUBJECT_OBJECT_RESTORE = 'object_restore';
+    public const SUBJECT_OBJECT_DELETE = 'object_delete';
+
+    /** @var IL10N */
+    protected $l;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IEventMerger $eventMerger
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        protected IFactory $languageFactory,
+        IURLGenerator $url,
+        protected IManager $activityManager,
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        protected IEventMerger $eventMerger,
+        protected IAppManager $appManager,
+    ) {
+        parent::__construct($userManager, $groupManager, $url);
+    }
+
+    /**
+     * @param array $eventData
+     * @return array
+     */
+    protected function generateObjectParameter(array $eventData, string $affectedUser): array {
+        if (!isset($eventData['id']) || !isset($eventData['name'])) {
+            throw new \InvalidArgumentException();
+        }
+
+        $params = [
+            'type' => 'calendar-event',
+            'id' => $eventData['id'],
+            'name' => trim($eventData['name']) !== '' ? $eventData['name'] : $this->l->t('Untitled event'),
+        ];
+
+        if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
+            try {
+                // The calendar app needs to be manually loaded for the routes to be loaded
+                $this->appManager->loadApp('calendar');
+                $linkData = $eventData['link'];
+                $calendarUri = $this->urlencodeLowerHex($linkData['calendar_uri']);
+                if ($affectedUser === $linkData['owner']) {
+                    $objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $calendarUri . '/' . $linkData['object_uri']);
+                } else {
+                    // Can't use the "real" owner and calendar names here because we create a custom
+                    // calendar for incoming shares with the name "<calendar>_shared_by_<sharer>".
+                    // Hack: Fix the link by generating it for the incoming shared calendar instead,
+                    //       as seen from the affected user.
+                    $objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
+                }
+                $params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
+                    'objectId' => $objectId,
+                ]);
+            } catch (\Exception $error) {
+                // Do nothing
+            }
+        }
+        return $params;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws UnknownActivityException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
+            throw new UnknownActivityException();
+        }
+
+        $this->l = $this->languageFactory->get('dav', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+            $subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+            $subject = $this->l->t('You created event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+            $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+            $subject = $this->l->t('You deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+            $subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+            $subject = $this->l->t('You updated event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event') {
+            $subject = $this->l->t('{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event_self') {
+            $subject = $this->l->t('You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event') {
+            $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self') {
+            $subject = $this->l->t('You deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event') {
+            $subject = $this->l->t('{actor} restored event {event} of calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
+            $subject = $this->l->t('You restored event {event} of calendar {calendar}');
+        } else {
+            throw new UnknownActivityException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            switch ($subject) {
+                case self::SUBJECT_OBJECT_ADD . '_event':
+                case self::SUBJECT_OBJECT_DELETE . '_event':
+                case self::SUBJECT_OBJECT_UPDATE . '_event':
+                case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event':
+                case self::SUBJECT_OBJECT_RESTORE . '_event':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
+                    ];
+                case self::SUBJECT_OBJECT_ADD . '_event_self':
+                case self::SUBJECT_OBJECT_DELETE . '_event_self':
+                case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self':
+                case self::SUBJECT_OBJECT_RESTORE . '_event_self':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
+                    ];
+            }
+        }
+
+        if (isset($parameters['sourceCalendar']) && isset($parameters['targetCalendar'])) {
+            switch ($subject) {
+                case self::SUBJECT_OBJECT_MOVE . '_event':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
+                        'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
+                    ];
+                case self::SUBJECT_OBJECT_MOVE . '_event_self':
+                    return [
+                        'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
+                        'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
+                    ];
+            }
+        }
+
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        switch ($subject) {
+            case self::SUBJECT_OBJECT_ADD . '_event':
+            case self::SUBJECT_OBJECT_DELETE . '_event':
+            case self::SUBJECT_OBJECT_UPDATE . '_event':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
+                ];
+            case self::SUBJECT_OBJECT_ADD . '_event_self':
+            case self::SUBJECT_OBJECT_DELETE . '_event_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                return [
+                    'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    private function generateClassifiedObjectParameter(array $eventData, string $affectedUser): array {
+        $parameter = $this->generateObjectParameter($eventData, $affectedUser);
+        if (!empty($eventData['classified'])) {
+            $parameter['name'] = $this->l->t('Busy');
+        }
+        return $parameter;
+    }
+
+    /**
+     * Return urlencoded string but with lower cased hex sequences.
+     * The remaining casing will be untouched.
+     */
+    private function urlencodeLowerHex(string $raw): string {
+        return preg_replace_callback(
+            '/%[0-9A-F]{2}/',
+            static fn (array $matches) => strtolower($matches[0]),
+            urlencode($raw),
+        );
+    }
 }

Spacing +32 added lines, -32 removed lines

@@ -70,13 +70,13 @@ 
 				$linkData = $eventData['link'];
 				$calendarUri = $this->urlencodeLowerHex($linkData['calendar_uri']);
 				if ($affectedUser === $linkData['owner']) {
-					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $calendarUri . '/' . $linkData['object_uri']);
+					$objectId = base64_encode($this->url->getWebroot().'/remote.php/dav/calendars/'.$linkData['owner'].'/'.$calendarUri.'/'.$linkData['object_uri']);
 				} else {
 					// Can't use the "real" owner and calendar names here because we create a custom
 					// calendar for incoming shares with the name "<calendar>_shared_by_<sharer>".
 					// Hack: Fix the link by generating it for the incoming shared calendar instead,
 					//       as seen from the affected user.
-					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
+					$objectId = base64_encode($this->url->getWebroot().'/remote.php/dav/calendars/'.$affectedUser.'/'.$calendarUri.'_shared_by_'.$linkData['owner'].'/'.$linkData['object_uri']);
 				}
 				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
 					'objectId' => $objectId,
@@ -109,29 +109,29 @@ 
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
 			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
 			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
 			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
 			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE.'_event') {
 			$subject = $this->l->t('{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE.'_event_self') {
 			$subject = $this->l->t('You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE.'_event') {
 			$subject = $this->l->t('{actor} restored event {event} of calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE.'_event_self') {
 			$subject = $this->l->t('You restored event {event} of calendar {calendar}');
 		} else {
 			throw new UnknownActivityException();
@@ -156,21 +156,21 @@ 
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
-				case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event':
-				case self::SUBJECT_OBJECT_RESTORE . '_event':
+				case self::SUBJECT_OBJECT_ADD.'_event':
+				case self::SUBJECT_OBJECT_DELETE.'_event':
+				case self::SUBJECT_OBJECT_UPDATE.'_event':
+				case self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event':
+				case self::SUBJECT_OBJECT_RESTORE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-				case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self':
-				case self::SUBJECT_OBJECT_RESTORE . '_event_self':
+				case self::SUBJECT_OBJECT_ADD.'_event_self':
+				case self::SUBJECT_OBJECT_DELETE.'_event_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_event_self':
+				case self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event_self':
+				case self::SUBJECT_OBJECT_RESTORE.'_event_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
@@ -180,14 +180,14 @@ 
 
 		if (isset($parameters['sourceCalendar']) && isset($parameters['targetCalendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_MOVE . '_event':
+				case self::SUBJECT_OBJECT_MOVE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
 						'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
 					];
-				case self::SUBJECT_OBJECT_MOVE . '_event_self':
+				case self::SUBJECT_OBJECT_MOVE.'_event_self':
 					return [
 						'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
 						'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
@@ -202,17 +202,17 @@ 
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
+			case self::SUBJECT_OBJECT_ADD.'_event':
+			case self::SUBJECT_OBJECT_DELETE.'_event':
+			case self::SUBJECT_OBJECT_UPDATE.'_event':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+			case self::SUBJECT_OBJECT_ADD.'_event_self':
+			case self::SUBJECT_OBJECT_DELETE.'_event_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 				return [
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),

apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php

Indentation +163 added lines, -163 removed lines

@@ -21,176 +21,176 @@
 use TypeError;
 
 class EventTest extends TestCase {
-	protected IUserManager&MockObject $userManager;
-	protected IGroupManager&MockObject $groupManager;
-	protected IURLGenerator&MockObject $url;
-	protected IAppManager&MockObject $appManager;
-	protected IFactory&MockObject $i10nFactory;
-	protected IManager&MockObject $activityManager;
-	protected IEventMerger&MockObject $eventMerger;
-	protected Event&MockObject $provider;
+    protected IUserManager&MockObject $userManager;
+    protected IGroupManager&MockObject $groupManager;
+    protected IURLGenerator&MockObject $url;
+    protected IAppManager&MockObject $appManager;
+    protected IFactory&MockObject $i10nFactory;
+    protected IManager&MockObject $activityManager;
+    protected IEventMerger&MockObject $eventMerger;
+    protected Event&MockObject $provider;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->i10nFactory = $this->createMock(IFactory::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->activityManager = $this->createMock(IManager::class);
-		$this->url = $this->createMock(IURLGenerator::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->eventMerger = $this->createMock(IEventMerger::class);
-		$this->provider = $this->getMockBuilder(Event::class)
-			->setConstructorArgs([
-				$this->i10nFactory,
-				$this->url,
-				$this->activityManager,
-				$this->userManager,
-				$this->groupManager,
-				$this->eventMerger,
-				$this->appManager
-			])
-			->onlyMethods(['parse'])
-			->getMock();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->i10nFactory = $this->createMock(IFactory::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->activityManager = $this->createMock(IManager::class);
+        $this->url = $this->createMock(IURLGenerator::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->eventMerger = $this->createMock(IEventMerger::class);
+        $this->provider = $this->getMockBuilder(Event::class)
+            ->setConstructorArgs([
+                $this->i10nFactory,
+                $this->url,
+                $this->activityManager,
+                $this->userManager,
+                $this->groupManager,
+                $this->eventMerger,
+                $this->appManager
+            ])
+            ->onlyMethods(['parse'])
+            ->getMock();
+    }
 
-	public static function dataGenerateObjectParameter(): array {
-		$link = [
-			'object_uri' => 'someuuid.ics',
-			'calendar_uri' => 'personal',
-			'owner' => 'someuser'
-		];
+    public static function dataGenerateObjectParameter(): array {
+        $link = [
+            'object_uri' => 'someuuid.ics',
+            'calendar_uri' => 'personal',
+            'owner' => 'someuser'
+        ];
 
-		return [
-			[23, 'c1', $link, true],
-			[23, 'c1', $link, false],
-			[42, 'c2', null],
-		];
-	}
+        return [
+            [23, 'c1', $link, true],
+            [23, 'c1', $link, false],
+            [42, 'c2', null],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataGenerateObjectParameter
-	 */
-	public function testGenerateObjectParameter(int $id, string $name, ?array $link, bool $calendarAppEnabled = true): void {
-		$affectedUser = 'otheruser';
-		if ($link) {
-			$affectedUser = $link['owner'];
-			$generatedLink = [
-				'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
-			];
-			$this->appManager->expects($this->once())
-				->method('isEnabledForUser')
-				->with('calendar')
-				->willReturn($calendarAppEnabled);
-			if ($calendarAppEnabled) {
-				$this->url->expects($this->once())
-					->method('getWebroot');
-				$this->url->expects($this->once())
-					->method('linkToRouteAbsolute')
-					->with('calendar.view.indexdirect.edit', $generatedLink)
-					->willReturn('fullLink');
-			}
-		}
-		$objectParameter = ['id' => $id, 'name' => $name];
-		if ($link) {
-			$objectParameter['link'] = $link;
-		}
-		$result = [
-			'type' => 'calendar-event',
-			'id' => $id,
-			'name' => $name,
-		];
-		if ($link && $calendarAppEnabled) {
-			$result['link'] = 'fullLink';
-		}
-		$this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter, $affectedUser]));
-	}
+    /**
+     * @dataProvider dataGenerateObjectParameter
+     */
+    public function testGenerateObjectParameter(int $id, string $name, ?array $link, bool $calendarAppEnabled = true): void {
+        $affectedUser = 'otheruser';
+        if ($link) {
+            $affectedUser = $link['owner'];
+            $generatedLink = [
+                'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
+            ];
+            $this->appManager->expects($this->once())
+                ->method('isEnabledForUser')
+                ->with('calendar')
+                ->willReturn($calendarAppEnabled);
+            if ($calendarAppEnabled) {
+                $this->url->expects($this->once())
+                    ->method('getWebroot');
+                $this->url->expects($this->once())
+                    ->method('linkToRouteAbsolute')
+                    ->with('calendar.view.indexdirect.edit', $generatedLink)
+                    ->willReturn('fullLink');
+            }
+        }
+        $objectParameter = ['id' => $id, 'name' => $name];
+        if ($link) {
+            $objectParameter['link'] = $link;
+        }
+        $result = [
+            'type' => 'calendar-event',
+            'id' => $id,
+            'name' => $name,
+        ];
+        if ($link && $calendarAppEnabled) {
+            $result['link'] = 'fullLink';
+        }
+        $this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter, $affectedUser]));
+    }
 
-	public static function generateObjectParameterLinkEncodingDataProvider(): array {
-		return [
-			[ // Shared calendar
-				[
-					'object_uri' => 'someuuid.ics',
-					'calendar_uri' => 'personal',
-					'owner' => 'sharer'
-				],
-				base64_encode('/remote.php/dav/calendars/sharee/personal_shared_by_sharer/someuuid.ics'),
-			],
-			[ // Shared calendar with umlauts
-				[
-					'object_uri' => 'someuuid.ics',
-					'calendar_uri' => 'umlaut_äüöß',
-					'owner' => 'sharer'
-				],
-				base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
-			],
-			[ // Shared calendar with umlauts and mixed casing
-				[
-					'object_uri' => 'someuuid.ics',
-					'calendar_uri' => 'Umlaut_äüöß',
-					'owner' => 'sharer'
-				],
-				base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
-			],
-			[ // Owned calendar with umlauts
-				[
-					'object_uri' => 'someuuid.ics',
-					'calendar_uri' => 'umlaut_äüöß',
-					'owner' => 'sharee'
-				],
-				base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
-			],
-			[ // Owned calendar with umlauts and mixed casing
-				[
-					'object_uri' => 'someuuid.ics',
-					'calendar_uri' => 'Umlaut_äüöß',
-					'owner' => 'sharee'
-				],
-				base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
-			],
-		];
-	}
+    public static function generateObjectParameterLinkEncodingDataProvider(): array {
+        return [
+            [ // Shared calendar
+                [
+                    'object_uri' => 'someuuid.ics',
+                    'calendar_uri' => 'personal',
+                    'owner' => 'sharer'
+                ],
+                base64_encode('/remote.php/dav/calendars/sharee/personal_shared_by_sharer/someuuid.ics'),
+            ],
+            [ // Shared calendar with umlauts
+                [
+                    'object_uri' => 'someuuid.ics',
+                    'calendar_uri' => 'umlaut_äüöß',
+                    'owner' => 'sharer'
+                ],
+                base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
+            ],
+            [ // Shared calendar with umlauts and mixed casing
+                [
+                    'object_uri' => 'someuuid.ics',
+                    'calendar_uri' => 'Umlaut_äüöß',
+                    'owner' => 'sharer'
+                ],
+                base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
+            ],
+            [ // Owned calendar with umlauts
+                [
+                    'object_uri' => 'someuuid.ics',
+                    'calendar_uri' => 'umlaut_äüöß',
+                    'owner' => 'sharee'
+                ],
+                base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
+            ],
+            [ // Owned calendar with umlauts and mixed casing
+                [
+                    'object_uri' => 'someuuid.ics',
+                    'calendar_uri' => 'Umlaut_äüöß',
+                    'owner' => 'sharee'
+                ],
+                base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
+            ],
+        ];
+    }
 
-	/**
-	 * @dataProvider generateObjectParameterLinkEncodingDataProvider
-	 */
-	public function testGenerateObjectParameterLinkEncoding(array $link, string $objectId): void {
-		$generatedLink = [
-			'objectId' => $objectId,
-		];
-		$this->appManager->expects($this->once())
-			->method('isEnabledForUser')
-			->with('calendar')
-			->willReturn(true);
-		$this->url->expects($this->once())
-			->method('getWebroot');
-		$this->url->expects($this->once())
-			->method('linkToRouteAbsolute')
-			->with('calendar.view.indexdirect.edit', $generatedLink)
-			->willReturn('fullLink');
-		$objectParameter = ['id' => 42, 'name' => 'calendar', 'link' => $link];
-		$result = [
-			'type' => 'calendar-event',
-			'id' => 42,
-			'name' => 'calendar',
-			'link' => 'fullLink',
-		];
-		$this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter, 'sharee']));
-	}
+    /**
+     * @dataProvider generateObjectParameterLinkEncodingDataProvider
+     */
+    public function testGenerateObjectParameterLinkEncoding(array $link, string $objectId): void {
+        $generatedLink = [
+            'objectId' => $objectId,
+        ];
+        $this->appManager->expects($this->once())
+            ->method('isEnabledForUser')
+            ->with('calendar')
+            ->willReturn(true);
+        $this->url->expects($this->once())
+            ->method('getWebroot');
+        $this->url->expects($this->once())
+            ->method('linkToRouteAbsolute')
+            ->with('calendar.view.indexdirect.edit', $generatedLink)
+            ->willReturn('fullLink');
+        $objectParameter = ['id' => 42, 'name' => 'calendar', 'link' => $link];
+        $result = [
+            'type' => 'calendar-event',
+            'id' => 42,
+            'name' => 'calendar',
+            'link' => 'fullLink',
+        ];
+        $this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter, 'sharee']));
+    }
 
-	public static function dataGenerateObjectParameterThrows(): array {
-		return [
-			['event', TypeError::class],
-			[['name' => 'event']],
-			[['id' => 42]],
-		];
-	}
+    public static function dataGenerateObjectParameterThrows(): array {
+        return [
+            ['event', TypeError::class],
+            [['name' => 'event']],
+            [['id' => 42]],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataGenerateObjectParameterThrows
-	 */
-	public function testGenerateObjectParameterThrows(string|array $eventData, string $exception = InvalidArgumentException::class): void {
-		$this->expectException($exception);
+    /**
+     * @dataProvider dataGenerateObjectParameterThrows
+     */
+    public function testGenerateObjectParameterThrows(string|array $eventData, string $exception = InvalidArgumentException::class): void {
+        $this->expectException($exception);
 
-		$this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData, 'no_user']);
-	}
+        $this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData, 'no_user']);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -75,7 +75,7 @@ 
 		if ($link) {
 			$affectedUser = $link['owner'];
 			$generatedLink = [
-				'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
+				'objectId' => base64_encode('/remote.php/dav/calendars/'.$link['owner'].'/'.$link['calendar_uri'].'/'.$link['object_uri']),
 			];
 			$this->appManager->expects($this->once())
 				->method('isEnabledForUser')
@@ -107,7 +107,7 @@ 
 
 	public static function generateObjectParameterLinkEncodingDataProvider(): array {
 		return [
-			[ // Shared calendar
+			[// Shared calendar
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'personal',
@@ -115,7 +115,7 @@ 
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/personal_shared_by_sharer/someuuid.ics'),
 			],
-			[ // Shared calendar with umlauts
+			[// Shared calendar with umlauts
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'umlaut_äüöß',
@@ -123,7 +123,7 @@ 
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
 			],
-			[ // Shared calendar with umlauts and mixed casing
+			[// Shared calendar with umlauts and mixed casing
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'Umlaut_äüöß',
@@ -131,7 +131,7 @@ 
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
 			],
-			[ // Owned calendar with umlauts
+			[// Owned calendar with umlauts
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'umlaut_äüöß',
@@ -139,7 +139,7 @@ 
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
 			],
-			[ // Owned calendar with umlauts and mixed casing
+			[// Owned calendar with umlauts and mixed casing
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'Umlaut_äüöß',
@@ -188,7 +188,7 @@ 
 	/**
 	 * @dataProvider dataGenerateObjectParameterThrows
 	 */
-	public function testGenerateObjectParameterThrows(string|array $eventData, string $exception = InvalidArgumentException::class): void {
+	public function testGenerateObjectParameterThrows(string | array $eventData, string $exception = InvalidArgumentException::class): void {
 		$this->expectException($exception);
 
 		$this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData, 'no_user']);