upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Applies agreed-upon indentation convention to the changed controllers.

Browse source 
Based on https://github.com/nextcloud/server/pull/38636#discussion_r1218167753

Signed-off-by: Faraz Samapoor <f.samapoor@gmail.com>
This commit is contained in:
Faraz Samapoor 2023-06-05 18:42:42 +03:30 committed by Louis
parent 73b7096850
commit d64aa85b04
12 changed files with 110 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/Controller/JsController.php
View file

@ -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');

28
core/Controller/LoginController.php
View file

@ -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);
}

34
core/Controller/LostController.php
View file

@ -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;
}

10
core/Controller/NavigationController.php
View file

@ -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);
}

28
core/Controller/OCJSController.php
View file

@ -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(

14
core/Controller/OCSController.php
View file

@ -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);
}

12
core/Controller/PreviewController.php
View file

@ -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);
}

12
core/Controller/ProfileApiController.php
View file

@ -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);
}

20
core/Controller/ProfilePageController.php
View file

@ -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);
}

8
core/Controller/RecommendedAppsController.php
View file

@ -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);
}

10
core/Controller/ReferenceApiController.php
View file

@ -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);
}

10
core/Controller/ReferenceController.php
View file

@ -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);
}