From 73c447027e48c6faacd89d652cac6f8b2c9c831d Mon Sep 17 00:00:00 2001
From: nfebe <fenn25.fn@gmail.com>
Date: Tue, 22 Apr 2025 12:05:30 +0100
Subject: refactor: Thumbnail Generator logging and tests

Signed-off-by: nfebe <fenn25.fn@gmail.com>
---
 lib/private/Preview/Generator.php              |  2 +-
 tests/lib/Preview/BackgroundCleanupJobTest.php | 43 ++++++++++----------------
 tests/lib/Preview/Provider.php                 | 33 ++++++++------------
 3 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
index 66069beaecc..b95971d0085 100644
--- a/lib/private/Preview/Generator.php
+++ b/lib/private/Preview/Generator.php
@@ -119,7 +119,7 @@ class Generator {
 		$maxPreviewImage = null; // only load the image when we need it
 		if ($maxPreview->getSize() === 0) {
 			$maxPreview->delete();
-			$this->logger->error("Max preview generated for file {$file->getPath()} has size 0, deleting and throwing exception.");
+			$this->logger->error('Max preview generated for file {path} has size 0, deleting and throwing exception.', ['path' => $file->getPath()]);
 			throw new NotFoundException('Max preview size 0, invalid!');
 		}
 
diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php
index 945366cde9f..cecb4a7a212 100644
--- a/tests/lib/Preview/BackgroundCleanupJobTest.php
+++ b/tests/lib/Preview/BackgroundCleanupJobTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-only
@@ -9,12 +10,15 @@ namespace Test\Preview;
 use OC\Preview\BackgroundCleanupJob;
 use OC\Preview\Storage\Root;
 use OC\PreviewManager;
+use OCP\App\IAppManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\File;
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IDBConnection;
+use OCP\IPreview;
+use OCP\Server;
 use Test\Traits\MountProviderTrait;
 use Test\Traits\UserTrait;
 
@@ -28,25 +32,12 @@ use Test\Traits\UserTrait;
 class BackgroundCleanupJobTest extends \Test\TestCase {
 	use MountProviderTrait;
 	use UserTrait;
-
-	/** @var string */
-	private $userId;
-
-	/** @var bool */
-	private $trashEnabled;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var PreviewManager */
-	private $previewManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IMimeTypeLoader */
-	private $mimeTypeLoader;
-
+	private string $userId;
+	private bool $trashEnabled;
+	private IDBConnection $connection;
+	private PreviewManager $previewManager;
+	private IRootFolder $rootFolder;
+	private IMimeTypeLoader $mimeTypeLoader;
 	private ITimeFactory $timeFactory;
 
 	protected function setUp(): void {
@@ -62,20 +53,20 @@ class BackgroundCleanupJobTest extends \Test\TestCase {
 		$this->logout();
 		$this->loginAsUser($this->userId);
 
-		$appManager = \OC::$server->getAppManager();
+		$appManager = Server::get(IAppManager::class);
 		$this->trashEnabled = $appManager->isEnabledForUser('files_trashbin', $user);
 		$appManager->disableApp('files_trashbin');
 
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->previewManager = \OC::$server->getPreviewManager();
-		$this->rootFolder = \OC::$server->get(IRootFolder::class);
-		$this->mimeTypeLoader = \OC::$server->getMimeTypeLoader();
-		$this->timeFactory = \OCP\Server::get(ITimeFactory::class);
+		$this->connection = Server::get(IDBConnection::class);
+		$this->previewManager = Server::get(IPreview::class);
+		$this->rootFolder = Server::get(IRootFolder::class);
+		$this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
+		$this->timeFactory = Server::get(ITimeFactory::class);
 	}
 
 	protected function tearDown(): void {
 		if ($this->trashEnabled) {
-			$appManager = \OC::$server->getAppManager();
+			$appManager = Server::get(IAppManager::class);
 			$appManager->enableApp('files_trashbin');
 		}
 
diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php
index 41a2a4ca3c4..a7f55151354 100644
--- a/tests/lib/Preview/Provider.php
+++ b/tests/lib/Preview/Provider.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -9,33 +10,25 @@ namespace Test\Preview;
 
 use OC\Files\Node\File;
 use OCP\Files\IRootFolder;
+use OCP\IUserManager;
 
 abstract class Provider extends \Test\TestCase {
-	/** @var string */
-	protected $imgPath;
-	/** @var int */
-	protected $width;
-	/** @var int */
-	protected $height;
-	/** @var \OC\Preview\Provider */
+	protected string $imgPath;
+	protected int $width;
+	protected int $height;
+	/** @var \OC\Preview\Provider|mixed $provider */
 	protected $provider;
-	/** @var int */
-	protected $maxWidth = 1024;
-	/** @var int */
-	protected $maxHeight = 1024;
-	/** @var bool */
-	protected $scalingUp = false;
-	/** @var int */
-	protected $userId;
-	/** @var \OC\Files\View */
-	protected $rootView;
-	/** @var \OC\Files\Storage\Storage */
-	protected $storage;
+	protected int $maxWidth = 1024;
+	protected int $maxHeight = 1024;
+	protected bool $scalingUp = false;
+	protected string $userId;
+	protected \OC\Files\View $rootView;
+	protected \OC\Files\Storage\Storage $storage;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$userManager = \OC::$server->getUserManager();
+		$userManager = \OCP\Server::get(IUserManager::class);
 		$userManager->clearBackends();
 		$backend = new \Test\Util\User\Dummy();
 		$userManager->registerBackend($backend);
-- 
cgit v1.2.3