upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Uses PHP8's constructor property promotion.

Browse source 
in core/Command and /TwoFactorAuth classes.

Signed-off-by: Faraz Samapoor <fsa@adlas.at>
This commit is contained in:
Faraz Samapoor 2023-06-12 19:20:14 +03:30 committed by Louis
parent 10d563a873
commit c01129947e
8 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/Command/Check.php
View file

@ -29,11 +29,8 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Check extends Base {
private SystemConfig $config;
public function __construct(SystemConfig $config) {
public function __construct(private SystemConfig $config) {
parent::__construct();
$this->config = $config;
}
protected function configure() {

11
core/Command/Status.php
View file

@ -33,14 +33,11 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Status extends Base {
private IConfig $config;
private Defaults $themingDefaults;
public function __construct(IConfig $config, Defaults $themingDefaults) {
public function __construct(
private IConfig $config,
private Defaults $themingDefaults,
) {
parent::__construct('status');
$this->config = $config;
$this->themingDefaults = $themingDefaults;
}
protected function configure() {

6
core/Command/TwoFactorAuth/Cleanup.php
View file

@ -32,12 +32,8 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Cleanup extends Base {
private IRegistry $registry;
public function __construct(IRegistry $registry) {
public function __construct(private IRegistry $registry) {
parent::__construct();
$this->registry = $registry;
}
protected function configure() {

9
core/Command/TwoFactorAuth/Disable.php
View file

@ -29,12 +29,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Disable extends Base {
private ProviderManager $manager;
public function __construct(ProviderManager $manager, IUserManager $userManager) {
public function __construct(
private ProviderManager $manager,
protected IUserManager $userManager,
) {
parent::__construct('twofactorauth:disable');
$this->manager = $manager;
$this->userManager = $userManager;
}
protected function configure() {

9
core/Command/TwoFactorAuth/Enable.php
View file

@ -29,12 +29,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Enable extends Base {
private ProviderManager $manager;
public function __construct(ProviderManager $manager, IUserManager $userManager) {
public function __construct(
private ProviderManager $manager,
protected IUserManager $userManager,
) {
parent::__construct('twofactorauth:enable');
$this->manager = $manager;
$this->userManager = $userManager;
}
protected function configure() {

6
core/Command/TwoFactorAuth/Enforce.php
View file

@ -35,12 +35,8 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Enforce extends Command {
private MandatoryTwoFactor $mandatoryTwoFactor;
public function __construct(MandatoryTwoFactor $mandatoryTwoFactor) {
public function __construct(private MandatoryTwoFactor $mandatoryTwoFactor) {
parent::__construct();
$this->mandatoryTwoFactor = $mandatoryTwoFactor;
}
protected function configure() {

10
core/Command/TwoFactorAuth/State.php
View file

@ -33,13 +33,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class State extends Base {
private IRegistry $registry;
public function __construct(IRegistry $registry, IUserManager $userManager) {
public function __construct(
private IRegistry $registry,
protected IUserManager $userManager,
) {
parent::__construct('twofactorauth:state');
$this->registry = $registry;
$this->userManager = $userManager;
}
protected function configure() {

13
core/Command/Upgrade.php
View file

@ -62,15 +62,12 @@ class Upgrade extends Command {
public const ERROR_INVALID_ARGUMENTS = 4;
public const ERROR_FAILURE = 5;
private IConfig $config;
private LoggerInterface $logger;
private Installer $installer;
public function __construct(IConfig $config, LoggerInterface $logger, Installer $installer) {
public function __construct(
private IConfig $config,
private LoggerInterface $logger,
private Installer $installer,
) {
parent::__construct();
$this->config = $config;
$this->logger = $logger;
$this->installer = $installer;
}
protected function configure() {