sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38637 from fsamapoor/constructor_property_promotion_part2 

[2/3] Refactors /core controllers using constructor property promotion.
pull/38766/head
Louis 2023-06-19 12:22:07 +07:00 committed by GitHub
parent b33cbecb47 d64aa85b04
commit ceee417d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 98 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/Controller/JsController.php
Unescape Escape View File

@ -45,13 +45,16 @@ use OCP\IRequest;
class JsController extends Controller {
protected IAppData $appData;
protected ITimeFactory $timeFactory;
public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory) {
public function __construct(
string $appName,
IRequest $request,
Factory $appDataFactory,
protected ITimeFactory $timeFactory,
) {
parent::__construct($appName, $request);
$this->appData = $appDataFactory->get('js');
$this->timeFactory = $timeFactory;
}
/**

53
core/Controller/LoginController.php
Unescape Escape View File

@ -55,7 +55,6 @@ use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Notification\IManager;
use OCP\Util;
@ -63,44 +62,22 @@ class LoginController extends Controller {
public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword';
public const LOGIN_MSG_USERDISABLED = 'userdisabled';
private IUserManager $userManager;
private IConfig $config;
private ISession $session;
/** @var Session */
private $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,
IUserManager $userManager,
IConfig $config,
ISession $session,
IUserSession $userSession,
IURLGenerator $urlGenerator,
Defaults $defaults,
Throttler $throttler,
IInitialStateService $initialStateService,
WebAuthnManager $webAuthnManager,
IManager $manager,
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);
$this->userManager = $userManager;
$this->config = $config;
$this->session = $session;
$this->userSession = $userSession;
$this->urlGenerator = $urlGenerator;
$this->defaults = $defaults;
$this->throttler = $throttler;
$this->initialStateService = $initialStateService;
$this->webAuthnManager = $webAuthnManager;
$this->manager = $manager;
$this->l10n = $l10n;
}
/**

52
core/Controller/LostController.php
Unescape Escape View File

@ -73,54 +73,28 @@ use function reset;
* @package OC\Core\Controller
*/
class LostController extends Controller {
protected IURLGenerator $urlGenerator;
protected IUserManager $userManager;
protected Defaults $defaults;
protected IL10N $l10n;
protected string $from;
protected IManager $encryptionManager;
protected IConfig $config;
protected 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,
IURLGenerator $urlGenerator,
IUserManager $userManager,
Defaults $defaults,
IL10N $l10n,
IConfig $config,
private IURLGenerator $urlGenerator,
private IUserManager $userManager,
private Defaults $defaults,
private IL10N $l10n,
private IConfig $config,
string $defaultMailAddress,
IManager $encryptionManager,
IMailer $mailer,
LoggerInterface $logger,
Manager $twoFactorManager,
IInitialState $initialState,
IVerificationToken $verificationToken,
IEventDispatcher $eventDispatcher,
Limiter $limiter
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->urlGenerator = $urlGenerator;
$this->userManager = $userManager;
$this->defaults = $defaults;
$this->l10n = $l10n;
$this->from = $defaultMailAddress;
$this->encryptionManager = $encryptionManager;
$this->config = $config;
$this->mailer = $mailer;
$this->logger = $logger;
$this->twoFactorManager = $twoFactorManager;
$this->initialState = $initialState;
$this->verificationToken = $verificationToken;
$this->eventDispatcher = $eventDispatcher;
$this->limiter = $limiter;
}
/**

12
core/Controller/NavigationController.php
Unescape Escape View File

@ -30,13 +30,13 @@ use OCP\IRequest;
use OCP\IURLGenerator;
class NavigationController extends OCSController {
private INavigationManager $navigationManager;
private IURLGenerator $urlGenerator;
public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
public function __construct(
string $appName,
IRequest $request,
private INavigationManager $navigationManager,
private IURLGenerator $urlGenerator,
) {
parent::__construct($appName, $request);
$this->navigationManager = $navigationManager;
$this->urlGenerator = $urlGenerator;
}
/**

28
core/Controller/OCJSController.php
Unescape Escape 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(

23
core/Controller/OCSController.php
Unescape Escape View File

@ -35,22 +35,15 @@ use OCP\IUserManager;
use OCP\IUserSession;
class OCSController extends \OCP\AppFramework\OCSController {
private CapabilitiesManager $capabilitiesManager;
private IUserSession $userSession;
private IUserManager $userManager;
private Manager $keyManager;
public function __construct(string $appName,
IRequest $request,
CapabilitiesManager $capabilitiesManager,
IUserSession $userSession,
IUserManager $userManager,
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);
$this->capabilitiesManager = $capabilitiesManager;
$this->userSession = $userSession;
$this->userManager = $userManager;
$this->keyManager = $keyManager;
}
/**

19
core/Controller/PreviewController.php
Unescape Escape View File

@ -40,21 +40,14 @@ use OCP\IPreview;
use OCP\IRequest;
class PreviewController extends Controller {
private ?string $userId;
private IRootFolder $root;
private IPreview $preview;
public function __construct(string $appName,
IRequest $request,
IPreview $preview,
IRootFolder $root,
?string $userId
public function __construct(
string $appName,
IRequest $request,
private IPreview $preview,
private IRootFolder $root,
private ?string $userId,
) {
parent::__construct($appName, $request);
$this->preview = $preview;
$this->root = $root;
$this->userId = $userId;
}
/**

17
core/Controller/ProfileApiController.php
Unescape Escape View File

@ -38,23 +38,14 @@ use OCP\IUserSession;
use OC\Profile\ProfileManager;
class ProfileApiController extends OCSController {
private ProfileConfigMapper $configMapper;
private ProfileManager $profileManager;
private IUserManager $userManager;
private IUserSession $userSession;
public function __construct(
IRequest $request,
ProfileConfigMapper $configMapper,
ProfileManager $profileManager,
IUserManager $userManager,
IUserSession $userSession
private ProfileConfigMapper $configMapper,
private ProfileManager $profileManager,
private IUserManager $userManager,
private IUserSession $userSession,
) {
parent::__construct('core', $request);
$this->configMapper = $configMapper;
$this->profileManager = $profileManager;
$this->userManager = $userManager;
$this->userSession = $userSession;
}
/**

31
core/Controller/ProfilePageController.php
Unescape Escape View File

@ -40,33 +40,18 @@ use OCP\UserStatus\IManager as IUserStatusManager;
use OCP\EventDispatcher\IEventDispatcher;
class ProfilePageController extends Controller {
private IInitialState $initialStateService;
private ProfileManager $profileManager;
private IShareManager $shareManager;
private IUserManager $userManager;
private IUserSession $userSession;
private IUserStatusManager $userStatusManager;
private IEventDispatcher $eventDispatcher;
public function __construct(
$appName,
string $appName,
IRequest $request,
IInitialState $initialStateService,
ProfileManager $profileManager,
IShareManager $shareManager,
IUserManager $userManager,
IUserSession $userSession,
IUserStatusManager $userStatusManager,
IEventDispatcher $eventDispatcher
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);
$this->initialStateService = $initialStateService;
$this->profileManager = $profileManager;
$this->shareManager = $shareManager;
$this->userManager = $userManager;
$this->userSession = $userSession;
$this->userStatusManager = $userStatusManager;
$this->eventDispatcher = $eventDispatcher;
}
/**

13
core/Controller/RecommendedAppsController.php
Unescape Escape View File

@ -33,15 +33,12 @@ use OCP\IRequest;
use OCP\IURLGenerator;
class RecommendedAppsController extends Controller {
public IURLGenerator $urlGenerator;
private IInitialStateService $initialStateService;
public function __construct(IRequest $request,
IURLGenerator $urlGenerator,
IInitialStateService $initialStateService) {
public function __construct(
IRequest $request,
public IURLGenerator $urlGenerator,
private IInitialStateService $initialStateService,
) {
parent::__construct('core', $request);
$this->urlGenerator = $urlGenerator;
$this->initialStateService = $initialStateService;
}
/**

15
core/Controller/ReferenceApiController.php
Unescape Escape View File

@ -30,16 +30,13 @@ use OCP\Collaboration\Reference\IReferenceManager;
use OCP\IRequest;
class ReferenceApiController extends \OCP\AppFramework\OCSController {
private IReferenceManager $referenceManager;
private ?string $userId;
public function __construct(string $appName,
IRequest $request,
IReferenceManager $referenceManager,
?string $userId) {
public function __construct(
string $appName,
IRequest $request,
private IReferenceManager $referenceManager,
private ?string $userId,
) {
parent::__construct($appName, $request);
$this->referenceManager = $referenceManager;
$this->userId = $userId;
}
/**

12
core/Controller/ReferenceController.php
Unescape Escape View File

@ -36,13 +36,13 @@ use OCP\Files\NotPermittedException;
use OCP\IRequest;
class ReferenceController extends Controller {
private IReferenceManager $referenceManager;
private IAppDataFactory $appDataFactory;
public function __construct(string $appName, IRequest $request, IReferenceManager $referenceManager, IAppDataFactory $appDataFactory) {
public function __construct(
string $appName,
IRequest $request,
private IReferenceManager $referenceManager,
private IAppDataFactory $appDataFactory,
) {
parent::__construct($appName, $request);
$this->referenceManager = $referenceManager;
$this->appDataFactory = $appDataFactory;
}
/**