Migrate from ILogger to LoggerInterface in lib/private

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

2 files changed, 6 insertions, 21 deletions

diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index e3dc539dd00..f2803fa5ff8 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -30,7 +30,6 @@ use OC\Files\View;
 use OC\Memcache\ArrayCache;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage;
-use OCP\ILogger;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -48,19 +47,14 @@ class EncryptionWrapper {
 	/** @var  Manager */
 	private $manager;
 
-	/** @var  ILogger */
-	private $logger;
+	private LoggerInterface $logger;
 
 	/**
 	 * EncryptionWrapper constructor.
-	 *
-	 * @param ArrayCache $arrayCache
-	 * @param Manager $manager
-	 * @param ILogger $logger
 	 */
 	public function __construct(ArrayCache $arrayCache,
 								Manager $manager,
-								ILogger $logger
+								LoggerInterface $logger
 	) {
 		$this->arrayCache = $arrayCache;
 		$this->manager = $manager;
@@ -101,7 +95,7 @@ class EncryptionWrapper {
 				Filesystem::getMountManager(),
 				$this->manager,
 				$fileHelper,
-				\OC::$server->get(LoggerInterface::class),
+				$this->logger,
 				$uid
 			);
 			return new Encryption(
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php
index 55578ee25f4..5788da990d5 100644
--- a/lib/private/Encryption/Manager.php
+++ b/lib/private/Encryption/Manager.php
@@ -34,7 +34,7 @@ use OCP\Encryption\IEncryptionModule;
 use OCP\Encryption\IManager;
 use OCP\IConfig;
 use OCP\IL10N;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 
 class Manager implements IManager {
 
@@ -44,8 +44,7 @@ class Manager implements IManager {
 	/** @var IConfig */
 	protected $config;
 
-	/** @var ILogger */
-	protected $logger;
+	protected LoggerInterface $logger;
 
 	/** @var Il10n */
 	protected $l;
@@ -59,15 +58,7 @@ class Manager implements IManager {
 	/** @var ArrayCache  */
 	protected $arrayCache;
 
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param IL10N $l10n
-	 * @param View $rootView
-	 * @param Util $util
-	 * @param ArrayCache $arrayCache
-	 */
-	public function __construct(IConfig $config, ILogger $logger, IL10N $l10n, View $rootView, Util $util, ArrayCache $arrayCache) {
+	public function __construct(IConfig $config, LoggerInterface $logger, IL10N $l10n, View $rootView, Util $util, ArrayCache $arrayCache) {
 		$this->encryptionModules = [];
 		$this->config = $config;
 		$this->logger = $logger;