Merge pull request #31948 from nextcloud/core-cleanup-74

Update core to PHP 7.4 standard

Author: CarlSchwan

core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php

@@ -28,23 +28,19 @@
 
 use OC\BackgroundJob\QueuedJob;
 use OCP\IConfig;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 
 class BackgroundCleanupUpdaterBackupsJob extends QueuedJob {
+	protected IConfig $config;
+	protected LoggerInterface $log;
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ILogger */
-	protected $log;
-
-	public function __construct(IConfig $config, ILogger $log) {
+	public function __construct(IConfig $config, LoggerInterface $log) {
 		$this->config = $config;
 		$this->log = $log;
 	}
 
 	/**
 	 * This job cleans up all backups except the latest 3 from the updaters backup directory
-	 *
 	 */
 	public function run($arguments) {
 		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');

core/BackgroundJobs/CheckForUserCertificates.php

@@ -35,13 +35,9 @@
 use OCP\IUserManager;
 
 class CheckForUserCertificates extends QueuedJob {
-
-	/** @var IConfig */
-	protected $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
+	protected IConfig $config;
+	private IUserManager $userManager;
+	private IRootFolder $rootFolder;
 
 	public function __construct(IConfig $config, IUserManager $userManager, IRootFolder $rootFolder) {
 		$this->config = $config;

core/BackgroundJobs/CleanupLoginFlowV2.php

@@ -31,9 +31,7 @@
 use OCP\BackgroundJob\TimedJob;
 
 class CleanupLoginFlowV2 extends TimedJob {
-
-	/** @var LoginFlowV2Mapper */
-	private $loginFlowV2Mapper;
+	private LoginFlowV2Mapper $loginFlowV2Mapper;
 
 	public function __construct(ITimeFactory $time, LoginFlowV2Mapper $loginFlowV2Mapper) {
 		parent::__construct($time);

core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php

@@ -31,11 +31,8 @@
 use OCP\IUserManager;
 
 class LookupServerSendCheckBackgroundJob extends QueuedJob {
-
-	/** @var IConfig */
-	protected $config;
-	/** @var IUserManager */
-	private $userManager;
+	protected IConfig $config;
+	private IUserManager $userManager;
 
 	public function __construct(IConfig $config, IUserManager $userManager) {
 		$this->config = $config;

core/Command/App/Disable.php

@@ -33,16 +33,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Disable extends Command implements CompletionAwareInterface {
+	protected IAppManager $appManager;
+	protected int $exitCode = 0;
 
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var int */
-	protected $exitCode = 0;
-
-	/**
-	 * @param IAppManager $appManager
-	 */
 	public function __construct(IAppManager $appManager) {
 		parent::__construct();
 		$this->appManager = $appManager;

core/Command/App/Enable.php

@@ -39,20 +39,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Enable extends Command implements CompletionAwareInterface {
+	protected IAppManager $appManager;
+	protected IGroupManager $groupManager;
+	protected int $exitCode = 0;
 
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var int */
-	protected $exitCode = 0;
-
-	/**
-	 * @param IAppManager $appManager
-	 * @param IGroupManager $groupManager
-	 */
 	public function __construct(IAppManager $appManager, IGroupManager $groupManager) {
 		parent::__construct();
 		$this->appManager = $appManager;

core/Command/App/ListApps.php

@@ -33,13 +33,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListApps extends Base {
+	protected IAppManager $manager;
 
-	/** @var IAppManager */
-	protected $manager;
-
-	/**
-	 * @param IAppManager $manager
-	 */
 	public function __construct(IAppManager $manager) {
 		parent::__construct();
 		$this->manager = $manager;

core/Command/App/Remove.php

@@ -28,7 +28,7 @@
 
 use OC\Installer;
 use OCP\App\IAppManager;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Command\Command;
@@ -39,20 +39,11 @@
 use Throwable;
 
 class Remove extends Command implements CompletionAwareInterface {
+	protected IAppManager $manager;
+	private Installer $installer;
+	private LoggerInterface $logger;
 
-	/** @var IAppManager */
-	protected $manager;
-	/** @var Installer */
-	private $installer;
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IAppManager $manager
-	 * @param Installer $installer
-	 * @param ILogger $logger
-	 */
-	public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) {
+	public function __construct(IAppManager $manager, Installer $installer, LoggerInterface $logger) {
 		parent::__construct();
 		$this->manager = $manager;
 		$this->installer = $installer;
@@ -100,9 +91,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$output->writeln($appId . ' disabled');
 			} catch (Throwable $e) {
 				$output->writeln('<error>Error: ' . $e->getMessage() . '</error>');
-				$this->logger->logException($e, [
+				$this->logger->error($e->getMessage(), [
 					'app' => 'CLI',
-					'level' => ILogger::ERROR
+					'exception' => $e,
 				]);
 				return 1;
 			}
@@ -113,9 +104,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$result = $this->installer->removeApp($appId);
 		} catch (Throwable $e) {
 			$output->writeln('<error>Error: ' . $e->getMessage() . '</error>');
-			$this->logger->logException($e, [
+			$this->logger->error($e->getMessage(), [
 				'app' => 'CLI',
-				'level' => ILogger::ERROR
+				'exception' => $e,
 			]);
 			return 1;
 		}

core/Command/App/Update.php

@@ -29,27 +29,19 @@
 
 use OC\Installer;
 use OCP\App\IAppManager;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Update extends Command {
+	protected IAppManager $manager;
+	private Installer $installer;
+	private LoggerInterface $logger;
 
-	/** @var IAppManager */
-	protected $manager;
-	/** @var Installer */
-	private $installer;
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IAppManager $manager
-	 * @param Installer $installer
-	 */
-	public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) {
+	public function __construct(IAppManager $manager, Installer $installer, LoggerInterface $logger) {
 		parent::__construct();
 		$this->manager = $manager;
 		$this->installer = $installer;
@@ -114,7 +106,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					try {
 						$result = $this->installer->updateAppstoreApp($appId, $input->getOption('allow-unstable'));
 					} catch (\Exception $e) {
-						$this->logger->logException($e, ['message' => 'Failure during update of app "' . $appId . '"','app' => 'app:update']);
+						$this->logger->error('Failure during update of app "' . $appId . '"', [
+							'app' => 'app:update',
+							'exception' => $e,
+						]);
 						$output->writeln('Error: ' . $e->getMessage());
 						$return = 1;
 					}

core/Command/Background/Base.php

@@ -38,15 +38,8 @@
  */
 abstract class Base extends Command {
 	abstract protected function getMode();
+	protected IConfig $config;
 
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 */
 	public function __construct(IConfig $config) {
 		parent::__construct();
 		$this->config = $config;