nextcloud / server

apps/dav/lib/Listener/ActivityUpdaterListener.php

Spacing +13 added lines, -13 removed lines

@@ -70,7 +70,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar creation, so we just log it
-				$this->logger->error('Error generating activities for a new calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -87,7 +87,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for changed calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -103,7 +103,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for changed calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -119,13 +119,13 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for changed calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
 		} elseif ($event instanceof CalendarDeletedEvent) {
 			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+				$deletedProp = '{'.Plugin::NS_NEXTCLOUD.'}deleted-at';
 				if (isset($event->getCalendarData()[$deletedProp])) {
 					$this->logger->debug(
 						sprintf('Calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
@@ -142,7 +142,7 @@ 
 				}
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -160,7 +160,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a new calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -178,7 +178,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -197,7 +197,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -215,7 +215,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a new calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -233,13 +233,13 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object restoration, so we just log it
-				$this->logger->error('Error generating activity for a restored calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a restored calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
 		} elseif ($event instanceof CalendarObjectDeletedEvent) {
 			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+				$deletedProp = '{'.Plugin::NS_NEXTCLOUD.'}deleted-at';
 				if (isset($event->getObjectData()[$deletedProp])) {
 					$this->logger->debug(
 						sprintf('Calendar object in calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
@@ -258,7 +258,7 @@ 
 				}
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

Indentation +212 added lines, -212 removed lines

@@ -30,216 +30,216 @@
 /** @template-implements IEventListener<CalendarCreatedEvent|CalendarUpdatedEvent|CalendarMovedToTrashEvent|CalendarRestoredEvent|CalendarDeletedEvent|CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectMovedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent|CalendarObjectDeletedEvent> */
 class ActivityUpdaterListener implements IEventListener {
 
-	public function __construct(
-		private ActivityBackend $activityBackend,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if ($event instanceof CalendarCreatedEvent) {
-			try {
-				$this->activityBackend->onCalendarAdd(
-					$event->getCalendarData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for new calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar creation, so we just log it
-				$this->logger->error('Error generating activities for a new calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarUpdatedEvent) {
-			try {
-				$this->activityBackend->onCalendarUpdate(
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getMutations()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarMovedToTrashEvent) {
-			try {
-				$this->activityBackend->onCalendarMovedToTrash(
-					$event->getCalendarData(),
-					$event->getShares()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarRestoredEvent) {
-			try {
-				$this->activityBackend->onCalendarRestored(
-					$event->getCalendarData(),
-					$event->getShares()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarDeletedEvent) {
-			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
-				if (isset($event->getCalendarData()[$deletedProp])) {
-					$this->logger->debug(
-						sprintf('Calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
-					);
-				} else {
-					$this->activityBackend->onCalendarDelete(
-						$event->getCalendarData(),
-						$event->getShares()
-					);
-
-					$this->logger->debug(
-						sprintf('Activity generated for deleted calendar %d', $event->getCalendarId())
-					);
-				}
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectCreatedEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_ADD,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for new calendar object in calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectUpdatedEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_UPDATE,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for updated calendar object in calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectMovedEvent) {
-			try {
-				$this->activityBackend->onMovedCalendarObject(
-					$event->getSourceCalendarData(),
-					$event->getTargetCalendarData(),
-					$event->getSourceShares(),
-					$event->getTargetShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for moved calendar object from calendar %d to calendar %d', $event->getSourceCalendarId(), $event->getTargetCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_MOVE_TO_TRASH,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for a calendar object of calendar %d that is moved to trash', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectRestoredEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_RESTORE,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for a restore calendar object of calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object restoration, so we just log it
-				$this->logger->error('Error generating activity for a restored calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectDeletedEvent) {
-			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
-				if (isset($event->getObjectData()[$deletedProp])) {
-					$this->logger->debug(
-						sprintf('Calendar object in calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
-					);
-				} else {
-					$this->activityBackend->onTouchCalendarObject(
-						\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_DELETE,
-						$event->getCalendarData(),
-						$event->getShares(),
-						$event->getObjectData()
-					);
-
-					$this->logger->debug(
-						sprintf('Activity generated for deleted calendar object in calendar %d', $event->getCalendarId())
-					);
-				}
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+    public function __construct(
+        private ActivityBackend $activityBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if ($event instanceof CalendarCreatedEvent) {
+            try {
+                $this->activityBackend->onCalendarAdd(
+                    $event->getCalendarData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for new calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar creation, so we just log it
+                $this->logger->error('Error generating activities for a new calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarUpdatedEvent) {
+            try {
+                $this->activityBackend->onCalendarUpdate(
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getMutations()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar update, so we just log it
+                $this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarMovedToTrashEvent) {
+            try {
+                $this->activityBackend->onCalendarMovedToTrash(
+                    $event->getCalendarData(),
+                    $event->getShares()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar update, so we just log it
+                $this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarRestoredEvent) {
+            try {
+                $this->activityBackend->onCalendarRestored(
+                    $event->getCalendarData(),
+                    $event->getShares()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar update, so we just log it
+                $this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarDeletedEvent) {
+            try {
+                $deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+                if (isset($event->getCalendarData()[$deletedProp])) {
+                    $this->logger->debug(
+                        sprintf('Calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
+                    );
+                } else {
+                    $this->activityBackend->onCalendarDelete(
+                        $event->getCalendarData(),
+                        $event->getShares()
+                    );
+
+                    $this->logger->debug(
+                        sprintf('Activity generated for deleted calendar %d', $event->getCalendarId())
+                    );
+                }
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectCreatedEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_ADD,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for new calendar object in calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object creation, so we just log it
+                $this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectUpdatedEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_UPDATE,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for updated calendar object in calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectMovedEvent) {
+            try {
+                $this->activityBackend->onMovedCalendarObject(
+                    $event->getSourceCalendarData(),
+                    $event->getTargetCalendarData(),
+                    $event->getSourceShares(),
+                    $event->getTargetShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for moved calendar object from calendar %d to calendar %d', $event->getSourceCalendarId(), $event->getTargetCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_MOVE_TO_TRASH,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for a calendar object of calendar %d that is moved to trash', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object creation, so we just log it
+                $this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectRestoredEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_RESTORE,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for a restore calendar object of calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object restoration, so we just log it
+                $this->logger->error('Error generating activity for a restored calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectDeletedEvent) {
+            try {
+                $deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+                if (isset($event->getObjectData()[$deletedProp])) {
+                    $this->logger->debug(
+                        sprintf('Calendar object in calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
+                    );
+                } else {
+                    $this->activityBackend->onTouchCalendarObject(
+                        \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_DELETE,
+                        $event->getCalendarData(),
+                        $event->getShares(),
+                        $event->getObjectData()
+                    );
+
+                    $this->logger->debug(
+                        sprintf('Activity generated for deleted calendar object in calendar %d', $event->getCalendarId())
+                    );
+                }
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/dav/lib/Listener/SubscriptionListener.php

Spacing +6 added lines, -6 removed lines

@@ -57,13 +57,13 @@ 
 			$subscriptionId = $event->getSubscriptionId();
 			$subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Refreshing webcal data for subscription ' . $subscriptionId);
+			$this->logger->debug('Refreshing webcal data for subscription '.$subscriptionId);
 			$this->refreshWebcalService->refreshSubscription(
-				(string)$subscriptionData['principaluri'],
-				(string)$subscriptionData['uri']
+				(string) $subscriptionData['principaluri'],
+				(string) $subscriptionData['uri']
 			);
 
-			$this->logger->debug('Scheduling webcal data refreshment for subscription ' . $subscriptionId);
+			$this->logger->debug('Scheduling webcal data refreshment for subscription '.$subscriptionId);
 			$this->jobList->add(RefreshWebcalJob::class, [
 				'principaluri' => $subscriptionData['principaluri'],
 				'uri' => $subscriptionData['uri']
@@ -72,13 +72,13 @@ 
 			$subscriptionId = $event->getSubscriptionId();
 			$subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Removing refresh webcal job for subscription ' . $subscriptionId);
+			$this->logger->debug('Removing refresh webcal job for subscription '.$subscriptionId);
 			$this->jobList->remove(RefreshWebcalJob::class, [
 				'principaluri' => $subscriptionData['principaluri'],
 				'uri' => $subscriptionData['uri']
 			]);
 
-			$this->logger->debug('Cleaning all reminders for subscription ' . $subscriptionId);
+			$this->logger->debug('Cleaning all reminders for subscription '.$subscriptionId);
 			$this->reminderBackend->cleanRemindersForCalendar($subscriptionId);
 		}
 	}

Indentation +36 added lines, -36 removed lines

@@ -20,45 +20,45 @@
 
 /** @template-implements IEventListener<SubscriptionCreatedEvent|SubscriptionDeletedEvent> */
 class SubscriptionListener implements IEventListener {
-	public function __construct(
-		private IJobList $jobList,
-		private RefreshWebcalService $refreshWebcalService,
-		private ReminderBackend $reminderBackend,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IJobList $jobList,
+        private RefreshWebcalService $refreshWebcalService,
+        private ReminderBackend $reminderBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/**
-	 * In case the user has set their default calendar to the deleted one
-	 */
-	public function handle(Event $event): void {
-		if ($event instanceof SubscriptionCreatedEvent) {
-			$subscriptionId = $event->getSubscriptionId();
-			$subscriptionData = $event->getSubscriptionData();
+    /**
+     * In case the user has set their default calendar to the deleted one
+     */
+    public function handle(Event $event): void {
+        if ($event instanceof SubscriptionCreatedEvent) {
+            $subscriptionId = $event->getSubscriptionId();
+            $subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Refreshing webcal data for subscription ' . $subscriptionId);
-			$this->refreshWebcalService->refreshSubscription(
-				(string)$subscriptionData['principaluri'],
-				(string)$subscriptionData['uri']
-			);
+            $this->logger->debug('Refreshing webcal data for subscription ' . $subscriptionId);
+            $this->refreshWebcalService->refreshSubscription(
+                (string)$subscriptionData['principaluri'],
+                (string)$subscriptionData['uri']
+            );
 
-			$this->logger->debug('Scheduling webcal data refreshment for subscription ' . $subscriptionId);
-			$this->jobList->add(RefreshWebcalJob::class, [
-				'principaluri' => $subscriptionData['principaluri'],
-				'uri' => $subscriptionData['uri']
-			]);
-		} elseif ($event instanceof SubscriptionDeletedEvent) {
-			$subscriptionId = $event->getSubscriptionId();
-			$subscriptionData = $event->getSubscriptionData();
+            $this->logger->debug('Scheduling webcal data refreshment for subscription ' . $subscriptionId);
+            $this->jobList->add(RefreshWebcalJob::class, [
+                'principaluri' => $subscriptionData['principaluri'],
+                'uri' => $subscriptionData['uri']
+            ]);
+        } elseif ($event instanceof SubscriptionDeletedEvent) {
+            $subscriptionId = $event->getSubscriptionId();
+            $subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Removing refresh webcal job for subscription ' . $subscriptionId);
-			$this->jobList->remove(RefreshWebcalJob::class, [
-				'principaluri' => $subscriptionData['principaluri'],
-				'uri' => $subscriptionData['uri']
-			]);
+            $this->logger->debug('Removing refresh webcal job for subscription ' . $subscriptionId);
+            $this->jobList->remove(RefreshWebcalJob::class, [
+                'principaluri' => $subscriptionData['principaluri'],
+                'uri' => $subscriptionData['uri']
+            ]);
 
-			$this->logger->debug('Cleaning all reminders for subscription ' . $subscriptionId);
-			$this->reminderBackend->cleanRemindersForCalendar($subscriptionId);
-		}
-	}
+            $this->logger->debug('Cleaning all reminders for subscription ' . $subscriptionId);
+            $this->reminderBackend->cleanRemindersForCalendar($subscriptionId);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php

Indentation +47 added lines, -47 removed lines

@@ -35,56 +35,56 @@
  * or mangle Etag headers.
  */
 class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
-	private ?Server $server = null;
+    private ?Server $server = null;
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
 
-		$server->on('afterMethod:*', [$this, 'afterMethod']);
-		$server->on('afterMove', [$this, 'afterMove']);
-	}
+        $server->on('afterMethod:*', [$this, 'afterMethod']);
+        $server->on('afterMove', [$this, 'afterMove']);
+    }
 
-	/**
-	 * After method, copy the "Etag" header to "OC-Etag" header.
-	 *
-	 * @param RequestInterface $request request
-	 * @param ResponseInterface $response response
-	 */
-	public function afterMethod(RequestInterface $request, ResponseInterface $response) {
-		$eTag = $response->getHeader('Etag');
-		if (!empty($eTag)) {
-			$response->setHeader('OC-ETag', $eTag);
-		}
-	}
+    /**
+     * After method, copy the "Etag" header to "OC-Etag" header.
+     *
+     * @param RequestInterface $request request
+     * @param ResponseInterface $response response
+     */
+    public function afterMethod(RequestInterface $request, ResponseInterface $response) {
+        $eTag = $response->getHeader('Etag');
+        if (!empty($eTag)) {
+            $response->setHeader('OC-ETag', $eTag);
+        }
+    }
 
-	/**
-	 * Called after a node is moved.
-	 *
-	 * This allows the backend to move all the associated properties.
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 * @return void
-	 */
-	public function afterMove($source, $destination) {
-		try {
-			$node = $this->server->tree->getNodeForPath($destination);
-		} catch (NotFound $e) {
-			// Don't care
-			return;
-		}
+    /**
+     * Called after a node is moved.
+     *
+     * This allows the backend to move all the associated properties.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    public function afterMove($source, $destination) {
+        try {
+            $node = $this->server->tree->getNodeForPath($destination);
+        } catch (NotFound $e) {
+            // Don't care
+            return;
+        }
 
-		if ($node instanceof File) {
-			$eTag = $node->getETag();
-			$this->server->httpResponse->setHeader('OC-ETag', $eTag);
-			$this->server->httpResponse->setHeader('ETag', $eTag);
-		}
-	}
+        if ($node instanceof File) {
+            $eTag = $node->getETag();
+            $this->server->httpResponse->setHeader('OC-ETag', $eTag);
+            $this->server->httpResponse->setHeader('ETag', $eTag);
+        }
+    }
 }

apps/dav/lib/DAV/Sharing/IShareable.php

Indentation +34 added lines, -34 removed lines

@@ -31,41 +31,41 @@
  */
 interface IShareable extends INode {
 
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * resource.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param list<array{href: string, commonName: string, readOnly: bool}> $add
-	 * @param list<string> $remove
-	 */
-	public function updateShares(array $add, array $remove): void;
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * resource.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param list<array{href: string, commonName: string, readOnly: bool}> $add
+     * @param list<string> $remove
+     */
+    public function updateShares(array $add, array $remove): void;
 
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *
-	 * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
-	 */
-	public function getShares(): array;
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *
+     * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
+     */
+    public function getShares(): array;
 
-	public function getResourceId(): int;
+    public function getResourceId(): int;
 
-	/**
-	 * @return ?string
-	 */
-	public function getOwner();
+    /**
+     * @return ?string
+     */
+    public function getOwner();
 }

apps/settings/templates/settings/admin/server.php

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 /** @var array $_ */
 
 script('settings', [
-	'vue-settings-admin-basic-settings',
+    'vue-settings-admin-basic-settings',
 ]);
 ?>
 

core/Migrations/Version25000Date20220515204012.php

Indentation +18 added lines, -18 removed lines

@@ -28,25 +28,25 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version25000Date20220515204012 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('share')) {
-			$shareTable = $schema->getTable('share');
+        if ($schema->hasTable('share')) {
+            $shareTable = $schema->getTable('share');
 
-			if (!$shareTable->hasColumn('attributes')) {
-				$shareTable->addColumn(
-					'attributes',
-					Types::JSON,
-					[
-						'default' => null,
-						'notnull' => false
-					]
-				);
-			}
-		}
+            if (!$shareTable->hasColumn('attributes')) {
+                $shareTable->addColumn(
+                    'attributes',
+                    Types::JSON,
+                    [
+                        'default' => null,
+                        'notnull' => false
+                    ]
+                );
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version24000Date20220202150027.php

Indentation +20 added lines, -20 removed lines

@@ -14,25 +14,25 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version24000Date20220202150027 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('mounts');
-		if (!$table->hasColumn('mount_provider_class')) {
-			$table->addColumn('mount_provider_class', Types::STRING, [
-				'notnull' => false,
-				'length' => 128,
-			]);
-			$table->addIndex(['mount_provider_class'], 'mounts_class_index');
-			return $schema;
-		}
-		return null;
-	}
+        $table = $schema->getTable('mounts');
+        if (!$table->hasColumn('mount_provider_class')) {
+            $table->addColumn('mount_provider_class', Types::STRING, [
+                'notnull' => false,
+                'length' => 128,
+            ]);
+            $table->addIndex(['mount_provider_class'], 'mounts_class_index');
+            return $schema;
+        }
+        return null;
+    }
 }

core/templates/publicshareauth.php

Braces +20 added lines, -8 removed lines

@@ -10,9 +10,12 @@ 
 	<!-- password prompt form. It should be hidden when we show the email prompt form -->
 	<?php if (!isset($_['identityOk'])): ?>
 		<form method="post" id="password-input-form">
-	<?php else: ?>
+	<?php else {
+    : ?>
 		<form method="post" id="password-input-form" style="display:none;">
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 		<fieldset class="warning">
 			<?php if (!isset($_['wrongpw'])): ?>
 				<div class="warning-info"><?php p($l->t('This share is password-protected')); ?></div>
@@ -38,9 +41,12 @@ 
 	<!-- email prompt form. It should initially be hidden -->
 	<?php if (isset($_['identityOk'])): ?>
 		<form method="post" id="email-input-form">
-	<?php else: ?>
+	<?php else {
+    : ?>
 		<form method="post" id="email-input-form" style="display:none;">
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 		<fieldset class="warning">
 			<div class="warning-info" id="email-prompt"><?php p($l->t('Please type in your email address to request a temporary password')); ?></div>
 			 <p>
@@ -53,8 +59,11 @@ 
 			<?php if (isset($_['identityOk'])): ?>
 				<?php if ($_['identityOk']): ?>
 					<div class="warning-info" id="identification-success"><?php p($l->t('Password sent!')); ?></div>
-				<?php else: ?>
-					<div class="warning" id="identification-failure"><?php p($l->t('You are not authorized to request a password for this share')); ?></div>
+				<?php else {
+    : ?>
+					<div class="warning" id="identification-failure"><?php p($l->t('You are not authorized to request a password for this share'));
+}
+?></div>
 				<?php endif; ?>
 			<?php endif; ?>
 		</fieldset>
@@ -73,9 +82,12 @@ 
 				id="request-password-back-button"
 	<?php if (isset($_['identityOk'])): ?>
 				style="display:block;">
-	<?php else: ?>
+	<?php else {
+    : ?>
 				style="display:none;">
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 				<?php p($l->t('Back')); ?></a>
 		</fieldset>
 	</form>

core/templates/loginflow/grant.php

Indentation +6 added lines, -6 removed lines

@@ -31,15 +31,15 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php p($l->t('Currently logged in as %1$s (%2$s).', [
-			$_['userDisplayName'],
-			$_['userId'],
-		])) ?>
+            $_['userDisplayName'],
+            $_['userId'],
+        ])) ?>
 	</p>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<br/>

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	</p>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>