nextcloud / server

lib/private/Repair/RepairDavShares.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 		$qb = $this->dbc->getQueryBuilder();
 		$qb->select(['id', 'principaluri'])
 			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX.'%')));
 
 		$updateQuery = $this->dbc->getQueryBuilder();
 		$updateQuery->update('dav_shares')
@@ -100,7 +100,7 @@ 
 			// + AND there are no ambivalent groups
 
 			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX.$encodedGid;
 				$logParameters = [
 					'app' => 'core',
 					'id' => $share['id'],

Indentation +76 added lines, -76 removed lines

@@ -21,89 +21,89 @@
 use function urlencode;
 
 class RepairDavShares implements IRepairStep {
-	protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
+    protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
 
-	/** @var bool */
-	private $hintInvalidShares = false;
+    /** @var bool */
+    private $hintInvalidShares = false;
 
-	public function __construct(
-		private IConfig $config,
-		private IDBConnection $dbc,
-		private IGroupManager $groupManager,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IDBConnection $dbc,
+        private IGroupManager $groupManager,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getName() {
-		return 'Repair DAV shares';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getName() {
+        return 'Repair DAV shares';
+    }
 
-	protected function repairUnencodedGroupShares() {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select(['id', 'principaluri'])
-			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+    protected function repairUnencodedGroupShares() {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select(['id', 'principaluri'])
+            ->from('dav_shares')
+            ->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
 
-		$updateQuery = $this->dbc->getQueryBuilder();
-		$updateQuery->update('dav_shares')
-			->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
-			->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
+        $updateQuery = $this->dbc->getQueryBuilder();
+        $updateQuery->update('dav_shares')
+            ->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
+            ->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
 
-		$statement = $qb->executeQuery();
-		while ($share = $statement->fetch()) {
-			$gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
-			$decodedGid = urldecode($gid);
-			$encodedGid = urlencode($gid);
-			if ($gid === $encodedGid
-				|| !$this->groupManager->groupExists($gid)
-				|| ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
-			) {
-				$this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
-				continue;
-			}
+        $statement = $qb->executeQuery();
+        while ($share = $statement->fetch()) {
+            $gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
+            $decodedGid = urldecode($gid);
+            $encodedGid = urlencode($gid);
+            if ($gid === $encodedGid
+                || !$this->groupManager->groupExists($gid)
+                || ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
+            ) {
+                $this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
+                continue;
+            }
 
-			// Repair when
-			// + the group name needs encoding
-			// + AND it is not encoded yet
-			// + AND there are no ambivalent groups
+            // Repair when
+            // + the group name needs encoding
+            // + AND it is not encoded yet
+            // + AND there are no ambivalent groups
 
-			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
-				$logParameters = [
-					'app' => 'core',
-					'id' => $share['id'],
-					'old' => $share['principaluri'],
-					'new' => $fixedPrincipal,
-				];
-				$updateQuery
-					->setParameter('updatedPrincipalUri', $fixedPrincipal)
-					->setParameter('shareId', $share['id'])
-					->executeStatement();
-				$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
-			} catch (Exception $e) {
-				$logParameters['message'] = $e->getMessage();
-				$logParameters['exception'] = $e;
-				$this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
-			}
-		}
-		return true;
-	}
+            try {
+                $fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+                $logParameters = [
+                    'app' => 'core',
+                    'id' => $share['id'],
+                    'old' => $share['principaluri'],
+                    'new' => $fixedPrincipal,
+                ];
+                $updateQuery
+                    ->setParameter('updatedPrincipalUri', $fixedPrincipal)
+                    ->setParameter('shareId', $share['id'])
+                    ->executeStatement();
+                $this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
+            } catch (Exception $e) {
+                $logParameters['message'] = $e->getMessage();
+                $logParameters['exception'] = $e;
+                $this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
-		if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
-			&& $this->repairUnencodedGroupShares()
-		) {
-			$output->info('Repaired DAV group shares');
-			if ($this->hintInvalidShares) {
-				$output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
-			}
-		}
-	}
+    /**
+     * @inheritDoc
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
+        if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
+            && $this->repairUnencodedGroupShares()
+        ) {
+            $output->info('Repaired DAV group shares');
+            if ($this->hintInvalidShares) {
+                $output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
+            }
+        }
+    }
 }

apps/dav/lib/Listener/CalendarContactInteractionListener.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 						}
 					}
 				} catch (Throwable $e) {
-					$this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
+					$this->logger->warning('Could not read calendar data for interaction events: '.$e->getMessage(), [
 						'exception' => $e,
 					]);
 				}

Indentation +109 added lines, -109 removed lines

@@ -30,113 +30,113 @@
 
 /** @template-implements IEventListener<CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarShareUpdatedEvent> */
 class CalendarContactInteractionListener implements IEventListener {
-	private const URI_USERS = 'principals/users/';
-
-	public function __construct(
-		private IEventDispatcher $dispatcher,
-		private IUserSession $userSession,
-		private Principal $principalConnector,
-		private IMailer $mailer,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if (($user = $this->userSession->getUser()) === null) {
-			// Without user context we can't do anything
-			return;
-		}
-
-		if ($event instanceof CalendarObjectCreatedEvent || $event instanceof CalendarObjectUpdatedEvent) {
-			// users: href => principal:principals/users/admin
-			foreach ($event->getShares() as $share) {
-				if (!isset($share['href'])) {
-					continue;
-				}
-				$this->emitFromUri($share['href'], $user);
-			}
-
-			// emit interaction for email attendees as well
-			if (isset($event->getObjectData()['calendardata'])) {
-				try {
-					$calendar = Reader::read($event->getObjectData()['calendardata']);
-					if ($calendar->VEVENT) {
-						foreach ($calendar->VEVENT as $calendarEvent) {
-							$this->emitFromObject($calendarEvent, $user);
-						}
-					}
-				} catch (Throwable $e) {
-					$this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
-						'exception' => $e,
-					]);
-				}
-			}
-		}
-
-		if ($event instanceof CalendarShareUpdatedEvent && !empty($event->getAdded())) {
-			// group: href => principal:principals/groups/admin
-			// users: href => principal:principals/users/admin
-			foreach ($event->getAdded() as $added) {
-				if (!isset($added['href'])) {
-					// Nothing to work with
-					continue;
-				}
-				$this->emitFromUri($added['href'], $user);
-			}
-		}
-	}
-
-	private function emitFromUri(string $uri, IUser $user): void {
-		$principal = $this->principalConnector->findByUri(
-			$uri,
-			$this->principalConnector->getPrincipalPrefix()
-		);
-		if ($principal === null) {
-			// Invalid principal
-			return;
-		}
-		if (!str_starts_with($principal, self::URI_USERS)) {
-			// Not a user principal
-			return;
-		}
-
-		$uid = substr($principal, strlen(self::URI_USERS));
-		$this->dispatcher->dispatchTyped(
-			(new ContactInteractedWithEvent($user))->setUid($uid)
-		);
-	}
-
-	private function emitFromObject(VEvent $vevent, IUser $user): void {
-		if (!$vevent->ATTENDEE) {
-			// Nothing left to do
-			return;
-		}
-
-		foreach ($vevent->ATTENDEE as $attendee) {
-			if (!($attendee instanceof Property)) {
-				continue;
-			}
-
-			$cuType = $attendee->offsetGet('CUTYPE');
-			if ($cuType instanceof Parameter && $cuType->getValue() !== 'INDIVIDUAL') {
-				// Don't care about those
-				continue;
-			}
-
-			$mailTo = $attendee->getValue();
-			if (!str_starts_with($mailTo, 'mailto:')) {
-				// Doesn't look like an email
-				continue;
-			}
-			$email = substr($mailTo, strlen('mailto:'));
-			if (!$this->mailer->validateMailAddress($email)) {
-				// This really isn't a valid email
-				continue;
-			}
-
-			$this->dispatcher->dispatchTyped(
-				(new ContactInteractedWithEvent($user))->setEmail($email)
-			);
-		}
-	}
+    private const URI_USERS = 'principals/users/';
+
+    public function __construct(
+        private IEventDispatcher $dispatcher,
+        private IUserSession $userSession,
+        private Principal $principalConnector,
+        private IMailer $mailer,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if (($user = $this->userSession->getUser()) === null) {
+            // Without user context we can't do anything
+            return;
+        }
+
+        if ($event instanceof CalendarObjectCreatedEvent || $event instanceof CalendarObjectUpdatedEvent) {
+            // users: href => principal:principals/users/admin
+            foreach ($event->getShares() as $share) {
+                if (!isset($share['href'])) {
+                    continue;
+                }
+                $this->emitFromUri($share['href'], $user);
+            }
+
+            // emit interaction for email attendees as well
+            if (isset($event->getObjectData()['calendardata'])) {
+                try {
+                    $calendar = Reader::read($event->getObjectData()['calendardata']);
+                    if ($calendar->VEVENT) {
+                        foreach ($calendar->VEVENT as $calendarEvent) {
+                            $this->emitFromObject($calendarEvent, $user);
+                        }
+                    }
+                } catch (Throwable $e) {
+                    $this->logger->warning('Could not read calendar data for interaction events: ' . $e->getMessage(), [
+                        'exception' => $e,
+                    ]);
+                }
+            }
+        }
+
+        if ($event instanceof CalendarShareUpdatedEvent && !empty($event->getAdded())) {
+            // group: href => principal:principals/groups/admin
+            // users: href => principal:principals/users/admin
+            foreach ($event->getAdded() as $added) {
+                if (!isset($added['href'])) {
+                    // Nothing to work with
+                    continue;
+                }
+                $this->emitFromUri($added['href'], $user);
+            }
+        }
+    }
+
+    private function emitFromUri(string $uri, IUser $user): void {
+        $principal = $this->principalConnector->findByUri(
+            $uri,
+            $this->principalConnector->getPrincipalPrefix()
+        );
+        if ($principal === null) {
+            // Invalid principal
+            return;
+        }
+        if (!str_starts_with($principal, self::URI_USERS)) {
+            // Not a user principal
+            return;
+        }
+
+        $uid = substr($principal, strlen(self::URI_USERS));
+        $this->dispatcher->dispatchTyped(
+            (new ContactInteractedWithEvent($user))->setUid($uid)
+        );
+    }
+
+    private function emitFromObject(VEvent $vevent, IUser $user): void {
+        if (!$vevent->ATTENDEE) {
+            // Nothing left to do
+            return;
+        }
+
+        foreach ($vevent->ATTENDEE as $attendee) {
+            if (!($attendee instanceof Property)) {
+                continue;
+            }
+
+            $cuType = $attendee->offsetGet('CUTYPE');
+            if ($cuType instanceof Parameter && $cuType->getValue() !== 'INDIVIDUAL') {
+                // Don't care about those
+                continue;
+            }
+
+            $mailTo = $attendee->getValue();
+            if (!str_starts_with($mailTo, 'mailto:')) {
+                // Doesn't look like an email
+                continue;
+            }
+            $email = substr($mailTo, strlen('mailto:'));
+            if (!$this->mailer->validateMailAddress($email)) {
+                // This really isn't a valid email
+                continue;
+            }
+
+            $this->dispatcher->dispatchTyped(
+                (new ContactInteractedWithEvent($user))->setEmail($email)
+            );
+        }
+    }
 }

lib/private/AppFramework/Bootstrap/ServiceRegistration.php

Indentation +18 added lines, -18 removed lines

@@ -30,24 +30,24 @@
  * @template T
  */
 class ServiceRegistration extends ARegistration {
-	/**
-	 * @var string
-	 * @psalm-var class-string<T>
-	 */
-	private $service;
+    /**
+     * @var string
+     * @psalm-var class-string<T>
+     */
+    private $service;
 
-	/**
-	 * @psalm-param class-string<T> $service
-	 */
-	public function __construct(string $appId, string $service) {
-		parent::__construct($appId);
-		$this->service = $service;
-	}
+    /**
+     * @psalm-param class-string<T> $service
+     */
+    public function __construct(string $appId, string $service) {
+        parent::__construct($appId);
+        $this->service = $service;
+    }
 
-	/**
-	 * @psalm-return class-string<T>
-	 */
-	public function getService(): string {
-		return $this->service;
-	}
+    /**
+     * @psalm-return class-string<T>
+     */
+    public function getService(): string {
+        return $this->service;
+    }
 }

lib/private/Preview/WebP.php

Indentation +9 added lines, -9 removed lines

@@ -29,14 +29,14 @@
 use OCP\Files\FileInfo;
 
 class WebP extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/webp/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/webp/';
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)(imagetypes() & IMG_WEBP);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 	}
 
 	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
+		return (bool) (imagetypes() & IMG_WEBP);
 	}
 }

apps/dav/lib/AppInfo/PluginManager.php

Spacing +9 added lines, -9 removed lines

@@ -261,7 +261,7 @@ 
 			}
 		}
 
-		throw new \Exception('Could not load ' . $className, 0, $e);
+		throw new \Exception('Could not load '.$className, 0, $e);
 	}
 
 
@@ -271,10 +271,10 @@ 
 	 * @throws \Exception
 	 */
 	private function loadSabrePluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ServerPlugin {
+		return array_map(function(string $className): ServerPlugin {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof ServerPlugin)) {
-				throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
+				throw new \Exception('Sabre server plugin '.$className.' does not implement the '.ServerPlugin::class.' interface');
 			}
 			return $instance;
 		}, $classes);
@@ -285,10 +285,10 @@ 
 	 * @return Collection[]
 	 */
 	private function loadSabreCollectionsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): Collection {
+		return array_map(function(string $className): Collection {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof Collection)) {
-				throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
+				throw new \Exception('Sabre collection plugin '.$className.' does not implement the '.Collection::class.' interface');
 			}
 			return $instance;
 		}, $classes);
@@ -299,10 +299,10 @@ 
 	 * @return IAddressBookProvider[]
 	 */
 	private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): IAddressBookProvider {
+		return array_map(function(string $className): IAddressBookProvider {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof IAddressBookProvider)) {
-				throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
+				throw new \Exception('Sabre address book plugin class '.$className.' does not implement the '.IAddressBookProvider::class.' interface');
 			}
 			return $instance;
 		}, $classes);
@@ -313,10 +313,10 @@ 
 	 * @return ICalendarProvider[]
 	 */
 	private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ICalendarProvider {
+		return array_map(function(string $className): ICalendarProvider {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof ICalendarProvider)) {
-				throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
+				throw new \Exception('Sabre calendar plugin class '.$className.' does not implement the '.ICalendarProvider::class.' interface');
 			}
 			return $instance;
 		}, $classes);

Indentation +268 added lines, -268 removed lines

@@ -27,272 +27,272 @@
  */
 class PluginManager {
 
-	/**
-	 * App plugins
-	 *
-	 * @var ServerPlugin[]
-	 */
-	private $plugins = [];
-
-	/**
-	 * App collections
-	 *
-	 * @var Collection[]
-	 */
-	private $collections = [];
-
-	/**
-	 * Address book plugins
-	 *
-	 * @var IAddressBookProvider[]
-	 */
-	private $addressBookPlugins = [];
-
-	/**
-	 * Calendar plugins
-	 *
-	 * @var ICalendarProvider[]
-	 */
-	private $calendarPlugins = [];
-
-	/** @var bool */
-	private $populated = false;
-
-	/**
-	 * Contstruct a PluginManager
-	 *
-	 * @param ServerContainer $container server container for resolving plugin classes
-	 * @param IAppManager $appManager app manager to loading apps and their info
-	 */
-	public function __construct(
-		private ServerContainer $container,
-		private IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * Returns an array of app-registered plugins
-	 *
-	 * @return ServerPlugin[]
-	 */
-	public function getAppPlugins() {
-		$this->populate();
-		return $this->plugins;
-	}
-
-	/**
-	 * Returns an array of app-registered collections
-	 *
-	 * @return array
-	 */
-	public function getAppCollections() {
-		$this->populate();
-		return $this->collections;
-	}
-
-	/**
-	 * @return IAddressBookProvider[]
-	 */
-	public function getAddressBookPlugins(): array {
-		$this->populate();
-		return $this->addressBookPlugins;
-	}
-
-	/**
-	 * Returns an array of app-registered calendar plugins
-	 *
-	 * @return ICalendarProvider[]
-	 */
-	public function getCalendarPlugins():array {
-		$this->populate();
-		return $this->calendarPlugins;
-	}
-
-	/**
-	 * Retrieve plugin and collection list and populate attributes
-	 */
-	private function populate(): void {
-		if ($this->populated) {
-			return;
-		}
-		$this->populated = true;
-
-		$this->calendarPlugins[] = $this->container->get(AppCalendarPlugin::class);
-
-		foreach ($this->appManager->getEnabledApps() as $app) {
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
-				continue;
-			}
-			$plugins = $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
-			foreach ($plugins as $plugin) {
-				$this->plugins[] = $plugin;
-			}
-
-			$collections = $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
-			foreach ($collections as $collection) {
-				$this->collections[] = $collection;
-			}
-
-			$addresbookPlugins = $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
-			foreach ($addresbookPlugins as $addresbookPlugin) {
-				$this->addressBookPlugins[] = $addresbookPlugin;
-			}
-
-			$calendarPlugins = $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
-			foreach ($calendarPlugins as $calendarPlugin) {
-				$this->calendarPlugins[] = $calendarPlugin;
-			}
-		}
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractPluginList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
-				if (isset($array['sabre']['plugins']['plugin'])) {
-					$items = $array['sabre']['plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractCollectionList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
-				if (isset($array['sabre']['collections']['collection'])) {
-					$items = $array['sabre']['collections']['collection'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractAddressBookPluginList(array $array): array {
-		if (!isset($array['sabre']) || !is_array($array['sabre'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
-			return [];
-		}
-
-		$items = $array['sabre']['address-book-plugins']['plugin'];
-		if (!is_array($items)) {
-			$items = [$items];
-		}
-		return $items;
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractCalendarPluginList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
-				if (isset($array['sabre']['calendar-plugins']['plugin'])) {
-					$items = $array['sabre']['calendar-plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	private function createClass(string $className): object {
-		try {
-			return $this->container->get($className);
-		} catch (QueryException $e) {
-			if (class_exists($className)) {
-				return new $className();
-			}
-		}
-
-		throw new \Exception('Could not load ' . $className, 0, $e);
-	}
-
-
-	/**
-	 * @param string[] $classes
-	 * @return ServerPlugin[]
-	 * @throws \Exception
-	 */
-	private function loadSabrePluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ServerPlugin {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof ServerPlugin)) {
-				throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return Collection[]
-	 */
-	private function loadSabreCollectionsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): Collection {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof Collection)) {
-				throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return IAddressBookProvider[]
-	 */
-	private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): IAddressBookProvider {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof IAddressBookProvider)) {
-				throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return ICalendarProvider[]
-	 */
-	private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ICalendarProvider {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof ICalendarProvider)) {
-				throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
+    /**
+     * App plugins
+     *
+     * @var ServerPlugin[]
+     */
+    private $plugins = [];
+
+    /**
+     * App collections
+     *
+     * @var Collection[]
+     */
+    private $collections = [];
+
+    /**
+     * Address book plugins
+     *
+     * @var IAddressBookProvider[]
+     */
+    private $addressBookPlugins = [];
+
+    /**
+     * Calendar plugins
+     *
+     * @var ICalendarProvider[]
+     */
+    private $calendarPlugins = [];
+
+    /** @var bool */
+    private $populated = false;
+
+    /**
+     * Contstruct a PluginManager
+     *
+     * @param ServerContainer $container server container for resolving plugin classes
+     * @param IAppManager $appManager app manager to loading apps and their info
+     */
+    public function __construct(
+        private ServerContainer $container,
+        private IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * Returns an array of app-registered plugins
+     *
+     * @return ServerPlugin[]
+     */
+    public function getAppPlugins() {
+        $this->populate();
+        return $this->plugins;
+    }
+
+    /**
+     * Returns an array of app-registered collections
+     *
+     * @return array
+     */
+    public function getAppCollections() {
+        $this->populate();
+        return $this->collections;
+    }
+
+    /**
+     * @return IAddressBookProvider[]
+     */
+    public function getAddressBookPlugins(): array {
+        $this->populate();
+        return $this->addressBookPlugins;
+    }
+
+    /**
+     * Returns an array of app-registered calendar plugins
+     *
+     * @return ICalendarProvider[]
+     */
+    public function getCalendarPlugins():array {
+        $this->populate();
+        return $this->calendarPlugins;
+    }
+
+    /**
+     * Retrieve plugin and collection list and populate attributes
+     */
+    private function populate(): void {
+        if ($this->populated) {
+            return;
+        }
+        $this->populated = true;
+
+        $this->calendarPlugins[] = $this->container->get(AppCalendarPlugin::class);
+
+        foreach ($this->appManager->getEnabledApps() as $app) {
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
+                continue;
+            }
+            $plugins = $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+            foreach ($plugins as $plugin) {
+                $this->plugins[] = $plugin;
+            }
+
+            $collections = $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
+            foreach ($collections as $collection) {
+                $this->collections[] = $collection;
+            }
+
+            $addresbookPlugins = $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
+            foreach ($addresbookPlugins as $addresbookPlugin) {
+                $this->addressBookPlugins[] = $addresbookPlugin;
+            }
+
+            $calendarPlugins = $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
+            foreach ($calendarPlugins as $calendarPlugin) {
+                $this->calendarPlugins[] = $calendarPlugin;
+            }
+        }
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractPluginList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
+                if (isset($array['sabre']['plugins']['plugin'])) {
+                    $items = $array['sabre']['plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractCollectionList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
+                if (isset($array['sabre']['collections']['collection'])) {
+                    $items = $array['sabre']['collections']['collection'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractAddressBookPluginList(array $array): array {
+        if (!isset($array['sabre']) || !is_array($array['sabre'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
+            return [];
+        }
+
+        $items = $array['sabre']['address-book-plugins']['plugin'];
+        if (!is_array($items)) {
+            $items = [$items];
+        }
+        return $items;
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractCalendarPluginList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
+                if (isset($array['sabre']['calendar-plugins']['plugin'])) {
+                    $items = $array['sabre']['calendar-plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    private function createClass(string $className): object {
+        try {
+            return $this->container->get($className);
+        } catch (QueryException $e) {
+            if (class_exists($className)) {
+                return new $className();
+            }
+        }
+
+        throw new \Exception('Could not load ' . $className, 0, $e);
+    }
+
+
+    /**
+     * @param string[] $classes
+     * @return ServerPlugin[]
+     * @throws \Exception
+     */
+    private function loadSabrePluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): ServerPlugin {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof ServerPlugin)) {
+                throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return Collection[]
+     */
+    private function loadSabreCollectionsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): Collection {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof Collection)) {
+                throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return IAddressBookProvider[]
+     */
+    private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): IAddressBookProvider {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof IAddressBookProvider)) {
+                throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return ICalendarProvider[]
+     */
+    private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): ICalendarProvider {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof ICalendarProvider)) {
+                throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
 }

lib/public/Files/Cache/AbstractCacheEvent.php

Indentation +51 added lines, -51 removed lines

@@ -35,61 +35,61 @@
  * @since 22.0.0
  */
 class AbstractCacheEvent extends Event implements ICacheEvent {
-	protected $storage;
-	protected $path;
-	protected $fileId;
-	protected $storageId;
+    protected $storage;
+    protected $path;
+    protected $fileId;
+    protected $storageId;
 
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param int $fileId
-	 * @since 22.0.0
-	 */
-	public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
-		$this->storage = $storage;
-		$this->path = $path;
-		$this->fileId = $fileId;
-		$this->storageId = $storageId;
-	}
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param int $fileId
+     * @since 22.0.0
+     */
+    public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
+        $this->storage = $storage;
+        $this->path = $path;
+        $this->fileId = $fileId;
+        $this->storageId = $storageId;
+    }
 
-	/**
-	 * @return IStorage
-	 * @since 22.0.0
-	 */
-	public function getStorage(): IStorage {
-		return $this->storage;
-	}
+    /**
+     * @return IStorage
+     * @since 22.0.0
+     */
+    public function getStorage(): IStorage {
+        return $this->storage;
+    }
 
-	/**
-	 * @return string
-	 * @since 22.0.0
-	 */
-	public function getPath(): string {
-		return $this->path;
-	}
+    /**
+     * @return string
+     * @since 22.0.0
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
 
-	/**
-	 * @param string $path
-	 * @since 22.0.0
-	 */
-	public function setPath(string $path): void {
-		$this->path = $path;
-	}
+    /**
+     * @param string $path
+     * @since 22.0.0
+     */
+    public function setPath(string $path): void {
+        $this->path = $path;
+    }
 
-	/**
-	 * @return int
-	 * @since 22.0.0
-	 */
-	public function getFileId(): int {
-		return $this->fileId;
-	}
+    /**
+     * @return int
+     * @since 22.0.0
+     */
+    public function getFileId(): int {
+        return $this->fileId;
+    }
 
-	/**
-	 * @return int
-	 * @since 22.0.0
-	 */
-	public function getStorageId(): int {
-		return $this->storageId;
-	}
+    /**
+     * @return int
+     * @since 22.0.0
+     */
+    public function getStorageId(): int {
+        return $this->storageId;
+    }
 }

apps/dav/lib/Migration/Version1011Date20190806104428.php

Indentation +34 added lines, -34 removed lines

@@ -38,41 +38,41 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version1011Date20190806104428 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();
+    /**
+     * @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->createTable('dav_cal_proxy');
-		$table->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 11,
-			'unsigned' => true,
-		]);
-		$table->addColumn('owner_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('proxy_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('permissions', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
+        $table = $schema->createTable('dav_cal_proxy');
+        $table->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('owner_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('proxy_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('permissions', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
 
-		$table->setPrimaryKey(['id']);
-		$table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx');
-		$table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid');
+        $table->setPrimaryKey(['id']);
+        $table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx');
+        $table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1017Date20210216083742.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version1017Date20210216083742 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('dav_cal_proxy');
-		if ($table->hasIndex('dav_cal_proxy_ioid')) {
-			$table->dropIndex('dav_cal_proxy_ioid');
-		}
+        $table = $schema->getTable('dav_cal_proxy');
+        if ($table->hasIndex('dav_cal_proxy_ioid')) {
+            $table->dropIndex('dav_cal_proxy_ioid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/files_sharing/lib/Migration/Version22000Date20210216084241.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version22000Date20210216084241 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('share_external');
-		if ($table->hasIndex('sh_external_user')) {
-			$table->dropIndex('sh_external_user');
-		}
+        $table = $schema->getTable('share_external');
+        if ($table->hasIndex('sh_external_user')) {
+            $table->dropIndex('sh_external_user');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }