From b70c6a128fe5d0053b7971881696eafce4cb7c26 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Tue, 12 Apr 2022 17:55:01 +0200
Subject: Update core to PHP 7.4 standard

- Typed properties
- Port to LoggerInterface

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
---
 core/Command/Maintenance/DataFingerprint.php   |  7 ++-----
 core/Command/Maintenance/Install.php           |  7 ++-----
 core/Command/Maintenance/Mimetype/UpdateDB.php |  7 ++-----
 core/Command/Maintenance/Mimetype/UpdateJS.php |  4 +---
 core/Command/Maintenance/Mode.php              |  4 +---
 core/Command/Maintenance/Repair.php            | 24 ++++++------------------
 core/Command/Maintenance/UpdateTheme.php       |  8 ++------
 7 files changed, 16 insertions(+), 45 deletions(-)

(limited to 'core/Command/Maintenance')

diff --git a/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php
index 2bd1b9270bb..a57dc307b18 100644
--- a/core/Command/Maintenance/DataFingerprint.php
+++ b/core/Command/Maintenance/DataFingerprint.php
@@ -29,11 +29,8 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DataFingerprint extends Command {
-
-	/** @var IConfig */
-	protected $config;
-	/** @var ITimeFactory */
-	protected $timeFactory;
+	protected IConfig $config;
+	protected ITimeFactory $timeFactory;
 
 	public function __construct(IConfig $config,
 								ITimeFactory $timeFactory) {
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index d98ec870e37..c445f2c2f46 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -47,11 +47,8 @@ use Throwable;
 use function get_class;
 
 class Install extends Command {
-
-	/** @var SystemConfig */
-	private $config;
-	/** @var IniGetWrapper  */
-	private $iniGetWrapper;
+	private SystemConfig $config;
+	private IniGetWrapper $iniGetWrapper;
 
 	public function __construct(SystemConfig $config, IniGetWrapper $iniGetWrapper) {
 		parent::__construct();
diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php
index e2e3137927f..edc42c0fdcd 100644
--- a/core/Command/Maintenance/Mimetype/UpdateDB.php
+++ b/core/Command/Maintenance/Mimetype/UpdateDB.php
@@ -35,11 +35,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 class UpdateDB extends Command {
 	public const DEFAULT_MIMETYPE = 'application/octet-stream';
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
-
-	/** @var IMimeTypeLoader */
-	protected $mimetypeLoader;
+	protected IMimeTypeDetector $mimetypeDetector;
+	protected IMimeTypeLoader $mimetypeLoader;
 
 	public function __construct(
 		IMimeTypeDetector $mimetypeDetector,
diff --git a/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php
index 042b4d5d62f..6a5a3d0ac61 100644
--- a/core/Command/Maintenance/Mimetype/UpdateJS.php
+++ b/core/Command/Maintenance/Mimetype/UpdateJS.php
@@ -31,9 +31,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateJS extends Command {
-
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
+	protected IMimeTypeDetector $mimetypeDetector;
 
 	public function __construct(
 		IMimeTypeDetector $mimetypeDetector
diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php
index 17580b8b331..c2af33aa4ed 100644
--- a/core/Command/Maintenance/Mode.php
+++ b/core/Command/Maintenance/Mode.php
@@ -33,9 +33,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Mode extends Command {
-
-	/** @var IConfig */
-	protected $config;
+	protected IConfig $config;
 
 	public function __construct(IConfig $config) {
 		$this->config = $config;
diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index 2a3d7a908e2..aa0f6a2a086 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -40,25 +40,13 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair extends Command {
-	/** @var \OC\Repair $repair */
-	protected $repair;
-	/** @var IConfig */
-	protected $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var ProgressBar */
-	private $progress;
-	/** @var OutputInterface */
-	private $output;
-	/** @var IAppManager */
-	private $appManager;
+	protected \OC\Repair $repair;
+	protected IConfig $config;
+	private EventDispatcherInterface $dispatcher;
+	private ProgressBar $progress;
+	private OutputInterface $output;
+	private IAppManager $appManager;
 
-	/**
-	 * @param \OC\Repair $repair
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param IAppManager $appManager
-	 */
 	public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
 		$this->repair = $repair;
 		$this->config = $config;
diff --git a/core/Command/Maintenance/UpdateTheme.php b/core/Command/Maintenance/UpdateTheme.php
index 10526fd54e6..e469b218b3f 100644
--- a/core/Command/Maintenance/UpdateTheme.php
+++ b/core/Command/Maintenance/UpdateTheme.php
@@ -33,12 +33,8 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateTheme extends UpdateJS {
-
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
-
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+	protected IMimeTypeDetector $mimetypeDetector;
+	protected ICacheFactory $cacheFactory;
 
 	public function __construct(
 		IMimeTypeDetector $mimetypeDetector,
-- 
cgit v1.2.3