From 99f117146d5d56bcb48c707413640e5a1cb40657 Mon Sep 17 00:00:00 2001 From: Faraz Samapoor Date: Mon, 12 Jun 2023 18:11:17 +0330 Subject: Uses PHP8's constructor property promotion in core/Command/User classes. Signed-off-by: Faraz Samapoor --- core/Command/User/Add.php | 10 ++++------ core/Command/User/AddAppPassword.php | 19 ++++++------------- core/Command/User/Delete.php | 9 +-------- core/Command/User/Disable.php | 5 +---- core/Command/User/Enable.php | 5 +---- core/Command/User/Info.php | 10 ++++------ core/Command/User/LastSeen.php | 5 +---- core/Command/User/ListCommand.php | 11 ++++------- core/Command/User/Report.php | 11 ++++------- core/Command/User/ResetPassword.php | 10 ++++------ core/Command/User/Setting.php | 10 ++++------ 11 files changed, 34 insertions(+), 71 deletions(-) diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php index 24d11fbee6e..5e8ab92070d 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -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() { diff --git a/core/Command/User/AddAppPassword.php b/core/Command/User/AddAppPassword.php index ec39cdc974e..8c506c8510e 100644 --- a/core/Command/User/AddAppPassword.php +++ b/core/Command/User/AddAppPassword.php @@ -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(); } diff --git a/core/Command/User/Delete.php b/core/Command/User/Delete.php index 9624f04fa18..55776728d52 100644 --- a/core/Command/User/Delete.php +++ b/core/Command/User/Delete.php @@ -33,14 +33,7 @@ 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(); } diff --git a/core/Command/User/Disable.php b/core/Command/User/Disable.php index bc819f39e1d..915ec7f108d 100644 --- a/core/Command/User/Disable.php +++ b/core/Command/User/Disable.php @@ -32,10 +32,7 @@ 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(); } diff --git a/core/Command/User/Enable.php b/core/Command/User/Enable.php index f4e16eec4af..a032d36ee4b 100644 --- a/core/Command/User/Enable.php +++ b/core/Command/User/Enable.php @@ -32,10 +32,7 @@ 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(); } diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index 1e89a8d0911..a8fb62099e2 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -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(); } diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 5ea6c64d249..40210836469 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -34,10 +34,7 @@ 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(); } diff --git a/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php index bf4bf7f030e..f25d6c2dae9 100644 --- a/core/Command/User/ListCommand.php +++ b/core/Command/User/ListCommand.php @@ -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(); } diff --git a/core/Command/User/Report.php b/core/Command/User/Report.php index e080a617258..74ab5c29cc1 100644 --- a/core/Command/User/Report.php +++ b/core/Command/User/Report.php @@ -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(); } diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php index 294cea38b71..6719f893be3 100644 --- a/core/Command/User/ResetPassword.php +++ b/core/Command/User/ResetPassword.php @@ -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() { diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php index fac5c3c976c..8a8736fdaa2 100644 --- a/core/Command/User/Setting.php +++ b/core/Command/User/Setting.php @@ -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() { -- cgit v1.2.3 From 9dc4efc52a874f988e781bf51d04d8d9dec6b6e2 Mon Sep 17 00:00:00 2001 From: Faraz Samapoor Date: Tue, 13 Jun 2023 12:07:56 +0330 Subject: Moves single constructor parameters to new lines. Based on: https://github.com/nextcloud/server/pull/38764#discussion_r1227630895 Signed-off-by: Faraz Samapoor --- core/Command/User/Delete.php | 4 +++- core/Command/User/Disable.php | 4 +++- core/Command/User/Enable.php | 4 +++- core/Command/User/LastSeen.php | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/Command/User/Delete.php b/core/Command/User/Delete.php index 55776728d52..94390a3f070 100644 --- a/core/Command/User/Delete.php +++ b/core/Command/User/Delete.php @@ -33,7 +33,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class Delete extends Base { - public function __construct(protected IUserManager $userManager) { + public function __construct( + protected IUserManager $userManager, + ) { parent::__construct(); } diff --git a/core/Command/User/Disable.php b/core/Command/User/Disable.php index 915ec7f108d..3fdf6220f45 100644 --- a/core/Command/User/Disable.php +++ b/core/Command/User/Disable.php @@ -32,7 +32,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class Disable extends Base { - public function __construct(protected IUserManager $userManager) { + public function __construct( + protected IUserManager $userManager, + ) { parent::__construct(); } diff --git a/core/Command/User/Enable.php b/core/Command/User/Enable.php index a032d36ee4b..2055bd30cec 100644 --- a/core/Command/User/Enable.php +++ b/core/Command/User/Enable.php @@ -32,7 +32,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class Enable extends Base { - public function __construct(protected IUserManager $userManager) { + public function __construct( + protected IUserManager $userManager, + ) { parent::__construct(); } diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 40210836469..90ddb6992d9 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -34,7 +34,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class LastSeen extends Base { - public function __construct(protected IUserManager $userManager) { + public function __construct( + protected IUserManager $userManager, + ) { parent::__construct(); } -- cgit v1.2.3