nextcloud / server

lib/public/WorkflowEngine/EntityContext/IIcon.php

Indentation +7 added lines, -7 removed lines

@@ -32,11 +32,11 @@
  * @since 18.0.0
  */
 interface IIcon {
-	/**
-	 * returns a URL to an icon that is related to the entity, for instance
-	 * a group icon for groups.
-	 *
-	 * @since 18.0.0
-	 */
-	public function getIconUrl(): string;
+    /**
+     * returns a URL to an icon that is related to the entity, for instance
+     * a group icon for groups.
+     *
+     * @since 18.0.0
+     */
+    public function getIconUrl(): string;
 }

apps/files/lib/Db/TransferOwnership.php

Indentation +14 added lines, -14 removed lines

@@ -37,24 +37,24 @@
  * @method string getNodeName()
  */
 class TransferOwnership extends Entity {
-	/** @var string */
-	protected $sourceUser;
+    /** @var string */
+    protected $sourceUser;
 
-	/** @var string */
-	protected $targetUser;
+    /** @var string */
+    protected $targetUser;
 
-	/** @var integer */
-	protected $fileId;
+    /** @var integer */
+    protected $fileId;
 
-	/** @var string */
-	protected $nodeName;
+    /** @var string */
+    protected $nodeName;
 
-	public function __construct() {
-		$this->addType('sourceUser', 'string');
-		$this->addType('targetUser', 'string');
-		$this->addType('fileId', 'integer');
-		$this->addType('nodeName', 'string');
-	}
+    public function __construct() {
+        $this->addType('sourceUser', 'string');
+        $this->addType('targetUser', 'string');
+        $this->addType('fileId', 'integer');
+        $this->addType('nodeName', 'string');
+    }
 
 
 }

apps/files_versions/lib/Sabre/RestoreFolder.php

Indentation +44 added lines, -44 removed lines

@@ -34,49 +34,49 @@
 use Sabre\DAV\INode;
 
 class RestoreFolder implements ICollection, IMoveTarget {
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function getChild($name) {
-		return null;
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName() {
-		return 'restore';
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
-
-	public function getChildren(): array {
-		return [];
-	}
-
-	public function childExists($name): bool {
-		return false;
-	}
-
-	public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
-		if (!($sourceNode instanceof VersionFile)) {
-			return false;
-		}
-
-		$sourceNode->rollBack();
-		return true;
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function getChild($name) {
+        return null;
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName() {
+        return 'restore';
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
+
+    public function getChildren(): array {
+        return [];
+    }
+
+    public function childExists($name): bool {
+        return false;
+    }
+
+    public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
+        if (!($sourceNode instanceof VersionFile)) {
+            return false;
+        }
+
+        $sourceNode->rollBack();
+        return true;
+    }
 
 }

lib/private/Hooks/BasicEmitter.php

Indentation +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
  * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
  */
 abstract class BasicEmitter implements Emitter {
-	use EmitterTrait;
+    use EmitterTrait;
 }

lib/public/WorkflowEngine/IFileCheck.php

Indentation +7 added lines, -7 removed lines

@@ -36,12 +36,12 @@
  * @since 18.0.0
  */
 interface IFileCheck extends IEntityCheck {
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 * @since 18.0.0
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     * @since 18.0.0
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
 
 }

apps/comments/lib/Search/Result.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 			$suffix = '…';
 		}
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+		return $prefix.mb_substr($message, $start, $end - $start).$suffix;
 	}
 
 }

Indentation +78 added lines, -78 removed lines

@@ -13,92 +13,92 @@
  * @deprecated 20.0.0
  */
 class Result extends BaseResult {
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'comment';
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $comment;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $path;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $fileName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $type = 'comment';
+    /**
+     * @deprecated 20.0.0
+     */
+    public $comment;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $path;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $fileName;
 
-	/**
-	 * @throws NotFoundException
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(
-		string $search,
-		IComment $comment,
-		/**
-		 * @deprecated 20.0.0
-		 */
-		public string $authorName,
-		string $path,
-	) {
-		parent::__construct(
-			$comment->getId(),
-			$comment->getMessage()
-			/* @todo , [link to file] */
-		);
+    /**
+     * @throws NotFoundException
+     * @deprecated 20.0.0
+     */
+    public function __construct(
+        string $search,
+        IComment $comment,
+        /**
+         * @deprecated 20.0.0
+         */
+        public string $authorName,
+        string $path,
+    ) {
+        parent::__construct(
+            $comment->getId(),
+            $comment->getMessage()
+            /* @todo , [link to file] */
+        );
 
-		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
-		$this->authorId = $comment->getActorId();
-		$this->fileName = basename($path);
-		$this->path = $this->getVisiblePath($path);
-	}
+        $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+        $this->authorId = $comment->getActorId();
+        $this->fileName = basename($path);
+        $this->path = $this->getVisiblePath($path);
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getVisiblePath(string $path): string {
-		$segments = explode('/', trim($path, '/'), 3);
+    /**
+     * @throws NotFoundException
+     */
+    protected function getVisiblePath(string $path): string {
+        $segments = explode('/', trim($path, '/'), 3);
 
-		if (!isset($segments[2])) {
-			throw new NotFoundException('Path not inside visible section');
-		}
+        if (!isset($segments[2])) {
+            throw new NotFoundException('Path not inside visible section');
+        }
 
-		return $segments[2];
-	}
+        return $segments[2];
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getRelevantMessagePart(string $message, string $search): string {
-		$start = mb_stripos($message, $search);
-		if ($start === false) {
-			throw new NotFoundException('Comment section not found');
-		}
+    /**
+     * @throws NotFoundException
+     */
+    protected function getRelevantMessagePart(string $message, string $search): string {
+        $start = mb_stripos($message, $search);
+        if ($start === false) {
+            throw new NotFoundException('Comment section not found');
+        }
 
-		$end = $start + mb_strlen($search);
+        $end = $start + mb_strlen($search);
 
-		if ($start <= 25) {
-			$start = 0;
-			$prefix = '';
-		} else {
-			$start -= 25;
-			$prefix = '…';
-		}
+        if ($start <= 25) {
+            $start = 0;
+            $prefix = '';
+        } else {
+            $start -= 25;
+            $prefix = '…';
+        }
 
-		if ((mb_strlen($message) - $end) <= 25) {
-			$end = mb_strlen($message);
-			$suffix = '';
-		} else {
-			$end += 25;
-			$suffix = '…';
-		}
+        if ((mb_strlen($message) - $end) <= 25) {
+            $end = mb_strlen($message);
+            $suffix = '';
+        } else {
+            $end += 25;
+            $suffix = '…';
+        }
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
-	}
+        return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+    }
 }

apps/workflowengine/lib/Check/FileMimeType.php

Spacing +1 added lines, -1 removed lines

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

Indentation +137 added lines, -137 removed lines

@@ -14,141 +14,141 @@
 use OCP\WorkflowEngine\IFileCheck;
 
 class FileMimeType extends AbstractStringCheck implements IFileCheck {
-	use TFileCheck {
-		setFileInfo as _setFileInfo;
-	}
-
-	/** @var array */
-	protected $mimeType;
-
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 */
-	public function __construct(
-		IL10N $l,
-		protected IRequest $request,
-		protected IMimeTypeDetector $mimeTypeDetector,
-	) {
-		parent::__construct($l);
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
-		$this->_setFileInfo($storage, $path, $isDir);
-		if (!isset($this->mimeType[$this->storage->getId()][$this->path])
-			|| $this->mimeType[$this->storage->getId()][$this->path] === '') {
-			if ($isDir) {
-				$this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
-			} else {
-				$this->mimeType[$this->storage->getId()][$this->path] = null;
-			}
-		}
-	}
-
-	/**
-	 * The mimetype is only cached if the file has a valid mimetype. Otherwise files access
-	 * control will cache "application/octet-stream" for all the target node on:
-	 * rename, move, copy and all other methods which create a new item
-	 *
-	 * To check this:
-	 * 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
-	 * 2. Add an access control rule which checks for any mimetype
-	 * 3. Create a folder and rename it, the folder should not be tagged, but it is
-	 *
-	 * @param string $storageId
-	 * @param string|null $path
-	 * @param string $mimeType
-	 * @return string
-	 */
-	protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
-		if ($path !== null && $mimeType !== 'application/octet-stream') {
-			$this->mimeType[$storageId][$path] = $mimeType;
-		}
-
-		return $mimeType;
-	}
-
-	/**
-	 * Make sure that even though the content based check returns an application/octet-stream can still be checked based on mimetypemappings of their extension
-	 *
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		return $this->executeStringCheck($operator, $value, $this->getActualValue());
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
-			return $this->mimeType[$this->storage->getId()][$this->path];
-		}
-		$cacheEntry = $this->storage->getCache()->get($this->path);
-		if ($cacheEntry && $cacheEntry->getMimeType() !== 'application/octet-stream') {
-			return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $cacheEntry->getMimeType());
-		}
-
-		if ($this->storage->file_exists($this->path) &&
-			$this->storage->filesize($this->path) &&
-			$this->storage->instanceOfStorage(Local::class)
-		) {
-			$path = $this->storage->getLocalFile($this->path);
-			$mimeType = $this->mimeTypeDetector->detectContent($path);
-			return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
-		}
-
-		if ($this->isWebDAVRequest() || $this->isPublicWebDAVRequest()) {
-			// Creating a folder
-			if ($this->request->getMethod() === 'MKCOL') {
-				return 'httpd/unix-directory';
-			}
-		}
-
-		// We do not cache this, as the file did not exist yet.
-		// In case it does in the future, we will check with detectContent()
-		// again to get the real mimetype of the content, rather than
-		// guessing it from the path.
-		return $this->mimeTypeDetector->detectPath($this->path);
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			str_starts_with($this->request->getPathInfo() ?? '', '/webdav/') ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			str_starts_with($this->request->getPathInfo() ?? '', '/dav/files/') ||
-			$this->request->getPathInfo() === '/dav/uploads' ||
-			str_starts_with($this->request->getPathInfo() ?? '', '/dav/uploads/')
-		);
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isPublicWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			str_starts_with($this->request->getPathInfo() ?? '', '/webdav/')
-		);
-	}
-
-	public function supportedEntities(): array {
-		return [ File::class ];
-	}
-
-	public function isAvailableForScope(int $scope): bool {
-		return true;
-	}
+    use TFileCheck {
+        setFileInfo as _setFileInfo;
+    }
+
+    /** @var array */
+    protected $mimeType;
+
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     * @param IMimeTypeDetector $mimeTypeDetector
+     */
+    public function __construct(
+        IL10N $l,
+        protected IRequest $request,
+        protected IMimeTypeDetector $mimeTypeDetector,
+    ) {
+        parent::__construct($l);
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
+        $this->_setFileInfo($storage, $path, $isDir);
+        if (!isset($this->mimeType[$this->storage->getId()][$this->path])
+            || $this->mimeType[$this->storage->getId()][$this->path] === '') {
+            if ($isDir) {
+                $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+            } else {
+                $this->mimeType[$this->storage->getId()][$this->path] = null;
+            }
+        }
+    }
+
+    /**
+     * The mimetype is only cached if the file has a valid mimetype. Otherwise files access
+     * control will cache "application/octet-stream" for all the target node on:
+     * rename, move, copy and all other methods which create a new item
+     *
+     * To check this:
+     * 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
+     * 2. Add an access control rule which checks for any mimetype
+     * 3. Create a folder and rename it, the folder should not be tagged, but it is
+     *
+     * @param string $storageId
+     * @param string|null $path
+     * @param string $mimeType
+     * @return string
+     */
+    protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
+        if ($path !== null && $mimeType !== 'application/octet-stream') {
+            $this->mimeType[$storageId][$path] = $mimeType;
+        }
+
+        return $mimeType;
+    }
+
+    /**
+     * Make sure that even though the content based check returns an application/octet-stream can still be checked based on mimetypemappings of their extension
+     *
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        return $this->executeStringCheck($operator, $value, $this->getActualValue());
+    }
+
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
+            return $this->mimeType[$this->storage->getId()][$this->path];
+        }
+        $cacheEntry = $this->storage->getCache()->get($this->path);
+        if ($cacheEntry && $cacheEntry->getMimeType() !== 'application/octet-stream') {
+            return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $cacheEntry->getMimeType());
+        }
+
+        if ($this->storage->file_exists($this->path) &&
+            $this->storage->filesize($this->path) &&
+            $this->storage->instanceOfStorage(Local::class)
+        ) {
+            $path = $this->storage->getLocalFile($this->path);
+            $mimeType = $this->mimeTypeDetector->detectContent($path);
+            return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
+        }
+
+        if ($this->isWebDAVRequest() || $this->isPublicWebDAVRequest()) {
+            // Creating a folder
+            if ($this->request->getMethod() === 'MKCOL') {
+                return 'httpd/unix-directory';
+            }
+        }
+
+        // We do not cache this, as the file did not exist yet.
+        // In case it does in the future, we will check with detectContent()
+        // again to get the real mimetype of the content, rather than
+        // guessing it from the path.
+        return $this->mimeTypeDetector->detectPath($this->path);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            str_starts_with($this->request->getPathInfo() ?? '', '/webdav/') ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            str_starts_with($this->request->getPathInfo() ?? '', '/dav/files/') ||
+            $this->request->getPathInfo() === '/dav/uploads' ||
+            str_starts_with($this->request->getPathInfo() ?? '', '/dav/uploads/')
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isPublicWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            str_starts_with($this->request->getPathInfo() ?? '', '/webdav/')
+        );
+    }
+
+    public function supportedEntities(): array {
+        return [ File::class ];
+    }
+
+    public function isAvailableForScope(int $scope): bool {
+        return true;
+    }
 }

apps/settings/lib/Settings/Personal/Security/TwoFactor.php

Spacing +2 added lines, -2 removed lines

@@ -106,12 +106,12 @@
 		}
 
 		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+			'providers' => array_map(function(IProvidesPersonalSettings $provider) use ($user) {
 				return [
 					'provider' => $provider,
 					'settings' => $provider->getPersonalSettings($user)
 				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+			}, array_filter($this->providerLoader->getProviders($user), function(IProvider $provider) {
 				return $provider instanceof IProvidesPersonalSettings;
 			}))
 		];

Indentation +71 added lines, -71 removed lines

@@ -24,85 +24,85 @@
 
 class TwoFactor implements ISettings {
 
-	/** @var ProviderLoader */
-	private $providerLoader;
+    /** @var ProviderLoader */
+    private $providerLoader;
 
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
 
-	public function __construct(
-		ProviderLoader $providerLoader,
-		MandatoryTwoFactor $mandatoryTwoFactor,
-		private IUserSession $userSession,
-		private IConfig $config,
-		private ?string $userId,
-	) {
-		$this->providerLoader = $providerLoader;
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-	}
+    public function __construct(
+        ProviderLoader $providerLoader,
+        MandatoryTwoFactor $mandatoryTwoFactor,
+        private IUserSession $userSession,
+        private IConfig $config,
+        private ?string $userId,
+    ) {
+        $this->providerLoader = $providerLoader;
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+    }
 
-	public function getForm(): TemplateResponse {
-		return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
-			'twoFactorProviderData' => $this->getTwoFactorProviderData(),
-		]);
-	}
+    public function getForm(): TemplateResponse {
+        return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
+            'twoFactorProviderData' => $this->getTwoFactorProviderData(),
+        ]);
+    }
 
-	public function getSection(): ?string {
-		if (!$this->shouldShow()) {
-			return null;
-		}
-		return 'security';
-	}
+    public function getSection(): ?string {
+        if (!$this->shouldShow()) {
+            return null;
+        }
+        return 'security';
+    }
 
-	public function getPriority(): int {
-		return 15;
-	}
+    public function getPriority(): int {
+        return 15;
+    }
 
-	private function shouldShow(): bool {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return false;
-		}
+    private function shouldShow(): bool {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return false;
+        }
 
-		// Anyone who's supposed to use 2FA should see 2FA settings
-		if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
-			return true;
-		}
+        // Anyone who's supposed to use 2FA should see 2FA settings
+        if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
+            return true;
+        }
 
-		// If there is at least one provider with personal settings but it's not
-		// the backup codes provider, then these settings should show.
-		try {
-			$providers = $this->providerLoader->getProviders($user);
-		} catch (Exception $e) {
-			// Let's hope for the best
-			return true;
-		}
-		foreach ($providers as $provider) {
-			if ($provider instanceof IProvidesPersonalSettings
-				&& !($provider instanceof BackupCodesProvider)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        // If there is at least one provider with personal settings but it's not
+        // the backup codes provider, then these settings should show.
+        try {
+            $providers = $this->providerLoader->getProviders($user);
+        } catch (Exception $e) {
+            // Let's hope for the best
+            return true;
+        }
+        foreach ($providers as $provider) {
+            if ($provider instanceof IProvidesPersonalSettings
+                && !($provider instanceof BackupCodesProvider)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	private function getTwoFactorProviderData(): array {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return [];
-		}
+    private function getTwoFactorProviderData(): array {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return [];
+        }
 
-		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
-				return [
-					'provider' => $provider,
-					'settings' => $provider->getPersonalSettings($user)
-				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
-				return $provider instanceof IProvidesPersonalSettings;
-			}))
-		];
-	}
+        return [
+            'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+                return [
+                    'provider' => $provider,
+                    'settings' => $provider->getPersonalSettings($user)
+                ];
+            }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+                return $provider instanceof IProvidesPersonalSettings;
+            }))
+        ];
+    }
 }

apps/dav/lib/CalDAV/Integration/ICalendarProvider.php

Indentation +34 added lines, -34 removed lines

@@ -32,42 +32,42 @@
  */
 interface ICalendarProvider {
 
-	/**
-	 * Provides the appId of the plugin
-	 *
-	 * @since 19.0.0
-	 * @return string AppId
-	 */
-	public function getAppId(): string;
+    /**
+     * Provides the appId of the plugin
+     *
+     * @since 19.0.0
+     * @return string AppId
+     */
+    public function getAppId(): string;
 
-	/**
-	 * Fetches all calendars for a given principal uri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @return ExternalCalendar[] Array of all calendars
-	 */
-	public function fetchAllForCalendarHome(string $principalUri): array;
+    /**
+     * Fetches all calendars for a given principal uri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @return ExternalCalendar[] Array of all calendars
+     */
+    public function fetchAllForCalendarHome(string $principalUri): array;
 
-	/**
-	 * Checks whether plugin has a calendar for a given principalUri and calendarUri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $calendarUri E.g. personal
-	 * @return bool True if calendar for principalUri and calendarUri exists, false otherwise
-	 */
-	public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool;
+    /**
+     * Checks whether plugin has a calendar for a given principalUri and calendarUri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $calendarUri E.g. personal
+     * @return bool True if calendar for principalUri and calendarUri exists, false otherwise
+     */
+    public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool;
 
-	/**
-	 * Fetches a calendar for a given principalUri and calendarUri
-	 * Returns null if calendar does not exist
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $calendarUri E.g. personal
-	 * @return ExternalCalendar|null Calendar if it exists, null otherwise
-	 */
-	public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar;
+    /**
+     * Fetches a calendar for a given principalUri and calendarUri
+     * Returns null if calendar does not exist
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $calendarUri E.g. personal
+     * @return ExternalCalendar|null Calendar if it exists, null otherwise
+     */
+    public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar;
 
 }