From 2800436948acbceb45362fc5cab7b2f5257caccd Mon Sep 17 00:00:00 2001 From: Faraz Samapoor Date: Mon, 5 Jun 2023 18:47:57 +0330 Subject: [PATCH] Applies agreed-upon indentation convention to the changed controllers. Based on https://github.com/nextcloud/server/pull/38636#discussion_r1218167753 Signed-off-by: Faraz Samapoor --- core/Controller/SearchController.php | 10 +++++---- core/Controller/TranslationApiController.php | 10 +++++---- .../TwoFactorChallengeController.php | 16 ++++++++------ core/Controller/UnifiedSearchController.php | 12 +++++----- core/Controller/UserController.php | 8 ++++--- core/Controller/WebAuthnController.php | 16 ++++++++------ core/Controller/WellKnownController.php | 6 +++-- core/Controller/WhatsNewController.php | 22 ++++++++++--------- core/Controller/WipeController.php | 8 ++++--- 9 files changed, 63 insertions(+), 45 deletions(-) diff --git a/core/Controller/SearchController.php b/core/Controller/SearchController.php index 39df2503840..f839c16e8da 100644 --- a/core/Controller/SearchController.php +++ b/core/Controller/SearchController.php @@ -34,10 +34,12 @@ use OCP\Search\Result; use Psr\Log\LoggerInterface; class SearchController extends Controller { - public function __construct(string $appName, - IRequest $request, - private ISearch $searcher, - private LoggerInterface $logger) { + public function __construct( + string $appName, + IRequest $request, + private ISearch $searcher, + private LoggerInterface $logger, + ) { parent::__construct($appName, $request); } diff --git a/core/Controller/TranslationApiController.php b/core/Controller/TranslationApiController.php index 734834d15c9..c1628c24555 100644 --- a/core/Controller/TranslationApiController.php +++ b/core/Controller/TranslationApiController.php @@ -36,10 +36,12 @@ use OCP\Translation\CouldNotTranslateException; use OCP\Translation\ITranslationManager; class TranslationApiController extends \OCP\AppFramework\OCSController { - public function __construct(string $appName, - IRequest $request, - private ITranslationManager $translationManager, - private IL10N $l10n) { + public function __construct( + string $appName, + IRequest $request, + private ITranslationManager $translationManager, + private IL10N $l10n, + ) { parent::__construct($appName, $request); } diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index c8fb6da79d3..40b100c41bd 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -42,13 +42,15 @@ use OCP\IUserSession; use Psr\Log\LoggerInterface; class TwoFactorChallengeController extends Controller { - public function __construct(string $appName, - IRequest $request, - private Manager $twoFactorManager, - private IUserSession $userSession, - private ISession $session, - private IURLGenerator $urlGenerator, - private LoggerInterface $logger) { + public function __construct( + string $appName, + IRequest $request, + private Manager $twoFactorManager, + private IUserSession $userSession, + private ISession $session, + private IURLGenerator $urlGenerator, + private LoggerInterface $logger, + ) { parent::__construct($appName, $request); } diff --git a/core/Controller/UnifiedSearchController.php b/core/Controller/UnifiedSearchController.php index a41fa6206b2..7e73ac8100f 100644 --- a/core/Controller/UnifiedSearchController.php +++ b/core/Controller/UnifiedSearchController.php @@ -40,11 +40,13 @@ use OCP\Search\ISearchQuery; use Symfony\Component\Routing\Exception\ResourceNotFoundException; class UnifiedSearchController extends OCSController { - public function __construct(IRequest $request, - private IUserSession $userSession, - private SearchComposer $composer, - private IRouter $router, - private IURLGenerator $urlGenerator) { + public function __construct( + IRequest $request, + private IUserSession $userSession, + private SearchComposer $composer, + private IRouter $router, + private IURLGenerator $urlGenerator, + ) { parent::__construct('core', $request); } diff --git a/core/Controller/UserController.php b/core/Controller/UserController.php index 51b31afd18f..f8dbc1af027 100644 --- a/core/Controller/UserController.php +++ b/core/Controller/UserController.php @@ -30,9 +30,11 @@ use OCP\IRequest; use OCP\IUserManager; class UserController extends Controller { - public function __construct(string $appName, - IRequest $request, - protected IUserManager $userManager) { + public function __construct( + string $appName, + IRequest $request, + protected IUserManager $userManager, + ) { parent::__construct($appName, $request); } diff --git a/core/Controller/WebAuthnController.php b/core/Controller/WebAuthnController.php index d4ee5637598..08a6b36d276 100644 --- a/core/Controller/WebAuthnController.php +++ b/core/Controller/WebAuthnController.php @@ -45,13 +45,15 @@ class WebAuthnController extends Controller { 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) { + 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); } diff --git a/core/Controller/WellKnownController.php b/core/Controller/WellKnownController.php index ea5e77b74bf..2e317ae01b5 100644 --- a/core/Controller/WellKnownController.php +++ b/core/Controller/WellKnownController.php @@ -33,8 +33,10 @@ use OCP\AppFramework\Http\Response; use OCP\IRequest; class WellKnownController extends Controller { - public function __construct(IRequest $request, - private RequestManager $requestManager) { + public function __construct( + IRequest $request, + private RequestManager $requestManager, + ) { parent::__construct('core', $request); } diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php index 39939a02a63..0791ce616f5 100644 --- a/core/Controller/WhatsNewController.php +++ b/core/Controller/WhatsNewController.php @@ -37,16 +37,18 @@ use OCP\IUserSession; use OCP\L10N\IFactory; class WhatsNewController extends OCSController { - public function __construct(string $appName, - IRequest $request, - CapabilitiesManager $capabilitiesManager, - private IUserSession $userSession, - IUserManager $userManager, - Manager $keyManager, - private IConfig $config, - private ChangesCheck $whatsNewService, - private IFactory $langFactory, - private Defaults $defaults) { + public function __construct( + string $appName, + IRequest $request, + CapabilitiesManager $capabilitiesManager, + private IUserSession $userSession, + IUserManager $userManager, + Manager $keyManager, + private IConfig $config, + private ChangesCheck $whatsNewService, + private IFactory $langFactory, + private Defaults $defaults, + ) { parent::__construct($appName, $request, $capabilitiesManager, $userSession, $userManager, $keyManager); } diff --git a/core/Controller/WipeController.php b/core/Controller/WipeController.php index 70bd66e2d8b..6ffb950ca86 100644 --- a/core/Controller/WipeController.php +++ b/core/Controller/WipeController.php @@ -33,9 +33,11 @@ use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; class WipeController extends Controller { - public function __construct(string $appName, - IRequest $request, - private RemoteWipe $remoteWipe) { + public function __construct( + string $appName, + IRequest $request, + private RemoteWipe $remoteWipe, + ) { parent::__construct($appName, $request); } -- 2.39.5