Less ILogger

Signed-off-by: Joas Schilling <coding@schilljs.com>

5 files changed, 15 insertions, 30 deletions

diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php
index f716c567c79..bd40766afcb 100644
--- a/lib/private/Avatar/Avatar.php
+++ b/lib/private/Avatar/Avatar.php
@@ -43,14 +43,14 @@ use OC\Color;
 use OC_Image;
 use OCP\Files\NotFoundException;
 use OCP\IAvatar;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 
 /**
  * This class gets and sets users avatars.
  */
 abstract class Avatar implements IAvatar {
 
-	/** @var ILogger  */
+	/** @var LoggerInterface  */
 	protected $logger;
 
 	/**
@@ -69,12 +69,7 @@ abstract class Avatar implements IAvatar {
 			<text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">{letter}</text>
 		</svg>';
 
-	/**
-	 * The base avatar constructor.
-	 *
-	 * @param ILogger $logger The logger
-	 */
-	public function __construct(ILogger $logger) {
+	public function __construct(LoggerInterface $logger) {
 		$this->logger = $logger;
 	}
 
diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php
index 04d3a721022..c54539b2cde 100644
--- a/lib/private/Avatar/AvatarManager.php
+++ b/lib/private/Avatar/AvatarManager.php
@@ -45,8 +45,8 @@ use OCP\IAvatar;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IL10N;
-use OCP\ILogger;
 use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
 
 /**
  * This class implements methods to access Avatar functionality
@@ -65,7 +65,7 @@ class AvatarManager implements IAvatarManager {
 	/** @var IL10N */
 	private $l;
 
-	/** @var ILogger  */
+	/** @var LoggerInterface */
 	private $logger;
 
 	/** @var IConfig */
@@ -77,22 +77,12 @@ class AvatarManager implements IAvatarManager {
 	/** @var KnownUserService */
 	private $knownUserService;
 
-	/**
-	 * AvatarManager constructor.
-	 *
-	 * @param Manager $userManager
-	 * @param IAppData $appData
-	 * @param IL10N $l
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 */
 	public function __construct(
 			IUserSession $userSession,
 			Manager $userManager,
 			IAppData $appData,
 			IL10N $l,
-			ILogger $logger,
+			LoggerInterface $logger,
 			IConfig $config,
 			IAccountManager $accountManager,
 			KnownUserService $knownUserService
diff --git a/lib/private/Avatar/GuestAvatar.php b/lib/private/Avatar/GuestAvatar.php
index cc7e21b9fe6..c208353d726 100644
--- a/lib/private/Avatar/GuestAvatar.php
+++ b/lib/private/Avatar/GuestAvatar.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
 namespace OC\Avatar;
 
 use OCP\Files\SimpleFS\InMemoryFile;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 
 /**
  * This class represents a guest user's avatar.
@@ -44,9 +44,9 @@ class GuestAvatar extends Avatar {
 	 * GuestAvatar constructor.
 	 *
 	 * @param string $userDisplayName The guest user display name
-	 * @param ILogger $logger The logger
+	 * @param LoggerInterface $logger The logger
 	 */
-	public function __construct(string $userDisplayName, ILogger $logger) {
+	public function __construct(string $userDisplayName, LoggerInterface $logger) {
 		parent::__construct($logger);
 		$this->userDisplayName = $userDisplayName;
 	}
diff --git a/lib/private/Avatar/PlaceholderAvatar.php b/lib/private/Avatar/PlaceholderAvatar.php
index 5883fe531a3..377b5e03654 100644
--- a/lib/private/Avatar/PlaceholderAvatar.php
+++ b/lib/private/Avatar/PlaceholderAvatar.php
@@ -38,7 +38,7 @@ use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
 use OCP\IImage;
 use OCP\IL10N;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 
 /**
  * This class represents a registered user's placeholder avatar.
@@ -60,12 +60,12 @@ class PlaceholderAvatar extends Avatar {
 	 * @param ISimpleFolder $folder The avatar files folder
 	 * @param IL10N $l The localization helper
 	 * @param User $user The user this class manages the avatar for
-	 * @param ILogger $logger The logger
+	 * @param LoggerInterface $logger The logger
 	 */
 	public function __construct(
 		ISimpleFolder $folder,
 		$user,
-		ILogger $logger) {
+		LoggerInterface $logger) {
 		parent::__construct($logger);
 
 		$this->folder = $folder;
diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php
index f47809425ed..970548f8c8e 100644
--- a/lib/private/Avatar/UserAvatar.php
+++ b/lib/private/Avatar/UserAvatar.php
@@ -39,7 +39,7 @@ use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
 use OCP\IImage;
 use OCP\IL10N;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 
 /**
  * This class represents a registered user's avatar.
@@ -64,13 +64,13 @@ class UserAvatar extends Avatar {
 	 * @param ISimpleFolder $folder The avatar files folder
 	 * @param IL10N $l The localization helper
 	 * @param User $user The user this class manages the avatar for
-	 * @param ILogger $logger The logger
+	 * @param LoggerInterface $logger The logger
 	 */
 	public function __construct(
 		ISimpleFolder $folder,
 		IL10N $l,
 		$user,
-		ILogger $logger,
+		LoggerInterface $logger,
 		IConfig $config) {
 		parent::__construct($logger);
 		$this->folder = $folder;