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

Merge pull request #38766 from fsamapoor/constructor_property_promotion_in_core_command_part3

Browse Source 
Uses PHP8's constructor property promotion in core/Command/User classes.
pull/38774/head
Louis 3 years ago committed by GitHub
parent 4bfd7ee9eb 9dc4efc52a
commit c24e05f9c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 42 additions and 71 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      core/Command/User/Add.php
  2. 19
      core/Command/User/AddAppPassword.php
  3. 11
      core/Command/User/Delete.php
  4. 7
      core/Command/User/Disable.php
  5. 7
      core/Command/User/Enable.php
  6. 10
      core/Command/User/Info.php
  7. 7
      core/Command/User/LastSeen.php
  8. 11
      core/Command/User/ListCommand.php
  9. 11
      core/Command/User/Report.php
  10. 10
      core/Command/User/ResetPassword.php
  11. 10
      core/Command/User/Setting.php

10
core/Command/User/Add.php
Unescape View File

@ -39,13 +39,11 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
class Add extends Command {
protected IUserManager $userManager;
protected IGroupManager $groupManager;
public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
public function __construct(
protected IUserManager $userManager,
protected IGroupManager $groupManager,
) {
parent::__construct();
$this->userManager = $userManager;
$this->groupManager = $groupManager;
}
protected function configure() {

19
core/Command/User/AddAppPassword.php
Unescape View File

@ -41,19 +41,12 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
class AddAppPassword extends Command {
protected IUserManager $userManager;
protected IProvider $tokenProvider;
private ISecureRandom $random;
private IEventDispatcher $eventDispatcher;
public function __construct(IUserManager $userManager,
IProvider $tokenProvider,
ISecureRandom $random,
IEventDispatcher $eventDispatcher) {
$this->tokenProvider = $tokenProvider;
$this->userManager = $userManager;
$this->random = $random;
$this->eventDispatcher = $eventDispatcher;
public function __construct(
protected IUserManager $userManager,
protected IProvider $tokenProvider,
private ISecureRandom $random,
private IEventDispatcher $eventDispatcher,
) {
parent::__construct();
}

11
core/Command/User/Delete.php
Unescape View File

@ -33,14 +33,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Delete extends Base {
/** @var IUserManager */
protected $userManager;
/**
* @param IUserManager $userManager
*/
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
public function __construct(
protected IUserManager $userManager,
) {
parent::__construct();
}

7
core/Command/User/Disable.php
Unescape View File

@ -32,10 +32,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Disable extends Base {
protected IUserManager $userManager;
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
public function __construct(
protected IUserManager $userManager,
) {
parent::__construct();
}

7
core/Command/User/Enable.php
Unescape View File

@ -32,10 +32,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Enable extends Base {
protected IUserManager $userManager;
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
public function __construct(
protected IUserManager $userManager,
) {
parent::__construct();
}

10
core/Command/User/Info.php
Unescape View File

@ -35,12 +35,10 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Info extends Base {
protected IUserManager $userManager;
protected IGroupManager $groupManager;
public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
$this->userManager = $userManager;
$this->groupManager = $groupManager;
public function __construct(
protected IUserManager $userManager,
protected IGroupManager $groupManager,
) {
parent::__construct();
}

7
core/Command/User/LastSeen.php
Unescape View File

@ -34,10 +34,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class LastSeen extends Base {
protected IUserManager $userManager;
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
public function __construct(
protected IUserManager $userManager,
) {
parent::__construct();
}

11
core/Command/User/ListCommand.php
Unescape View File

@ -33,13 +33,10 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class ListCommand extends Base {
protected IUserManager $userManager;
protected IGroupManager $groupManager;
public function __construct(IUserManager $userManager,
IGroupManager $groupManager) {
$this->userManager = $userManager;
$this->groupManager = $groupManager;
public function __construct(
protected IUserManager $userManager,
protected IGroupManager $groupManager,
) {
parent::__construct();
}

11
core/Command/User/Report.php
Unescape View File

@ -41,13 +41,10 @@ use Symfony\Component\Console\Output\OutputInterface;
class Report extends Command {
public const DEFAULT_COUNT_DIRS_MAX_USERS = 500;
protected IUserManager $userManager;
private IConfig $config;
public function __construct(IUserManager $userManager,
IConfig $config) {
$this->userManager = $userManager;
$this->config = $config;
public function __construct(
protected IUserManager $userManager,
private IConfig $config,
) {
parent::__construct();
}

10
core/Command/User/ResetPassword.php
Unescape View File

@ -41,13 +41,11 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\Console\Question\Question;
class ResetPassword extends Base {
protected IUserManager $userManager;
private IAppManager $appManager;
public function __construct(IUserManager $userManager, IAppManager $appManager) {
public function __construct(
protected IUserManager $userManager,
private IAppManager $appManager,
) {
parent::__construct();
$this->userManager = $userManager;
$this->appManager = $appManager;
}
protected function configure() {

10
core/Command/User/Setting.php
Unescape View File

@ -36,13 +36,11 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Setting extends Base {
protected IUserManager $userManager;
protected IConfig $config;
public function __construct(IUserManager $userManager, IConfig $config) {
public function __construct(
protected IUserManager $userManager,
protected IConfig $config,
) {
parent::__construct();
$this->userManager = $userManager;
$this->config = $config;
}
protected function configure() {

Write Preview
Loading…
Cancel
Save