Merge pull request #38768 from fsamapoor/constructor_property_promotion_in_core_command_part5

Uses PHP8's constructor property promotion in core/Command/Config and Group

15 files changed, 48 insertions, 58 deletions

diff --git a/core/Command/Config/App/DeleteConfig.php b/core/Command/Config/App/DeleteConfig.php
index 0da1e965bd0..b77f27ccd07 100644
--- a/core/Command/Config/App/DeleteConfig.php
+++ b/core/Command/Config/App/DeleteConfig.php
@@ -28,14 +28,10 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	protected IConfig $config;
-
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
+	public function __construct(
+		protected IConfig $config,
+	) {
 		parent::__construct();
-		$this->config = $config;
 	}
 
 	protected function configure() {
diff --git a/core/Command/Config/App/GetConfig.php b/core/Command/Config/App/GetConfig.php
index 7fdff2be732..96078b63e90 100644
--- a/core/Command/Config/App/GetConfig.php
+++ b/core/Command/Config/App/GetConfig.php
@@ -28,11 +28,10 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	protected IConfig $config;
-
-	public function __construct(IConfig $config) {
+	public function __construct(
+		protected IConfig $config,
+	) {
 		parent::__construct();
-		$this->config = $config;
 	}
 
 	protected function configure() {
diff --git a/core/Command/Config/App/SetConfig.php b/core/Command/Config/App/SetConfig.php
index 89a5f6ba5d1..99746246b85 100644
--- a/core/Command/Config/App/SetConfig.php
+++ b/core/Command/Config/App/SetConfig.php
@@ -28,11 +28,10 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	protected IConfig $config;
-
-	public function __construct(IConfig $config) {
+	public function __construct(
+		protected IConfig $config,
+	) {
 		parent::__construct();
-		$this->config = $config;
 	}
 
 	protected function configure() {
diff --git a/core/Command/Config/Import.php b/core/Command/Config/Import.php
index 227c909038c..b8431c8c295 100644
--- a/core/Command/Config/Import.php
+++ b/core/Command/Config/Import.php
@@ -35,11 +35,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Command implements CompletionAwareInterface {
 	protected array $validRootKeys = ['system', 'apps'];
-	protected IConfig $config;
 
-	public function __construct(IConfig $config) {
+	public function __construct(
+		protected IConfig $config,
+	) {
 		parent::__construct();
-		$this->config = $config;
 	}
 
 	protected function configure() {
diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php
index dd8fad72d7c..4adb0a9df5b 100644
--- a/core/Command/Config/ListConfigs.php
+++ b/core/Command/Config/ListConfigs.php
@@ -33,13 +33,12 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class ListConfigs extends Base {
 	protected string $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
-	protected SystemConfig $systemConfig;
-	protected IAppConfig $appConfig;
 
-	public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
+	public function __construct(
+		protected SystemConfig $systemConfig,
+		protected IAppConfig $appConfig,
+	) {
 		parent::__construct();
-		$this->systemConfig = $systemConfig;
-		$this->appConfig = $appConfig;
 	}
 
 	protected function configure() {
diff --git a/core/Command/Config/System/Base.php b/core/Command/Config/System/Base.php
index 18bc9cb7ca0..09ec456f6a4 100644
--- a/core/Command/Config/System/Base.php
+++ b/core/Command/Config/System/Base.php
@@ -26,11 +26,10 @@ use OC\SystemConfig;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 abstract class Base extends \OC\Core\Command\Base {
-	protected SystemConfig $systemConfig;
-
-	public function __construct(SystemConfig $systemConfig) {
+	public function __construct(
+		protected SystemConfig $systemConfig,
+	) {
 		parent::__construct();
-		$this->systemConfig = $systemConfig;
 	}
 
 	/**
diff --git a/core/Command/Config/System/DeleteConfig.php b/core/Command/Config/System/DeleteConfig.php
index f4d49ba8f51..f6650e7d6d3 100644
--- a/core/Command/Config/System/DeleteConfig.php
+++ b/core/Command/Config/System/DeleteConfig.php
@@ -30,7 +30,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	public function __construct(SystemConfig $systemConfig) {
+	public function __construct(
+		SystemConfig $systemConfig,
+	) {
 		parent::__construct($systemConfig);
 	}
 
diff --git a/core/Command/Config/System/GetConfig.php b/core/Command/Config/System/GetConfig.php
index 01bbf82d5d1..ab5b884fda4 100644
--- a/core/Command/Config/System/GetConfig.php
+++ b/core/Command/Config/System/GetConfig.php
@@ -29,7 +29,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	public function __construct(SystemConfig $systemConfig) {
+	public function __construct(
+		SystemConfig $systemConfig,
+	) {
 		parent::__construct($systemConfig);
 	}
 
diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php
index 01a1999bcf9..ba5265a84d7 100644
--- a/core/Command/Config/System/SetConfig.php
+++ b/core/Command/Config/System/SetConfig.php
@@ -32,7 +32,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	public function __construct(SystemConfig $systemConfig) {
+	public function __construct(
+		SystemConfig $systemConfig,
+	) {
 		parent::__construct($systemConfig);
 	}
 
diff --git a/core/Command/Group/Add.php b/core/Command/Group/Add.php
index d205cef0696..40502762e95 100644
--- a/core/Command/Group/Add.php
+++ b/core/Command/Group/Add.php
@@ -36,10 +36,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Add extends Base {
-	protected IGroupManager $groupManager;
-
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
+	public function __construct(
+		protected IGroupManager $groupManager,
+	) {
 		parent::__construct();
 	}
 
diff --git a/core/Command/Group/AddUser.php b/core/Command/Group/AddUser.php
index 6638bcd4c6d..a66d2898ef9 100644
--- a/core/Command/Group/AddUser.php
+++ b/core/Command/Group/AddUser.php
@@ -34,12 +34,10 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class AddUser 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/Group/Delete.php b/core/Command/Group/Delete.php
index fd1074d6f61..c7cbf0aa0f6 100644
--- a/core/Command/Group/Delete.php
+++ b/core/Command/Group/Delete.php
@@ -35,10 +35,9 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Delete extends Base {
-	protected IGroupManager $groupManager;
-
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
+	public function __construct(
+		protected IGroupManager $groupManager,
+	) {
 		parent::__construct();
 	}
 
diff --git a/core/Command/Group/Info.php b/core/Command/Group/Info.php
index dc475581ac5..1dab56e1a89 100644
--- a/core/Command/Group/Info.php
+++ b/core/Command/Group/Info.php
@@ -35,10 +35,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	protected IGroupManager $groupManager;
-
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
+	public function __construct(
+		protected IGroupManager $groupManager,
+	) {
 		parent::__construct();
 	}
 
diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php
index 0285cc05dcd..22ce4cb0317 100644
--- a/core/Command/Group/ListCommand.php
+++ b/core/Command/Group/ListCommand.php
@@ -32,10 +32,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	protected IGroupManager $groupManager;
-
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
+	public function __construct(
+		protected IGroupManager $groupManager,
+	) {
 		parent::__construct();
 	}
 
diff --git a/core/Command/Group/RemoveUser.php b/core/Command/Group/RemoveUser.php
index c7b3a2d84e7..6c7d4ce4d84 100644
--- a/core/Command/Group/RemoveUser.php
+++ b/core/Command/Group/RemoveUser.php
@@ -34,12 +34,10 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class RemoveUser 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();
 	}