1 files changed, 15 insertions, 40 deletions

diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
index fb09097f6ef..646dd2c5e83 100644
--- a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
+++ b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
@@ -3,37 +3,19 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2019, Daniel Kesselberg (mail@danielkesselberg.de)
- *
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OC\Repair\NC16;
 
-use OCP\Files\IAppData;
+use OCP\Files\AppData\IAppDataFactory;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
-use OCP\ILogger;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
+use Psr\Log\LoggerInterface;
 use RuntimeException;
 
 /**
@@ -46,20 +28,11 @@ use RuntimeException;
  * photo could be returned for this vcard. These invalid files are removed by this migration step.
  */
 class CleanupCardDAVPhotoCache implements IRepairStep {
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppData */
-	private $appData;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(IConfig $config, IAppData $appData, ILogger $logger) {
-		$this->config = $config;
-		$this->appData = $appData;
-		$this->logger = $logger;
+	public function __construct(
+		private IConfig $config,
+		private IAppDataFactory $appDataFactory,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	public function getName(): string {
@@ -67,12 +40,14 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
 	}
 
 	private function repair(IOutput $output): void {
+		$photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+
 		try {
-			$folders = $this->appData->getDirectoryListing();
+			$folders = $photoCacheAppData->getDirectoryListing();
 		} catch (NotFoundException $e) {
 			return;
 		} catch (RuntimeException $e) {
-			$this->logger->logException($e, ['message' => 'Failed to fetch directory listing in CleanupCardDAVPhotoCache']);
+			$this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
 			return;
 		}
 
@@ -91,7 +66,7 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
 				/** @var ISimpleFolder $folder */
 				$folder->getFile('photo.')->delete();
 			} catch (\Exception $e) {
-				$this->logger->logException($e);
+				$this->logger->error($e->getMessage(), ['exception' => $e]);
 				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
 			}
 		}
@@ -99,7 +74,7 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
 
 	private function shouldRun(): bool {
 		return version_compare(
-			$this->config->getSystemValue('version', '0.0.0.0'),
+			$this->config->getSystemValueString('version', '0.0.0.0'),
 			'16.0.0.0',
 			'<='
 		);