diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php index 6ed3386..5ce72f7 100644 --- a/lib/Service/MailService.php +++ b/lib/Service/MailService.php @@ -32,11 +32,11 @@ use OCA\Registration\Db\Registration; use OCP\Defaults; use OCP\IGroupManager; use OCP\IL10N; -use OCP\ILogger; use OCP\IURLGenerator; use OCP\Mail\IMailer; use OCP\Util; use OCP\IConfig; +use Psr\Log\LoggerInterface; class MailService { @@ -52,7 +52,7 @@ class MailService { private $groupManager; /** @var LoginFlowService */ private $loginFlowService; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var IConfig */ private $config; @@ -64,7 +64,7 @@ class MailService { IGroupManager $groupManager, IConfig $config, LoginFlowService $loginFlowService, - ILogger $logger) { + LoggerInterface $logger) { $this->urlGenerator = $urlGenerator; $this->mailer = $mailer; $this->config = $config; diff --git a/lib/Service/RegistrationService.php b/lib/Service/RegistrationService.php index fb5c5b0..72c36f3 100644 --- a/lib/Service/RegistrationService.php +++ b/lib/Service/RegistrationService.php @@ -43,7 +43,6 @@ use OCA\Registration\Db\Registration; use OCA\Registration\Db\RegistrationMapper; use OCP\Accounts\IAccountManager; use OCP\AppFramework\Db\DoesNotExistException; -use OCP\ILogger; use OCP\IRequest; use OCP\ISession; use OCP\IURLGenerator; @@ -56,6 +55,7 @@ use \OCP\IGroupManager; use \OCP\IL10N; use \OCP\IConfig; use \OCP\Security\ISecureRandom; +use Psr\Log\LoggerInterface; class RegistrationService { @@ -83,7 +83,7 @@ class RegistrationService { private $userSession; /** @var IRequest */ private $request; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var ISession */ private $session; @@ -105,7 +105,7 @@ class RegistrationService { ISecureRandom $random, IUserSession $userSession, IRequest $request, - ILogger $logger, + LoggerInterface $logger, ISession $session, IProvider $tokenProvider, ICrypto $crypto diff --git a/tests/Unit/Service/RegistrationServiceTest.php b/tests/Unit/Service/RegistrationServiceTest.php index 9c96dc1..4bca6db 100644 --- a/tests/Unit/Service/RegistrationServiceTest.php +++ b/tests/Unit/Service/RegistrationServiceTest.php @@ -11,7 +11,6 @@ use OCP\Accounts\IAccountManager; use OCP\IConfig; use OCP\IGroupManager; use OCP\IL10N; -use OCP\ILogger; use OC\Authentication\Token\IProvider; use OCP\IRequest; use OCP\Security\ISecureRandom; @@ -24,6 +23,7 @@ use OCP\IUserSession; use ChristophWurst\Nextcloud\Testing\DatabaseTransaction; use ChristophWurst\Nextcloud\Testing\TestCase; +use Psr\Log\LoggerInterface; /** * class RegistrationServiceTest @@ -55,7 +55,7 @@ class RegistrationServiceTest extends TestCase { private $usersession; /** @var IRequest */ private $request; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var ISession */ private $session; @@ -84,7 +84,7 @@ class RegistrationServiceTest extends TestCase { $this->random = \OC::$server->getSecureRandom(); $this->usersession = $this->createMock(IUserSession::class); $this->request = $this->createMock(IRequest::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->session = $this->createMock(ISession::class); $this->tokenProvider = $this->createMock(IProvider::class); $this->crypto = $this->createMock(ICrypto::class);