nextcloud / server

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';
 }

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

Indentation +181 added lines, -181 removed lines

@@ -35,185 +35,185 @@
  */
 class Backend {
 
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * Backend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $db,
-								ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * Get all reminders with a notification date before now
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getRemindersToProcess():array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri'])
-			->from('calendar_reminders', 'cr')
-			->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
-			->leftJoin('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
-			->leftJoin('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'));
-		$stmt = $query->execute();
-
-		return array_map(
-			[$this, 'fixRowTyping'],
-			$stmt->fetchAll()
-		);
-	}
-
-	/**
-	 * Get all scheduled reminders for an event
-	 *
-	 * @param int $objectId
-	 * @return array
-	 */
-	public function getAllScheduledRemindersForEvent(int $objectId):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('calendar_reminders')
-			->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
-		$stmt = $query->execute();
-
-		return array_map(
-			[$this, 'fixRowTyping'],
-			$stmt->fetchAll()
-		);
-	}
-
-	/**
-	 * Insert a new reminder into the database
-	 *
-	 * @param int $calendarId
-	 * @param int $objectId
-	 * @param string $uid
-	 * @param bool $isRecurring
-	 * @param int $recurrenceId
-	 * @param bool $isRecurrenceException
-	 * @param string $eventHash
-	 * @param string $alarmHash
-	 * @param string $type
-	 * @param bool $isRelative
-	 * @param int $notificationDate
-	 * @param bool $isRepeatBased
-	 * @return int The insert id
-	 */
-	public function insertReminder(int $calendarId,
-								   int $objectId,
-								   string $uid,
-								   bool $isRecurring,
-								   int $recurrenceId,
-								   bool $isRecurrenceException,
-								   string $eventHash,
-								   string $alarmHash,
-								   string $type,
-								   bool $isRelative,
-								   int $notificationDate,
-								   bool $isRepeatBased):int {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter($calendarId),
-				'object_id' => $query->createNamedParameter($objectId),
-				'uid' => $query->createNamedParameter($uid),
-				'is_recurring' => $query->createNamedParameter($isRecurring ? 1 : 0),
-				'recurrence_id' => $query->createNamedParameter($recurrenceId),
-				'is_recurrence_exception' => $query->createNamedParameter($isRecurrenceException ? 1 : 0),
-				'event_hash' => $query->createNamedParameter($eventHash),
-				'alarm_hash' => $query->createNamedParameter($alarmHash),
-				'type' => $query->createNamedParameter($type),
-				'is_relative' => $query->createNamedParameter($isRelative ? 1 : 0),
-				'notification_date' => $query->createNamedParameter($notificationDate),
-				'is_repeat_based' => $query->createNamedParameter($isRepeatBased ? 1 : 0),
-			])
-			->execute();
-
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * Sets a new notificationDate on an existing reminder
-	 *
-	 * @param int $reminderId
-	 * @param int $newNotificationDate
-	 */
-	public function updateReminder(int $reminderId,
-								   int $newNotificationDate):void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendar_reminders')
-			->set('notification_date', $query->createNamedParameter($newNotificationDate))
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->execute();
-	}
-
-	/**
-	 * Remove a reminder by it's id
-	 *
-	 * @param integer $reminderId
-	 * @return void
-	 */
-	public function removeReminder(int $reminderId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->execute();
-	}
-
-	/**
-	 * Cleans reminders in database
-	 *
-	 * @param int $objectId
-	 */
-	public function cleanRemindersForEvent(int $objectId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
-			->execute();
-	}
-
-	/**
-	 * Remove all reminders for a calendar
-	 *
-	 * @param int $calendarId
-	 * @return void
-	 */
-	public function cleanRemindersForCalendar(int $calendarId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('calendar_id', $query->createNamedParameter($calendarId)))
-			->execute();
-	}
-
-	/**
-	 * @param array $row
-	 * @return array
-	 */
-	private function fixRowTyping(array $row): array {
-		$row['id'] = (int) $row['id'];
-		$row['calendar_id'] = (int) $row['calendar_id'];
-		$row['object_id'] = (int) $row['object_id'];
-		$row['is_recurring'] = (bool) $row['is_recurring'];
-		$row['recurrence_id'] = (int) $row['recurrence_id'];
-		$row['is_recurrence_exception'] = (bool) $row['is_recurrence_exception'];
-		$row['is_relative'] = (bool) $row['is_relative'];
-		$row['notification_date'] = (int) $row['notification_date'];
-		$row['is_repeat_based'] = (bool) $row['is_repeat_based'];
-
-		return $row;
-	}
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * Backend constructor.
+     *
+     * @param IDBConnection $db
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $db,
+                                ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * Get all reminders with a notification date before now
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getRemindersToProcess():array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri'])
+            ->from('calendar_reminders', 'cr')
+            ->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
+            ->leftJoin('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
+            ->leftJoin('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'));
+        $stmt = $query->execute();
+
+        return array_map(
+            [$this, 'fixRowTyping'],
+            $stmt->fetchAll()
+        );
+    }
+
+    /**
+     * Get all scheduled reminders for an event
+     *
+     * @param int $objectId
+     * @return array
+     */
+    public function getAllScheduledRemindersForEvent(int $objectId):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('calendar_reminders')
+            ->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
+        $stmt = $query->execute();
+
+        return array_map(
+            [$this, 'fixRowTyping'],
+            $stmt->fetchAll()
+        );
+    }
+
+    /**
+     * Insert a new reminder into the database
+     *
+     * @param int $calendarId
+     * @param int $objectId
+     * @param string $uid
+     * @param bool $isRecurring
+     * @param int $recurrenceId
+     * @param bool $isRecurrenceException
+     * @param string $eventHash
+     * @param string $alarmHash
+     * @param string $type
+     * @param bool $isRelative
+     * @param int $notificationDate
+     * @param bool $isRepeatBased
+     * @return int The insert id
+     */
+    public function insertReminder(int $calendarId,
+                                    int $objectId,
+                                    string $uid,
+                                    bool $isRecurring,
+                                    int $recurrenceId,
+                                    bool $isRecurrenceException,
+                                    string $eventHash,
+                                    string $alarmHash,
+                                    string $type,
+                                    bool $isRelative,
+                                    int $notificationDate,
+                                    bool $isRepeatBased):int {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter($calendarId),
+                'object_id' => $query->createNamedParameter($objectId),
+                'uid' => $query->createNamedParameter($uid),
+                'is_recurring' => $query->createNamedParameter($isRecurring ? 1 : 0),
+                'recurrence_id' => $query->createNamedParameter($recurrenceId),
+                'is_recurrence_exception' => $query->createNamedParameter($isRecurrenceException ? 1 : 0),
+                'event_hash' => $query->createNamedParameter($eventHash),
+                'alarm_hash' => $query->createNamedParameter($alarmHash),
+                'type' => $query->createNamedParameter($type),
+                'is_relative' => $query->createNamedParameter($isRelative ? 1 : 0),
+                'notification_date' => $query->createNamedParameter($notificationDate),
+                'is_repeat_based' => $query->createNamedParameter($isRepeatBased ? 1 : 0),
+            ])
+            ->execute();
+
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * Sets a new notificationDate on an existing reminder
+     *
+     * @param int $reminderId
+     * @param int $newNotificationDate
+     */
+    public function updateReminder(int $reminderId,
+                                    int $newNotificationDate):void {
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendar_reminders')
+            ->set('notification_date', $query->createNamedParameter($newNotificationDate))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->execute();
+    }
+
+    /**
+     * Remove a reminder by it's id
+     *
+     * @param integer $reminderId
+     * @return void
+     */
+    public function removeReminder(int $reminderId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->execute();
+    }
+
+    /**
+     * Cleans reminders in database
+     *
+     * @param int $objectId
+     */
+    public function cleanRemindersForEvent(int $objectId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
+            ->execute();
+    }
+
+    /**
+     * Remove all reminders for a calendar
+     *
+     * @param int $calendarId
+     * @return void
+     */
+    public function cleanRemindersForCalendar(int $calendarId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('calendar_id', $query->createNamedParameter($calendarId)))
+            ->execute();
+    }
+
+    /**
+     * @param array $row
+     * @return array
+     */
+    private function fixRowTyping(array $row): array {
+        $row['id'] = (int) $row['id'];
+        $row['calendar_id'] = (int) $row['calendar_id'];
+        $row['object_id'] = (int) $row['object_id'];
+        $row['is_recurring'] = (bool) $row['is_recurring'];
+        $row['recurrence_id'] = (int) $row['recurrence_id'];
+        $row['is_recurrence_exception'] = (bool) $row['is_recurrence_exception'];
+        $row['is_relative'] = (bool) $row['is_relative'];
+        $row['notification_date'] = (int) $row['notification_date'];
+        $row['is_repeat_based'] = (bool) $row['is_repeat_based'];
+
+        return $row;
+    }
 }

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

@@ -35,30 +35,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($file->getParent()->getPath());
-		$path = $file->getName();
+    private function getViewAndPath(File $file) {
+        $view = new View($file->getParent()->getPath());
+        $path = $file->getName();
 
-		return [$view, $path];
-	}
+        return [$view, $path];
+    }
 }

lib/private/Repair/NC16/ClearCollectionsAccessCache.php

Indentation +25 added lines, -25 removed lines

@@ -30,29 +30,29 @@
 
 class ClearCollectionsAccessCache implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IManager|Manager */
-	private $manager;
-
-	public function __construct(IConfig $config, IManager $manager) {
-		$this->config = $config;
-		$this->manager = $manager;
-	}
-
-	public function getName(): string {
-		return 'Clear access cache of projects';
-	}
-
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
-		return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
-	}
-
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->manager->invalidateAccessCacheForAllCollections();
-		}
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var IManager|Manager */
+    private $manager;
+
+    public function __construct(IConfig $config, IManager $manager) {
+        $this->config = $config;
+        $this->manager = $manager;
+    }
+
+    public function getName(): string {
+        return 'Clear access cache of projects';
+    }
+
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+        return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
+    }
+
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->manager->invalidateAccessCacheForAllCollections();
+        }
+    }
 }

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
-	 * @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
+     * @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
-	 * @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
+     * @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
-	 * @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
+     * @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);
+    }
 }

apps/workflowengine/lib/Check/FileSize.php

Indentation +87 added lines, -87 removed lines

@@ -31,91 +31,91 @@
 
 class FileSize implements ICheck {
 
-	/** @var int */
-	protected $size;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IRequest */
-	protected $request;
-
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request) {
-		$this->l = $l;
-		$this->request = $request;
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$size = $this->getFileSizeFromHeader();
-
-		$value = Util::computerFileSize($value);
-		if ($size !== false) {
-			switch ($operator) {
-				case 'less':
-					return $size < $value;
-				case '!less':
-					return $size >= $value;
-				case 'greater':
-					return $size > $value;
-				case '!greater':
-					return $size <= $value;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['less', '!less', 'greater', '!greater'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
-
-		if (!preg_match('/^[0-9]+[ ]?[kmgt]?b$/i', $value)) {
-			throw new \UnexpectedValueException($this->l->t('The given file size is invalid'), 2);
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getFileSizeFromHeader() {
-		if ($this->size !== null) {
-			return $this->size;
-		}
-
-		$size = $this->request->getHeader('OC-Total-Length');
-		if ($size === '') {
-			if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
-				$size = $this->request->getHeader('Content-Length');
-			}
-		}
-
-		if ($size === '') {
-			$size = false;
-		}
-
-		$this->size = $size;
-		return $this->size;
-	}
-
-	public function supportedEntities(): array {
-		return [ File::class ];
-	}
-
-	public function isAvailableForScope(int $scope): bool {
-		return true;
-	}
+    /** @var int */
+    protected $size;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IRequest */
+    protected $request;
+
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request) {
+        $this->l = $l;
+        $this->request = $request;
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $size = $this->getFileSizeFromHeader();
+
+        $value = Util::computerFileSize($value);
+        if ($size !== false) {
+            switch ($operator) {
+                case 'less':
+                    return $size < $value;
+                case '!less':
+                    return $size >= $value;
+                case 'greater':
+                    return $size > $value;
+                case '!greater':
+                    return $size <= $value;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['less', '!less', 'greater', '!greater'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
+
+        if (!preg_match('/^[0-9]+[ ]?[kmgt]?b$/i', $value)) {
+            throw new \UnexpectedValueException($this->l->t('The given file size is invalid'), 2);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function getFileSizeFromHeader() {
+        if ($this->size !== null) {
+            return $this->size;
+        }
+
+        $size = $this->request->getHeader('OC-Total-Length');
+        if ($size === '') {
+            if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
+                $size = $this->request->getHeader('Content-Length');
+            }
+        }
+
+        if ($size === '') {
+            $size = false;
+        }
+
+        $this->size = $size;
+        return $this->size;
+    }
+
+    public function supportedEntities(): array {
+        return [ File::class ];
+    }
+
+    public function isAvailableForScope(int $scope): bool {
+        return true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	}
 
 	public function supportedEntities(): array {
-		return [ File::class ];
+		return [File::class];
 	}
 
 	public function isAvailableForScope(int $scope): bool {

apps/workflowengine/lib/Check/UserGroupMembership.php

Indentation +82 added lines, -82 removed lines

@@ -31,86 +31,86 @@
 
 class UserGroupMembership implements ICheck {
 
-	/** @var string */
-	protected $cachedUser;
-
-	/** @var string[] */
-	protected $cachedGroupMemberships;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param IL10N $l
-	 */
-	public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) {
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			$groupIds = $this->getUserGroups($user);
-			return ($operator === 'is') === in_array($value, $groupIds);
-		} else {
-			return $operator !== 'is';
-		}
-	}
-
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
-
-		if (!$this->groupManager->groupExists($value)) {
-			throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	protected function getUserGroups(IUser $user) {
-		$uid = $user->getUID();
-
-		if ($this->cachedUser !== $uid) {
-			$this->cachedUser = $uid;
-			$this->cachedGroupMemberships = $this->groupManager->getUserGroupIds($user);
-		}
-
-		return $this->cachedGroupMemberships;
-	}
-
-	public function supportedEntities(): array {
-		// universal by default
-		return [];
-	}
-
-	public function isAvailableForScope(int $scope): bool {
-		// admin only by default
-		return $scope === IManager::SCOPE_ADMIN;
-	}
+    /** @var string */
+    protected $cachedUser;
+
+    /** @var string[] */
+    protected $cachedGroupMemberships;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IL10N */
+    protected $l;
+
+    /**
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param IL10N $l
+     */
+    public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) {
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->l = $l;
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            $groupIds = $this->getUserGroups($user);
+            return ($operator === 'is') === in_array($value, $groupIds);
+        } else {
+            return $operator !== 'is';
+        }
+    }
+
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
+
+        if (!$this->groupManager->groupExists($value)) {
+            throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    protected function getUserGroups(IUser $user) {
+        $uid = $user->getUID();
+
+        if ($this->cachedUser !== $uid) {
+            $this->cachedUser = $uid;
+            $this->cachedGroupMemberships = $this->groupManager->getUserGroupIds($user);
+        }
+
+        return $this->cachedGroupMemberships;
+    }
+
+    public function supportedEntities(): array {
+        // universal by default
+        return [];
+    }
+
+    public function isAvailableForScope(int $scope): bool {
+        // admin only by default
+        return $scope === IManager::SCOPE_ADMIN;
+    }
 }

lib/public/WorkflowEngine/IEntityCheck.php

Indentation +16 added lines, -16 removed lines

@@ -34,21 +34,21 @@
  * @since 18.0.0
  */
 interface IEntityCheck {
-	/**
-	 * Equips the check with a subject fitting the Entity. For instance, an
-	 * entity of File will receive an instance of OCP\Files\Node, or a comment
-	 * entity might get an IComment.
-	 *
-	 * The implementing check must be aware of the incoming type.
-	 *
-	 * If an unsupported subject is passed the implementation MAY throw an
-	 * \UnexpectedValueException.
-	 *
-	 * @param IEntity $entity
-	 * @param mixed $subject
-	 * @throws \UnexpectedValueException
-	 * @since 18.0.0
-	 */
-	public function setEntitySubject(IEntity $entity, $subject): void;
+    /**
+     * Equips the check with a subject fitting the Entity. For instance, an
+     * entity of File will receive an instance of OCP\Files\Node, or a comment
+     * entity might get an IComment.
+     *
+     * The implementing check must be aware of the incoming type.
+     *
+     * If an unsupported subject is passed the implementation MAY throw an
+     * \UnexpectedValueException.
+     *
+     * @param IEntity $entity
+     * @param mixed $subject
+     * @throws \UnexpectedValueException
+     * @since 18.0.0
+     */
+    public function setEntitySubject(IEntity $entity, $subject): void;
 
 }