Merge pull request #281 from nextcloud/techdebt/noid/move-from-ILogger-to-LoggerInterface

Move from ILogger to LoggerInterface
This commit is contained in:
Joas Schilling 2021-04-01 17:04:06 +02:00 committed by GitHub
commit bff137faa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View File

@ -32,11 +32,11 @@ use OCA\Registration\Db\Registration;
use OCP\Defaults; use OCP\Defaults;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
use OCP\ILogger;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\Mail\IMailer; use OCP\Mail\IMailer;
use OCP\Util; use OCP\Util;
use OCP\IConfig; use OCP\IConfig;
use Psr\Log\LoggerInterface;
class MailService { class MailService {
@ -52,7 +52,7 @@ class MailService {
private $groupManager; private $groupManager;
/** @var LoginFlowService */ /** @var LoginFlowService */
private $loginFlowService; private $loginFlowService;
/** @var ILogger */ /** @var LoggerInterface */
private $logger; private $logger;
/** @var IConfig */ /** @var IConfig */
private $config; private $config;
@ -64,7 +64,7 @@ class MailService {
IGroupManager $groupManager, IGroupManager $groupManager,
IConfig $config, IConfig $config,
LoginFlowService $loginFlowService, LoginFlowService $loginFlowService,
ILogger $logger) { LoggerInterface $logger) {
$this->urlGenerator = $urlGenerator; $this->urlGenerator = $urlGenerator;
$this->mailer = $mailer; $this->mailer = $mailer;
$this->config = $config; $this->config = $config;

View File

@ -43,7 +43,6 @@ use OCA\Registration\Db\Registration;
use OCA\Registration\Db\RegistrationMapper; use OCA\Registration\Db\RegistrationMapper;
use OCP\Accounts\IAccountManager; use OCP\Accounts\IAccountManager;
use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\DoesNotExistException;
use OCP\ILogger;
use OCP\IRequest; use OCP\IRequest;
use OCP\ISession; use OCP\ISession;
use OCP\IURLGenerator; use OCP\IURLGenerator;
@ -56,6 +55,7 @@ use \OCP\IGroupManager;
use \OCP\IL10N; use \OCP\IL10N;
use \OCP\IConfig; use \OCP\IConfig;
use \OCP\Security\ISecureRandom; use \OCP\Security\ISecureRandom;
use Psr\Log\LoggerInterface;
class RegistrationService { class RegistrationService {
@ -83,7 +83,7 @@ class RegistrationService {
private $userSession; private $userSession;
/** @var IRequest */ /** @var IRequest */
private $request; private $request;
/** @var ILogger */ /** @var LoggerInterface */
private $logger; private $logger;
/** @var ISession */ /** @var ISession */
private $session; private $session;
@ -105,7 +105,7 @@ class RegistrationService {
ISecureRandom $random, ISecureRandom $random,
IUserSession $userSession, IUserSession $userSession,
IRequest $request, IRequest $request,
ILogger $logger, LoggerInterface $logger,
ISession $session, ISession $session,
IProvider $tokenProvider, IProvider $tokenProvider,
ICrypto $crypto ICrypto $crypto

View File

@ -11,7 +11,6 @@ use OCP\Accounts\IAccountManager;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
use OCP\ILogger;
use OC\Authentication\Token\IProvider; use OC\Authentication\Token\IProvider;
use OCP\IRequest; use OCP\IRequest;
use OCP\Security\ISecureRandom; use OCP\Security\ISecureRandom;
@ -24,6 +23,7 @@ use OCP\IUserSession;
use ChristophWurst\Nextcloud\Testing\DatabaseTransaction; use ChristophWurst\Nextcloud\Testing\DatabaseTransaction;
use ChristophWurst\Nextcloud\Testing\TestCase; use ChristophWurst\Nextcloud\Testing\TestCase;
use Psr\Log\LoggerInterface;
/** /**
* class RegistrationServiceTest * class RegistrationServiceTest
@ -55,7 +55,7 @@ class RegistrationServiceTest extends TestCase {
private $usersession; private $usersession;
/** @var IRequest */ /** @var IRequest */
private $request; private $request;
/** @var ILogger */ /** @var LoggerInterface */
private $logger; private $logger;
/** @var ISession */ /** @var ISession */
private $session; private $session;
@ -84,7 +84,7 @@ class RegistrationServiceTest extends TestCase {
$this->random = \OC::$server->getSecureRandom(); $this->random = \OC::$server->getSecureRandom();
$this->usersession = $this->createMock(IUserSession::class); $this->usersession = $this->createMock(IUserSession::class);
$this->request = $this->createMock(IRequest::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->session = $this->createMock(ISession::class);
$this->tokenProvider = $this->createMock(IProvider::class); $this->tokenProvider = $this->createMock(IProvider::class);
$this->crypto = $this->createMock(ICrypto::class); $this->crypto = $this->createMock(ICrypto::class);