Use DI logger instead of custom one.

Fixes #1072.

Signed-off-by: Pierre Gordon pierregordon@protonmaiil.com

30 files changed, 89 insertions, 265 deletions

diff --git a/lib/Controller/AccountsController.php b/lib/Controller/AccountsController.php
index cc20d454d..88d2d6f75 100644
--- a/lib/Controller/AccountsController.php
+++ b/lib/Controller/AccountsController.php
@@ -40,11 +40,11 @@ use OCA\Mail\Model\RepliedMessageData;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AliasesService;
 use OCA\Mail\Service\GroupsIntegration;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\Service\SetupService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\Security\ICrypto;
 
@@ -59,7 +59,7 @@ class AccountsController extends Controller {
 	/** @var string */
 	private $currentUserId;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var IL10N */
@@ -82,12 +82,12 @@ class AccountsController extends Controller {
 	 * @param IRequest $request
 	 * @param AccountService $accountService
 	 * @param $UserId
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param IL10N $l10n
 	 * @param ICrypto $crypto
 	 * @param SetupService $setup
 	 */
-	public function __construct($appName, IRequest $request, AccountService $accountService, GroupsIntegration $groupsIntegration, $UserId, Logger $logger, IL10N $l10n, ICrypto $crypto, AliasesService $aliasesService, IMailTransmission $mailTransmission, SetupService $setup
+	public function __construct($appName, IRequest $request, AccountService $accountService, GroupsIntegration $groupsIntegration, $UserId, ILogger $logger, IL10N $l10n, ICrypto $crypto, AliasesService $aliasesService, IMailTransmission $mailTransmission, SetupService $setup
 	) {
 		parent::__construct($appName, $request);
 		$this->accountService = $accountService;
diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
index 4a041e48a..94dce68da 100755
--- a/lib/Controller/MessagesController.php
+++ b/lib/Controller/MessagesController.php
@@ -37,7 +37,6 @@ use OCA\Mail\Http\HtmlResponse;
 use OCA\Mail\Model\IMAPMessage;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\IMailBox;
-use OCA\Mail\Service\Logger;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
@@ -48,6 +47,7 @@ use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\Folder;
 use OCP\Files\IMimeTypeDetector;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
@@ -62,7 +62,7 @@ class MessagesController extends Controller {
 	/** @var string */
 	private $currentUserId;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var Folder */
@@ -89,7 +89,7 @@ class MessagesController extends Controller {
 	 * @param AccountService $accountService
 	 * @param string $UserId
 	 * @param $userFolder
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param IL10N $l10n
 	 * @param IMimeTypeDetector $mimeTypeDetector
 	 * @param IURLGenerator $urlGenerator
@@ -97,7 +97,7 @@ class MessagesController extends Controller {
 	 */
 	public function __construct(string $appName, IRequest $request,
 								AccountService $accountService, IMailManager $mailManager, string $UserId,
-								$userFolder, Logger $logger, IL10N $l10n, IMimeTypeDetector $mimeTypeDetector,
+								$userFolder, ILogger $logger, IL10N $l10n, IMimeTypeDetector $mimeTypeDetector,
 								IURLGenerator $urlGenerator, ITimeFactory $timeFactory) {
 		parent::__construct($appName, $request);
 
diff --git a/lib/Http/Middleware/ErrorMiddleware.php b/lib/Http/Middleware/ErrorMiddleware.php
index d0f4f5ee7..9b5e60ab5 100644
--- a/lib/Http/Middleware/ErrorMiddleware.php
+++ b/lib/Http/Middleware/ErrorMiddleware.php
@@ -31,7 +31,6 @@ use OCA\Mail\Exception\ClientException;
 use OCA\Mail\Exception\NotImplemented;
 use OCA\Mail\Http\JSONErrorResponse;
 use OCA\Mail\Http\JSONResponse;
-use OCA\Mail\Service\Logger;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
@@ -39,10 +38,11 @@ use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
 use OCP\IConfig;
+use OCP\ILogger;
 
 class ErrorMiddleware extends Middleware {
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var IConfig */
@@ -53,10 +53,10 @@ class ErrorMiddleware extends Middleware {
 
 	/**
 	 * @param IConfig $config
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param IControllerMethodReflector $reflector
 	 */
-	public function __construct(IConfig $config, Logger $logger,
+	public function __construct(IConfig $config, ILogger $logger,
 								IControllerMethodReflector $reflector) {
 		$this->config = $config;
 		$this->logger = $logger;
diff --git a/lib/Service/AutoCompletion/AddressCollector.php b/lib/Service/AutoCompletion/AddressCollector.php
index 76d2b5258..53131e74b 100644
--- a/lib/Service/AutoCompletion/AddressCollector.php
+++ b/lib/Service/AutoCompletion/AddressCollector.php
@@ -28,7 +28,7 @@ use OCA\Mail\Address;
 use OCA\Mail\AddressList;
 use OCA\Mail\Db\CollectedAddress;
 use OCA\Mail\Db\CollectedAddressMapper;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 
 class AddressCollector {
 
@@ -38,10 +38,10 @@ class AddressCollector {
 	/** @var string */
 	private $userId;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
-	public function __construct(CollectedAddressMapper $mapper, string $UserId = null, Logger $logger) {
+	public function __construct(CollectedAddressMapper $mapper, string $UserId = null, ILogger $logger) {
 		$this->mapper = $mapper;
 		$this->userId = $UserId;
 		$this->logger = $logger;
diff --git a/lib/Service/AutoConfig/ConnectivityTester.php b/lib/Service/AutoConfig/ConnectivityTester.php
index a5565b30a..5313ae466 100644
--- a/lib/Service/AutoConfig/ConnectivityTester.php
+++ b/lib/Service/AutoConfig/ConnectivityTester.php
@@ -23,19 +23,19 @@ declare(strict_types=1);
 
 namespace OCA\Mail\Service\AutoConfig;
 
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 
 class ConnectivityTester {
 
 	const CONNECTION_TIMEOUT = 5;
 
-	/** @var Logger */
+	/** @var ILogger */
 	protected $logger;
 
 	/**
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 */
-	public function __construct(Logger $logger) {
+	public function __construct(ILogger $logger) {
 		$this->logger = $logger;
 	}
 
diff --git a/lib/Service/AutoConfig/ImapConnectivityTester.php b/lib/Service/AutoConfig/ImapConnectivityTester.php
index dbc57ab09..5c72de91c 100644
--- a/lib/Service/AutoConfig/ImapConnectivityTester.php
+++ b/lib/Service/AutoConfig/ImapConnectivityTester.php
@@ -25,7 +25,7 @@ namespace OCA\Mail\Service\AutoConfig;
 
 use Horde_Imap_Client_Exception;
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 
 class ImapConnectivityTester {
 
@@ -38,19 +38,19 @@ class ImapConnectivityTester {
 	/** @var string|null */
 	private $userId;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/**
 	 * @param ImapConnector $imapConnector
 	 * @param ConnectivityTester $connectivityTester
 	 * @param string $UserId
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(ImapConnector $imapConnector,
 								ConnectivityTester $connectivityTester,
 								string $UserId = null,
-								Logger $logger) {
+								ILogger $logger) {
 		$this->imapConnector = $imapConnector;
 		$this->connectivityTester = $connectivityTester;
 		$this->userId = $UserId;
diff --git a/lib/Service/AutoConfig/ImapConnector.php b/lib/Service/AutoConfig/ImapConnector.php
index 7365625a9..62de98c18 100644
--- a/lib/Service/AutoConfig/ImapConnector.php
+++ b/lib/Service/AutoConfig/ImapConnector.php
@@ -23,17 +23,17 @@ declare(strict_types=1);
 
 namespace OCA\Mail\Service\AutoConfig;
 
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\Logger;
 
 class ImapConnector {
 
 	/** @var ICrypto */
 	private $crypto;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var string */
@@ -41,10 +41,10 @@ class ImapConnector {
 
 	/**
 	 * @param ICrypto $crypto
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param string|null $UserId
 	 */
-	public function __construct(ICrypto $crypto, Logger $logger, string $UserId = null) {
+	public function __construct(ICrypto $crypto, ILogger $logger, string $UserId = null) {
 		$this->crypto = $crypto;
 		$this->logger = $logger;
 		$this->userId = $UserId;
diff --git a/lib/Service/AutoConfig/IspDb.php b/lib/Service/AutoConfig/IspDb.php
index 13658c27c..7621f9272 100644
--- a/lib/Service/AutoConfig/IspDb.php
+++ b/lib/Service/AutoConfig/IspDb.php
@@ -26,11 +26,11 @@ declare(strict_types=1);
 namespace OCA\Mail\Service\AutoConfig;
 
 use Exception;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 
 class IspDb {
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var string[] */
@@ -42,7 +42,7 @@ class IspDb {
 		];
 	}
 
-	public function __construct(Logger $logger) {
+	public function __construct(ILogger $logger) {
 		$this->logger = $logger;
 	}
 
diff --git a/lib/Service/AutoConfig/IspDbConfigurationDetector.php b/lib/Service/AutoConfig/IspDbConfigurationDetector.php
index 017c29aa3..ea721ea1a 100644
--- a/lib/Service/AutoConfig/IspDbConfigurationDetector.php
+++ b/lib/Service/AutoConfig/IspDbConfigurationDetector.php
@@ -31,8 +31,8 @@ use Horde_Mail_Exception;
 use Horde_Mail_Transport_Smtphorde;
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\SMTP\SmtpClientFactory;
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 
 class IspDbConfigurationDetector {
@@ -40,7 +40,7 @@ class IspDbConfigurationDetector {
 	/** @var string */
 	private $UserId;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var string */
@@ -59,14 +59,14 @@ class IspDbConfigurationDetector {
 	private $smtpClientFactory;
 
 	/**
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param string $UserId
 	 * @param ICrypto $crypto
 	 * @param IspDb $ispDb
 	 * @param ImapConnector $imapConnector
 	 * @param SmtpClientFactory $smtpClientFactory
 	 */
-	public function __construct(Logger $logger,
+	public function __construct(ILogger $logger,
 								string $UserId = null,
 								ICrypto $crypto,
 								IspDb $ispDb,
diff --git a/lib/Service/AutoConfig/MxRecord.php b/lib/Service/AutoConfig/MxRecord.php
index 4aed3d2f7..337f4f37f 100644
--- a/lib/Service/AutoConfig/MxRecord.php
+++ b/lib/Service/AutoConfig/MxRecord.php
@@ -23,14 +23,14 @@ declare(strict_types=1);
 
 namespace OCA\Mail\Service\AutoConfig;
 
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 
 class MxRecord {
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
-	public function __construct(Logger $logger) {
+	public function __construct(ILogger $logger) {
 		$this->logger = $logger;
 	}
 
diff --git a/lib/Service/AutoConfig/SmtpConnectivityTester.php b/lib/Service/AutoConfig/SmtpConnectivityTester.php
index 534890188..1b5a6d4a6 100644
--- a/lib/Service/AutoConfig/SmtpConnectivityTester.php
+++ b/lib/Service/AutoConfig/SmtpConnectivityTester.php
@@ -26,8 +26,8 @@ namespace OCA\Mail\Service\AutoConfig;
 use Exception;
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\SMTP\SmtpClientFactory;
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 
 class SmtpConnectivityTester {
@@ -41,7 +41,7 @@ class SmtpConnectivityTester {
 	/** @var SmtpClientFactory */
 	private $clientFactory;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var string */
@@ -51,13 +51,13 @@ class SmtpConnectivityTester {
 	 * @param ConnectivityTester $connectivityTester
 	 * @param ICrypto $crypto
 	 * @param SmtpClientFactory $clientFactory
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param string $UserId
 	 */
 	public function __construct(ConnectivityTester $connectivityTester,
 								ICrypto $crypto,
 								SmtpClientFactory $clientFactory,
-								Logger $logger,
+								ILogger $logger,
 								$UserId) {
 		$this->connectivityTester = $connectivityTester;
 		$this->crypto = $crypto;
diff --git a/lib/Service/DefaultAccount/Manager.php b/lib/Service/DefaultAccount/Manager.php
index b3f303e01..a188e0fdb 100644
--- a/lib/Service/DefaultAccount/Manager.php
+++ b/lib/Service/DefaultAccount/Manager.php
@@ -24,10 +24,10 @@ declare(strict_types=1);
 namespace OCA\Mail\Service\DefaultAccount;
 
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\Logger;
 use OCP\Authentication\Exceptions\CredentialsUnavailableException;
 use OCP\Authentication\LoginCredentials\IStore;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IUserSession;
 use OCP\Security\ICrypto;
 
@@ -41,7 +41,7 @@ class Manager {
 	/** @var IStore */
 	private $credentialStore;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var IUserSession */
@@ -53,13 +53,13 @@ class Manager {
 	/**
 	 * @param IConfig $config
 	 * @param IStore $credentialStore
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 * @param IUserSession $userSession
 	 * @param ICrypto $crypto
 	 */
 	public function __construct(IConfig $config,
 								IStore $credentialStore,
-								Logger $logger,
+								ILogger $logger,
 								IUserSession $userSession,
 								ICrypto $crypto) {
 		$this->config = $config;
diff --git a/lib/Service/Logger.php b/lib/Service/Logger.php
deleted file mode 100644
index 9d5092458..000000000
--- a/lib/Service/Logger.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Christoph Wurst <wurst.christoph@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * Mail
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Mail\Service;
-
-use OCP\ILogger;
-
-class Logger {
-
-	/** @var array */
-	private $context;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(string $appName, ILogger $logger) {
-		$this->context = [
-			'app' => $appName,
-		];
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function emergency($message, array $context = []) {
-		$this->logger->emergency($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function alert($message, array $context = []) {
-		$this->logger->alert($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function critical($message, array $context = []) {
-		$this->logger->critical($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function error($message, array $context = []) {
-		$this->logger->error($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function warning($message, array $context = []) {
-		$this->logger->warning($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function notice($message, array $context = []) {
-		$this->logger->notice($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function info($message, array $context = []) {
-		$this->logger->info($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function debug($message, array $context = []) {
-		$this->logger->debug($message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function log($level, $message, array $context = []) {
-		$this->logger->log($level, $message, array_merge($this->context, $context));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function logException($exception, array $context = []) {
-		$this->logger->logException($exception, array_merge($this->context, $context));
-	}
-
-}
diff --git a/lib/Service/MailTransmission.php b/lib/Service/MailTransmission.php
index 3ff085d2e..65ee42aed 100644
--- a/lib/Service/MailTransmission.php
+++ b/lib/Service/MailTransmission.php
@@ -41,6 +41,7 @@ use OCA\Mail\Model\RepliedMessageData;
 use OCA\Mail\Service\AutoCompletion\AddressCollector;
 use OCA\Mail\SMTP\SmtpClientFactory;
 use OCP\Files\Folder;
+use OCP\ILogger;
 
 class MailTransmission implements IMailTransmission {
 
@@ -56,7 +57,7 @@ class MailTransmission implements IMailTransmission {
 	/** @var SmtpClientFactory */
 	private $clientFactory;
 
-	/** @var Logger */
+	/** @var ILogger */
 	private $logger;
 
 	/**
@@ -64,13 +65,13 @@ class MailTransmission implements IMailTransmission {
 	 * @param Folder $userFolder
 	 * @param IAttachmentService $attachmentService
 	 * @param SmtpClientFactory $clientFactory
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(AddressCollector $addressCollector,
 								$userFolder,
 								IAttachmentService $attachmentService,
 								SmtpClientFactory $clientFactory,
-								Logger $logger) {
+								ILogger $logger) {
 		$this->addressCollector = $addressCollector;
 		$this->userFolder = $userFolder;
 		$this->attachmentService = $attachmentService;
diff --git a/lib/Service/SetupService.php b/lib/Service/SetupService.php
index d113a0ce6..1fa5ba8ee 100644
--- a/lib/Service/SetupService.php
+++ b/lib/Service/SetupService.php
@@ -28,6 +28,7 @@ use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Service\AutoConfig\AutoConfig;
 use OCA\Mail\SMTP\SmtpClientFactory;
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 
 class SetupService {
@@ -44,16 +45,16 @@ class SetupService {
 	/** @var SmtpClientFactory */
 	private $smtpClientFactory;
 
-	/** var Logger */
+	/** var ILogger */
 	private $logger;
 
 	/**
 	 * @param AutoConfig $autoConfig
 	 * @param AccountService $accountService
 	 * @param ICrypto $crypto
-	 * @param Logger $logger
+	 * @param ILogger $logger
 	 */
-	public function __construct(AutoConfig $autoConfig, AccountService $accountService, ICrypto $crypto, SmtpClientFactory $smtpClientFactory, Logger $logger) {
+	public function __construct(AutoConfig $autoConfig, AccountService $accountService, ICrypto $crypto, SmtpClientFactory $smtpClientFactory, ILogger $logger) {
 		$this->autoConfig = $autoConfig;
 		$this->accountService = $accountService;
 		$this->crypto = $crypto;
diff --git a/tests/Controller/AccountsControllerTest.php b/tests/Controller/AccountsControllerTest.php
index b9073ccc4..518b61fb5 100644
--- a/tests/Controller/AccountsControllerTest.php
+++ b/tests/Controller/AccountsControllerTest.php
@@ -35,12 +35,12 @@ use OCA\Mail\Model\RepliedMessageData;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AliasesService;
 use OCA\Mail\Service\AutoConfig\AutoConfig;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\Service\SetupService;
 use OCA\Mail\Service\GroupsIntegration;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\Security\ICrypto;
 use PHPUnit_Framework_MockObject_MockObject;
@@ -65,7 +65,7 @@ class AccountsControllerTest extends TestCase {
 	/** @var AutoConfig|PHPUnit_Framework_MockObject_MockObject */
 	private $autoConfig;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var IL10N|PHPUnit_Framework_MockObject_MockObject */
@@ -104,7 +104,7 @@ class AccountsControllerTest extends TestCase {
 			->will($this->returnArgument(0));
 		$this->userId = 'manfred';
 		$this->autoConfig = $this->createMock(AutoConfig::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->crypto = $this->createMock(ICrypto::class);
 		$this->aliasesService = $this->createMock(AliasesService::class);
diff --git a/tests/Controller/MessagesControllerTest.php b/tests/Controller/MessagesControllerTest.php
index 36eac5779..9efd630f4 100644
--- a/tests/Controller/MessagesControllerTest.php
+++ b/tests/Controller/MessagesControllerTest.php
@@ -33,7 +33,6 @@ use OCA\Mail\Http\HtmlResponse;
 use OCA\Mail\Mailbox;
 use OCA\Mail\Model\IMAPMessage;
 use OCA\Mail\Service\AccountService;
-use OCA\Mail\Service\Logger;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\JSONResponse;
@@ -41,6 +40,7 @@ use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\Folder;
 use OCP\Files\IMimeTypeDetector;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
@@ -73,7 +73,7 @@ class MessagesControllerTest extends TestCase {
 		$this->userId = 'john';
 		$this->userFolder = $this->createMock(Folder::class);
 		$this->request = $this->createMock(Request::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
diff --git a/tests/Http/Middleware/ErrorMiddlewareTest.php b/tests/Http/Middleware/ErrorMiddlewareTest.php
index 1331fe6e7..8f4a68d59 100644
--- a/tests/Http/Middleware/ErrorMiddlewareTest.php
+++ b/tests/Http/Middleware/ErrorMiddlewareTest.php
@@ -29,12 +29,12 @@ use OCA\Mail\Exception\NotImplemented;
 use OCA\Mail\Exception\ServiceException;
 use OCA\Mail\Http\JSONResponse;
 use OCA\Mail\Http\Middleware\ErrorMiddleware;
-use OCA\Mail\Service\Logger;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
 use OCP\IConfig;
+use OCP\ILogger;
 use PHPUnit_Framework_MockObject_MockObject;
 
 class ErrorMiddlewareTest extends TestCase {
@@ -42,7 +42,7 @@ class ErrorMiddlewareTest extends TestCase {
 	/** @var IConfig|PHPUnit_Framework_MockObject_MockObject */
 	private $config;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var IControllerMethodReflector|PHPUnit_Framework_MockObject_MockObject */
@@ -55,7 +55,7 @@ class ErrorMiddlewareTest extends TestCase {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->reflector = $this->createMock(IControllerMethodReflector::class);
 
 		$this->middleware = new ErrorMiddleware($this->config, $this->logger,
diff --git a/tests/Integration/Service/MailTransmissionIntegrationTest.php b/tests/Integration/Service/MailTransmissionIntegrationTest.php
index 655f38506..5deafe547 100644
--- a/tests/Integration/Service/MailTransmissionIntegrationTest.php
+++ b/tests/Integration/Service/MailTransmissionIntegrationTest.php
@@ -31,11 +31,11 @@ use OCA\Mail\Model\NewMessageData;
 use OCA\Mail\Model\RepliedMessageData;
 use OCA\Mail\Service\Attachment\UploadedFile;
 use OCA\Mail\Service\AutoCompletion\AddressCollector;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\Service\MailTransmission;
 use OCA\Mail\SMTP\SmtpClientFactory;
 use OCA\Mail\Tests\Integration\Framework\ImapTest;
 use OCA\Mail\Tests\Integration\TestCase;
+use OCP\ILogger;
 use OCP\IUser;
 
 class MailTransmissionIntegrationTest extends TestCase {
@@ -75,7 +75,7 @@ class MailTransmissionIntegrationTest extends TestCase {
 		$this->attachmentService = OC::$server->query(IAttachmentService::class);
 		$this->user = $this->createTestUser();
 		$userFolder = OC::$server->getUserFolder($this->user->getUID());
-		$this->transmission = new MailTransmission(OC::$server->query(AddressCollector::class), $userFolder, $this->attachmentService, OC::$server->query(SmtpClientFactory::class), OC::$server->query(Logger::class));
+		$this->transmission = new MailTransmission(OC::$server->query(AddressCollector::class), $userFolder, $this->attachmentService, OC::$server->query(SmtpClientFactory::class), OC::$server->query(ILogger::class));
 	}
 
 	public function testSendMail() {
diff --git a/tests/Service/Autocompletion/AddressCollectorTest.php b/tests/Service/Autocompletion/AddressCollectorTest.php
index fcebaf883..8f420a983 100644
--- a/tests/Service/Autocompletion/AddressCollectorTest.php
+++ b/tests/Service/Autocompletion/AddressCollectorTest.php
@@ -25,6 +25,7 @@ use ChristophWurst\Nextcloud\Testing\TestCase;
 use OCA\Mail\AddressList;
 use OCA\Mail\Db\CollectedAddress;
 use OCA\Mail\Service\AutoCompletion\AddressCollector;
+use OCP\ILogger;
 
 class AddressCollectorTest extends TestCase {
 
@@ -39,7 +40,7 @@ class AddressCollectorTest extends TestCase {
 		$this->mapper = $this->getMockBuilder('\OCA\Mail\Db\CollectedAddressMapper')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->logger = $this->getMockBuilder('\OCA\Mail\Service\Logger')
+		$this->logger = $this->getMockBuilder(ILogger::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/tests/Service/Autoconfig/ConnectivityTesterTest.php b/tests/Service/Autoconfig/ConnectivityTesterTest.php
index d18444638..9729463c3 100644
--- a/tests/Service/Autoconfig/ConnectivityTesterTest.php
+++ b/tests/Service/Autoconfig/ConnectivityTesterTest.php
@@ -23,12 +23,12 @@ namespace OCA\Mail\Tests\Service\Autoconfig;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
 use OCA\Mail\Service\AutoConfig\ConnectivityTester;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 use PHPUnit_Framework_MockObject_MockObject;
 
 class ConnectivityTesterTest extends TestCase {
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var ConnectivityTester */
@@ -37,7 +37,7 @@ class ConnectivityTesterTest extends TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 
 		$this->tester = new ConnectivityTester($this->logger);
 	}
diff --git a/tests/Service/Autoconfig/ImapConnectivityTesterTest.php b/tests/Service/Autoconfig/ImapConnectivityTesterTest.php
index f4d4d3813..39d4cebdd 100644
--- a/tests/Service/Autoconfig/ImapConnectivityTesterTest.php
+++ b/tests/Service/Autoconfig/ImapConnectivityTesterTest.php
@@ -26,7 +26,7 @@ use Horde_Imap_Client_Exception;
 use OCA\Mail\Service\AutoConfig\ConnectivityTester;
 use OCA\Mail\Service\AutoConfig\ImapConnectivityTester;
 use OCA\Mail\Service\AutoConfig\ImapConnector;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 use OpenCloud\Common\Log\Logger as Logger2;
 use PHPUnit_Framework_MockObject_MockObject;
 
@@ -49,7 +49,7 @@ class ImapConnectivityTesterTest extends TestCase {
 
 		$this->imapConnector = $this->createMock(ImapConnector::class);
 		$this->connectivityTester = $this->createMock(ConnectivityTester::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->tester = new ImapConnectivityTester($this->imapConnector, $this->connectivityTester, 'dave', $this->logger);
 	}
 
diff --git a/tests/Service/Autoconfig/ImapConnectorTest.php b/tests/Service/Autoconfig/ImapConnectorTest.php
index f4ebab547..a3fea541a 100644
--- a/tests/Service/Autoconfig/ImapConnectorTest.php
+++ b/tests/Service/Autoconfig/ImapConnectorTest.php
@@ -26,7 +26,7 @@ use Horde_Imap_Client_Exception;
 use OC;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Service\AutoConfig\ImapConnector;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 use PHPUnit_Framework_MockObject_MockObject;
 
@@ -35,7 +35,7 @@ class ImapConnectorTest extends TestCase {
 	/** @var ICrypto */
 	private $crypto;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var ImapConnector */
@@ -45,7 +45,7 @@ class ImapConnectorTest extends TestCase {
 		parent::setUp();
 
 		$this->crypto = OC::$server->getCrypto();
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 
 		$this->connector = new ImapConnector($this->crypto, $this->logger, 'christopher');
 	}
diff --git a/tests/Service/Autoconfig/IspDbTest.php b/tests/Service/Autoconfig/IspDbTest.php
index 80924be6f..cca8f9c56 100644
--- a/tests/Service/Autoconfig/IspDbTest.php
+++ b/tests/Service/Autoconfig/IspDbTest.php
@@ -24,6 +24,7 @@ namespace OCA\Mail\Tests\Service\Autoconfig;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
 use OCA\Mail\Service\AutoConfig\IspDb;
+use OCP\ILogger;
 
 class IspDbtest extends TestCase {
 
@@ -32,7 +33,7 @@ class IspDbtest extends TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->logger = $this->getMockBuilder('\OCA\Mail\Service\Logger')
+		$this->logger = $this->getMockBuilder(ILogger::class)
 			->disableOriginalConstructor()
 			->getMock();
 	}
diff --git a/tests/Service/Autoconfig/MxRecordTest.php b/tests/Service/Autoconfig/MxRecordTest.php
index 9f83f918d..536016f29 100644
--- a/tests/Service/Autoconfig/MxRecordTest.php
+++ b/tests/Service/Autoconfig/MxRecordTest.php
@@ -23,7 +23,7 @@ namespace OCA\Mail\Tests\Service\Autoconfig;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
 use OCA\Mail\Service\AutoConfig\MxRecord;
-use OCA\Mail\Service\Logger;
+use OCP\ILogger;
 
 class MxRecordTest extends TestCase {
 
@@ -33,7 +33,7 @@ class MxRecordTest extends TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$logger = $this->createMock(Logger::class);
+		$logger = $this->createMock(ILogger::class);
 		$this->record = new MxRecord($logger);
 	}
 
diff --git a/tests/Service/Autoconfig/SmtpConnectivityTesterTest.php b/tests/Service/Autoconfig/SmtpConnectivityTesterTest.php
index 41fa8bb54..676f59cae 100644
--- a/tests/Service/Autoconfig/SmtpConnectivityTesterTest.php
+++ b/tests/Service/Autoconfig/SmtpConnectivityTesterTest.php
@@ -27,8 +27,8 @@ use Horde_Mail_Transport_Smtphorde;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Service\AutoConfig\ConnectivityTester;
 use OCA\Mail\Service\AutoConfig\SmtpConnectivityTester;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\SMTP\SmtpClientFactory;
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 use PHPUnit_Framework_MockObject_MockObject;
 
@@ -43,7 +43,7 @@ class SmtpConnectivityTesterTest extends TestCase {
 	/** @var SmtpClientFactory|PHPUnit_Framework_MockObject_MockObject */
 	private $clientFactory;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var SmtpConnectivityTester */
@@ -55,7 +55,7 @@ class SmtpConnectivityTesterTest extends TestCase {
 		$this->connectivityTester = $this->createMock(ConnectivityTester::class);
 		$this->crypto = $this->createMock(ICrypto::class);
 		$this->clientFactory = $this->createMock(SmtpClientFactory::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->tester = new SmtpConnectivityTester($this->connectivityTester, $this->crypto, $this->clientFactory, $this->logger, 'dave');
 	}
 
diff --git a/tests/Service/DefaultAccount/ManagerTest.php b/tests/Service/DefaultAccount/ManagerTest.php
index b8ecb9c92..96fd15c0b 100644
--- a/tests/Service/DefaultAccount/ManagerTest.php
+++ b/tests/Service/DefaultAccount/ManagerTest.php
@@ -24,11 +24,11 @@ namespace OCA\Mail\Tests\Service\DefaultAccount;
 use ChristophWurst\Nextcloud\Testing\TestCase;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Service\DefaultAccount\Manager;
-use OCA\Mail\Service\Logger;
 use OCP\Authentication\Exceptions\CredentialsUnavailableException;
 use OCP\Authentication\LoginCredentials\ICredentials;
 use OCP\Authentication\LoginCredentials\IStore;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Security\ICrypto;
@@ -42,7 +42,7 @@ class ManagerTest extends TestCase {
 	/** @var IStore|PHPUnit_Framework_MockObject_MockObject */
 	private $credentialStore;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */
@@ -59,7 +59,7 @@ class ManagerTest extends TestCase {
 
 		$this->config = $this->createMock(IConfig::class);
 		$this->credentialStore = $this->createMock(IStore::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->crypto = $this->createMock(ICrypto::class);
 
diff --git a/tests/Service/LoggerTest.php b/tests/Service/LoggerTest.php
deleted file mode 100644
index 6f882c0f3..000000000
--- a/tests/Service/LoggerTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * Mail
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Mail\Tests\Service;
-
-use ChristophWurst\Nextcloud\Testing\TestCase;
-use Exception;
-use OCA\Mail\Service\Logger;
-use OCP\ILogger;
-
-class LoggerTest extends TestCase {
-
-	/**
-	 * @dataProvider providesLoggerMethods
-	 * @param $method
-	 */
-	public function testLoggerMethod($method, $param = '1') {
-
-		$baseLogger = $this->getMockBuilder(ILogger::class)->getMock();
-		$baseLogger->expects($this->once())
-			->method($method)
-			->with(
-				$this->equalTo($param), $this->equalTo([
-					'app' => 'mail',
-					'key' => 'value',
-		]));
-
-		$logger = new Logger('mail', $baseLogger);
-		$logger->$method($param, ['key' => 'value']);
-	}
-
-	public function providesLoggerMethods() {
-		return [
-			['alert'],
-			['warning'],
-			['emergency'],
-			['critical'],
-			['error'],
-			['notice'],
-			['info'],
-			['debug'],
-			['logException', new Exception()],
-		];
-	}
-
-}
diff --git a/tests/Service/MailTransmissionTest.php b/tests/Service/MailTransmissionTest.php
index 3179bac83..5e9e46be1 100644
--- a/tests/Service/MailTransmissionTest.php
+++ b/tests/Service/MailTransmissionTest.php
@@ -36,10 +36,10 @@ use OCA\Mail\Model\NewMessageData;
 use OCA\Mail\Model\RepliedMessageData;
 use OCA\Mail\Model\ReplyMessage;
 use OCA\Mail\Service\AutoCompletion\AddressCollector;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\Service\MailTransmission;
 use OCA\Mail\SMTP\SmtpClientFactory;
 use OCP\Files\Folder;
+use OCP\ILogger;
 use PHPUnit_Framework_MockObject_MockObject;
 
 class MailTransmissionTest extends TestCase {
@@ -56,7 +56,7 @@ class MailTransmissionTest extends TestCase {
 	/** @var SmtpClientFactory|PHPUnit_Framework_MockObject_MockObject */
 	private $clientFactory;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var MailTransmission */
@@ -69,7 +69,7 @@ class MailTransmissionTest extends TestCase {
 		$this->userFolder = $this->createMock(Folder::class);
 		$this->attachmentService = $this->createMock(IAttachmentService::class);
 		$this->clientFactory = $this->createMock(SmtpClientFactory::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 
 		$this->transmission = new MailTransmission($this->addressCollector, $this->userFolder, $this->attachmentService, $this->clientFactory, $this->logger);
 	}
diff --git a/tests/Service/SetupServiceTest.php b/tests/Service/SetupServiceTest.php
index 342ac62dd..ed609ca5c 100644
--- a/tests/Service/SetupServiceTest.php
+++ b/tests/Service/SetupServiceTest.php
@@ -28,10 +28,10 @@ use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AutoConfig\AutoConfig;
-use OCA\Mail\Service\Logger;
 use OCA\Mail\Service\SetupService;
 use OCA\Mail\SMTP\SmtpClientFactory;
 use ChristophWurst\Nextcloud\Testing\TestCase;
+use OCP\ILogger;
 use OCP\Security\ICrypto;
 use PHPUnit_Framework_MockObject_MockObject;
 
@@ -49,7 +49,7 @@ class SetupServiceTest extends TestCase {
 	/** @var SmtpClientFactory|PHPUnit_Framework_MockObject_MockObject */
 	private $smtpClientFactory;
 
-	/** @var Logger|PHPUnit_Framework_MockObject_MockObject */
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
 	private $logger;
 
 	/** @var SetupService */
@@ -62,7 +62,7 @@ class SetupServiceTest extends TestCase {
 		$this->accountService = $this->createMock(AccountService::class);
 		$this->crypto = $this->createMock(ICrypto::class);
 		$this->smtpClientFactory = $this->createMock(SmtpClientFactory::class);
-		$this->logger = $this->createMock(Logger::class);
+		$this->logger = $this->createMock(ILogger::class);
 
 		$this->service = new SetupService($this->autoConfig, $this->accountService, $this->crypto, $this->smtpClientFactory, $this->logger);
 	}