nextcloud / server

core/routes.php

Indentation +79 added lines, -79 removed lines

@@ -37,90 +37,90 @@ 
 /** @var Application $application */
 $application = \OC::$server->query(Application::class);
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
-		['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
-		['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
-		['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
-		['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
-		['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
-		['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
-		['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
-		['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
-		['name' => 'GuestAvatar#getAvatar', 'url' => '/avatar/guest/{guestName}/{size}', 'verb' => 'GET'],
-		['name' => 'CSRFToken#index', 'url' => '/csrftoken', 'verb' => 'GET'],
-		['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
-		['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
-		['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
-		['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
-		// Original login flow used by all clients
-		['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
-		['name' => 'ClientFlowLogin#grantPage', 'url' => '/login/flow/grant', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
-		// NG login flow used by desktop client in case of Kerberos/fancy 2fa (smart cards for example)
-		['name' => 'ClientFlowLoginV2#poll', 'url' => '/login/v2/poll', 'verb' => 'POST'],
-		['name' => 'ClientFlowLoginV2#showAuthPickerPage', 'url' => '/login/v2/flow', 'verb' => 'GET'],
-		['name' => 'ClientFlowLoginV2#landing', 'url' => '/login/v2/flow/{token}', 'verb' => 'GET'],
-		['name' => 'ClientFlowLoginV2#grantPage', 'url' => '/login/v2/grant', 'verb' => 'GET'],
-		['name' => 'ClientFlowLoginV2#generateAppPassword', 'url' => '/login/v2/grant', 'verb' => 'POST'],
-		['name' => 'ClientFlowLoginV2#init', 'url' => '/login/v2', 'verb' => 'POST'],
-		['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
-		['name' => 'TwoFactorChallenge#setupProviders', 'url' => 'login/setupchallenge', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#setupProvider', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#confirmProviderSetup', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'POST'],
-		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
-		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
-		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
-		['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
-		['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
-		['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
-		['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
-		['name' => 'Wipe#checkWipe', 'url' => '/core/wipe/check', 'verb' => 'POST'],
-		['name' => 'Wipe#wipeDone', 'url' => '/core/wipe/success', 'verb' => 'POST'],
+    'routes' => [
+        ['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
+        ['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
+        ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
+        ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
+        ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
+        ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
+        ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
+        ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
+        ['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
+        ['name' => 'GuestAvatar#getAvatar', 'url' => '/avatar/guest/{guestName}/{size}', 'verb' => 'GET'],
+        ['name' => 'CSRFToken#index', 'url' => '/csrftoken', 'verb' => 'GET'],
+        ['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
+        ['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
+        ['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
+        ['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
+        // Original login flow used by all clients
+        ['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLogin#grantPage', 'url' => '/login/flow/grant', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
+        // NG login flow used by desktop client in case of Kerberos/fancy 2fa (smart cards for example)
+        ['name' => 'ClientFlowLoginV2#poll', 'url' => '/login/v2/poll', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLoginV2#showAuthPickerPage', 'url' => '/login/v2/flow', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLoginV2#landing', 'url' => '/login/v2/flow/{token}', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLoginV2#grantPage', 'url' => '/login/v2/grant', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLoginV2#generateAppPassword', 'url' => '/login/v2/grant', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLoginV2#init', 'url' => '/login/v2', 'verb' => 'POST'],
+        ['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
+        ['name' => 'TwoFactorChallenge#setupProviders', 'url' => 'login/setupchallenge', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#setupProvider', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#confirmProviderSetup', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'POST'],
+        ['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
+        ['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
+        ['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
+        ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
+        ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
+        ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
+        ['name' => 'Wipe#checkWipe', 'url' => '/core/wipe/check', 'verb' => 'POST'],
+        ['name' => 'Wipe#wipeDone', 'url' => '/core/wipe/success', 'verb' => 'POST'],
 
-		// Logins for passwordless auth
-		['name' => 'WebAuthn#startAuthentication', 'url' => 'login/webauthn/start', 'verb' => 'POST'],
-		['name' => 'WebAuthn#finishAuthentication', 'url' => 'login/webauthn/finish', 'verb' => 'POST'],
+        // Logins for passwordless auth
+        ['name' => 'WebAuthn#startAuthentication', 'url' => 'login/webauthn/start', 'verb' => 'POST'],
+        ['name' => 'WebAuthn#finishAuthentication', 'url' => 'login/webauthn/finish', 'verb' => 'POST'],
 
-		// Well known requests https://tools.ietf.org/html/rfc5785
-		['name' => 'WellKnown#handle', 'url' => '.well-known/{service}'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
-		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
-		['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
-		['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'WhatsNew#get', 'url' => '/whatsnew', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'WhatsNew#dismiss', 'url' => '/whatsnew', 'verb' => 'POST'],
-		['root' => '/core', 'name' => 'AppPassword#getAppPassword', 'url' => '/getapppassword', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'AppPassword#rotateAppPassword', 'url' => '/apppassword/rotate', 'verb' => 'POST'],
-		['root' => '/core', 'name' => 'AppPassword#deleteAppPassword', 'url' => '/apppassword', 'verb' => 'DELETE'],
+        // Well known requests https://tools.ietf.org/html/rfc5785
+        ['name' => 'WellKnown#handle', 'url' => '.well-known/{service}'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
+        ['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
+        ['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
+        ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'WhatsNew#get', 'url' => '/whatsnew', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'WhatsNew#dismiss', 'url' => '/whatsnew', 'verb' => 'POST'],
+        ['root' => '/core', 'name' => 'AppPassword#getAppPassword', 'url' => '/getapppassword', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'AppPassword#rotateAppPassword', 'url' => '/apppassword/rotate', 'verb' => 'POST'],
+        ['root' => '/core', 'name' => 'AppPassword#deleteAppPassword', 'url' => '/apppassword', 'verb' => 'DELETE'],
 
-		['root' => '/collaboration', 'name' => 'CollaborationResources#searchCollections', 'url' => '/resources/collections/search/{filter}', 'verb' => 'GET'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#listCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'GET'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#renameCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'PUT'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#addResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'POST'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#searchCollections', 'url' => '/resources/collections/search/{filter}', 'verb' => 'GET'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#listCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'GET'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#renameCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'PUT'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#addResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'POST'],
 
-		['root' => '/collaboration', 'name' => 'CollaborationResources#removeResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'DELETE'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#getCollectionsByResource', 'url' => '/resources/{resourceType}/{resourceId}', 'verb' => 'GET'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#createCollectionOnResource', 'url' => '/resources/{baseResourceType}/{baseResourceId}', 'verb' => 'POST'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#removeResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'DELETE'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#getCollectionsByResource', 'url' => '/resources/{resourceType}/{resourceId}', 'verb' => 'GET'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#createCollectionOnResource', 'url' => '/resources/{baseResourceType}/{baseResourceId}', 'verb' => 'POST'],
 
-		// Unified search
-		['root' => '/search', 'name' => 'UnifiedSearch#getProviders', 'url' => '/providers', 'verb' => 'GET'],
-		['root' => '/search', 'name' => 'UnifiedSearch#search', 'url' => '/providers/{providerId}/search', 'verb' => 'GET'],
+        // Unified search
+        ['root' => '/search', 'name' => 'UnifiedSearch#getProviders', 'url' => '/providers', 'verb' => 'GET'],
+        ['root' => '/search', 'name' => 'UnifiedSearch#search', 'url' => '/providers/{providerId}/search', 'verb' => 'GET'],
 
-	],
+    ],
 ]);
 
 // Post installation check
@@ -129,4 +129,4 @@ 
 // Core ajax actions
 // Routing
 $this->create('core_ajax_update', '/core/ajax/update.php')
-	->actionInclude('core/ajax/update.php');
+    ->actionInclude('core/ajax/update.php');

core/Controller/WellKnownController.php

Indentation +26 added lines, -26 removed lines

@@ -34,34 +34,34 @@
 
 class WellKnownController extends Controller {
 
-	/** @var RequestManager */
-	private $requestManager;
+    /** @var RequestManager */
+    private $requestManager;
 
-	public function __construct(IRequest $request,
-								RequestManager $wellKnownManager) {
-		parent::__construct('core', $request);
-		$this->requestManager = $wellKnownManager;
-	}
+    public function __construct(IRequest $request,
+                                RequestManager $wellKnownManager) {
+        parent::__construct('core', $request);
+        $this->requestManager = $wellKnownManager;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return Response
-	 */
-	public function handle(string $service): Response {
-		$response = $this->requestManager->process(
-			$service,
-			$this->request
-		);
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    public function handle(string $service): Response {
+        $response = $this->requestManager->process(
+            $service,
+            $this->request
+        );
 
-		if ($response === null) {
-			$httpResponse = new JSONResponse(["message" => "$service not supported"], Http::STATUS_NOT_FOUND);
-		} else {
-			$httpResponse = $response->toHttpResponse();
-		}
+        if ($response === null) {
+            $httpResponse = new JSONResponse(["message" => "$service not supported"], Http::STATUS_NOT_FOUND);
+        } else {
+            $httpResponse = $response->toHttpResponse();
+        }
 
-		// We add a custom header so that setup checks can detect if their requests are answered by this controller
-		return $httpResponse->addHeader('X-NEXTCLOUD-WELL-KNOWN', '1');
-	}
+        // We add a custom header so that setup checks can detect if their requests are answered by this controller
+        return $httpResponse->addHeader('X-NEXTCLOUD-WELL-KNOWN', '1');
+    }
 }

apps/settings/lib/AppInfo/Application.php

Indentation +141 added lines, -141 removed lines

@@ -66,145 +66,145 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'settings';
-
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		// Register Middleware
-		$context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$context->registerMiddleware(SubadminMiddleware::class);
-		$context->registerSearchProvider(SectionSearch::class);
-		$context->registerSearchProvider(AppSearch::class);
-
-		/**
-		 * Core class wrappers
-		 */
-		/** FIXME: Remove once OC_User is non-static and mockable */
-		$context->registerService('isAdmin', function () {
-			return \OC_User::isAdminUser(\OC_User::getUser());
-		});
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$context->registerService('isSubAdmin', function () {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if ($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$context->registerService(IProvider::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->query(IProvider::class);
-		});
-		$context->registerService(IManager::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->getSettingsManager();
-		});
-
-		$context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
-			/** @var Server $server */
-			$server = $appContainer->query(IServerContainer::class);
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
-
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-	}
-
-	public function boot(IBootContext $context): void {
-		$context->injectFn(function (EventDispatcherInterface $dispatcher, IAppContainer $appContainer) {
-			$dispatcher->addListener('app_password_created', function (GenericEvent $event) use ($appContainer) {
-				if (($token = $event->getSubject()) instanceof IToken) {
-					/** @var IActivityManager $activityManager */
-					$activityManager = $appContainer->get(IActivityManager::class);
-					/** @var ILogger $logger */
-					$logger = $appContainer->get(ILogger::class);
-
-					$activity = $activityManager->generateEvent();
-					$activity->setApp('settings')
-						->setType('security')
-						->setAffectedUser($token->getUID())
-						->setAuthor($token->getUID())
-						->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
-						->setObject('app_token', $token->getId());
-
-					try {
-						$activityManager->publish($activity);
-					} catch (BadMethodCallException $e) {
-						$logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
-					}
-				}
-			});
-		});
-
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-
-		$context->injectFn(function (IGroupManager $groupManager) {
-			/** @var IGroupManager|Manager $groupManager */
-			$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
-			$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
-		});
-	}
-
-	public function addUserToGroup(IGroup $group, IUser $user): void {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->addUserToGroup($group, $user);
-	}
-
-	public function removeUserFromGroup(IGroup $group, IUser $user): void {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->removeUserFromGroup($group, $user);
-	}
-
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
-
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
+    public const APP_ID = 'settings';
+
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        // Register Middleware
+        $context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $context->registerMiddleware(SubadminMiddleware::class);
+        $context->registerSearchProvider(SectionSearch::class);
+        $context->registerSearchProvider(AppSearch::class);
+
+        /**
+         * Core class wrappers
+         */
+        /** FIXME: Remove once OC_User is non-static and mockable */
+        $context->registerService('isAdmin', function () {
+            return \OC_User::isAdminUser(\OC_User::getUser());
+        });
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+        $context->registerService('isSubAdmin', function () {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if ($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $context->registerService(IProvider::class, function (IAppContainer $appContainer) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $appContainer->query(IServerContainer::class);
+            return $serverContainer->query(IProvider::class);
+        });
+        $context->registerService(IManager::class, function (IAppContainer $appContainer) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $appContainer->query(IServerContainer::class);
+            return $serverContainer->getSettingsManager();
+        });
+
+        $context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
+            /** @var Server $server */
+            $server = $appContainer->query(IServerContainer::class);
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
+
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+    }
+
+    public function boot(IBootContext $context): void {
+        $context->injectFn(function (EventDispatcherInterface $dispatcher, IAppContainer $appContainer) {
+            $dispatcher->addListener('app_password_created', function (GenericEvent $event) use ($appContainer) {
+                if (($token = $event->getSubject()) instanceof IToken) {
+                    /** @var IActivityManager $activityManager */
+                    $activityManager = $appContainer->get(IActivityManager::class);
+                    /** @var ILogger $logger */
+                    $logger = $appContainer->get(ILogger::class);
+
+                    $activity = $activityManager->generateEvent();
+                    $activity->setApp('settings')
+                        ->setType('security')
+                        ->setAffectedUser($token->getUID())
+                        ->setAuthor($token->getUID())
+                        ->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
+                        ->setObject('app_token', $token->getId());
+
+                    try {
+                        $activityManager->publish($activity);
+                    } catch (BadMethodCallException $e) {
+                        $logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
+                    }
+                }
+            });
+        });
+
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+
+        $context->injectFn(function (IGroupManager $groupManager) {
+            /** @var IGroupManager|Manager $groupManager */
+            $groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
+            $groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
+        });
+    }
+
+    public function addUserToGroup(IGroup $group, IUser $user): void {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->addUserToGroup($group, $user);
+    }
+
+    public function removeUserFromGroup(IGroup $group, IUser $user): void {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->removeUserFromGroup($group, $user);
+    }
+
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
+
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -86,11 +86,11 @@ 
 		 * Core class wrappers
 		 */
 		/** FIXME: Remove once OC_User is non-static and mockable */
-		$context->registerService('isAdmin', function () {
+		$context->registerService('isAdmin', function() {
 			return \OC_User::isAdminUser(\OC_User::getUser());
 		});
 		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$context->registerService('isSubAdmin', function () {
+		$context->registerService('isSubAdmin', function() {
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
 			if ($userObject !== null) {
@@ -98,18 +98,18 @@ 
 			}
 			return $isSubAdmin;
 		});
-		$context->registerService(IProvider::class, function (IAppContainer $appContainer) {
+		$context->registerService(IProvider::class, function(IAppContainer $appContainer) {
 			/** @var IServerContainer $serverContainer */
 			$serverContainer = $appContainer->query(IServerContainer::class);
 			return $serverContainer->query(IProvider::class);
 		});
-		$context->registerService(IManager::class, function (IAppContainer $appContainer) {
+		$context->registerService(IManager::class, function(IAppContainer $appContainer) {
 			/** @var IServerContainer $serverContainer */
 			$serverContainer = $appContainer->query(IServerContainer::class);
 			return $serverContainer->getSettingsManager();
 		});
 
-		$context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
+		$context->registerService(NewUserMailHelper::class, function(IAppContainer $appContainer) {
 			/** @var Server $server */
 			$server = $appContainer->query(IServerContainer::class);
 			/** @var Defaults $defaults */
@@ -130,8 +130,8 @@ 
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(function (EventDispatcherInterface $dispatcher, IAppContainer $appContainer) {
-			$dispatcher->addListener('app_password_created', function (GenericEvent $event) use ($appContainer) {
+		$context->injectFn(function(EventDispatcherInterface $dispatcher, IAppContainer $appContainer) {
+			$dispatcher->addListener('app_password_created', function(GenericEvent $event) use ($appContainer) {
 				if (($token = $event->getSubject()) instanceof IToken) {
 					/** @var IActivityManager $activityManager */
 					$activityManager = $appContainer->get(IActivityManager::class);
@@ -158,10 +158,10 @@ 
 		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
 		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
 
-		$context->injectFn(function (IGroupManager $groupManager) {
+		$context->injectFn(function(IGroupManager $groupManager) {
 			/** @var IGroupManager|Manager $groupManager */
-			$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
-			$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
+			$groupManager->listen('\OC\Group', 'postRemoveUser', [$this, 'removeUserFromGroup']);
+			$groupManager->listen('\OC\Group', 'postAddUser', [$this, 'addUserToGroup']);
 		});
 	}
 

lib/public/Http/WellKnown/JrdResponse.php

Indentation +128 added lines, -128 removed lines

@@ -39,132 +39,132 @@
  */
 final class JrdResponse implements IResponse {
 
-	/** @var string */
-	private $subject;
-
-	/** @var string|null */
-	private $expires;
-
-	/** @var string[] */
-	private $aliases = [];
-
-	/** @var (string|null)[] */
-	private $properties = [];
-
-	/** @var mixed[] */
-	private $links;
-
-	/**
-	 * @param string $subject https://tools.ietf.org/html/rfc7033#section-4.4.1
-	 *
-	 * @since 21.0.0
-	 */
-	public function __construct(string $subject) {
-		$this->subject = $subject;
-	}
-
-	/**
-	 * @param string $expires
-	 *
-	 * @return $this
-	 *
-	 * @since 21.0.0
-	 */
-	public function setExpires(string $expires): self {
-		$this->expires = $expires;
-
-		return $this;
-	}
-
-	/**
-	 * Add an alias
-	 *
-	 * @ref https://tools.ietf.org/html/rfc7033#section-4.4.2
-	 *
-	 * @param string $alias
-	 *
-	 * @return $this
-	 *
-	 * @since 21.0.0
-	 */
-	public function addAlias(string $alias): self {
-		$this->aliases[] = $alias;
-
-		return $this;
-	}
-
-	/**
-	 * Add a property
-	 *
-	 * @ref https://tools.ietf.org/html/rfc7033#section-4.4.3
-	 *
-	 * @param string $property
-	 * @param string|null $value
-	 *
-	 * @return $this
-	 *
-	 * @since 21.0.0
-	 */
-	public function addProperty(string $property, ?string $value): self {
-		$this->properties[$property] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Add a link
-	 *
-	 * @ref https://tools.ietf.org/html/rfc7033#section-8.4
-	 *
-	 * @param string $rel https://tools.ietf.org/html/rfc7033#section-4.4.4.1
-	 * @param string|null $type https://tools.ietf.org/html/rfc7033#section-4.4.4.2
-	 * @param string|null $href https://tools.ietf.org/html/rfc7033#section-4.4.4.3
-	 * @param string[]|null $titles https://tools.ietf.org/html/rfc7033#section-4.4.4.4
-	 * @param string|null $properties https://tools.ietf.org/html/rfc7033#section-4.4.4.5
-	 *
-	 * @psalm-param array<string,(string|null)>|null $properties https://tools.ietf.org/html/rfc7033#section-4.4.4.5
-	 *
-	 * @return JrdResponse
-	 * @since 21.0.0
-	 */
-	public function addLink(string $rel,
-							?string $type,
-							?string $href,
-							?array $titles = [],
-							?array $properties = []): self {
-		$this->links[] = array_filter([
-			'rel' => $rel,
-			'type' => $type,
-			'href' => $href,
-			'titles' => $titles,
-			'properties' => $properties,
-		]);
-
-		return $this;
-	}
-
-	/**
-	 * @since 21.0.0
-	 */
-	public function toHttpResponse(): Response {
-		return new JSONResponse(array_filter([
-			'subject' => $this->subject,
-			'expires' => $this->expires,
-			'aliases' => $this->aliases,
-			'properties' => $this->properties,
-			'links' => $this->links,
-		]));
-	}
-
-	/**
-	 * Does this response have any data attached to it?
-	 *
-	 * @since 21.0.0
-	 */
-	public function isEmpty(): bool {
-		return $this->expires === null
-			&& empty($this->aliases)
-			&& empty($this->properties)
-			&& empty($this->links);
-	}
+    /** @var string */
+    private $subject;
+
+    /** @var string|null */
+    private $expires;
+
+    /** @var string[] */
+    private $aliases = [];
+
+    /** @var (string|null)[] */
+    private $properties = [];
+
+    /** @var mixed[] */
+    private $links;
+
+    /**
+     * @param string $subject https://tools.ietf.org/html/rfc7033#section-4.4.1
+     *
+     * @since 21.0.0
+     */
+    public function __construct(string $subject) {
+        $this->subject = $subject;
+    }
+
+    /**
+     * @param string $expires
+     *
+     * @return $this
+     *
+     * @since 21.0.0
+     */
+    public function setExpires(string $expires): self {
+        $this->expires = $expires;
+
+        return $this;
+    }
+
+    /**
+     * Add an alias
+     *
+     * @ref https://tools.ietf.org/html/rfc7033#section-4.4.2
+     *
+     * @param string $alias
+     *
+     * @return $this
+     *
+     * @since 21.0.0
+     */
+    public function addAlias(string $alias): self {
+        $this->aliases[] = $alias;
+
+        return $this;
+    }
+
+    /**
+     * Add a property
+     *
+     * @ref https://tools.ietf.org/html/rfc7033#section-4.4.3
+     *
+     * @param string $property
+     * @param string|null $value
+     *
+     * @return $this
+     *
+     * @since 21.0.0
+     */
+    public function addProperty(string $property, ?string $value): self {
+        $this->properties[$property] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Add a link
+     *
+     * @ref https://tools.ietf.org/html/rfc7033#section-8.4
+     *
+     * @param string $rel https://tools.ietf.org/html/rfc7033#section-4.4.4.1
+     * @param string|null $type https://tools.ietf.org/html/rfc7033#section-4.4.4.2
+     * @param string|null $href https://tools.ietf.org/html/rfc7033#section-4.4.4.3
+     * @param string[]|null $titles https://tools.ietf.org/html/rfc7033#section-4.4.4.4
+     * @param string|null $properties https://tools.ietf.org/html/rfc7033#section-4.4.4.5
+     *
+     * @psalm-param array<string,(string|null)>|null $properties https://tools.ietf.org/html/rfc7033#section-4.4.4.5
+     *
+     * @return JrdResponse
+     * @since 21.0.0
+     */
+    public function addLink(string $rel,
+                            ?string $type,
+                            ?string $href,
+                            ?array $titles = [],
+                            ?array $properties = []): self {
+        $this->links[] = array_filter([
+            'rel' => $rel,
+            'type' => $type,
+            'href' => $href,
+            'titles' => $titles,
+            'properties' => $properties,
+        ]);
+
+        return $this;
+    }
+
+    /**
+     * @since 21.0.0
+     */
+    public function toHttpResponse(): Response {
+        return new JSONResponse(array_filter([
+            'subject' => $this->subject,
+            'expires' => $this->expires,
+            'aliases' => $this->aliases,
+            'properties' => $this->properties,
+            'links' => $this->links,
+        ]));
+    }
+
+    /**
+     * Does this response have any data attached to it?
+     *
+     * @since 21.0.0
+     */
+    public function isEmpty(): bool {
+        return $this->expires === null
+            && empty($this->aliases)
+            && empty($this->properties)
+            && empty($this->links);
+    }
 }

lib/public/Http/WellKnown/GenericResponse.php

Indentation +16 added lines, -16 removed lines

@@ -32,20 +32,20 @@
  */
 final class GenericResponse implements IResponse {
 
-	/** @var Response */
-	private $response;
-
-	/**
-	 * @since 21.0.0
-	 */
-	public function __construct(Response $response) {
-		$this->response = $response;
-	}
-
-	/**
-	 * @since 21.0.0
-	 */
-	public function toHttpResponse(): Response {
-		return $this->response;
-	}
+    /** @var Response */
+    private $response;
+
+    /**
+     * @since 21.0.0
+     */
+    public function __construct(Response $response) {
+        $this->response = $response;
+    }
+
+    /**
+     * @since 21.0.0
+     */
+    public function toHttpResponse(): Response {
+        return $this->response;
+    }
 }

lib/public/Http/WellKnown/IRequestContext.php

Indentation +6 added lines, -6 removed lines

@@ -37,10 +37,10 @@
  */
 interface IRequestContext {
 
-	/**
-	 * @return IRequest
-	 *
-	 * @since 21.0.0
-	 */
-	public function getHttpRequest(): IRequest;
+    /**
+     * @return IRequest
+     *
+     * @since 21.0.0
+     */
+    public function getHttpRequest(): IRequest;
 }

lib/public/Http/WellKnown/IResponse.php

Indentation +4 added lines, -4 removed lines

@@ -32,8 +32,8 @@
  */
 interface IResponse {
 
-	/**
-	 * @since 21.0.0
-	 */
-	public function toHttpResponse(): Response;
+    /**
+     * @since 21.0.0
+     */
+    public function toHttpResponse(): Response;
 }

lib/public/Http/WellKnown/IHandler.php

Indentation +10 added lines, -10 removed lines

@@ -35,14 +35,14 @@
  */
 interface IHandler {
 
-	/**
-	 * @param string $service the name of the well known service, e.g. 'webfinger'
-	 * @param IRequestContext $context
-	 * @param IResponse|null $previousResponse the response of the previous handler, if any
-	 *
-	 * @return IResponse|null a response object if the request could be handled, null otherwise
-	 *
-	 * @since 21.0.0
-	 */
-	public function handle(string $service, IRequestContext $context, ?IResponse $previousResponse): ?IResponse;
+    /**
+     * @param string $service the name of the well known service, e.g. 'webfinger'
+     * @param IRequestContext $context
+     * @param IResponse|null $previousResponse the response of the previous handler, if any
+     *
+     * @return IResponse|null a response object if the request could be handled, null otherwise
+     *
+     * @since 21.0.0
+     */
+    public function handle(string $service, IRequestContext $context, ?IResponse $previousResponse): ?IResponse;
 }

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +154 added lines, -154 removed lines

@@ -41,158 +41,158 @@
  */
 interface IRegistrationContext {
 
-	/**
-	 * @param string $capability
-	 * @see IAppContainer::registerCapability
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerCapability(string $capability): void;
-
-	/**
-	 * Register an implementation of \OCP\Support\CrashReport\IReporter that
-	 * will receive unhandled exceptions and throwables
-	 *
-	 * @param string $reporterClass
-	 * @psalm-param class-string<\OCP\Support\CrashReport\IReporter> $reporterClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerCrashReporter(string $reporterClass): void;
-
-	/**
-	 * Register an implementation of \OCP\Dashboard\IWidget that
-	 * will handle the implementation of a dashboard widget
-	 *
-	 * @param string $widgetClass
-	 * @psalm-param class-string<\OCP\Dashboard\IWidget> $widgetClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerDashboardWidget(string $widgetClass): void;
-	/**
-	 * Register a service
-	 *
-	 * @param string $name
-	 * @param callable $factory
-	 * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
-	 * @param bool $shared
-	 *
-	 * @return void
-	 * @see IContainer::registerService()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerService(string $name, callable $factory, bool $shared = true): void;
-
-	/**
-	 * @param string $alias
-	 * @psalm-param string|class-string $alias
-	 * @param string $target
-	 * @psalm-param string|class-string $target
-	 *
-	 * @return void
-	 * @see IContainer::registerAlias()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerServiceAlias(string $alias, string $target): void;
-
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return void
-	 * @see IContainer::registerParameter()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerParameter(string $name, $value): void;
-
-	/**
-	 * Register a service listener
-	 *
-	 * This is equivalent to calling IEventDispatcher::addServiceListener
-	 *
-	 * @template T of \OCP\EventDispatcher\Event
-	 * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @psalm-param string|class-string<T> $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
-	 * @psalm-param class-string<\OCP\EventDispatcher\IEventListener<T>> $listener fully qualified class name that can be built by the DI container
-	 * @param int $priority
-	 *
-	 * @see IEventDispatcher::addServiceListener()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerEventListener(string $event, string $listener, int $priority = 0): void;
-
-	/**
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
-	 *
-	 * @return void
-	 * @see IAppContainer::registerMiddleWare()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerMiddleware(string $class): void;
-
-	/**
-	 * Register a search provider for the unified search
-	 *
-	 * It is allowed to register more than one provider per app as the search
-	 * results can go into distinct sections, e.g. "Files" and "Files shared
-	 * with you" in the Files app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Search\IProvider> $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerSearchProvider(string $class): void;
-
-	/**
-	 * Register an alternative login option
-	 *
-	 * It is allowed to register more than one option per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Authentication\IAlternativeLogin> $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerAlternativeLogin(string $class): void;
-
-	/**
-	 * Register an initialstate provider
-	 *
-	 * It is allowed to register more than one provider per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\AppFramework\Services\InitialStateProvider> $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerInitialStateProvider(string $class): void;
-
-	/**
-	 * Register a well known protocol handler
-	 *
-	 * It is allowed to register more than one handler per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Http\WellKnown\IHandler> $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerWellKnownHandler(string $class): void;
+    /**
+     * @param string $capability
+     * @see IAppContainer::registerCapability
+     *
+     * @since 20.0.0
+     */
+    public function registerCapability(string $capability): void;
+
+    /**
+     * Register an implementation of \OCP\Support\CrashReport\IReporter that
+     * will receive unhandled exceptions and throwables
+     *
+     * @param string $reporterClass
+     * @psalm-param class-string<\OCP\Support\CrashReport\IReporter> $reporterClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerCrashReporter(string $reporterClass): void;
+
+    /**
+     * Register an implementation of \OCP\Dashboard\IWidget that
+     * will handle the implementation of a dashboard widget
+     *
+     * @param string $widgetClass
+     * @psalm-param class-string<\OCP\Dashboard\IWidget> $widgetClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerDashboardWidget(string $widgetClass): void;
+    /**
+     * Register a service
+     *
+     * @param string $name
+     * @param callable $factory
+     * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
+     * @param bool $shared
+     *
+     * @return void
+     * @see IContainer::registerService()
+     *
+     * @since 20.0.0
+     */
+    public function registerService(string $name, callable $factory, bool $shared = true): void;
+
+    /**
+     * @param string $alias
+     * @psalm-param string|class-string $alias
+     * @param string $target
+     * @psalm-param string|class-string $target
+     *
+     * @return void
+     * @see IContainer::registerAlias()
+     *
+     * @since 20.0.0
+     */
+    public function registerServiceAlias(string $alias, string $target): void;
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return void
+     * @see IContainer::registerParameter()
+     *
+     * @since 20.0.0
+     */
+    public function registerParameter(string $name, $value): void;
+
+    /**
+     * Register a service listener
+     *
+     * This is equivalent to calling IEventDispatcher::addServiceListener
+     *
+     * @template T of \OCP\EventDispatcher\Event
+     * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @psalm-param string|class-string<T> $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
+     * @psalm-param class-string<\OCP\EventDispatcher\IEventListener<T>> $listener fully qualified class name that can be built by the DI container
+     * @param int $priority
+     *
+     * @see IEventDispatcher::addServiceListener()
+     *
+     * @since 20.0.0
+     */
+    public function registerEventListener(string $event, string $listener, int $priority = 0): void;
+
+    /**
+     * @param string $class
+     * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
+     *
+     * @return void
+     * @see IAppContainer::registerMiddleWare()
+     *
+     * @since 20.0.0
+     */
+    public function registerMiddleware(string $class): void;
+
+    /**
+     * Register a search provider for the unified search
+     *
+     * It is allowed to register more than one provider per app as the search
+     * results can go into distinct sections, e.g. "Files" and "Files shared
+     * with you" in the Files app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Search\IProvider> $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerSearchProvider(string $class): void;
+
+    /**
+     * Register an alternative login option
+     *
+     * It is allowed to register more than one option per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Authentication\IAlternativeLogin> $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerAlternativeLogin(string $class): void;
+
+    /**
+     * Register an initialstate provider
+     *
+     * It is allowed to register more than one provider per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\AppFramework\Services\InitialStateProvider> $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerInitialStateProvider(string $class): void;
+
+    /**
+     * Register a well known protocol handler
+     *
+     * It is allowed to register more than one handler per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Http\WellKnown\IHandler> $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerWellKnownHandler(string $class): void;
 }