Update core to PHP 7.4 standard

- Typed properties
- Port to LoggerInterface

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

6 files changed, 6 insertions, 30 deletions

diff --git a/core/Command/TwoFactorAuth/Base.php b/core/Command/TwoFactorAuth/Base.php
index 94a3e5aeb60..27bd381d951 100644
--- a/core/Command/TwoFactorAuth/Base.php
+++ b/core/Command/TwoFactorAuth/Base.php
@@ -30,9 +30,7 @@ use OCP\IUserManager;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 class Base extends \OC\Core\Command\Base {
-
-	/** @var IUserManager */
-	protected $userManager;
+	protected IUserManager $userManager;
 
 	/**
 	 * Return possible values for the named option
diff --git a/core/Command/TwoFactorAuth/Cleanup.php b/core/Command/TwoFactorAuth/Cleanup.php
index b567ebe39a6..7d3fc3c33f7 100644
--- a/core/Command/TwoFactorAuth/Cleanup.php
+++ b/core/Command/TwoFactorAuth/Cleanup.php
@@ -32,9 +32,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Cleanup extends Base {
-
-	/** @var IRegistry */
-	private $registry;
+	private IRegistry $registry;
 
 	public function __construct(IRegistry $registry) {
 		parent::__construct();
diff --git a/core/Command/TwoFactorAuth/Disable.php b/core/Command/TwoFactorAuth/Disable.php
index 3a8ce28a6b6..54e4b138a0a 100644
--- a/core/Command/TwoFactorAuth/Disable.php
+++ b/core/Command/TwoFactorAuth/Disable.php
@@ -29,12 +29,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Disable extends Base {
-
-	/** @var ProviderManager */
-	private $manager;
-
-	/** @var IUserManager */
-	protected $userManager;
+	private ProviderManager $manager;
 
 	public function __construct(ProviderManager $manager, IUserManager $userManager) {
 		parent::__construct('twofactorauth:disable');
diff --git a/core/Command/TwoFactorAuth/Enable.php b/core/Command/TwoFactorAuth/Enable.php
index 1346c6c5df8..67c1778399d 100644
--- a/core/Command/TwoFactorAuth/Enable.php
+++ b/core/Command/TwoFactorAuth/Enable.php
@@ -29,12 +29,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Enable extends Base {
-
-	/** @var ProviderManager */
-	private $manager;
-
-	/** @var IUserManager */
-	protected $userManager;
+	private ProviderManager $manager;
 
 	public function __construct(ProviderManager $manager, IUserManager $userManager) {
 		parent::__construct('twofactorauth:enable');
diff --git a/core/Command/TwoFactorAuth/Enforce.php b/core/Command/TwoFactorAuth/Enforce.php
index 7f75aec33d1..d8fa41e2e95 100644
--- a/core/Command/TwoFactorAuth/Enforce.php
+++ b/core/Command/TwoFactorAuth/Enforce.php
@@ -35,9 +35,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Enforce extends Command {
-
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
+	private MandatoryTwoFactor $mandatoryTwoFactor;
 
 	public function __construct(MandatoryTwoFactor $mandatoryTwoFactor) {
 		parent::__construct();
@@ -92,9 +90,6 @@ class Enforce extends Command {
 		return 0;
 	}
 
-	/**
-	 * @param OutputInterface $output
-	 */
 	protected function writeEnforced(OutputInterface $output, EnforcementState $state) {
 		if (empty($state->getEnforcedGroups())) {
 			$message = 'Two-factor authentication is enforced for all users';
@@ -107,9 +102,6 @@ class Enforce extends Command {
 		$output->writeln($message);
 	}
 
-	/**
-	 * @param OutputInterface $output
-	 */
 	protected function writeNotEnforced(OutputInterface $output) {
 		$output->writeln('Two-factor authentication is not enforced');
 	}
diff --git a/core/Command/TwoFactorAuth/State.php b/core/Command/TwoFactorAuth/State.php
index 5120080cfb3..4694c76b408 100644
--- a/core/Command/TwoFactorAuth/State.php
+++ b/core/Command/TwoFactorAuth/State.php
@@ -33,9 +33,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class State extends Base {
-
-	/** @var IRegistry */
-	private $registry;
+	private IRegistry $registry;
 
 	public function __construct(IRegistry $registry, IUserManager $userManager) {
 		parent::__construct('twofactorauth:state');