nextcloud / server

apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php

Spacing +8 added lines, -8 removed lines

@@ -78,7 +78,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar move, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -93,7 +93,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a deleted calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -114,7 +114,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error restoring reminders of a calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -129,7 +129,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error creating reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -144,7 +144,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -159,7 +159,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error deleting reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -174,7 +174,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error restoring reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -189,7 +189,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

Indentation +128 added lines, -128 removed lines

@@ -28,141 +28,141 @@
 /** @template-implements IEventListener<CalendarMovedToTrashEvent|CalendarDeletedEvent|CalendarRestoredEvent|CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent|CalendarObjectDeletedEvent> */
 class CalendarObjectReminderUpdaterListener implements IEventListener {
 
-	public function __construct(
-		private ReminderBackend $reminderBackend,
-		private ReminderService $reminderService,
-		private CalDavBackend $calDavBackend,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private ReminderBackend $reminderBackend,
+        private ReminderService $reminderService,
+        private CalDavBackend $calDavBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if ($event instanceof CalendarMovedToTrashEvent) {
-			try {
-				$this->reminderBackend->cleanRemindersForCalendar(
-					$event->getCalendarId()
-				);
+    public function handle(Event $event): void {
+        if ($event instanceof CalendarMovedToTrashEvent) {
+            try {
+                $this->reminderBackend->cleanRemindersForCalendar(
+                    $event->getCalendarId()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar %d cleaned up after move into trashbin', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar move, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarDeletedEvent) {
-			try {
-				$this->reminderBackend->cleanRemindersForCalendar(
-					$event->getCalendarId()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar %d cleaned up after move into trashbin', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar move, so we just log it
+                $this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarDeletedEvent) {
+            try {
+                $this->reminderBackend->cleanRemindersForCalendar(
+                    $event->getCalendarId()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar %d cleaned up', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarRestoredEvent) {
-			try {
-				$objects = $this->calDavBackend->getCalendarObjects($event->getCalendarId());
-				$this->logger->debug(sprintf('Restoring calendar reminder objects for %d items', count($objects)));
-				foreach ($objects as $object) {
-					$fullObject = $this->calDavBackend->getCalendarObject(
-						$event->getCalendarId(),
-						$object['uri']
-					);
-					$this->reminderService->onCalendarObjectCreate($fullObject);
-				}
+                $this->logger->debug(
+                    sprintf('Reminders of calendar %d cleaned up', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarRestoredEvent) {
+            try {
+                $objects = $this->calDavBackend->getCalendarObjects($event->getCalendarId());
+                $this->logger->debug(sprintf('Restoring calendar reminder objects for %d items', count($objects)));
+                foreach ($objects as $object) {
+                    $fullObject = $this->calDavBackend->getCalendarObject(
+                        $event->getCalendarId(),
+                        $object['uri']
+                    );
+                    $this->reminderService->onCalendarObjectCreate($fullObject);
+                }
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar %d restored', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectCreatedEvent) {
-			try {
-				$this->reminderService->onCalendarObjectCreate(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar %d restored', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectCreatedEvent) {
+            try {
+                $this->reminderService->onCalendarObjectCreate(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar object of calendar %d created', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectUpdatedEvent) {
-			try {
-				$this->reminderService->onCalendarObjectEdit(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar object of calendar %d created', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar object creation, so we just log it
+                $this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectUpdatedEvent) {
+            try {
+                $this->reminderService->onCalendarObjectEdit(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
-			try {
-				$this->reminderService->onCalendarObjectDelete(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
+            try {
+                $this->reminderService->onCalendarObjectDelete(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of restored calendar object of calendar %d deleted', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectRestoredEvent) {
-			try {
-				$this->reminderService->onCalendarObjectCreate(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of restored calendar object of calendar %d deleted', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectRestoredEvent) {
+            try {
+                $this->reminderService->onCalendarObjectCreate(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of restored calendar object of calendar %d restored', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectDeletedEvent) {
-			try {
-				$this->reminderService->onCalendarObjectDelete(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of restored calendar object of calendar %d restored', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectDeletedEvent) {
+            try {
+                $this->reminderService->onCalendarObjectDelete(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+                $this->logger->debug(
+                    sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/dav/lib/Migration/Version1018Date20210312100735.php

Indentation +30 added lines, -30 removed lines

@@ -12,34 +12,34 @@
 
 class Version1018Date20210312100735 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$calendarsTable = $schema->getTable('calendars');
-		$calendarsTable->addColumn('deleted_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
-		$calendarsTable->addIndex([
-			'principaluri',
-			'deleted_at',
-		], 'cals_princ_del_idx');
-
-		$calendarObjectsTable = $schema->getTable('calendarobjects');
-		$calendarObjectsTable->addColumn('deleted_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $calendarsTable = $schema->getTable('calendars');
+        $calendarsTable->addColumn('deleted_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
+        $calendarsTable->addIndex([
+            'principaluri',
+            'deleted_at',
+        ], 'cals_princ_del_idx');
+
+        $calendarObjectsTable = $schema->getTable('calendarobjects');
+        $calendarObjectsTable->addColumn('deleted_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
+
+        return $schema;
+    }
 }

apps/dav/lib/CalDAV/IRestorable.php

Indentation +6 added lines, -6 removed lines

@@ -32,10 +32,10 @@
  */
 interface IRestorable {
 
-	/**
-	 * Restore this node
-	 *
-	 * @throws Exception
-	 */
-	public function restore(): void;
+    /**
+     * Restore this node
+     *
+     * @throws Exception
+     */
+    public function restore(): void;
 }

apps/dav/lib/CalDAV/Trashbin/RestoreTarget.php

Indentation +35 added lines, -35 removed lines

@@ -33,50 +33,50 @@
 use Sabre\DAV\INode;
 
 class RestoreTarget implements ICollection, IMoveTarget {
-	public const NAME = 'restore';
+    public const NAME = 'restore';
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 
-	public function getChild($name) {
-		throw new NotFound();
-	}
+    public function getChild($name) {
+        throw new NotFound();
+    }
 
-	public function getChildren(): array {
-		return [];
-	}
+    public function getChildren(): array {
+        return [];
+    }
 
-	public function childExists($name): bool {
-		return false;
-	}
+    public function childExists($name): bool {
+        return false;
+    }
 
-	public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
-		if ($sourceNode instanceof IRestorable) {
-			$sourceNode->restore();
-			return true;
-		}
+    public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
+        if ($sourceNode instanceof IRestorable) {
+            $sourceNode->restore();
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function delete() {
-		throw new Forbidden();
-	}
+    public function delete() {
+        throw new Forbidden();
+    }
 
-	public function getName(): string {
-		return 'restore';
-	}
+    public function getName(): string {
+        return 'restore';
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function getLastModified() {
-		return 0;
-	}
+    public function getLastModified() {
+        return 0;
+    }
 }

lib/public/AppFramework/Http/DownloadResponse.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 		$filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']);
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$this->addHeader('Content-Type', $contentType);
 	}
 }

Indentation +14 added lines, -14 removed lines

@@ -18,20 +18,20 @@
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DownloadResponse extends Response {
-	/**
-	 * Creates a response that prompts the user to download the file
-	 * @param string $filename the name that the downloaded file should have
-	 * @param C $contentType the mimetype that the downloaded file should have
-	 * @param S $status
-	 * @param H $headers
-	 * @since 7.0.0
-	 */
-	public function __construct(string $filename, string $contentType, int $status = Http::STATUS_OK, array $headers = []) {
-		parent::__construct($status, $headers);
+    /**
+     * Creates a response that prompts the user to download the file
+     * @param string $filename the name that the downloaded file should have
+     * @param C $contentType the mimetype that the downloaded file should have
+     * @param S $status
+     * @param H $headers
+     * @since 7.0.0
+     */
+    public function __construct(string $filename, string $contentType, int $status = Http::STATUS_OK, array $headers = []) {
+        parent::__construct($status, $headers);
 
-		$filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']);
+        $filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']);
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
-		$this->addHeader('Content-Type', $contentType);
-	}
+        $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $this->addHeader('Content-Type', $contentType);
+    }
 }

apps/dav/lib/Migration/Version1008Date20181030113700.php

Indentation +18 added lines, -18 removed lines

@@ -37,22 +37,22 @@
 
 class Version1008Date20181030113700 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) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('cards');
-		$table->addColumn('uid', Types::STRING, [
-			'notnull' => false,
-			'length' => 255
-		]);
-
-		return $schema;
-	}
+    /**
+     * @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) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('cards');
+        $table->addColumn('uid', Types::STRING, [
+            'notnull' => false,
+            'length' => 255
+        ]);
+
+        return $schema;
+    }
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php

Indentation +14 added lines, -14 removed lines

@@ -33,20 +33,20 @@
 
 class Version1002Date20180821043638 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('twofactor_backupcodes');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     *
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('twofactor_backupcodes');
 
-		$table->getColumn('code')->setLength(128);
+        $table->getColumn('code')->setLength(128);
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Accounts/Account.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 	}
 
 	public function getProperties(): array {
-		return array_filter($this->properties, function ($obj) {
+		return array_filter($this->properties, function($obj) {
 			return $obj instanceof IAccountProperty;
 		});
 	}
@@ -96,7 +96,7 @@ 
 			$index = $obj->getName();
 			if ($this->isCollection($index)) {
 				$incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
-				$index .= '#' . $incrementals[$index];
+				$index .= '#'.$incrementals[$index];
 			}
 			$result[$index] = $obj;
 		}

Indentation +121 added lines, -121 removed lines

@@ -17,125 +17,125 @@
 use RuntimeException;
 
 class Account implements IAccount {
-	use TAccountsHelper;
-
-	/** @var IAccountPropertyCollection[]|IAccountProperty[] */
-	private array $properties = [];
-
-	public function __construct(
-		private IUser $user,
-	) {
-	}
-
-	public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount {
-		if ($this->isCollection($property)) {
-			throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection');
-		}
-		$this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData);
-		return $this;
-	}
-
-	public function getProperty(string $property): IAccountProperty {
-		if ($this->isCollection($property)) {
-			throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection');
-		}
-		if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) {
-			throw new PropertyDoesNotExistException($property);
-		}
-		return $this->properties[$property];
-	}
-
-	public function getProperties(): array {
-		return array_filter($this->properties, function ($obj) {
-			return $obj instanceof IAccountProperty;
-		});
-	}
-
-	public function setAllPropertiesFromJson(array $properties): IAccount {
-		foreach ($properties as $propertyName => $propertyObject) {
-			if ($this->isCollection($propertyName)) {
-				$collection = new AccountPropertyCollection($propertyName);
-				/** @var array<int, IAccountProperty> $collectionProperties */
-				$collectionProperties = [];
-				/** @var array<int, array<string, string>> $propertyObject */
-				foreach ($propertyObject as ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData]) {
-					$collectionProperties[] = new AccountProperty($collection->getName(), $value, $scope, $verified, $verificationData);
-				}
-				$collection->setProperties($collectionProperties);
-				$this->setPropertyCollection($collection);
-			} else {
-				/** @var array<string, string> $propertyObject */
-				['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData] = $propertyObject;
-				$this->setProperty($propertyName, $value, $scope, $verified, $verificationData);
-			}
-		}
-
-		return $this;
-	}
-
-	public function getAllProperties(): Generator {
-		foreach ($this->properties as $propertyObject) {
-			if ($propertyObject instanceof IAccountProperty) {
-				yield $propertyObject;
-			} elseif ($propertyObject instanceof IAccountPropertyCollection) {
-				foreach ($propertyObject->getProperties() as $property) {
-					yield $property;
-				}
-			}
-		}
-	}
-
-	public function getFilteredProperties(?string $scope = null, ?string $verified = null): array {
-		$result = $incrementals = [];
-		/** @var IAccountProperty $obj */
-		foreach ($this->getAllProperties() as $obj) {
-			if ($scope !== null && $scope !== $obj->getScope()) {
-				continue;
-			}
-			if ($verified !== null && $verified !== $obj->getVerified()) {
-				continue;
-			}
-			$index = $obj->getName();
-			if ($this->isCollection($index)) {
-				$incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
-				$index .= '#' . $incrementals[$index];
-			}
-			$result[$index] = $obj;
-		}
-		return $result;
-	}
-
-	/** @return array<string, IAccountProperty|array<int, IAccountProperty>> */
-	public function jsonSerialize(): array {
-		$properties = $this->properties;
-		foreach ($properties as $propertyName => $propertyObject) {
-			if ($propertyObject instanceof IAccountPropertyCollection) {
-				// Override collection serialization to discard duplicate name
-				$properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName];
-			}
-		}
-		return $properties;
-	}
-
-	public function getUser(): IUser {
-		return $this->user;
-	}
-
-	public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount {
-		$this->properties[$propertyCollection->getName()] = $propertyCollection;
-		return $this;
-	}
-
-	public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection {
-		if (!$this->isCollection($propertyCollectionName)) {
-			throw new PropertyDoesNotExistException($propertyCollectionName);
-		}
-		if (!array_key_exists($propertyCollectionName, $this->properties)) {
-			$this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName);
-		}
-		if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) {
-			throw new RuntimeException('Requested collection is not an IAccountPropertyCollection');
-		}
-		return $this->properties[$propertyCollectionName];
-	}
+    use TAccountsHelper;
+
+    /** @var IAccountPropertyCollection[]|IAccountProperty[] */
+    private array $properties = [];
+
+    public function __construct(
+        private IUser $user,
+    ) {
+    }
+
+    public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount {
+        if ($this->isCollection($property)) {
+            throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection');
+        }
+        $this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData);
+        return $this;
+    }
+
+    public function getProperty(string $property): IAccountProperty {
+        if ($this->isCollection($property)) {
+            throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection');
+        }
+        if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) {
+            throw new PropertyDoesNotExistException($property);
+        }
+        return $this->properties[$property];
+    }
+
+    public function getProperties(): array {
+        return array_filter($this->properties, function ($obj) {
+            return $obj instanceof IAccountProperty;
+        });
+    }
+
+    public function setAllPropertiesFromJson(array $properties): IAccount {
+        foreach ($properties as $propertyName => $propertyObject) {
+            if ($this->isCollection($propertyName)) {
+                $collection = new AccountPropertyCollection($propertyName);
+                /** @var array<int, IAccountProperty> $collectionProperties */
+                $collectionProperties = [];
+                /** @var array<int, array<string, string>> $propertyObject */
+                foreach ($propertyObject as ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData]) {
+                    $collectionProperties[] = new AccountProperty($collection->getName(), $value, $scope, $verified, $verificationData);
+                }
+                $collection->setProperties($collectionProperties);
+                $this->setPropertyCollection($collection);
+            } else {
+                /** @var array<string, string> $propertyObject */
+                ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData] = $propertyObject;
+                $this->setProperty($propertyName, $value, $scope, $verified, $verificationData);
+            }
+        }
+
+        return $this;
+    }
+
+    public function getAllProperties(): Generator {
+        foreach ($this->properties as $propertyObject) {
+            if ($propertyObject instanceof IAccountProperty) {
+                yield $propertyObject;
+            } elseif ($propertyObject instanceof IAccountPropertyCollection) {
+                foreach ($propertyObject->getProperties() as $property) {
+                    yield $property;
+                }
+            }
+        }
+    }
+
+    public function getFilteredProperties(?string $scope = null, ?string $verified = null): array {
+        $result = $incrementals = [];
+        /** @var IAccountProperty $obj */
+        foreach ($this->getAllProperties() as $obj) {
+            if ($scope !== null && $scope !== $obj->getScope()) {
+                continue;
+            }
+            if ($verified !== null && $verified !== $obj->getVerified()) {
+                continue;
+            }
+            $index = $obj->getName();
+            if ($this->isCollection($index)) {
+                $incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
+                $index .= '#' . $incrementals[$index];
+            }
+            $result[$index] = $obj;
+        }
+        return $result;
+    }
+
+    /** @return array<string, IAccountProperty|array<int, IAccountProperty>> */
+    public function jsonSerialize(): array {
+        $properties = $this->properties;
+        foreach ($properties as $propertyName => $propertyObject) {
+            if ($propertyObject instanceof IAccountPropertyCollection) {
+                // Override collection serialization to discard duplicate name
+                $properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName];
+            }
+        }
+        return $properties;
+    }
+
+    public function getUser(): IUser {
+        return $this->user;
+    }
+
+    public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount {
+        $this->properties[$propertyCollection->getName()] = $propertyCollection;
+        return $this;
+    }
+
+    public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection {
+        if (!$this->isCollection($propertyCollectionName)) {
+            throw new PropertyDoesNotExistException($propertyCollectionName);
+        }
+        if (!array_key_exists($propertyCollectionName, $this->properties)) {
+            $this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName);
+        }
+        if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) {
+            throw new RuntimeException('Requested collection is not an IAccountPropertyCollection');
+        }
+        return $this->properties[$propertyCollectionName];
+    }
 }

apps/dav/lib/Command/DeleteCalendar.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 		$user = $input->getArgument('uid');
 		if (!$this->userManager->userExists($user)) {
 			throw new \InvalidArgumentException(
-				'User <' . $user . '> is unknown.');
+				'User <'.$user.'> is unknown.');
 		}
 
 		$birthday = $input->getOption('birthday');
@@ -112,11 +112,11 @@ 
 		}
 
 		$calendarInfo = $this->calDav->getCalendarByUri(
-			'principals/users/' . $user,
+			'principals/users/'.$user,
 			$name);
 		if ($calendarInfo === null) {
 			throw new \InvalidArgumentException(
-				'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.');
+				'User <'.$user.'> has no calendar named <'.$name.'>. You can run occ dav:list-calendars to list calendars URIs for this user.');
 		}
 
 		$calendar = new Calendar(

Indentation +70 added lines, -70 removed lines

@@ -22,82 +22,82 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteCalendar extends Command {
-	public function __construct(
-		private CalDavBackend $calDav,
-		private IConfig $config,
-		private IL10N $l10n,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private CalDavBackend $calDav,
+        private IConfig $config,
+        private IL10N $l10n,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('dav:delete-calendar')
-			->setDescription('Delete a dav calendar')
-			->addArgument('uid',
-				InputArgument::REQUIRED,
-				'User who owns the calendar')
-			->addArgument('name',
-				InputArgument::OPTIONAL,
-				'Name of the calendar to delete')
-			->addOption('birthday',
-				null,
-				InputOption::VALUE_NONE,
-				'Delete the birthday calendar')
-			->addOption('force',
-				'f',
-				InputOption::VALUE_NONE,
-				'Force delete skipping trashbin');
-	}
+    protected function configure(): void {
+        $this
+            ->setName('dav:delete-calendar')
+            ->setDescription('Delete a dav calendar')
+            ->addArgument('uid',
+                InputArgument::REQUIRED,
+                'User who owns the calendar')
+            ->addArgument('name',
+                InputArgument::OPTIONAL,
+                'Name of the calendar to delete')
+            ->addOption('birthday',
+                null,
+                InputOption::VALUE_NONE,
+                'Delete the birthday calendar')
+            ->addOption('force',
+                'f',
+                InputOption::VALUE_NONE,
+                'Force delete skipping trashbin');
+    }
 
-	protected function execute(
-		InputInterface $input,
-		OutputInterface $output,
-	): int {
-		/** @var string $user */
-		$user = $input->getArgument('uid');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException(
-				'User <' . $user . '> is unknown.');
-		}
+    protected function execute(
+        InputInterface $input,
+        OutputInterface $output,
+    ): int {
+        /** @var string $user */
+        $user = $input->getArgument('uid');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException(
+                'User <' . $user . '> is unknown.');
+        }
 
-		$birthday = $input->getOption('birthday');
-		if ($birthday !== false) {
-			$name = BirthdayService::BIRTHDAY_CALENDAR_URI;
-		} else {
-			/** @var string $name */
-			$name = $input->getArgument('name');
-			if (!$name) {
-				throw new \InvalidArgumentException(
-					'Please specify a calendar name or --birthday');
-			}
-		}
+        $birthday = $input->getOption('birthday');
+        if ($birthday !== false) {
+            $name = BirthdayService::BIRTHDAY_CALENDAR_URI;
+        } else {
+            /** @var string $name */
+            $name = $input->getArgument('name');
+            if (!$name) {
+                throw new \InvalidArgumentException(
+                    'Please specify a calendar name or --birthday');
+            }
+        }
 
-		$calendarInfo = $this->calDav->getCalendarByUri(
-			'principals/users/' . $user,
-			$name);
-		if ($calendarInfo === null) {
-			throw new \InvalidArgumentException(
-				'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.');
-		}
+        $calendarInfo = $this->calDav->getCalendarByUri(
+            'principals/users/' . $user,
+            $name);
+        if ($calendarInfo === null) {
+            throw new \InvalidArgumentException(
+                'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.');
+        }
 
-		$calendar = new Calendar(
-			$this->calDav,
-			$calendarInfo,
-			$this->l10n,
-			$this->config,
-			$this->logger
-		);
+        $calendar = new Calendar(
+            $this->calDav,
+            $calendarInfo,
+            $this->l10n,
+            $this->config,
+            $this->logger
+        );
 
-		$force = $input->getOption('force');
-		if ($force) {
-			$calendar->disableTrashbin();
-		}
+        $force = $input->getOption('force');
+        if ($force) {
+            $calendar->disableTrashbin();
+        }
 
-		$calendar->delete();
+        $calendar->delete();
 
-		return self::SUCCESS;
-	}
+        return self::SUCCESS;
+    }
 }