nextcloud / server

apps/files_sharing/lib/Controller/ShareesAPIController.php

Indentation +359 added lines, -359 removed lines

@@ -39,363 +39,363 @@
  */
 class ShareesAPIController extends OCSController {
 
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var Files_SharingShareesSearchResult */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'remote_groups' => [],
-			'emails' => [],
-			'circles' => [],
-			'rooms' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'remote_groups' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-		'rooms' => [],
-		'lookupEnabled' => false,
-	];
-
-	protected $reachedEndFor = [];
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected ?string $userId,
-		protected IConfig $config,
-		protected IURLGenerator $urlGenerator,
-		protected IManager $shareManager,
-		protected ISearch $collaboratorSearch,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * Search for sharees
-	 *
-	 * @param string $search Text to search for
-	 * @param string|null $itemType Limit to specific item types
-	 * @param int $page Page offset for searching
-	 * @param int $perPage Limit amount of search results per page
-	 * @param int|list<int>|null $shareType Limit to specific share types
-	 * @param bool $lookup If a global lookup should be performed too
-	 * @return DataResponse<Http::STATUS_OK, Files_SharingShareesSearchResult, array{Link?: string}>
-	 * @throws OCSBadRequestException Invalid search parameters
-	 *
-	 * 200: Sharees search result returned
-	 */
-	#[NoAdminRequired]
-	public function search(string $search = '', ?string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = false): DataResponse {
-
-		// only search for string larger than a given threshold
-		$threshold = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
-		if (strlen($search) < $threshold) {
-			return new DataResponse($this->result);
-		}
-
-		if ($this->shareManager->sharingDisabledForUser($this->userId)) {
-			return new DataResponse($this->result);
-		}
-
-		// never return more than the max. number of results configured in the config.php
-		$maxResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
-		if ($maxResults > 0) {
-			$perPage = min($perPage, $maxResults);
-		}
-		if ($perPage <= 0) {
-			throw new OCSBadRequestException('Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			throw new OCSBadRequestException('Invalid page');
-		}
-
-		$shareTypes = [
-			IShare::TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = IShare::TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
-				$shareTypes[] = IShare::TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
-				$shareTypes[] = IShare::TYPE_ROOM;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_SCIENCEMESH)) {
-				$shareTypes[] = IShare::TYPE_SCIENCEMESH;
-			}
-		} else {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = IShare::TYPE_GROUP;
-			}
-			$shareTypes[] = IShare::TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (Server::get(IAppManager::class)->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = IShare::TYPE_CIRCLE;
-		}
-
-		if ($this->shareManager->shareProviderExists(IShare::TYPE_SCIENCEMESH)) {
-			$shareTypes[] = IShare::TYPE_SCIENCEMESH;
-		}
-
-		if ($itemType === 'calendar') {
-			$shareTypes[] = IShare::TYPE_REMOTE;
-		}
-
-		if ($shareType !== null && is_array($shareType)) {
-			$shareTypes = array_intersect($shareTypes, $shareType);
-		} elseif (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int)$shareType]);
-		}
-		sort($shareTypes);
-
-		$this->limit = $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		// In global scale mode we always search the lookup server
-		$this->result['lookupEnabled'] = Server::get(GlobalScaleIConfig::class)->isGlobalScaleEnabled();
-		// TODO: Reconsider using lookup server for non-global-scale federation
-
-		[$result, $hasMoreResults] = $this->collaboratorSearch->search($search, $shareTypes, $this->result['lookupEnabled'], $this->limit, $this->offset);
-
-		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
-		if (isset($result['exact'])) {
-			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
-		}
-		$this->result = array_merge($this->result, $result);
-		$response = new DataResponse($this->result);
-
-		if ($hasMoreResults) {
-			$response->setHeaders(['Link' => $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			])]);
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param string $user
-	 * @param int $shareType
-	 *
-	 * @return Generator<array<string>>
-	 */
-	private function getAllShareesByType(string $user, int $shareType): Generator {
-		$offset = 0;
-		$pageSize = 50;
-
-		while (count($page = $this->shareManager->getSharesBy(
-			$user,
-			$shareType,
-			null,
-			false,
-			$pageSize,
-			$offset
-		))) {
-			foreach ($page as $share) {
-				yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
-			}
-
-			$offset += $pageSize;
-		}
-	}
-
-	private function sortShareesByFrequency(array $sharees): array {
-		usort($sharees, function (array $s1, array $s2): int {
-			return $s2['count'] - $s1['count'];
-		});
-		return $sharees;
-	}
-
-	private $searchResultTypeMap = [
-		IShare::TYPE_USER => 'users',
-		IShare::TYPE_GROUP => 'groups',
-		IShare::TYPE_REMOTE => 'remotes',
-		IShare::TYPE_REMOTE_GROUP => 'remote_groups',
-		IShare::TYPE_EMAIL => 'emails',
-	];
-
-	private function getAllSharees(string $user, array $shareTypes): ISearchResult {
-		$result = [];
-		foreach ($shareTypes as $shareType) {
-			$sharees = $this->getAllShareesByType($user, $shareType);
-			$shareTypeResults = [];
-			foreach ($sharees as [$sharee, $displayname]) {
-				if (!isset($this->searchResultTypeMap[$shareType]) || trim($sharee) === '') {
-					continue;
-				}
-
-				if (!isset($shareTypeResults[$sharee])) {
-					$shareTypeResults[$sharee] = [
-						'count' => 1,
-						'label' => $displayname,
-						'value' => [
-							'shareType' => $shareType,
-							'shareWith' => $sharee,
-						],
-					];
-				} else {
-					$shareTypeResults[$sharee]['count']++;
-				}
-			}
-			$result = array_merge($result, array_values($shareTypeResults));
-		}
-
-		$top5 = array_slice(
-			$this->sortShareesByFrequency($result),
-			0,
-			5
-		);
-
-		$searchResult = new SearchResult();
-		foreach ($this->searchResultTypeMap as $int => $str) {
-			$searchResult->addResultSet(new SearchResultType($str), [], []);
-			foreach ($top5 as $x) {
-				if ($x['value']['shareType'] === $int) {
-					$searchResult->addResultSet(new SearchResultType($str), [], [$x]);
-				}
-			}
-		}
-		return $searchResult;
-	}
-
-	/**
-	 * Find recommended sharees
-	 *
-	 * @param string $itemType Limit to specific item types
-	 * @param int|list<int>|null $shareType Limit to specific share types
-	 * @return DataResponse<Http::STATUS_OK, Files_SharingShareesRecommendedResult, array{}>
-	 *
-	 * 200: Recommended sharees returned
-	 */
-	#[NoAdminRequired]
-	public function findRecommended(string $itemType, $shareType = null): DataResponse {
-		$shareTypes = [
-			IShare::TYPE_USER,
-		];
-
-		if ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = IShare::TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
-				$shareTypes[] = IShare::TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
-				$shareTypes[] = IShare::TYPE_ROOM;
-			}
-		} else {
-			$shareTypes[] = IShare::TYPE_GROUP;
-			$shareTypes[] = IShare::TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (Server::get(IAppManager::class)->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = IShare::TYPE_CIRCLE;
-		}
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-		} elseif (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int)$shareType]);
-			sort($shareTypes);
-		}
-
-		return new DataResponse(
-			$this->getAllSharees($this->userId, $shareTypes)->asArray()
-		);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	protected function isRemoteGroupSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE_GROUP);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink(int $page, array $params): string {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		return '<' . $url . http_build_query($params) . '>; rel="next"';
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2(): bool {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var Files_SharingShareesSearchResult */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'remote_groups' => [],
+            'emails' => [],
+            'circles' => [],
+            'rooms' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'remote_groups' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+        'rooms' => [],
+        'lookupEnabled' => false,
+    ];
+
+    protected $reachedEndFor = [];
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected ?string $userId,
+        protected IConfig $config,
+        protected IURLGenerator $urlGenerator,
+        protected IManager $shareManager,
+        protected ISearch $collaboratorSearch,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * Search for sharees
+     *
+     * @param string $search Text to search for
+     * @param string|null $itemType Limit to specific item types
+     * @param int $page Page offset for searching
+     * @param int $perPage Limit amount of search results per page
+     * @param int|list<int>|null $shareType Limit to specific share types
+     * @param bool $lookup If a global lookup should be performed too
+     * @return DataResponse<Http::STATUS_OK, Files_SharingShareesSearchResult, array{Link?: string}>
+     * @throws OCSBadRequestException Invalid search parameters
+     *
+     * 200: Sharees search result returned
+     */
+    #[NoAdminRequired]
+    public function search(string $search = '', ?string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = false): DataResponse {
+
+        // only search for string larger than a given threshold
+        $threshold = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
+        if (strlen($search) < $threshold) {
+            return new DataResponse($this->result);
+        }
+
+        if ($this->shareManager->sharingDisabledForUser($this->userId)) {
+            return new DataResponse($this->result);
+        }
+
+        // never return more than the max. number of results configured in the config.php
+        $maxResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
+        if ($maxResults > 0) {
+            $perPage = min($perPage, $maxResults);
+        }
+        if ($perPage <= 0) {
+            throw new OCSBadRequestException('Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            throw new OCSBadRequestException('Invalid page');
+        }
+
+        $shareTypes = [
+            IShare::TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = IShare::TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
+                $shareTypes[] = IShare::TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
+                $shareTypes[] = IShare::TYPE_ROOM;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_SCIENCEMESH)) {
+                $shareTypes[] = IShare::TYPE_SCIENCEMESH;
+            }
+        } else {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = IShare::TYPE_GROUP;
+            }
+            $shareTypes[] = IShare::TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (Server::get(IAppManager::class)->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = IShare::TYPE_CIRCLE;
+        }
+
+        if ($this->shareManager->shareProviderExists(IShare::TYPE_SCIENCEMESH)) {
+            $shareTypes[] = IShare::TYPE_SCIENCEMESH;
+        }
+
+        if ($itemType === 'calendar') {
+            $shareTypes[] = IShare::TYPE_REMOTE;
+        }
+
+        if ($shareType !== null && is_array($shareType)) {
+            $shareTypes = array_intersect($shareTypes, $shareType);
+        } elseif (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int)$shareType]);
+        }
+        sort($shareTypes);
+
+        $this->limit = $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        // In global scale mode we always search the lookup server
+        $this->result['lookupEnabled'] = Server::get(GlobalScaleIConfig::class)->isGlobalScaleEnabled();
+        // TODO: Reconsider using lookup server for non-global-scale federation
+
+        [$result, $hasMoreResults] = $this->collaboratorSearch->search($search, $shareTypes, $this->result['lookupEnabled'], $this->limit, $this->offset);
+
+        // extra treatment for 'exact' subarray, with a single merge expected keys might be lost
+        if (isset($result['exact'])) {
+            $result['exact'] = array_merge($this->result['exact'], $result['exact']);
+        }
+        $this->result = array_merge($this->result, $result);
+        $response = new DataResponse($this->result);
+
+        if ($hasMoreResults) {
+            $response->setHeaders(['Link' => $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ])]);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param string $user
+     * @param int $shareType
+     *
+     * @return Generator<array<string>>
+     */
+    private function getAllShareesByType(string $user, int $shareType): Generator {
+        $offset = 0;
+        $pageSize = 50;
+
+        while (count($page = $this->shareManager->getSharesBy(
+            $user,
+            $shareType,
+            null,
+            false,
+            $pageSize,
+            $offset
+        ))) {
+            foreach ($page as $share) {
+                yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
+            }
+
+            $offset += $pageSize;
+        }
+    }
+
+    private function sortShareesByFrequency(array $sharees): array {
+        usort($sharees, function (array $s1, array $s2): int {
+            return $s2['count'] - $s1['count'];
+        });
+        return $sharees;
+    }
+
+    private $searchResultTypeMap = [
+        IShare::TYPE_USER => 'users',
+        IShare::TYPE_GROUP => 'groups',
+        IShare::TYPE_REMOTE => 'remotes',
+        IShare::TYPE_REMOTE_GROUP => 'remote_groups',
+        IShare::TYPE_EMAIL => 'emails',
+    ];
+
+    private function getAllSharees(string $user, array $shareTypes): ISearchResult {
+        $result = [];
+        foreach ($shareTypes as $shareType) {
+            $sharees = $this->getAllShareesByType($user, $shareType);
+            $shareTypeResults = [];
+            foreach ($sharees as [$sharee, $displayname]) {
+                if (!isset($this->searchResultTypeMap[$shareType]) || trim($sharee) === '') {
+                    continue;
+                }
+
+                if (!isset($shareTypeResults[$sharee])) {
+                    $shareTypeResults[$sharee] = [
+                        'count' => 1,
+                        'label' => $displayname,
+                        'value' => [
+                            'shareType' => $shareType,
+                            'shareWith' => $sharee,
+                        ],
+                    ];
+                } else {
+                    $shareTypeResults[$sharee]['count']++;
+                }
+            }
+            $result = array_merge($result, array_values($shareTypeResults));
+        }
+
+        $top5 = array_slice(
+            $this->sortShareesByFrequency($result),
+            0,
+            5
+        );
+
+        $searchResult = new SearchResult();
+        foreach ($this->searchResultTypeMap as $int => $str) {
+            $searchResult->addResultSet(new SearchResultType($str), [], []);
+            foreach ($top5 as $x) {
+                if ($x['value']['shareType'] === $int) {
+                    $searchResult->addResultSet(new SearchResultType($str), [], [$x]);
+                }
+            }
+        }
+        return $searchResult;
+    }
+
+    /**
+     * Find recommended sharees
+     *
+     * @param string $itemType Limit to specific item types
+     * @param int|list<int>|null $shareType Limit to specific share types
+     * @return DataResponse<Http::STATUS_OK, Files_SharingShareesRecommendedResult, array{}>
+     *
+     * 200: Recommended sharees returned
+     */
+    #[NoAdminRequired]
+    public function findRecommended(string $itemType, $shareType = null): DataResponse {
+        $shareTypes = [
+            IShare::TYPE_USER,
+        ];
+
+        if ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = IShare::TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
+                $shareTypes[] = IShare::TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
+                $shareTypes[] = IShare::TYPE_ROOM;
+            }
+        } else {
+            $shareTypes[] = IShare::TYPE_GROUP;
+            $shareTypes[] = IShare::TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (Server::get(IAppManager::class)->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = IShare::TYPE_CIRCLE;
+        }
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+        } elseif (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int)$shareType]);
+            sort($shareTypes);
+        }
+
+        return new DataResponse(
+            $this->getAllSharees($this->userId, $shareTypes)->asArray()
+        );
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    protected function isRemoteGroupSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE_GROUP);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink(int $page, array $params): string {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        return '<' . $url . http_build_query($params) . '>; rel="next"';
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2(): bool {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

apps/dav/lib/Migration/Version1034Date20250605132605.php

Indentation +80 added lines, -80 removed lines

@@ -16,87 +16,87 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1034Date20250605132605 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure(): ISchemaWrapper $schemaClosure
-	 * @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(): ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$davSharesTable = $schema->getTable('dav_shares');
-		if (!$davSharesTable->hasColumn('token')) {
-			$davSharesTable->addColumn('token', Types::STRING, [
-				'notnull' => false,
-				'default' => null,
-				'length' => 255,
-			]);
-		}
+        $davSharesTable = $schema->getTable('dav_shares');
+        if (!$davSharesTable->hasColumn('token')) {
+            $davSharesTable->addColumn('token', Types::STRING, [
+                'notnull' => false,
+                'default' => null,
+                'length' => 255,
+            ]);
+        }
 
-		if (!$schema->hasTable('calendars_federated')) {
-			$federatedCalendarsTable = $schema->createTable('calendars_federated');
-			$federatedCalendarsTable->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$federatedCalendarsTable->addColumn('display_name', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('color', Types::STRING, [
-				'notnull' => false,
-				'length' => 7,
-				'default' => null,
-			]);
-			$federatedCalendarsTable->addColumn('uri', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('principaluri', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('remote_Url', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('token', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('sync_token', Types::INTEGER, [
-				'notnull' => true,
-				'unsigned' => true,
-				'default' => 0,
-			]);
-			$federatedCalendarsTable->addColumn('last_sync', Types::BIGINT, [
-				'notnull' => false,
-				'unsigned' => true,
-				'default' => null,
-			]);
-			$federatedCalendarsTable->addColumn('shared_by', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('shared_by_display_name', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('components', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$federatedCalendarsTable->addColumn('permissions', Types::INTEGER, [
-				'notnull' => true,
-			]);
-			$federatedCalendarsTable->setPrimaryKey(['id']);
-			$federatedCalendarsTable->addIndex(['principaluri', 'uri'], 'fedcals_uris_index');
-			$federatedCalendarsTable->addIndex(['last_sync'], 'fedcals_last_sync_index');
-		}
+        if (!$schema->hasTable('calendars_federated')) {
+            $federatedCalendarsTable = $schema->createTable('calendars_federated');
+            $federatedCalendarsTable->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $federatedCalendarsTable->addColumn('display_name', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('color', Types::STRING, [
+                'notnull' => false,
+                'length' => 7,
+                'default' => null,
+            ]);
+            $federatedCalendarsTable->addColumn('uri', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('principaluri', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('remote_Url', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('token', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('sync_token', Types::INTEGER, [
+                'notnull' => true,
+                'unsigned' => true,
+                'default' => 0,
+            ]);
+            $federatedCalendarsTable->addColumn('last_sync', Types::BIGINT, [
+                'notnull' => false,
+                'unsigned' => true,
+                'default' => null,
+            ]);
+            $federatedCalendarsTable->addColumn('shared_by', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('shared_by_display_name', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('components', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $federatedCalendarsTable->addColumn('permissions', Types::INTEGER, [
+                'notnull' => true,
+            ]);
+            $federatedCalendarsTable->setPrimaryKey(['id']);
+            $federatedCalendarsTable->addIndex(['principaluri', 'uri'], 'fedcals_uris_index');
+            $federatedCalendarsTable->addIndex(['last_sync'], 'fedcals_last_sync_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Command/CreateCalendar.php

Indentation +54 added lines, -54 removed lines

@@ -30,60 +30,60 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CreateCalendar extends Command {
-	public function __construct(
-		protected IUserManager $userManager,
-		private IGroupManager $groupManager,
-		protected IDBConnection $dbConnection,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IUserManager $userManager,
+        private IGroupManager $groupManager,
+        protected IDBConnection $dbConnection,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('dav:create-calendar')
-			->setDescription('Create a dav calendar')
-			->addArgument('user',
-				InputArgument::REQUIRED,
-				'User for whom the calendar will be created')
-			->addArgument('name',
-				InputArgument::REQUIRED,
-				'Name of the calendar');
-	}
+    protected function configure(): void {
+        $this
+            ->setName('dav:create-calendar')
+            ->setDescription('Create a dav calendar')
+            ->addArgument('user',
+                InputArgument::REQUIRED,
+                'User for whom the calendar will be created')
+            ->addArgument('name',
+                InputArgument::REQUIRED,
+                'Name of the calendar');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('user');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> in unknown.");
-		}
-		$principalBackend = new Principal(
-			$this->userManager,
-			$this->groupManager,
-			Server::get(IAccountManager::class),
-			Server::get(\OCP\Share\IManager::class),
-			Server::get(IUserSession::class),
-			Server::get(IAppManager::class),
-			Server::get(ProxyMapper::class),
-			Server::get(KnownUserService::class),
-			Server::get(IConfig::class),
-			\OC::$server->getL10NFactory(),
-		);
-		$random = Server::get(ISecureRandom::class);
-		$logger = Server::get(LoggerInterface::class);
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$config = Server::get(IConfig::class);
-		$name = $input->getArgument('name');
-		$caldav = new CalDavBackend(
-			$this->dbConnection,
-			$principalBackend,
-			$this->userManager,
-			$random,
-			$logger,
-			$dispatcher,
-			$config,
-			Server::get(Backend::class),
-			Server::get(FederatedCalendarMapper::class),
-		);
-		$caldav->createCalendar("principals/users/$user", $name, []);
-		return self::SUCCESS;
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('user');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> in unknown.");
+        }
+        $principalBackend = new Principal(
+            $this->userManager,
+            $this->groupManager,
+            Server::get(IAccountManager::class),
+            Server::get(\OCP\Share\IManager::class),
+            Server::get(IUserSession::class),
+            Server::get(IAppManager::class),
+            Server::get(ProxyMapper::class),
+            Server::get(KnownUserService::class),
+            Server::get(IConfig::class),
+            \OC::$server->getL10NFactory(),
+        );
+        $random = Server::get(ISecureRandom::class);
+        $logger = Server::get(LoggerInterface::class);
+        $dispatcher = Server::get(IEventDispatcher::class);
+        $config = Server::get(IConfig::class);
+        $name = $input->getArgument('name');
+        $caldav = new CalDavBackend(
+            $this->dbConnection,
+            $principalBackend,
+            $this->userManager,
+            $random,
+            $logger,
+            $dispatcher,
+            $config,
+            Server::get(Backend::class),
+            Server::get(FederatedCalendarMapper::class),
+        );
+        $caldav->createCalendar("principals/users/$user", $name, []);
+        return self::SUCCESS;
+    }
 }

apps/dav/lib/Service/ASyncService.php

Indentation +134 added lines, -134 removed lines

@@ -20,24 +20,24 @@ 
  * Abstract sync service to sync CalDAV and CardDAV data from federated instances.
  */
 abstract class ASyncService {
-	private ?IClient $client = null;
+    private ?IClient $client = null;
 
-	public function __construct(
-		protected IClientService $clientService,
-		protected IConfig $config,
-	) {
-	}
+    public function __construct(
+        protected IClientService $clientService,
+        protected IConfig $config,
+    ) {
+    }
 
-	private function getClient(): IClient {
-		if ($this->client === null) {
-			$this->client = $this->clientService->newClient();
-		}
+    private function getClient(): IClient {
+        if ($this->client === null) {
+            $this->client = $this->clientService->newClient();
+        }
 
-		return $this->client;
-	}
+        return $this->client;
+    }
 
-	protected function prepareUri(string $host, string $path): string {
-		/*
+    protected function prepareUri(string $host, string $path): string {
+        /*
 		 * The trailing slash is important for merging the uris together.
 		 *
 		 * $host is stored in oc_trusted_servers.url and usually without a trailing slash.
@@ -58,121 +58,121 @@ 
 		 * The response from the remote usually contains the webroot already and must be normalized to:
 		 * https://server.internal/cloud/remote.php/dav/addressbooks/system/system/system/Database:alice.vcf
 		 */
-		$host = rtrim($host, '/') . '/';
-
-		$uri = \GuzzleHttp\Psr7\UriResolver::resolve(
-			\GuzzleHttp\Psr7\Utils::uriFor($host),
-			\GuzzleHttp\Psr7\Utils::uriFor($path)
-		);
-
-		return (string)$uri;
-	}
-
-	/**
-	 * @return array{response: array<string, array<array-key, mixed>>, token: ?string, truncated: bool}
-	 */
-	protected function requestSyncReport(
-		string $absoluteUrl,
-		string $userName,
-		string $sharedSecret,
-		?string $syncToken,
-	): array {
-		$client = $this->getClient();
-
-		$options = [
-			'auth' => [$userName, $sharedSecret],
-			'body' => $this->buildSyncCollectionRequestBody($syncToken),
-			'headers' => ['Content-Type' => 'application/xml'],
-			'timeout' => $this->config->getSystemValueInt(
-				'carddav_sync_request_timeout',
-				IClient::DEFAULT_REQUEST_TIMEOUT,
-			),
-			'verify' => !$this->config->getSystemValue(
-				'sharing.federation.allowSelfSignedCertificates',
-				false,
-			),
-		];
-
-		$response = $client->request(
-			'REPORT',
-			$absoluteUrl,
-			$options,
-		);
-
-		$body = $response->getBody();
-		assert(is_string($body));
-
-		return $this->parseMultiStatus($body, $absoluteUrl);
-	}
-
-	protected function download(
-		string $absoluteUrl,
-		string $userName,
-		string $sharedSecret,
-	): string {
-		$client = $this->getClient();
-
-		$options = [
-			'auth' => [$userName, $sharedSecret],
-			'verify' => !$this->config->getSystemValue(
-				'sharing.federation.allowSelfSignedCertificates',
-				false,
-			),
-		];
-
-		$response = $client->get(
-			$absoluteUrl,
-			$options,
-		);
-
-		return (string)$response->getBody();
-	}
-
-	private function buildSyncCollectionRequestBody(?string $syncToken): string {
-		$dom = new \DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$root = $dom->createElementNS('DAV:', 'd:sync-collection');
-		$sync = $dom->createElement('d:sync-token', $syncToken ?? '');
-		$prop = $dom->createElement('d:prop');
-		$cont = $dom->createElement('d:getcontenttype');
-		$etag = $dom->createElement('d:getetag');
-
-		$prop->appendChild($cont);
-		$prop->appendChild($etag);
-		$root->appendChild($sync);
-		$root->appendChild($prop);
-		$dom->appendChild($root);
-		return $dom->saveXML();
-	}
-
-	/**
-	 * @return array{response: array<string, array<array-key, mixed>>, token: ?string, truncated: bool}
-	 * @throws ParseException
-	 */
-	private function parseMultiStatus(string $body, string $resourceUrl): array {
-		/** @var MultiStatus $multiStatus */
-		$multiStatus = (new SabreXmlService())->expect('{DAV:}multistatus', $body);
-
-		$result = [];
-		$truncated = false;
-
-		foreach ($multiStatus->getResponses() as $response) {
-			$href = $response->getHref();
-			if ($response->getHttpStatus() === '507' && $this->isResponseForRequestUri($href, $resourceUrl)) {
-				$truncated = true;
-			} else {
-				$result[$response->getHref()] = $response->getResponseProperties();
-			}
-		}
-
-		return ['response' => $result, 'token' => $multiStatus->getSyncToken(), 'truncated' => $truncated];
-	}
-
-	/**
-	 * Determines whether the provided response URI corresponds to the given request URI.
-	 */
-	private function isResponseForRequestUri(string $responseUri, string $requestUri): bool {
-		/*
+        $host = rtrim($host, '/') . '/';
+
+        $uri = \GuzzleHttp\Psr7\UriResolver::resolve(
+            \GuzzleHttp\Psr7\Utils::uriFor($host),
+            \GuzzleHttp\Psr7\Utils::uriFor($path)
+        );
+
+        return (string)$uri;
+    }
+
+    /**
+     * @return array{response: array<string, array<array-key, mixed>>, token: ?string, truncated: bool}
+     */
+    protected function requestSyncReport(
+        string $absoluteUrl,
+        string $userName,
+        string $sharedSecret,
+        ?string $syncToken,
+    ): array {
+        $client = $this->getClient();
+
+        $options = [
+            'auth' => [$userName, $sharedSecret],
+            'body' => $this->buildSyncCollectionRequestBody($syncToken),
+            'headers' => ['Content-Type' => 'application/xml'],
+            'timeout' => $this->config->getSystemValueInt(
+                'carddav_sync_request_timeout',
+                IClient::DEFAULT_REQUEST_TIMEOUT,
+            ),
+            'verify' => !$this->config->getSystemValue(
+                'sharing.federation.allowSelfSignedCertificates',
+                false,
+            ),
+        ];
+
+        $response = $client->request(
+            'REPORT',
+            $absoluteUrl,
+            $options,
+        );
+
+        $body = $response->getBody();
+        assert(is_string($body));
+
+        return $this->parseMultiStatus($body, $absoluteUrl);
+    }
+
+    protected function download(
+        string $absoluteUrl,
+        string $userName,
+        string $sharedSecret,
+    ): string {
+        $client = $this->getClient();
+
+        $options = [
+            'auth' => [$userName, $sharedSecret],
+            'verify' => !$this->config->getSystemValue(
+                'sharing.federation.allowSelfSignedCertificates',
+                false,
+            ),
+        ];
+
+        $response = $client->get(
+            $absoluteUrl,
+            $options,
+        );
+
+        return (string)$response->getBody();
+    }
+
+    private function buildSyncCollectionRequestBody(?string $syncToken): string {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElementNS('DAV:', 'd:sync-collection');
+        $sync = $dom->createElement('d:sync-token', $syncToken ?? '');
+        $prop = $dom->createElement('d:prop');
+        $cont = $dom->createElement('d:getcontenttype');
+        $etag = $dom->createElement('d:getetag');
+
+        $prop->appendChild($cont);
+        $prop->appendChild($etag);
+        $root->appendChild($sync);
+        $root->appendChild($prop);
+        $dom->appendChild($root);
+        return $dom->saveXML();
+    }
+
+    /**
+     * @return array{response: array<string, array<array-key, mixed>>, token: ?string, truncated: bool}
+     * @throws ParseException
+     */
+    private function parseMultiStatus(string $body, string $resourceUrl): array {
+        /** @var MultiStatus $multiStatus */
+        $multiStatus = (new SabreXmlService())->expect('{DAV:}multistatus', $body);
+
+        $result = [];
+        $truncated = false;
+
+        foreach ($multiStatus->getResponses() as $response) {
+            $href = $response->getHref();
+            if ($response->getHttpStatus() === '507' && $this->isResponseForRequestUri($href, $resourceUrl)) {
+                $truncated = true;
+            } else {
+                $result[$response->getHref()] = $response->getResponseProperties();
+            }
+        }
+
+        return ['response' => $result, 'token' => $multiStatus->getSyncToken(), 'truncated' => $truncated];
+    }
+
+    /**
+     * Determines whether the provided response URI corresponds to the given request URI.
+     */
+    private function isResponseForRequestUri(string $responseUri, string $requestUri): bool {
+        /*
 		 * Example response uri:
 		 *
 		 * /remote.php/dav/addressbooks/system/system/system/
@@ -186,9 +186,9 @@ 
 		 * https://github.com/nextcloud/3rdparty/blob/e0a509739b13820f0a62ff9cad5d0fede00e76ee/sabre/dav/lib/DAV/Sync/Plugin.php#L172-L174
 		 * https://github.com/nextcloud/server/blob/b40acb34a39592070d8455eb91c5364c07928c50/apps/federation/lib/SyncFederationAddressBooks.php#L41
 		 */
-		return str_ends_with(
-			rtrim($requestUri, '/'),
-			rtrim($responseUri, '/'),
-		);
-	}
+        return str_ends_with(
+            rtrim($requestUri, '/'),
+            rtrim($responseUri, '/'),
+        );
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -58,14 +58,14 @@ 
 		 * The response from the remote usually contains the webroot already and must be normalized to:
 		 * https://server.internal/cloud/remote.php/dav/addressbooks/system/system/system/Database:alice.vcf
 		 */
-		$host = rtrim($host, '/') . '/';
+		$host = rtrim($host, '/').'/';
 
 		$uri = \GuzzleHttp\Psr7\UriResolver::resolve(
 			\GuzzleHttp\Psr7\Utils::uriFor($host),
 			\GuzzleHttp\Psr7\Utils::uriFor($path)
 		);
 
-		return (string)$uri;
+		return (string) $uri;
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 			$options,
 		);
 
-		return (string)$response->getBody();
+		return (string) $response->getBody();
 	}
 
 	private function buildSyncCollectionRequestBody(?string $syncToken): string {

apps/dav/lib/BackgroundJob/FederatedCalendarPeriodicSyncJob.php

Indentation +41 added lines, -41 removed lines

@@ -18,45 +18,45 @@
 use Psr\Log\LoggerInterface;
 
 class FederatedCalendarPeriodicSyncJob extends TimedJob {
-	private const DOWNLOAD_LIMIT = 500;
-
-	public function __construct(
-		ITimeFactory $time,
-		private readonly FederatedCalendarSyncService $syncService,
-		private readonly FederatedCalendarMapper $federatedCalendarMapper,
-		private readonly CalendarFederationConfig $calendarFederationConfig,
-		private readonly LoggerInterface $logger,
-	) {
-		parent::__construct($time);
-
-		$this->setTimeSensitivity(self::TIME_SENSITIVE);
-		$this->setAllowParallelRuns(false);
-		$this->setInterval(3600);
-	}
-
-	protected function run($argument): void {
-		if (!$this->calendarFederationConfig->isFederationEnabled()) {
-			return;
-		}
-
-		$downloadedEvents = 0;
-		$oneHourAgo = $this->time->getTime() - 3600;
-		$calendars = $this->federatedCalendarMapper->findUnsyncedSinceBefore($oneHourAgo);
-		foreach ($calendars as $calendar) {
-			try {
-				$downloadedEvents += $this->syncService->syncOne($calendar);
-			} catch (ClientExceptionInterface $e) {
-				$name = $calendar->getUri();
-				$this->logger->error("Failed to sync federated calendar $name: " . $e->getMessage(), [
-					'exception' => $e,
-					'calendar' => $calendar->toCalendarInfo(),
-				]);
-			}
-
-			// Prevent stalling the background job queue for too long
-			if ($downloadedEvents >= self::DOWNLOAD_LIMIT) {
-				break;
-			}
-		}
-	}
+    private const DOWNLOAD_LIMIT = 500;
+
+    public function __construct(
+        ITimeFactory $time,
+        private readonly FederatedCalendarSyncService $syncService,
+        private readonly FederatedCalendarMapper $federatedCalendarMapper,
+        private readonly CalendarFederationConfig $calendarFederationConfig,
+        private readonly LoggerInterface $logger,
+    ) {
+        parent::__construct($time);
+
+        $this->setTimeSensitivity(self::TIME_SENSITIVE);
+        $this->setAllowParallelRuns(false);
+        $this->setInterval(3600);
+    }
+
+    protected function run($argument): void {
+        if (!$this->calendarFederationConfig->isFederationEnabled()) {
+            return;
+        }
+
+        $downloadedEvents = 0;
+        $oneHourAgo = $this->time->getTime() - 3600;
+        $calendars = $this->federatedCalendarMapper->findUnsyncedSinceBefore($oneHourAgo);
+        foreach ($calendars as $calendar) {
+            try {
+                $downloadedEvents += $this->syncService->syncOne($calendar);
+            } catch (ClientExceptionInterface $e) {
+                $name = $calendar->getUri();
+                $this->logger->error("Failed to sync federated calendar $name: " . $e->getMessage(), [
+                    'exception' => $e,
+                    'calendar' => $calendar->toCalendarInfo(),
+                ]);
+            }
+
+            // Prevent stalling the background job queue for too long
+            if ($downloadedEvents >= self::DOWNLOAD_LIMIT) {
+                break;
+            }
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 				$downloadedEvents += $this->syncService->syncOne($calendar);
 			} catch (ClientExceptionInterface $e) {
 				$name = $calendar->getUri();
-				$this->logger->error("Failed to sync federated calendar $name: " . $e->getMessage(), [
+				$this->logger->error("Failed to sync federated calendar $name: ".$e->getMessage(), [
 					'exception' => $e,
 					'calendar' => $calendar->toCalendarInfo(),
 				]);

apps/dav/lib/BackgroundJob/FederatedCalendarSyncJob.php

Indentation +38 added lines, -38 removed lines

@@ -19,49 +19,49 @@
 use Psr\Log\LoggerInterface;
 
 class FederatedCalendarSyncJob extends QueuedJob {
-	public const ARGUMENT_ID = 'id';
+    public const ARGUMENT_ID = 'id';
 
-	public function __construct(
-		ITimeFactory $time,
-		private readonly FederatedCalendarSyncService $syncService,
-		private readonly FederatedCalendarMapper $federatedCalendarMapper,
-		private readonly CalendarFederationConfig $calendarFederationConfig,
-		private readonly LoggerInterface $logger,
-	) {
-		parent::__construct($time);
+    public function __construct(
+        ITimeFactory $time,
+        private readonly FederatedCalendarSyncService $syncService,
+        private readonly FederatedCalendarMapper $federatedCalendarMapper,
+        private readonly CalendarFederationConfig $calendarFederationConfig,
+        private readonly LoggerInterface $logger,
+    ) {
+        parent::__construct($time);
 
-		$this->setAllowParallelRuns(false);
-	}
+        $this->setAllowParallelRuns(false);
+    }
 
-	protected function run($argument): void {
-		if (!$this->calendarFederationConfig->isFederationEnabled()) {
-			return;
-		}
+    protected function run($argument): void {
+        if (!$this->calendarFederationConfig->isFederationEnabled()) {
+            return;
+        }
 
-		$id = $argument[self::ARGUMENT_ID] ?? null;
-		if (!is_numeric($id)) {
-			return;
-		}
+        $id = $argument[self::ARGUMENT_ID] ?? null;
+        if (!is_numeric($id)) {
+            return;
+        }
 
-		$id = (int)$id;
-		try {
-			$calendar = $this->federatedCalendarMapper->find($id);
-		} catch (DoesNotExistException $e) {
-			return;
-		}
+        $id = (int)$id;
+        try {
+            $calendar = $this->federatedCalendarMapper->find($id);
+        } catch (DoesNotExistException $e) {
+            return;
+        }
 
-		try {
-			$this->syncService->syncOne($calendar);
-		} catch (ClientExceptionInterface $e) {
-			$name = $calendar->getUri();
-			$this->logger->error("Failed to sync federated calendar $name: " . $e->getMessage(), [
-				'exception' => $e,
-				'calendar' => $calendar->toCalendarInfo(),
-			]);
+        try {
+            $this->syncService->syncOne($calendar);
+        } catch (ClientExceptionInterface $e) {
+            $name = $calendar->getUri();
+            $this->logger->error("Failed to sync federated calendar $name: " . $e->getMessage(), [
+                'exception' => $e,
+                'calendar' => $calendar->toCalendarInfo(),
+            ]);
 
-			// Let the periodic background job pick up the calendar at a later point
-			$calendar->setLastSync(1);
-			$this->federatedCalendarMapper->update($calendar);
-		}
-	}
+            // Let the periodic background job pick up the calendar at a later point
+            $calendar->setLastSync(1);
+            $this->federatedCalendarMapper->update($calendar);
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 			return;
 		}
 
-		$id = (int)$id;
+		$id = (int) $id;
 		try {
 			$calendar = $this->federatedCalendarMapper->find($id);
 		} catch (DoesNotExistException $e) {
@@ -54,7 +54,7 @@ 
 			$this->syncService->syncOne($calendar);
 		} catch (ClientExceptionInterface $e) {
 			$name = $calendar->getUri();
-			$this->logger->error("Failed to sync federated calendar $name: " . $e->getMessage(), [
+			$this->logger->error("Failed to sync federated calendar $name: ".$e->getMessage(), [
 				'exception' => $e,
 				'calendar' => $calendar->toCalendarInfo(),
 			]);

apps/dav/lib/AppInfo/Application.php

Indentation +187 added lines, -187 removed lines

@@ -108,196 +108,196 @@
 use function is_null;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'dav';
-
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
-			return new AppCalendarPlugin(
-				$c->get(ICalendarManager::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		/*
+    public const APP_ID = 'dav';
+
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
+            return new AppCalendarPlugin(
+                $c->get(ICalendarManager::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
+        $context->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register Search Providers
 		 */
-		$context->registerSearchProvider(ContactsSearchProvider::class);
-		$context->registerSearchProvider(EventsSearchProvider::class);
-		$context->registerSearchProvider(TasksSearchProvider::class);
-
-		/**
-		 * Register event listeners
-		 */
-		$context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
-
-		$context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
-		$context->registerEventListener(CalendarMovedToTrashEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarRestoredEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarPublishedEvent::class, CalendarPublicationListener::class);
-		$context->registerEventListener(CalendarUnpublishedEvent::class, CalendarPublicationListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarShareUpdateListener::class);
-
-		$context->registerEventListener(SubscriptionCreatedEvent::class, SubscriptionListener::class);
-		$context->registerEventListener(SubscriptionDeletedEvent::class, SubscriptionListener::class);
-
-
-		$context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, CardListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, ClearPhotoCacheListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, ClearPhotoCacheListener::class);
-		$context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
-
-		$context->registerEventListener(BeforePreferenceDeletedEvent::class, UserPreferenceListener::class);
-		$context->registerEventListener(BeforePreferenceSetEvent::class, UserPreferenceListener::class);
-
-		$context->registerEventListener(OutOfOfficeChangedEvent::class, OutOfOfficeListener::class);
-		$context->registerEventListener(OutOfOfficeClearedEvent::class, OutOfOfficeListener::class);
-		$context->registerEventListener(OutOfOfficeScheduledEvent::class, OutOfOfficeListener::class);
-
-		$context->registerEventListener(UserFirstTimeLoggedInEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserIdAssignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(BeforeUserIdUnassignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserIdUnassignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(BeforeUserDeletedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserDeletedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserCreatedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserChangedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserUpdatedEvent::class, UserEventsListener::class);
-
-		$context->registerEventListener(SabrePluginAuthInitEvent::class, SabrePluginAuthInitListener::class);
-
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarFederationNotificationListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarFederationNotificationListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarFederationNotificationListener::class);
-
-		$context->registerNotifierService(Notifier::class);
-
-		$context->registerCalendarProvider(CalendarProvider::class);
-		$context->registerCalendarProvider(CachedSubscriptionProvider::class);
-
-		$context->registerUserMigrator(CalendarMigrator::class);
-		$context->registerUserMigrator(ContactsMigrator::class);
-
-		$context->registerSetupCheck(NeedsSystemAddressBookSync::class);
-		$context->registerSetupCheck(WebdavEndpoint::class);
-
-		// register admin settings form and listener(s)
-		$context->registerDeclarativeSettings(SystemAddressBookSettings::class);
-		$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, DavAdminSettingsListener::class);
-		$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, DavAdminSettingsListener::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		$context->getServerContainer()->get(IAppManager::class)->loadApps(['dav']);
-
-		$context->injectFn($this->registerContactsManager(...));
-		$context->injectFn($this->registerCalendarManager(...));
-		$context->injectFn($this->registerCalendarReminders(...));
-		$context->injectFn($this->registerCloudFederationProvider(...));
-	}
-
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = Server::get(IUserSession::class)->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
-
-	private function setupContactsProvider(IContactsManager $contactsManager,
-		IAppContainer $container,
-		string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, null, $urlGenerator);
-	}
-
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-		IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager): void {
-			$user = Server::get(IUserSession::class)->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
-
-	private function setupCalendarProvider(ICalendarManager $calendarManager,
-		IAppContainer $container,
-		$userId) {
-		$cm = $container->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
-
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-		LoggerInterface $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->error($ex->getMessage(), ['exception' => $ex]);
-		}
-	}
-
-	public function registerCloudFederationProvider(
-		ICloudFederationProviderManager $manager,
-	): void {
-		$manager->addCloudFederationProvider(
-			CalendarFederationProvider::PROVIDER_ID,
-			'Calendar Federation',
-			static fn () => Server::get(CalendarFederationProvider::class),
-		);
-	}
+        $context->registerSearchProvider(ContactsSearchProvider::class);
+        $context->registerSearchProvider(EventsSearchProvider::class);
+        $context->registerSearchProvider(TasksSearchProvider::class);
+
+        /**
+         * Register event listeners
+         */
+        $context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
+
+        $context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
+        $context->registerEventListener(CalendarMovedToTrashEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarRestoredEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectRestoredEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarPublishedEvent::class, CalendarPublicationListener::class);
+        $context->registerEventListener(CalendarUnpublishedEvent::class, CalendarPublicationListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarShareUpdateListener::class);
+
+        $context->registerEventListener(SubscriptionCreatedEvent::class, SubscriptionListener::class);
+        $context->registerEventListener(SubscriptionDeletedEvent::class, SubscriptionListener::class);
+
+
+        $context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, CardListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, ClearPhotoCacheListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, ClearPhotoCacheListener::class);
+        $context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
+
+        $context->registerEventListener(BeforePreferenceDeletedEvent::class, UserPreferenceListener::class);
+        $context->registerEventListener(BeforePreferenceSetEvent::class, UserPreferenceListener::class);
+
+        $context->registerEventListener(OutOfOfficeChangedEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeClearedEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeScheduledEvent::class, OutOfOfficeListener::class);
+
+        $context->registerEventListener(UserFirstTimeLoggedInEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserIdAssignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(BeforeUserIdUnassignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserIdUnassignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(BeforeUserDeletedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserDeletedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserCreatedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserChangedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserUpdatedEvent::class, UserEventsListener::class);
+
+        $context->registerEventListener(SabrePluginAuthInitEvent::class, SabrePluginAuthInitListener::class);
+
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarFederationNotificationListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarFederationNotificationListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarFederationNotificationListener::class);
+
+        $context->registerNotifierService(Notifier::class);
+
+        $context->registerCalendarProvider(CalendarProvider::class);
+        $context->registerCalendarProvider(CachedSubscriptionProvider::class);
+
+        $context->registerUserMigrator(CalendarMigrator::class);
+        $context->registerUserMigrator(ContactsMigrator::class);
+
+        $context->registerSetupCheck(NeedsSystemAddressBookSync::class);
+        $context->registerSetupCheck(WebdavEndpoint::class);
+
+        // register admin settings form and listener(s)
+        $context->registerDeclarativeSettings(SystemAddressBookSettings::class);
+        $context->registerEventListener(DeclarativeSettingsGetValueEvent::class, DavAdminSettingsListener::class);
+        $context->registerEventListener(DeclarativeSettingsSetValueEvent::class, DavAdminSettingsListener::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        $context->getServerContainer()->get(IAppManager::class)->loadApps(['dav']);
+
+        $context->injectFn($this->registerContactsManager(...));
+        $context->injectFn($this->registerCalendarManager(...));
+        $context->injectFn($this->registerCalendarReminders(...));
+        $context->injectFn($this->registerCloudFederationProvider(...));
+    }
+
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = Server::get(IUserSession::class)->getUser();
+            if (!is_null($user)) {
+                $this->setupContactsProvider($cm, $container, $user->getUID());
+            } else {
+                $this->setupSystemContactsProvider($cm, $container);
+            }
+        });
+    }
+
+    private function setupContactsProvider(IContactsManager $contactsManager,
+        IAppContainer $container,
+        string $userID): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, null, $urlGenerator);
+    }
+
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+        IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager): void {
+            $user = Server::get(IUserSession::class)->getUser();
+            if ($user !== null) {
+                $this->setupCalendarProvider($calendarManager, $container, $user->getUID());
+            }
+        });
+    }
+
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+        IAppContainer $container,
+        $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
+
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+        LoggerInterface $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->error($ex->getMessage(), ['exception' => $ex]);
+        }
+    }
+
+    public function registerCloudFederationProvider(
+        ICloudFederationProviderManager $manager,
+    ): void {
+        $manager->addCloudFederationProvider(
+            CalendarFederationProvider::PROVIDER_ID,
+            'Calendar Federation',
+            static fn () => Server::get(CalendarFederationProvider::class),
+        );
+    }
 }

apps/dav/lib/CalDAV/SyncServiceResult.php

Indentation +11 added lines, -11 removed lines

@@ -10,17 +10,17 @@
 namespace OCA\DAV\CalDAV;
 
 final class SyncServiceResult {
-	public function __construct(
-		private readonly string $syncToken,
-		private readonly int $downloadedEvents,
-	) {
-	}
+    public function __construct(
+        private readonly string $syncToken,
+        private readonly int $downloadedEvents,
+    ) {
+    }
 
-	public function getSyncToken(): string {
-		return $this->syncToken;
-	}
+    public function getSyncToken(): string {
+        return $this->syncToken;
+    }
 
-	public function getDownloadedEvents(): int {
-		return $this->downloadedEvents;
-	}
+    public function getDownloadedEvents(): int {
+        return $this->downloadedEvents;
+    }
 }

apps/dav/lib/CalDAV/AppCalendar/AppCalendarPlugin.php

Indentation +41 added lines, -41 removed lines

@@ -19,45 +19,45 @@
 
 /* Plugin for wrapping application generated calendars registered in nextcloud core (OCP\Calendar\ICalendarProvider) */
 class AppCalendarPlugin implements ICalendarProvider {
-	public function __construct(
-		protected IManager $manager,
-		protected LoggerInterface $logger,
-	) {
-	}
-
-	public function getAppID(): string {
-		return 'dav-wrapper';
-	}
-
-	public function fetchAllForCalendarHome(string $principalUri): array {
-		return array_map(function ($calendar) use (&$principalUri) {
-			return new AppCalendar($this->getAppID(), $calendar, $principalUri);
-		}, $this->getWrappedCalendars($principalUri));
-	}
-
-	public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool {
-		return count($this->getWrappedCalendars($principalUri, [ $calendarUri ])) > 0;
-	}
-
-	public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar {
-		$calendars = $this->getWrappedCalendars($principalUri, [ $calendarUri ]);
-		if (count($calendars) > 0) {
-			return new AppCalendar($this->getAppID(), $calendars[0], $principalUri);
-		}
-
-		return null;
-	}
-
-	protected function getWrappedCalendars(string $principalUri, array $calendarUris = []): array {
-		return array_values(
-			array_filter($this->manager->getCalendarsForPrincipal($principalUri, $calendarUris), function ($c) {
-				// We must not provide a wrapper for DAV calendars
-				return !(
-					($c instanceof CalendarImpl)
-					|| ($c instanceof CachedSubscriptionImpl)
-					|| ($c instanceof FederatedCalendarImpl)
-				);
-			})
-		);
-	}
+    public function __construct(
+        protected IManager $manager,
+        protected LoggerInterface $logger,
+    ) {
+    }
+
+    public function getAppID(): string {
+        return 'dav-wrapper';
+    }
+
+    public function fetchAllForCalendarHome(string $principalUri): array {
+        return array_map(function ($calendar) use (&$principalUri) {
+            return new AppCalendar($this->getAppID(), $calendar, $principalUri);
+        }, $this->getWrappedCalendars($principalUri));
+    }
+
+    public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool {
+        return count($this->getWrappedCalendars($principalUri, [ $calendarUri ])) > 0;
+    }
+
+    public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar {
+        $calendars = $this->getWrappedCalendars($principalUri, [ $calendarUri ]);
+        if (count($calendars) > 0) {
+            return new AppCalendar($this->getAppID(), $calendars[0], $principalUri);
+        }
+
+        return null;
+    }
+
+    protected function getWrappedCalendars(string $principalUri, array $calendarUris = []): array {
+        return array_values(
+            array_filter($this->manager->getCalendarsForPrincipal($principalUri, $calendarUris), function ($c) {
+                // We must not provide a wrapper for DAV calendars
+                return !(
+                    ($c instanceof CalendarImpl)
+                    || ($c instanceof CachedSubscriptionImpl)
+                    || ($c instanceof FederatedCalendarImpl)
+                );
+            })
+        );
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -30,17 +30,17 @@ 
 	}
 
 	public function fetchAllForCalendarHome(string $principalUri): array {
-		return array_map(function ($calendar) use (&$principalUri) {
+		return array_map(function($calendar) use (&$principalUri) {
 			return new AppCalendar($this->getAppID(), $calendar, $principalUri);
 		}, $this->getWrappedCalendars($principalUri));
 	}
 
 	public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool {
-		return count($this->getWrappedCalendars($principalUri, [ $calendarUri ])) > 0;
+		return count($this->getWrappedCalendars($principalUri, [$calendarUri])) > 0;
 	}
 
 	public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar {
-		$calendars = $this->getWrappedCalendars($principalUri, [ $calendarUri ]);
+		$calendars = $this->getWrappedCalendars($principalUri, [$calendarUri]);
 		if (count($calendars) > 0) {
 			return new AppCalendar($this->getAppID(), $calendars[0], $principalUri);
 		}
@@ -50,7 +50,7 @@ 
 
 	protected function getWrappedCalendars(string $principalUri, array $calendarUris = []): array {
 		return array_values(
-			array_filter($this->manager->getCalendarsForPrincipal($principalUri, $calendarUris), function ($c) {
+			array_filter($this->manager->getCalendarsForPrincipal($principalUri, $calendarUris), function($c) {
 				// We must not provide a wrapper for DAV calendars
 				return !(
 					($c instanceof CalendarImpl)