nextcloud / server

apps/dav/lib/CalDAV/Proxy/Proxy.php

Indentation +11 added lines, -11 removed lines

@@ -36,16 +36,16 @@
  */
 class Proxy extends Entity {
 
-	/** @var string */
-	protected $ownerId;
-	/** @var string */
-	protected $proxyId;
-	/** @var int */
-	protected $permissions;
+    /** @var string */
+    protected $ownerId;
+    /** @var string */
+    protected $proxyId;
+    /** @var int */
+    protected $permissions;
 
-	public function __construct() {
-		$this->addType('ownerId', 'string');
-		$this->addType('proxyId', 'string');
-		$this->addType('permissions', 'int');
-	}
+    public function __construct() {
+        $this->addType('ownerId', 'string');
+        $this->addType('proxyId', 'string');
+        $this->addType('permissions', 'int');
+    }
 }

apps/dav/lib/Migration/Version1012Date20190808122342.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 */
 	public function changeSchema(IOutput $output,
 								 \Closure $schemaClosure,
-								 array $options):?ISchemaWrapper {
+								 array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 

Indentation +77 added lines, -77 removed lines

@@ -38,86 +38,86 @@
  */
 class Version1012Date20190808122342 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 17.0.0
-	 */
-	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
+     * @since 17.0.0
+     */
+    public function changeSchema(IOutput $output,
+                                    \Closure $schemaClosure,
+                                    array $options):?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendar_reminders')) {
-			$table = $schema->createTable('calendar_reminders');
+        if (!$schema->hasTable('calendar_reminders')) {
+            $table = $schema->createTable('calendar_reminders');
 
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendar_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-			]);
-			$table->addColumn('object_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-			]);
-			$table->addColumn('is_recurring', Types::SMALLINT, [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('uid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('recurrence_id', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('is_recurrence_exception', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->addColumn('event_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('alarm_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('type', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('is_relative', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->addColumn('notification_date', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('is_repeat_based', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendar_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+            ]);
+            $table->addColumn('object_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+            ]);
+            $table->addColumn('is_recurring', Types::SMALLINT, [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('uid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('recurrence_id', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('is_recurrence_exception', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->addColumn('event_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('alarm_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('type', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('is_relative', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->addColumn('notification_date', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('is_repeat_based', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
 
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['object_id'], 'calendar_reminder_objid');
-			$table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['object_id'], 'calendar_reminder_objid');
+            $table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');
 
-			return $schema;
-		}
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php

Indentation +42 added lines, -42 removed lines

@@ -31,51 +31,51 @@
  */
 class NotificationProviderManager {
 
-	/** @var INotificationProvider[] */
-	private $providers = [];
+    /** @var INotificationProvider[] */
+    private $providers = [];
 
-	/**
-	 * Checks whether a provider for a given ACTION exists
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function hasProvider(string $type):bool {
-		return (\in_array($type, ReminderService::REMINDER_TYPES, true)
-			&& isset($this->providers[$type]));
-	}
+    /**
+     * Checks whether a provider for a given ACTION exists
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function hasProvider(string $type):bool {
+        return (\in_array($type, ReminderService::REMINDER_TYPES, true)
+            && isset($this->providers[$type]));
+    }
 
-	/**
-	 * Get provider for a given ACTION
-	 *
-	 * @param string $type
-	 * @return INotificationProvider
-	 * @throws NotificationProvider\ProviderNotAvailableException
-	 * @throws NotificationTypeDoesNotExistException
-	 */
-	public function getProvider(string $type):INotificationProvider {
-		if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
-			if (isset($this->providers[$type])) {
-				return $this->providers[$type];
-			}
-			throw new NotificationProvider\ProviderNotAvailableException($type);
-		}
-		throw new NotificationTypeDoesNotExistException($type);
-	}
+    /**
+     * Get provider for a given ACTION
+     *
+     * @param string $type
+     * @return INotificationProvider
+     * @throws NotificationProvider\ProviderNotAvailableException
+     * @throws NotificationTypeDoesNotExistException
+     */
+    public function getProvider(string $type):INotificationProvider {
+        if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
+            if (isset($this->providers[$type])) {
+                return $this->providers[$type];
+            }
+            throw new NotificationProvider\ProviderNotAvailableException($type);
+        }
+        throw new NotificationTypeDoesNotExistException($type);
+    }
 
-	/**
-	 * Registers a new provider
-	 *
-	 * @param string $providerClassName
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function registerProvider(string $providerClassName):void {
-		$provider = \OC::$server->query($providerClassName);
+    /**
+     * Registers a new provider
+     *
+     * @param string $providerClassName
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function registerProvider(string $providerClassName):void {
+        $provider = \OC::$server->query($providerClassName);
 
-		if (!$provider instanceof INotificationProvider) {
-			throw new \InvalidArgumentException('Invalid notification provider registered');
-		}
+        if (!$provider instanceof INotificationProvider) {
+            throw new \InvalidArgumentException('Invalid notification provider registered');
+        }
 
-		$this->providers[$provider::NOTIFICATION_TYPE] = $provider;
-	}
+        $this->providers[$provider::NOTIFICATION_TYPE] = $provider;
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationTypeDoesNotExistException.php

Indentation +10 added lines, -10 removed lines

@@ -26,15 +26,15 @@
 
 class NotificationTypeDoesNotExistException extends \Exception {
 
-	/**
-	 * NotificationTypeDoesNotExistException constructor.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $type ReminderType
-	 */
-	public function __construct(string $type) {
-		parent::__construct("Type $type is not an accepted type of notification");
-	}
+    /**
+     * NotificationTypeDoesNotExistException constructor.
+     *
+     * @since 16.0.0
+     *
+     * @param string $type ReminderType
+     */
+    public function __construct(string $type) {
+        parent::__construct("Type $type is not an accepted type of notification");
+    }
 
 }

apps/dav/lib/CalDAV/Reminder/NotificationProvider/ProviderNotAvailableException.php

Indentation +10 added lines, -10 removed lines

@@ -25,15 +25,15 @@
 
 class ProviderNotAvailableException extends \Exception {
 
-	/**
-	 * ProviderNotAvailableException constructor.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $type ReminderType
-	 */
-	public function __construct(string $type) {
-		parent::__construct("No notification provider for type $type available");
-	}
+    /**
+     * ProviderNotAvailableException constructor.
+     *
+     * @since 16.0.0
+     *
+     * @param string $type ReminderType
+     */
+    public function __construct(string $type) {
+        parent::__construct("No notification provider for type $type available");
+    }
 
 }

apps/dav/lib/CalDAV/Reminder/NotificationProvider/AudioProvider.php

Indentation +2 added lines, -2 removed lines

@@ -32,6 +32,6 @@
  */
 class AudioProvider extends PushProvider {
 
-	/** @var string */
-	public const NOTIFICATION_TYPE = 'AUDIO';
+    /** @var string */
+    public const NOTIFICATION_TYPE = 'AUDIO';
 }

lib/private/Preview/ProviderV1Adapter.php

Spacing +2 added lines, -2 removed lines

@@ -36,11 +36,11 @@
 	}
 
 	public function getMimeType(): string {
-		return (string)$this->providerV1->getMimeType();
+		return (string) $this->providerV1->getMimeType();
 	}
 
 	public function isAvailable(FileInfo $file): bool {
-		return (bool)$this->providerV1->isAvailable($file);
+		return (bool) $this->providerV1->isAvailable($file);
 	}
 
 	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {

Indentation +20 added lines, -20 removed lines

@@ -34,30 +34,30 @@
 use OCP\Preview\IProviderV2;
 
 class ProviderV1Adapter implements IProviderV2 {
-	private $providerV1;
+    private $providerV1;
 
-	public function __construct(IProvider $providerV1) {
-		$this->providerV1 = $providerV1;
-	}
+    public function __construct(IProvider $providerV1) {
+        $this->providerV1 = $providerV1;
+    }
 
-	public function getMimeType(): string {
-		return (string)$this->providerV1->getMimeType();
-	}
+    public function getMimeType(): string {
+        return (string)$this->providerV1->getMimeType();
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)$this->providerV1->isAvailable($file);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)$this->providerV1->isAvailable($file);
+    }
 
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		[$view, $path] = $this->getViewAndPath($file);
-		$thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view);
-		return $thumbnail === false ? null: $thumbnail;
-	}
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        [$view, $path] = $this->getViewAndPath($file);
+        $thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view);
+        return $thumbnail === false ? null: $thumbnail;
+    }
 
-	private function getViewAndPath(File $file) {
-		$view = new View(dirname($file->getPath()));
-		$path = $file->getName();
+    private function getViewAndPath(File $file) {
+        $view = new View(dirname($file->getPath()));
+        $path = $file->getName();
 
-		return [$view, $path];
-	}
+        return [$view, $path];
+    }
 }

lib/private/Security/RateLimiting/Limiter.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 										string $ip): void {
 		$ipSubnet = (new IpAddress($ip))->getSubnet();
 
-		$anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet);
+		$anonHashIdentifier = hash('sha512', 'anon::'.$identifier.$ipSubnet);
 		$this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit);
 	}
 
@@ -97,7 +97,7 @@ 
 										int $userLimit,
 										int $userPeriod,
 										IUser $user): void {
-		$userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID());
+		$userHashIdentifier = hash('sha512', 'user::'.$identifier.$user->getUID());
 		$this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit);
 	}
 }

Indentation +58 added lines, -58 removed lines

@@ -32,68 +32,68 @@
 use OCP\IUser;
 
 class Limiter {
-	/** @var IBackend */
-	private $backend;
+    /** @var IBackend */
+    private $backend;
 
-	/**
-	 * @param IBackend $backend
-	 */
-	public function __construct(IBackend $backend) {
-		$this->backend = $backend;
-	}
+    /**
+     * @param IBackend $backend
+     */
+    public function __construct(IBackend $backend) {
+        $this->backend = $backend;
+    }
 
-	/**
-	 * @param string $methodIdentifier
-	 * @param string $userIdentifier
-	 * @param int $period in seconds
-	 * @param int $limit
-	 * @throws RateLimitExceededException
-	 */
-	private function register(string $methodIdentifier,
-							  string $userIdentifier,
-							  int $period,
-							  int $limit): void {
-		$existingAttempts = $this->backend->getAttempts($methodIdentifier, $userIdentifier);
-		if ($existingAttempts >= $limit) {
-			throw new RateLimitExceededException();
-		}
+    /**
+     * @param string $methodIdentifier
+     * @param string $userIdentifier
+     * @param int $period in seconds
+     * @param int $limit
+     * @throws RateLimitExceededException
+     */
+    private function register(string $methodIdentifier,
+                                string $userIdentifier,
+                                int $period,
+                                int $limit): void {
+        $existingAttempts = $this->backend->getAttempts($methodIdentifier, $userIdentifier);
+        if ($existingAttempts >= $limit) {
+            throw new RateLimitExceededException();
+        }
 
-		$this->backend->registerAttempt($methodIdentifier, $userIdentifier, $period);
-	}
+        $this->backend->registerAttempt($methodIdentifier, $userIdentifier, $period);
+    }
 
-	/**
-	 * Registers attempt for an anonymous request
-	 *
-	 * @param string $identifier
-	 * @param int $anonLimit
-	 * @param int $anonPeriod in seconds
-	 * @param string $ip
-	 * @throws RateLimitExceededException
-	 */
-	public function registerAnonRequest(string $identifier,
-										int $anonLimit,
-										int $anonPeriod,
-										string $ip): void {
-		$ipSubnet = (new IpAddress($ip))->getSubnet();
+    /**
+     * Registers attempt for an anonymous request
+     *
+     * @param string $identifier
+     * @param int $anonLimit
+     * @param int $anonPeriod in seconds
+     * @param string $ip
+     * @throws RateLimitExceededException
+     */
+    public function registerAnonRequest(string $identifier,
+                                        int $anonLimit,
+                                        int $anonPeriod,
+                                        string $ip): void {
+        $ipSubnet = (new IpAddress($ip))->getSubnet();
 
-		$anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet);
-		$this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit);
-	}
+        $anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet);
+        $this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit);
+    }
 
-	/**
-	 * Registers attempt for an authenticated request
-	 *
-	 * @param string $identifier
-	 * @param int $userLimit
-	 * @param int $userPeriod in seconds
-	 * @param IUser $user
-	 * @throws RateLimitExceededException
-	 */
-	public function registerUserRequest(string $identifier,
-										int $userLimit,
-										int $userPeriod,
-										IUser $user): void {
-		$userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID());
-		$this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit);
-	}
+    /**
+     * Registers attempt for an authenticated request
+     *
+     * @param string $identifier
+     * @param int $userLimit
+     * @param int $userPeriod in seconds
+     * @param IUser $user
+     * @throws RateLimitExceededException
+     */
+    public function registerUserRequest(string $identifier,
+                                        int $userLimit,
+                                        int $userPeriod,
+                                        IUser $user): void {
+        $userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID());
+        $this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit);
+    }
 }

apps/dav/lib/Migration/RemoveOrphanEventsAndContacts.php

Spacing +9 added lines, -9 removed lines

@@ -48,23 +48,23 @@ 
 	 * @inheritdoc
 	 */
 	public function run(IOutput $output) {
-		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars',  'calendarid');
+		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars', 'calendarid');
 		$output->info(sprintf('%d events without a calendar have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects',  'objectid');
+		$orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects', 'objectid');
 		$output->info(sprintf('%d properties without an events have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars',  'calendarid');
+		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars', 'calendarid');
 		$output->info(sprintf('%d changes without a calendar have been cleaned up', $orphanItems));
 
-		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions',  'calendarid');
+		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions', 'calendarid');
 		$output->info(sprintf('%d cached events without a calendar subscription have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions',  'calendarid');
+		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions', 'calendarid');
 		$output->info(sprintf('%d changes without a calendar subscription have been cleaned up', $orphanItems));
 
-		$orphanItems = $this->removeOrphanChildren('cards', 'addressbooks',  'addressbookid');
+		$orphanItems = $this->removeOrphanChildren('cards', 'addressbooks', 'addressbookid');
 		$output->info(sprintf('%d contacts without an addressbook have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('cards_properties', 'cards',  'cardid');
+		$orphanItems = $this->removeOrphanChildren('cards_properties', 'cards', 'cardid');
 		$output->info(sprintf('%d properties without a contact have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks',  'addressbookid');
+		$orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks', 'addressbookid');
 		$output->info(sprintf('%d changes without an addressbook have been cleaned up', $orphanItems));
 	}
 
@@ -73,7 +73,7 @@ 
 
 		$qb->select('c.id')
 			->from($childTable, 'c')
-			->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.' . $parentId, 'p.id'))
+			->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.'.$parentId, 'p.id'))
 			->where($qb->expr()->isNull('p.id'));
 
 		if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {

Indentation +72 added lines, -72 removed lines

@@ -35,76 +35,76 @@
 
 class RemoveOrphanEventsAndContacts implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName(): string {
-		return 'Clean up orphan event and contact data';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars',  'calendarid');
-		$output->info(sprintf('%d events without a calendar have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects',  'objectid');
-		$output->info(sprintf('%d properties without an events have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars',  'calendarid');
-		$output->info(sprintf('%d changes without a calendar have been cleaned up', $orphanItems));
-
-		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions',  'calendarid');
-		$output->info(sprintf('%d cached events without a calendar subscription have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions',  'calendarid');
-		$output->info(sprintf('%d changes without a calendar subscription have been cleaned up', $orphanItems));
-
-		$orphanItems = $this->removeOrphanChildren('cards', 'addressbooks',  'addressbookid');
-		$output->info(sprintf('%d contacts without an addressbook have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('cards_properties', 'cards',  'cardid');
-		$output->info(sprintf('%d properties without a contact have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks',  'addressbookid');
-		$output->info(sprintf('%d changes without an addressbook have been cleaned up', $orphanItems));
-	}
-
-	protected function removeOrphanChildren($childTable, $parentTable, $parentId): int {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('c.id')
-			->from($childTable, 'c')
-			->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.' . $parentId, 'p.id'))
-			->where($qb->expr()->isNull('p.id'));
-
-		if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {
-			$calendarType = $parentTable === 'calendarsubscriptions' ? CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION : CalDavBackend::CALENDAR_TYPE_CALENDAR;
-			$qb->andWhere($qb->expr()->eq('c.calendartype', $qb->createNamedParameter($calendarType, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
-		}
-
-		$result = $qb->execute();
-
-		$orphanItems = [];
-		while ($row = $result->fetch()) {
-			$orphanItems[] = (int) $row['id'];
-		}
-		$result->closeCursor();
-
-		if (!empty($orphanItems)) {
-			$qb->delete($childTable)
-				->where($qb->expr()->in('id', $qb->createParameter('ids')));
-
-			$orphanItemsBatch = array_chunk($orphanItems, 200);
-			foreach ($orphanItemsBatch as $items) {
-				$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->execute();
-			}
-		}
-
-		return count($orphanItems);
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string {
+        return 'Clean up orphan event and contact data';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars',  'calendarid');
+        $output->info(sprintf('%d events without a calendar have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects',  'objectid');
+        $output->info(sprintf('%d properties without an events have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars',  'calendarid');
+        $output->info(sprintf('%d changes without a calendar have been cleaned up', $orphanItems));
+
+        $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions',  'calendarid');
+        $output->info(sprintf('%d cached events without a calendar subscription have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions',  'calendarid');
+        $output->info(sprintf('%d changes without a calendar subscription have been cleaned up', $orphanItems));
+
+        $orphanItems = $this->removeOrphanChildren('cards', 'addressbooks',  'addressbookid');
+        $output->info(sprintf('%d contacts without an addressbook have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('cards_properties', 'cards',  'cardid');
+        $output->info(sprintf('%d properties without a contact have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks',  'addressbookid');
+        $output->info(sprintf('%d changes without an addressbook have been cleaned up', $orphanItems));
+    }
+
+    protected function removeOrphanChildren($childTable, $parentTable, $parentId): int {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('c.id')
+            ->from($childTable, 'c')
+            ->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.' . $parentId, 'p.id'))
+            ->where($qb->expr()->isNull('p.id'));
+
+        if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {
+            $calendarType = $parentTable === 'calendarsubscriptions' ? CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION : CalDavBackend::CALENDAR_TYPE_CALENDAR;
+            $qb->andWhere($qb->expr()->eq('c.calendartype', $qb->createNamedParameter($calendarType, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
+        }
+
+        $result = $qb->execute();
+
+        $orphanItems = [];
+        while ($row = $result->fetch()) {
+            $orphanItems[] = (int) $row['id'];
+        }
+        $result->closeCursor();
+
+        if (!empty($orphanItems)) {
+            $qb->delete($childTable)
+                ->where($qb->expr()->in('id', $qb->createParameter('ids')));
+
+            $orphanItemsBatch = array_chunk($orphanItems, 200);
+            foreach ($orphanItemsBatch as $items) {
+                $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->execute();
+            }
+        }
+
+        return count($orphanItems);
+    }
 }