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>
pull/38636/head
Faraz Samapoor 3 years ago
parent 25cdc35473
commit fc0e2a938f
  1. 12
      core/Controller/AutoCompleteController.php
  2. 22
      core/Controller/AvatarController.php
  3. 8
      core/Controller/CSRFTokenController.php
  4. 28
      core/Controller/ClientFlowLoginController.php
  5. 22
      core/Controller/ClientFlowLoginV2Controller.php
  6. 8
      core/Controller/ContactsMenuController.php
  7. 10
      core/Controller/CssController.php
  8. 10
      core/Controller/GuestAvatarController.php
  9. 8
      core/Controller/HoverCardController.php

@ -40,11 +40,13 @@ use OCP\IRequest;
use OCP\Share\IShare;
class AutoCompleteController extends OCSController {
public function __construct(string $appName,
IRequest $request,
private ISearch $collaboratorSearch,
private IManager $autoCompleteManager,
private IEventDispatcher $dispatcher) {
public function __construct(
string $appName,
IRequest $request,
private ISearch $collaboratorSearch,
private IManager $autoCompleteManager,
private IEventDispatcher $dispatcher,
) {
parent::__construct($appName, $request);
}

@ -51,16 +51,18 @@ use Psr\Log\LoggerInterface;
* @package OC\Core\Controller
*/
class AvatarController extends Controller {
public function __construct(string $appName,
IRequest $request,
protected IAvatarManager $avatarManager,
protected ICache $cache,
protected IL10N $l10n,
protected IUserManager $userManager,
protected IRootFolder $rootFolder,
protected LoggerInterface $logger,
protected ?string $userId,
protected TimeFactory $timeFactory) {
public function __construct(
string $appName,
IRequest $request,
protected IAvatarManager $avatarManager,
protected ICache $cache,
protected IL10N $l10n,
protected IUserManager $userManager,
protected IRootFolder $rootFolder,
protected LoggerInterface $logger,
protected ?string $userId,
protected TimeFactory $timeFactory,
) {
parent::__construct($appName, $request);
}

@ -33,9 +33,11 @@ use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
class CSRFTokenController extends Controller {
public function __construct(string $appName,
IRequest $request,
private CsrfTokenManager $tokenManager) {
public function __construct(
string $appName,
IRequest $request,
private CsrfTokenManager $tokenManager,
) {
parent::__construct($appName, $request);
}

@ -59,19 +59,21 @@ use OCP\Session\Exceptions\SessionNotAvailableException;
class ClientFlowLoginController extends Controller {
public const STATE_NAME = 'client.flow.state.token';
public function __construct(string $appName,
IRequest $request,
private IUserSession $userSession,
private IL10N $l10n,
private Defaults $defaults,
private ISession $session,
private IProvider $tokenProvider,
private ISecureRandom $random,
private IURLGenerator $urlGenerator,
private ClientMapper $clientMapper,
private AccessTokenMapper $accessTokenMapper,
private ICrypto $crypto,
private IEventDispatcher $eventDispatcher) {
public function __construct(
string $appName,
IRequest $request,
private IUserSession $userSession,
private IL10N $l10n,
private Defaults $defaults,
private ISession $session,
private IProvider $tokenProvider,
private ISecureRandom $random,
private IURLGenerator $urlGenerator,
private ClientMapper $clientMapper,
private AccessTokenMapper $accessTokenMapper,
private ICrypto $crypto,
private IEventDispatcher $eventDispatcher,
) {
parent::__construct($appName, $request);
}

@ -51,16 +51,18 @@ class ClientFlowLoginV2Controller extends Controller {
public const TOKEN_NAME = 'client.flow.v2.login.token';
public const STATE_NAME = 'client.flow.v2.state.token';
public function __construct(string $appName,
IRequest $request,
private LoginFlowV2Service $loginFlowV2Service,
private IURLGenerator $urlGenerator,
private ISession $session,
private IUserSession $userSession,
private ISecureRandom $random,
private Defaults $defaults,
private ?string $userId,
private IL10N $l10n) {
public function __construct(
string $appName,
IRequest $request,
private LoginFlowV2Service $loginFlowV2Service,
private IURLGenerator $urlGenerator,
private ISession $session,
private IUserSession $userSession,
private ISecureRandom $random,
private Defaults $defaults,
private ?string $userId,
private IL10N $l10n,
) {
parent::__construct($appName, $request);
}

@ -33,9 +33,11 @@ use OCP\IRequest;
use OCP\IUserSession;
class ContactsMenuController extends Controller {
public function __construct(IRequest $request,
private IUserSession $userSession,
private Manager $manager) {
public function __construct(
IRequest $request,
private IUserSession $userSession,
private Manager $manager,
) {
parent::__construct('core', $request);
}

@ -46,10 +46,12 @@ use OCP\IRequest;
class CssController 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('css');

@ -36,10 +36,12 @@ class GuestAvatarController extends Controller {
/**
* GuestAvatarController constructor.
*/
public function __construct(string $appName,
IRequest $request,
private IAvatarManager $avatarManager,
private LoggerInterface $logger) {
public function __construct(
string $appName,
IRequest $request,
private IAvatarManager $avatarManager,
private LoggerInterface $logger,
) {
parent::__construct($appName, $request);
}

@ -33,9 +33,11 @@ use OCP\IUserSession;
use OCP\Share\IShare;
class HoverCardController extends \OCP\AppFramework\OCSController {
public function __construct(IRequest $request,
private IUserSession $userSession,
private Manager $manager) {
public function __construct(
IRequest $request,
private IUserSession $userSession,
private Manager $manager,
) {
parent::__construct('core', $request);
}

Loading…
Cancel
Save