From ec632641537ce1f55949a584582bb94c9f309940 Mon Sep 17 00:00:00 2001 From: Faraz Samapoor Date: Mon, 12 Jun 2023 18:16:44 +0330 Subject: [PATCH 1/2] Uses PHP8's constructor property promotion in core/Command/Maintenance classes. Signed-off-by: Faraz Samapoor --- core/Command/Maintenance/DataFingerprint.php | 11 ++++------- core/Command/Maintenance/Install.php | 10 ++++------ core/Command/Maintenance/Mimetype/UpdateDB.php | 9 ++------- core/Command/Maintenance/Mimetype/UpdateJS.php | 7 +------ core/Command/Maintenance/Mode.php | 5 +---- core/Command/Maintenance/Repair.php | 15 ++++++--------- core/Command/Maintenance/RepairShareOwnership.php | 9 ++------- core/Command/Maintenance/UpdateTheme.php | 6 +----- 8 files changed, 21 insertions(+), 51 deletions(-) diff --git a/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php index a57dc307b1803..3c15b95bc05a9 100644 --- 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 index efb99e51431f8..643bb54c0d605 100644 --- 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 index edc42c0fdcd92..212b1994263c0 100644 --- 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 index 6a5a3d0ac61b6..fb0244e59baee 100644 --- a/core/Command/Maintenance/Mimetype/UpdateJS.php +++ b/core/Command/Maintenance/Mimetype/UpdateJS.php @@ -31,13 +31,8 @@ use Symfony\Component\Console\Output\OutputInterface; class UpdateJS extends Command { - protected IMimeTypeDetector $mimetypeDetector; - - public function __construct( - IMimeTypeDetector $mimetypeDetector - ) { + public function __construct(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 index c2af33aa4edbf..88ca2359155c4 100644 --- a/core/Command/Maintenance/Mode.php +++ b/core/Command/Maintenance/Mode.php @@ -33,10 +33,7 @@ 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 index a1d97476f9412..6c40ca2820f52 100644 --- 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 index c4d8da7bf74f6..e3c8a82c9d6a1 100644 --- 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 index e469b218b3f2e..859aaa12d4fa6 100644 --- 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() { From d60bedfeeeca8f21fe148b4ec755144d31cc3704 Mon Sep 17 00:00:00 2001 From: Faraz Samapoor Date: Tue, 13 Jun 2023 12:10:10 +0330 Subject: [PATCH 2/2] 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/Maintenance/Mimetype/UpdateJS.php | 4 +++- core/Command/Maintenance/Mode.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php index fb0244e59baee..71145907b9eb4 100644 --- a/core/Command/Maintenance/Mimetype/UpdateJS.php +++ b/core/Command/Maintenance/Mimetype/UpdateJS.php @@ -31,7 +31,9 @@ use Symfony\Component\Console\Output\OutputInterface; class UpdateJS extends Command { - public function __construct(protected IMimeTypeDetector $mimetypeDetector) { + public function __construct( + protected IMimeTypeDetector $mimetypeDetector, + ) { parent::__construct(); } diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php index 88ca2359155c4..685c2fa083709 100644 --- a/core/Command/Maintenance/Mode.php +++ b/core/Command/Maintenance/Mode.php @@ -33,7 +33,9 @@ use Symfony\Component\Console\Output\OutputInterface; class Mode extends Command { - public function __construct(protected IConfig $config) { + public function __construct( + protected IConfig $config, + ) { parent::__construct(); }