Merge pull request #38767 from fsamapoor/constructor_property_promoti…

…on_in_core_command_part4 Uses PHP8's constructor property promotion in core/Command/Maintenance
nextcloud · Jun 19, 2023 · 81bb336 · 81bb336
2 parents 98ea74b + d60bedf
commit 81bb336
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 49 deletions.
diff --git a/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php
@@ -29,13 +29,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DataFingerprint extends Command {
-	protected IConfig $config;
-	protected ITimeFactory $timeFactory;
-
-	public function __construct(IConfig $config,
-								ITimeFactory $timeFactory) {
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
+	public function __construct(
+		protected IConfig $config,
+		protected ITimeFactory $timeFactory,
+	) {
 		parent::__construct();
 	}
 

diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
@@ -47,13 +47,11 @@
 use function get_class;
 
 class Install extends Command {
-	private SystemConfig $config;
-	private IniGetWrapper $iniGetWrapper;
-
-	public function __construct(SystemConfig $config, IniGetWrapper $iniGetWrapper) {
+	public function __construct(
+		private SystemConfig $config,
+		private IniGetWrapper $iniGetWrapper,
+	) {
 		parent::__construct();
-		$this->config = $config;
-		$this->iniGetWrapper = $iniGetWrapper;
 	}
 
 	protected function configure() {

diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php
@@ -35,16 +35,11 @@
 class UpdateDB extends Command {
 	public const DEFAULT_MIMETYPE = 'application/octet-stream';
 
-	protected IMimeTypeDetector $mimetypeDetector;
-	protected IMimeTypeLoader $mimetypeLoader;
-
 	public function __construct(
-		IMimeTypeDetector $mimetypeDetector,
-		IMimeTypeLoader $mimetypeLoader
+		protected IMimeTypeDetector $mimetypeDetector,
+		protected IMimeTypeLoader $mimetypeLoader,
 	) {
 		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-		$this->mimetypeLoader = $mimetypeLoader;
 	}
 
 	protected function configure() {

diff --git a/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php
@@ -31,13 +31,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateJS extends Command {
-	protected IMimeTypeDetector $mimetypeDetector;
-
 	public function __construct(
-		IMimeTypeDetector $mimetypeDetector
+		protected IMimeTypeDetector $mimetypeDetector,
 	) {
 		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
 	}
 
 	protected function configure() {

diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php
@@ -33,10 +33,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Mode extends Command {
-	protected IConfig $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
+	public function __construct(
+		protected IConfig $config,
+	) {
 		parent::__construct();
 	}
 

diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
@@ -47,19 +47,16 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Repair extends Command {
-	protected \OC\Repair $repair;
-	protected IConfig $config;
-	private IEventDispatcher $dispatcher;
 	private ProgressBar $progress;
 	private OutputInterface $output;
-	private IAppManager $appManager;
 	protected bool $errored = false;
 
-	public function __construct(\OC\Repair $repair, IConfig $config, IEventDispatcher $dispatcher, IAppManager $appManager) {
-		$this->repair = $repair;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->appManager = $appManager;
+	public function __construct(
+		protected \OC\Repair $repair,
+		protected IConfig $config,
+		private IEventDispatcher $dispatcher,
+		private IAppManager $appManager,
+	) {
 		parent::__construct();
 	}
 

diff --git a/core/Command/Maintenance/RepairShareOwnership.php b/core/Command/Maintenance/RepairShareOwnership.php
@@ -38,15 +38,10 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class RepairShareOwnership extends Command {
-	private IDBConnection $dbConnection;
-	private IUserManager $userManager;
-
 	public function __construct(
-		IDBConnection $dbConnection,
-		IUserManager $userManager
+		private IDBConnection $dbConnection,
+		private IUserManager $userManager,
 	) {
-		$this->dbConnection = $dbConnection;
-		$this->userManager = $userManager;
 		parent::__construct();
 	}
 

diff --git a/core/Command/Maintenance/UpdateTheme.php b/core/Command/Maintenance/UpdateTheme.php
@@ -33,15 +33,11 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateTheme extends UpdateJS {
-	protected IMimeTypeDetector $mimetypeDetector;
-	protected ICacheFactory $cacheFactory;
-
 	public function __construct(
 		IMimeTypeDetector $mimetypeDetector,
-		ICacheFactory $cacheFactory
+		protected ICacheFactory $cacheFactory,
 	) {
 		parent::__construct($mimetypeDetector);
-		$this->cacheFactory = $cacheFactory;
 	}
 
 	protected function configure() {