aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFaraz Samapoor <f.samapoor@gmail.com>2023-06-05 18:42:42 +0330
committerLouis <6653109+artonge@users.noreply.github.com>2023-06-16 19:29:40 +0200
commitd64aa85b0464933bd2dc25a56c0569c6dad6af19 (patch)
tree09e27885b4e046185bdde3d5fcc600bdeb63b547
parent73b7096850a8cd4530c327f32acaacd6c9bcd279 (diff)
downloadnextcloud-server-d64aa85b0464933bd2dc25a56c0569c6dad6af19.tar.gz
nextcloud-server-d64aa85b0464933bd2dc25a56c0569c6dad6af19.zip
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 <f.samapoor@gmail.com>
-rw-r--r--core/Controller/JsController.php10
-rw-r--r--core/Controller/LoginController.php28
-rw-r--r--core/Controller/LostController.php34
-rw-r--r--core/Controller/NavigationController.php10
-rw-r--r--core/Controller/OCJSController.php28
-rw-r--r--core/Controller/OCSController.php14
-rw-r--r--core/Controller/PreviewController.php12
-rw-r--r--core/Controller/ProfileApiController.php12
-rw-r--r--core/Controller/ProfilePageController.php20
-rw-r--r--core/Controller/RecommendedAppsController.php8
-rw-r--r--core/Controller/ReferenceApiController.php10
-rw-r--r--core/Controller/ReferenceController.php10
12 files changed, 110 insertions, 86 deletions
diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php
index 8a361dae67f..0ad78d5f87f 100644
--- a/core/Controller/JsController.php
+++ b/core/Controller/JsController.php
@@ -46,10 +46,12 @@ use OCP\IRequest;
class JsController extends Controller {
protected IAppData $appData;
- public function __construct(string $appName,
- IRequest $request,
- Factory $appDataFactory,
- protected ITimeFactory $timeFactory) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ Factory $appDataFactory,
+ protected ITimeFactory $timeFactory,
+ ) {
parent::__construct($appName, $request);
$this->appData = $appDataFactory->get('js');
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index c684b82d8dc..1bee366b00f 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -62,19 +62,21 @@ class LoginController extends Controller {
public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword';
public const LOGIN_MSG_USERDISABLED = 'userdisabled';
- public function __construct(?string $appName,
- IRequest $request,
- private IUserManager $userManager,
- private IConfig $config,
- private ISession $session,
- private Session $userSession,
- private IURLGenerator $urlGenerator,
- private Defaults $defaults,
- private Throttler $throttler,
- private IInitialStateService $initialStateService,
- private WebAuthnManager $webAuthnManager,
- private IManager $manager,
- private IL10N $l10n) {
+ public function __construct(
+ ?string $appName,
+ IRequest $request,
+ private IUserManager $userManager,
+ private IConfig $config,
+ private ISession $session,
+ private Session $userSession,
+ private IURLGenerator $urlGenerator,
+ private Defaults $defaults,
+ private Throttler $throttler,
+ private IInitialStateService $initialStateService,
+ private WebAuthnManager $webAuthnManager,
+ private IManager $manager,
+ private IL10N $l10n,
+ ) {
parent::__construct($appName, $request);
}
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index 1b773b344af..7de93b7107a 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -75,22 +75,24 @@ use function reset;
class LostController extends Controller {
protected string $from;
- public function __construct(string $appName,
- IRequest $request,
- private IURLGenerator $urlGenerator,
- private IUserManager $userManager,
- private Defaults $defaults,
- private IL10N $l10n,
- private IConfig $config,
- string $defaultMailAddress,
- private IManager $encryptionManager,
- private IMailer $mailer,
- private LoggerInterface $logger,
- private Manager $twoFactorManager,
- private IInitialState $initialState,
- private IVerificationToken $verificationToken,
- private IEventDispatcher $eventDispatcher,
- private Limiter $limiter) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private IURLGenerator $urlGenerator,
+ private IUserManager $userManager,
+ private Defaults $defaults,
+ private IL10N $l10n,
+ private IConfig $config,
+ string $defaultMailAddress,
+ private IManager $encryptionManager,
+ private IMailer $mailer,
+ private LoggerInterface $logger,
+ private Manager $twoFactorManager,
+ private IInitialState $initialState,
+ private IVerificationToken $verificationToken,
+ private IEventDispatcher $eventDispatcher,
+ private Limiter $limiter,
+ ) {
parent::__construct($appName, $request);
$this->from = $defaultMailAddress;
}
diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php
index 68a9bf98037..62c4dd98756 100644
--- a/core/Controller/NavigationController.php
+++ b/core/Controller/NavigationController.php
@@ -30,10 +30,12 @@ use OCP\IRequest;
use OCP\IURLGenerator;
class NavigationController extends OCSController {
- public function __construct(string $appName,
- IRequest $request,
- private INavigationManager $navigationManager,
- private IURLGenerator $urlGenerator) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private INavigationManager $navigationManager,
+ private IURLGenerator $urlGenerator,
+ ) {
parent::__construct($appName, $request);
}
diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php
index fa13f21607c..48bd842e6e2 100644
--- a/core/Controller/OCJSController.php
+++ b/core/Controller/OCJSController.php
@@ -47,19 +47,21 @@ use OCP\L10N\IFactory;
class OCJSController extends Controller {
private JSConfigHelper $helper;
- public function __construct(string $appName,
- IRequest $request,
- IFactory $l10nFactory,
- Defaults $defaults,
- IAppManager $appManager,
- ISession $session,
- IUserSession $userSession,
- IConfig $config,
- IGroupManager $groupManager,
- IniGetWrapper $iniWrapper,
- IURLGenerator $urlGenerator,
- CapabilitiesManager $capabilitiesManager,
- IInitialStateService $initialStateService) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ IFactory $l10nFactory,
+ Defaults $defaults,
+ IAppManager $appManager,
+ ISession $session,
+ IUserSession $userSession,
+ IConfig $config,
+ IGroupManager $groupManager,
+ IniGetWrapper $iniWrapper,
+ IURLGenerator $urlGenerator,
+ CapabilitiesManager $capabilitiesManager,
+ IInitialStateService $initialStateService,
+ ) {
parent::__construct($appName, $request);
$this->helper = new JSConfigHelper(
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index c4ae91b4db1..036cdfc2d60 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -35,12 +35,14 @@ use OCP\IUserManager;
use OCP\IUserSession;
class OCSController extends \OCP\AppFramework\OCSController {
- public function __construct(string $appName,
- IRequest $request,
- private CapabilitiesManager $capabilitiesManager,
- private IUserSession $userSession,
- private IUserManager $userManager,
- private Manager $keyManager) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private CapabilitiesManager $capabilitiesManager,
+ private IUserSession $userSession,
+ private IUserManager $userManager,
+ private Manager $keyManager,
+ ) {
parent::__construct($appName, $request);
}
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
index d742af20e1d..38373e2d147 100644
--- a/core/Controller/PreviewController.php
+++ b/core/Controller/PreviewController.php
@@ -40,11 +40,13 @@ use OCP\IPreview;
use OCP\IRequest;
class PreviewController extends Controller {
- public function __construct(string $appName,
- IRequest $request,
- private IPreview $preview,
- private IRootFolder $root,
- private ?string $userId) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private IPreview $preview,
+ private IRootFolder $root,
+ private ?string $userId,
+ ) {
parent::__construct($appName, $request);
}
diff --git a/core/Controller/ProfileApiController.php b/core/Controller/ProfileApiController.php
index 8fde293d5c9..e66d4f21c2b 100644
--- a/core/Controller/ProfileApiController.php
+++ b/core/Controller/ProfileApiController.php
@@ -38,11 +38,13 @@ use OCP\IUserSession;
use OC\Profile\ProfileManager;
class ProfileApiController extends OCSController {
- public function __construct(IRequest $request,
- private ProfileConfigMapper $configMapper,
- private ProfileManager $profileManager,
- private IUserManager $userManager,
- private IUserSession $userSession) {
+ public function __construct(
+ IRequest $request,
+ private ProfileConfigMapper $configMapper,
+ private ProfileManager $profileManager,
+ private IUserManager $userManager,
+ private IUserSession $userSession,
+ ) {
parent::__construct('core', $request);
}
diff --git a/core/Controller/ProfilePageController.php b/core/Controller/ProfilePageController.php
index 3e9478ba65c..23dbf104b6b 100644
--- a/core/Controller/ProfilePageController.php
+++ b/core/Controller/ProfilePageController.php
@@ -40,15 +40,17 @@ use OCP\UserStatus\IManager as IUserStatusManager;
use OCP\EventDispatcher\IEventDispatcher;
class ProfilePageController extends Controller {
- public function __construct(string $appName,
- IRequest $request,
- private IInitialState $initialStateService,
- private ProfileManager $profileManager,
- private IShareManager $shareManager,
- private IUserManager $userManager,
- private IUserSession $userSession,
- private IUserStatusManager $userStatusManager,
- private IEventDispatcher $eventDispatcher) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private IInitialState $initialStateService,
+ private ProfileManager $profileManager,
+ private IShareManager $shareManager,
+ private IUserManager $userManager,
+ private IUserSession $userSession,
+ private IUserStatusManager $userStatusManager,
+ private IEventDispatcher $eventDispatcher,
+ ) {
parent::__construct($appName, $request);
}
diff --git a/core/Controller/RecommendedAppsController.php b/core/Controller/RecommendedAppsController.php
index 5c3d71012a7..5765b946613 100644
--- a/core/Controller/RecommendedAppsController.php
+++ b/core/Controller/RecommendedAppsController.php
@@ -33,9 +33,11 @@ use OCP\IRequest;
use OCP\IURLGenerator;
class RecommendedAppsController extends Controller {
- public function __construct(IRequest $request,
- public IURLGenerator $urlGenerator,
- private IInitialStateService $initialStateService) {
+ public function __construct(
+ IRequest $request,
+ public IURLGenerator $urlGenerator,
+ private IInitialStateService $initialStateService,
+ ) {
parent::__construct('core', $request);
}
diff --git a/core/Controller/ReferenceApiController.php b/core/Controller/ReferenceApiController.php
index 25d78e153e8..3df2e41c2a9 100644
--- a/core/Controller/ReferenceApiController.php
+++ b/core/Controller/ReferenceApiController.php
@@ -30,10 +30,12 @@ use OCP\Collaboration\Reference\IReferenceManager;
use OCP\IRequest;
class ReferenceApiController extends \OCP\AppFramework\OCSController {
- public function __construct(string $appName,
- IRequest $request,
- private IReferenceManager $referenceManager,
- private ?string $userId) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private IReferenceManager $referenceManager,
+ private ?string $userId,
+ ) {
parent::__construct($appName, $request);
}
diff --git a/core/Controller/ReferenceController.php b/core/Controller/ReferenceController.php
index daebd89a947..a8a489aeeab 100644
--- a/core/Controller/ReferenceController.php
+++ b/core/Controller/ReferenceController.php
@@ -36,10 +36,12 @@ use OCP\Files\NotPermittedException;
use OCP\IRequest;
class ReferenceController extends Controller {
- public function __construct(string $appName,
- IRequest $request,
- private IReferenceManager $referenceManager,
- private IAppDataFactory $appDataFactory) {
+ public function __construct(
+ string $appName,
+ IRequest $request,
+ private IReferenceManager $referenceManager,
+ private IAppDataFactory $appDataFactory,
+ ) {
parent::__construct($appName, $request);
}