nextcloud / server

core/Controller/WebAuthnController.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 			'preLoginNameUsedAsUserName',
 			['uid' => &$uid]
 		);
-		$this->logger->debug('Got UID: ' . $uid);
+		$this->logger->debug('Got UID: '.$uid);
 
 		$publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
 		$this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));

Indentation +55 added lines, -55 removed lines

@@ -25,69 +25,69 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 
 class WebAuthnController extends Controller {
-	private const WEBAUTHN_LOGIN = 'webauthn_login';
-	private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
+    private const WEBAUTHN_LOGIN = 'webauthn_login';
+    private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private Manager $webAuthnManger,
-		private ISession $session,
-		private LoggerInterface $logger,
-		private WebAuthnChain $webAuthnChain,
-		private URLGenerator $urlGenerator,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private Manager $webAuthnManger,
+        private ISession $session,
+        private LoggerInterface $logger,
+        private WebAuthnChain $webAuthnChain,
+        private URLGenerator $urlGenerator,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	#[PublicPage]
-	#[UseSession]
-	#[FrontpageRoute(verb: 'POST', url: 'login/webauthn/start')]
-	public function startAuthentication(string $loginName): JSONResponse {
-		$this->logger->debug('Starting WebAuthn login');
+    #[PublicPage]
+    #[UseSession]
+    #[FrontpageRoute(verb: 'POST', url: 'login/webauthn/start')]
+    public function startAuthentication(string $loginName): JSONResponse {
+        $this->logger->debug('Starting WebAuthn login');
 
-		$this->logger->debug('Converting login name to UID');
-		$uid = $loginName;
-		Util::emitHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			['uid' => &$uid]
-		);
-		$this->logger->debug('Got UID: ' . $uid);
+        $this->logger->debug('Converting login name to UID');
+        $uid = $loginName;
+        Util::emitHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            ['uid' => &$uid]
+        );
+        $this->logger->debug('Got UID: ' . $uid);
 
-		$publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
-		$this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));
-		$this->session->set(self::WEBAUTHN_LOGIN_UID, $uid);
+        $publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
+        $this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));
+        $this->session->set(self::WEBAUTHN_LOGIN_UID, $uid);
 
-		return new JSONResponse($publicKeyCredentialRequestOptions);
-	}
+        return new JSONResponse($publicKeyCredentialRequestOptions);
+    }
 
-	#[PublicPage]
-	#[UseSession]
-	#[FrontpageRoute(verb: 'POST', url: 'login/webauthn/finish')]
-	public function finishAuthentication(string $data): JSONResponse {
-		$this->logger->debug('Validating WebAuthn login');
+    #[PublicPage]
+    #[UseSession]
+    #[FrontpageRoute(verb: 'POST', url: 'login/webauthn/finish')]
+    public function finishAuthentication(string $data): JSONResponse {
+        $this->logger->debug('Validating WebAuthn login');
 
-		if (!$this->session->exists(self::WEBAUTHN_LOGIN) || !$this->session->exists(self::WEBAUTHN_LOGIN_UID)) {
-			$this->logger->debug('Trying to finish WebAuthn login without session data');
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
+        if (!$this->session->exists(self::WEBAUTHN_LOGIN) || !$this->session->exists(self::WEBAUTHN_LOGIN_UID)) {
+            $this->logger->debug('Trying to finish WebAuthn login without session data');
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		// Obtain the publicKeyCredentialOptions from when we started the registration
-		$publicKeyCredentialRequestOptions = PublicKeyCredentialRequestOptions::createFromString($this->session->get(self::WEBAUTHN_LOGIN));
-		$uid = $this->session->get(self::WEBAUTHN_LOGIN_UID);
-		$this->webAuthnManger->finishAuthentication($publicKeyCredentialRequestOptions, $data, $uid);
+        // Obtain the publicKeyCredentialOptions from when we started the registration
+        $publicKeyCredentialRequestOptions = PublicKeyCredentialRequestOptions::createFromString($this->session->get(self::WEBAUTHN_LOGIN));
+        $uid = $this->session->get(self::WEBAUTHN_LOGIN_UID);
+        $this->webAuthnManger->finishAuthentication($publicKeyCredentialRequestOptions, $data, $uid);
 
-		//TODO: add other parameters
-		$loginData = new LoginData(
-			$this->request,
-			$uid,
-			''
-		);
-		$this->webAuthnChain->process($loginData);
+        //TODO: add other parameters
+        $loginData = new LoginData(
+            $this->request,
+            $uid,
+            ''
+        );
+        $this->webAuthnChain->process($loginData);
 
-		return new JSONResponse([
-			'defaultRedirectUrl' => $this->urlGenerator->linkToDefaultPageUrl(),
-		]);
-	}
+        return new JSONResponse([
+            'defaultRedirectUrl' => $this->urlGenerator->linkToDefaultPageUrl(),
+        ]);
+    }
 }

core/templates/loginflowv2/authpicker.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<div class="notecard warning">

apps/files_trashbin/lib/Sabre/TrashFolderFile.php

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFolderFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
+    }
 }

lib/private/Authentication/Token/INamedToken.php

Indentation +7 added lines, -7 removed lines

@@ -28,11 +28,11 @@
 namespace OC\Authentication\Token;
 
 interface INamedToken extends IToken {
-	/**
-	 * Set token name
-	 *
-	 * @param string $name
-	 * @return void
-	 */
-	public function setName(string $name): void;
+    /**
+     * Set token name
+     *
+     * @param string $name
+     * @return void
+     */
+    public function setName(string $name): void;
 }

apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	 * @return boolean
 	 */
 	public function isActive(IUser $user): bool {
-		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function ($appId) {
+		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function($appId) {
 			return $appId !== $this->appName;
 		});
 		foreach ($appIds as $appId) {

Indentation +106 added lines, -106 removed lines

@@ -22,120 +22,120 @@
 
 class BackupCodesProvider implements IDeactivatableByAdmin, IProvidesPersonalSettings {
 
-	/** @var AppManager */
-	private $appManager;
+    /** @var AppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param BackupCodeStorage $storage
-	 * @param IL10N $l10n
-	 * @param AppManager $appManager
-	 */
-	public function __construct(
-		private string $appName,
-		private BackupCodeStorage $storage,
-		private IL10N $l10n,
-		AppManager $appManager,
-		private IInitialStateService $initialStateService,
-		private ITemplateManager $templateManager,
-	) {
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param BackupCodeStorage $storage
+     * @param IL10N $l10n
+     * @param AppManager $appManager
+     */
+    public function __construct(
+        private string $appName,
+        private BackupCodeStorage $storage,
+        private IL10N $l10n,
+        AppManager $appManager,
+        private IInitialStateService $initialStateService,
+        private ITemplateManager $templateManager,
+    ) {
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * Get unique identifier of this 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getId(): string {
-		return 'backup_codes';
-	}
+    /**
+     * Get unique identifier of this 2FA provider
+     *
+     * @return string
+     */
+    public function getId(): string {
+        return 'backup_codes';
+    }
 
-	/**
-	 * Get the display name for selecting the 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Backup code');
-	}
+    /**
+     * Get the display name for selecting the 2FA provider
+     *
+     * @return string
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Backup code');
+    }
 
-	/**
-	 * Get the description for selecting the 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Use backup code');
-	}
+    /**
+     * Get the description for selecting the 2FA provider
+     *
+     * @return string
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Use backup code');
+    }
 
-	/**
-	 * Get the template for rending the 2FA provider view
-	 *
-	 * @param IUser $user
-	 * @return ITemplate
-	 */
-	public function getTemplate(IUser $user): ITemplate {
-		return $this->templateManager->getTemplate('twofactor_backupcodes', 'challenge');
-	}
+    /**
+     * Get the template for rending the 2FA provider view
+     *
+     * @param IUser $user
+     * @return ITemplate
+     */
+    public function getTemplate(IUser $user): ITemplate {
+        return $this->templateManager->getTemplate('twofactor_backupcodes', 'challenge');
+    }
 
-	/**
-	 * Verify the given challenge
-	 *
-	 * @param IUser $user
-	 * @param string $challenge
-	 * @return bool
-	 */
-	public function verifyChallenge(IUser $user, string $challenge): bool {
-		return $this->storage->validateCode($user, $challenge);
-	}
+    /**
+     * Verify the given challenge
+     *
+     * @param IUser $user
+     * @param string $challenge
+     * @return bool
+     */
+    public function verifyChallenge(IUser $user, string $challenge): bool {
+        return $this->storage->validateCode($user, $challenge);
+    }
 
-	/**
-	 * Decides whether 2FA is enabled for the given user
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
-		return $this->storage->hasBackupCodes($user);
-	}
+    /**
+     * Decides whether 2FA is enabled for the given user
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
+        return $this->storage->hasBackupCodes($user);
+    }
 
-	/**
-	 * Determine whether backup codes should be active or not
-	 *
-	 * Backup codes only make sense if at least one 2FA provider is active,
-	 * hence this method checks all enabled apps on whether they provide 2FA
-	 * functionality or not. If there's at least one app, backup codes are
-	 * enabled on the personal settings page.
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isActive(IUser $user): bool {
-		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function ($appId) {
-			return $appId !== $this->appName;
-		});
-		foreach ($appIds as $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-			if (isset($info['two-factor-providers']) && count($info['two-factor-providers']) > 0) {
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * Determine whether backup codes should be active or not
+     *
+     * Backup codes only make sense if at least one 2FA provider is active,
+     * hence this method checks all enabled apps on whether they provide 2FA
+     * functionality or not. If there's at least one app, backup codes are
+     * enabled on the personal settings page.
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isActive(IUser $user): bool {
+        $appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function ($appId) {
+            return $appId !== $this->appName;
+        });
+        foreach ($appIds as $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+            if (isset($info['two-factor-providers']) && count($info['two-factor-providers']) > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * @param IUser $user
-	 *
-	 * @return IPersonalProviderSettings
-	 */
-	public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
-		$state = $this->storage->getBackupCodesState($user);
-		$this->initialStateService->provideInitialState($this->appName, 'state', $state);
-		return new Personal();
-	}
+    /**
+     * @param IUser $user
+     *
+     * @return IPersonalProviderSettings
+     */
+    public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
+        $state = $this->storage->getBackupCodesState($user);
+        $this->initialStateService->provideInitialState($this->appName, 'state', $state);
+        return new Personal();
+    }
 
-	public function disableFor(IUser $user) {
-		$this->storage->deleteCodes($user);
-	}
+    public function disableFor(IUser $user) {
+        $this->storage->deleteCodes($user);
+    }
 }

apps/workflowengine/lib/Settings/ASettings.php

Spacing +6 added lines, -6 removed lines

@@ -146,8 +146,8 @@ 
 	}
 
 	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
+		return array_map(function(IEntity $entity) {
+			$events = array_map(function(IEntityEvent $entityEvent) {
 				return [
 					'eventName' => $entityEvent->getEventName(),
 					'displayName' => $entityEvent->getDisplayName()
@@ -164,11 +164,11 @@ 
 	}
 
 	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
+		$operators = array_filter($operators, function(IOperation $operator) {
 			return $operator->isAvailableForScope($this->getScope());
 		});
 
-		return array_map(function (IOperation $operator) {
+		return array_map(function(IOperation $operator) {
 			return [
 				'id' => get_class($operator),
 				'icon' => $operator->getIcon(),
@@ -182,11 +182,11 @@ 
 	}
 
 	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
+		$checks = array_filter($checks, function(ICheck $check) {
 			return $check->isAvailableForScope($this->getScope());
 		});
 
-		return array_map(function (ICheck $check) {
+		return array_map(function(ICheck $check) {
 			return [
 				'id' => get_class($check),
 				'supportedEntities' => $check->supportedEntities(),

Indentation +126 added lines, -126 removed lines

@@ -26,130 +26,130 @@
 use OCP\WorkflowEngine\ISpecificOperation;
 
 abstract class ASettings implements ISettings {
-	public function __construct(
-		private string $appName,
-		private IL10N $l10n,
-		private IEventDispatcher $eventDispatcher,
-		protected Manager $manager,
-		private IInitialState $initialStateService,
-		private IConfig $config,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
-
-	abstract public function getScope(): int;
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		// @deprecated in 20.0.0: retire this one in favor of the typed event
-		$this->eventDispatcher->dispatch(
-			'OCP\WorkflowEngine::loadAdditionalSettingScripts',
-			new LoadSettingsScriptsEvent()
-		);
-		$this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent());
-
-		$entities = $this->manager->getEntitiesList();
-		$this->initialStateService->provideInitialState(
-			'entities',
-			$this->entitiesToArray($entities)
-		);
-
-		$operators = $this->manager->getOperatorList();
-		$this->initialStateService->provideInitialState(
-			'operators',
-			$this->operatorsToArray($operators)
-		);
-
-		$checks = $this->manager->getCheckList();
-		$this->initialStateService->provideInitialState(
-			'checks',
-			$this->checksToArray($checks)
-		);
-
-		$this->initialStateService->provideInitialState(
-			'scope',
-			$this->getScope()
-		);
-
-		$this->initialStateService->provideInitialState(
-			'appstoreenabled',
-			$this->config->getSystemValueBool('appstoreenabled', true)
-		);
-
-		$this->initialStateService->provideInitialState(
-			'doc-url',
-			$this->urlGenerator->linkToDocs('admin-workflowengine')
-		);
-
-		return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection(): ?string {
-		return 'workflow';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority(): int {
-		return 0;
-	}
-
-	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
-				return [
-					'eventName' => $entityEvent->getEventName(),
-					'displayName' => $entityEvent->getDisplayName()
-				];
-			}, $entity->getEvents());
-
-			return [
-				'id' => get_class($entity),
-				'icon' => $entity->getIcon(),
-				'name' => $entity->getName(),
-				'events' => $events,
-			];
-		}, $entities);
-	}
-
-	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
-			return $operator->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (IOperation $operator) {
-			return [
-				'id' => get_class($operator),
-				'icon' => $operator->getIcon(),
-				'name' => $operator->getDisplayName(),
-				'description' => $operator->getDescription(),
-				'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
-				'isComplex' => $operator instanceof IComplexOperation,
-				'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
-			];
-		}, $operators);
-	}
-
-	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
-			return $check->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (ICheck $check) {
-			return [
-				'id' => get_class($check),
-				'supportedEntities' => $check->supportedEntities(),
-			];
-		}, $checks);
-	}
+    public function __construct(
+        private string $appName,
+        private IL10N $l10n,
+        private IEventDispatcher $eventDispatcher,
+        protected Manager $manager,
+        private IInitialState $initialStateService,
+        private IConfig $config,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
+
+    abstract public function getScope(): int;
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm(): TemplateResponse {
+        // @deprecated in 20.0.0: retire this one in favor of the typed event
+        $this->eventDispatcher->dispatch(
+            'OCP\WorkflowEngine::loadAdditionalSettingScripts',
+            new LoadSettingsScriptsEvent()
+        );
+        $this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent());
+
+        $entities = $this->manager->getEntitiesList();
+        $this->initialStateService->provideInitialState(
+            'entities',
+            $this->entitiesToArray($entities)
+        );
+
+        $operators = $this->manager->getOperatorList();
+        $this->initialStateService->provideInitialState(
+            'operators',
+            $this->operatorsToArray($operators)
+        );
+
+        $checks = $this->manager->getCheckList();
+        $this->initialStateService->provideInitialState(
+            'checks',
+            $this->checksToArray($checks)
+        );
+
+        $this->initialStateService->provideInitialState(
+            'scope',
+            $this->getScope()
+        );
+
+        $this->initialStateService->provideInitialState(
+            'appstoreenabled',
+            $this->config->getSystemValueBool('appstoreenabled', true)
+        );
+
+        $this->initialStateService->provideInitialState(
+            'doc-url',
+            $this->urlGenerator->linkToDocs('admin-workflowengine')
+        );
+
+        return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection(): ?string {
+        return 'workflow';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority(): int {
+        return 0;
+    }
+
+    private function entitiesToArray(array $entities) {
+        return array_map(function (IEntity $entity) {
+            $events = array_map(function (IEntityEvent $entityEvent) {
+                return [
+                    'eventName' => $entityEvent->getEventName(),
+                    'displayName' => $entityEvent->getDisplayName()
+                ];
+            }, $entity->getEvents());
+
+            return [
+                'id' => get_class($entity),
+                'icon' => $entity->getIcon(),
+                'name' => $entity->getName(),
+                'events' => $events,
+            ];
+        }, $entities);
+    }
+
+    private function operatorsToArray(array $operators) {
+        $operators = array_filter($operators, function (IOperation $operator) {
+            return $operator->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (IOperation $operator) {
+            return [
+                'id' => get_class($operator),
+                'icon' => $operator->getIcon(),
+                'name' => $operator->getDisplayName(),
+                'description' => $operator->getDescription(),
+                'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
+                'isComplex' => $operator instanceof IComplexOperation,
+                'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
+            ];
+        }, $operators);
+    }
+
+    private function checksToArray(array $checks) {
+        $checks = array_filter($checks, function (ICheck $check) {
+            return $check->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (ICheck $check) {
+            return [
+                'id' => get_class($check),
+                'supportedEntities' => $check->supportedEntities(),
+            ];
+        }, $checks);
+    }
 }

lib/private/Authentication/TwoFactorAuth/ProviderSet.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 * @return IProvider[]
 	 */
 	public function getPrimaryProviders(): array {
-		return array_filter($this->providers, function (IProvider $provider) {
+		return array_filter($this->providers, function(IProvider $provider) {
 			return !($provider instanceof BackupCodesProvider);
 		});
 	}

Indentation +39 added lines, -39 removed lines

@@ -33,49 +33,49 @@
  * Contains all two-factor provider information for the two-factor login challenge
  */
 class ProviderSet {
-	/** @var IProvider */
-	private $providers;
+    /** @var IProvider */
+    private $providers;
 
-	/** @var bool */
-	private $providerMissing;
+    /** @var bool */
+    private $providerMissing;
 
-	/**
-	 * @param IProvider[] $providers
-	 * @param bool $providerMissing
-	 */
-	public function __construct(array $providers, bool $providerMissing) {
-		$this->providers = [];
-		foreach ($providers as $provider) {
-			$this->providers[$provider->getId()] = $provider;
-		}
-		$this->providerMissing = $providerMissing;
-	}
+    /**
+     * @param IProvider[] $providers
+     * @param bool $providerMissing
+     */
+    public function __construct(array $providers, bool $providerMissing) {
+        $this->providers = [];
+        foreach ($providers as $provider) {
+            $this->providers[$provider->getId()] = $provider;
+        }
+        $this->providerMissing = $providerMissing;
+    }
 
-	/**
-	 * @param string $providerId
-	 * @return IProvider|null
-	 */
-	public function getProvider(string $providerId) {
-		return $this->providers[$providerId] ?? null;
-	}
+    /**
+     * @param string $providerId
+     * @return IProvider|null
+     */
+    public function getProvider(string $providerId) {
+        return $this->providers[$providerId] ?? null;
+    }
 
-	/**
-	 * @return IProvider[]
-	 */
-	public function getProviders(): array {
-		return $this->providers;
-	}
+    /**
+     * @return IProvider[]
+     */
+    public function getProviders(): array {
+        return $this->providers;
+    }
 
-	/**
-	 * @return IProvider[]
-	 */
-	public function getPrimaryProviders(): array {
-		return array_filter($this->providers, function (IProvider $provider) {
-			return !($provider instanceof BackupCodesProvider);
-		});
-	}
+    /**
+     * @return IProvider[]
+     */
+    public function getPrimaryProviders(): array {
+        return array_filter($this->providers, function (IProvider $provider) {
+            return !($provider instanceof BackupCodesProvider);
+        });
+    }
 
-	public function isProviderMissing(): bool {
-		return $this->providerMissing;
-	}
+    public function isProviderMissing(): bool {
+        return $this->providerMissing;
+    }
 }

lib/private/Collaboration/Resources/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
+		array_map(function(IResource $r) use ($resource) {
 			if ($this->isSameResource($r, $resource)) {
 				throw new ResourceException('Already part of the collection');
 			}
@@ -158,7 +158,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+		$this->resources = array_filter($this->getResources(), function(IResource $r) use ($resource) {
 			return !$this->isSameResource($r, $resource);
 		});
 

Indentation +159 added lines, -159 removed lines

@@ -18,163 +18,163 @@
 use OCP\IUser;
 
 class Collection implements ICollection {
-	/** @var IResource[] */
-	protected array $resources = [];
-
-	public function __construct(
-		/** @var Manager $manager */
-		protected IManager $manager,
-		protected IDBConnection $connection,
-		protected int $id,
-		protected string $name,
-		protected ?IUser $userForAccess = null,
-		protected ?bool $access = null,
-	) {
-	}
-
-	/**
-	 * @since 16.0.0
-	 */
-	public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @since 16.0.0
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @since 16.0.0
-	 */
-	public function setName(string $name): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update(Manager::TABLE_COLLECTIONS)
-			->set('name', $query->createNamedParameter($name))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$this->name = $name;
-	}
-
-	/**
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResources(): array {
-		if (empty($this->resources)) {
-			$this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
-		}
-
-		return $this->resources;
-	}
-
-	/**
-	 * Adds a resource to a collection
-	 *
-	 * @throws ResourceException when the resource is already part of the collection
-	 * @since 16.0.0
-	 */
-	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
-			if ($this->isSameResource($r, $resource)) {
-				throw new ResourceException('Already part of the collection');
-			}
-		}, $this->getResources());
-
-		$this->resources[] = $resource;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(Manager::TABLE_RESOURCES)
-			->values([
-				'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
-				'resource_type' => $query->createNamedParameter($resource->getType()),
-				'resource_id' => $query->createNamedParameter($resource->getId()),
-			]);
-
-		try {
-			$query->execute();
-		} catch (ConstraintViolationException $e) {
-			throw new ResourceException('Already part of the collection');
-		}
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-	}
-
-	/**
-	 * Removes a resource from a collection
-	 *
-	 * @since 16.0.0
-	 */
-	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
-			return !$this->isSameResource($r, $resource);
-		});
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_RESOURCES)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
-		$query->executeStatement();
-
-		if (empty($this->resources)) {
-			$this->removeCollection();
-		} else {
-			$this->manager->invalidateAccessCacheForCollection($this);
-		}
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool {
-		if ($user instanceof IUser) {
-			return $this->canUserAccess($user);
-		}
-		return $this->canGuestAccess();
-	}
-
-	protected function canUserAccess(IUser $user): bool {
-		if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, $user);
-		if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function canGuestAccess(): bool {
-		if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function isSameResource(IResource $resource1, IResource $resource2): bool {
-		return $resource1->getType() === $resource2->getType() &&
-			$resource1->getId() === $resource2->getId();
-	}
-
-	protected function removeCollection(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_COLLECTIONS)
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-		$this->id = 0;
-	}
+    /** @var IResource[] */
+    protected array $resources = [];
+
+    public function __construct(
+        /** @var Manager $manager */
+        protected IManager $manager,
+        protected IDBConnection $connection,
+        protected int $id,
+        protected string $name,
+        protected ?IUser $userForAccess = null,
+        protected ?bool $access = null,
+    ) {
+    }
+
+    /**
+     * @since 16.0.0
+     */
+    public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @since 16.0.0
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @since 16.0.0
+     */
+    public function setName(string $name): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update(Manager::TABLE_COLLECTIONS)
+            ->set('name', $query->createNamedParameter($name))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $this->name = $name;
+    }
+
+    /**
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResources(): array {
+        if (empty($this->resources)) {
+            $this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
+        }
+
+        return $this->resources;
+    }
+
+    /**
+     * Adds a resource to a collection
+     *
+     * @throws ResourceException when the resource is already part of the collection
+     * @since 16.0.0
+     */
+    public function addResource(IResource $resource): void {
+        array_map(function (IResource $r) use ($resource) {
+            if ($this->isSameResource($r, $resource)) {
+                throw new ResourceException('Already part of the collection');
+            }
+        }, $this->getResources());
+
+        $this->resources[] = $resource;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(Manager::TABLE_RESOURCES)
+            ->values([
+                'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
+                'resource_type' => $query->createNamedParameter($resource->getType()),
+                'resource_id' => $query->createNamedParameter($resource->getId()),
+            ]);
+
+        try {
+            $query->execute();
+        } catch (ConstraintViolationException $e) {
+            throw new ResourceException('Already part of the collection');
+        }
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+    }
+
+    /**
+     * Removes a resource from a collection
+     *
+     * @since 16.0.0
+     */
+    public function removeResource(IResource $resource): void {
+        $this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+            return !$this->isSameResource($r, $resource);
+        });
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_RESOURCES)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
+        $query->executeStatement();
+
+        if (empty($this->resources)) {
+            $this->removeCollection();
+        } else {
+            $this->manager->invalidateAccessCacheForCollection($this);
+        }
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool {
+        if ($user instanceof IUser) {
+            return $this->canUserAccess($user);
+        }
+        return $this->canGuestAccess();
+    }
+
+    protected function canUserAccess(IUser $user): bool {
+        if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, $user);
+        if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function canGuestAccess(): bool {
+        if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function isSameResource(IResource $resource1, IResource $resource2): bool {
+        return $resource1->getType() === $resource2->getType() &&
+            $resource1->getId() === $resource2->getId();
+    }
+
+    protected function removeCollection(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_COLLECTIONS)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+        $this->id = 0;
+    }
 }

lib/public/Accounts/PropertyDoesNotExistException.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 * @since 15.0.0
 	 */
 	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
+		parent::__construct('Property '.$property.' does not exist.');
 	}
 
 }

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  *
  */
 class PropertyDoesNotExistException extends \Exception {
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 15.0.0
-	 */
-	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 15.0.0
+     */
+    public function __construct($property) {
+        parent::__construct('Property ' . $property . ' does not exist.');
+    }
 }