diff options
author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-03-17 16:42:53 +0100 |
---|---|---|
committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-03-24 16:21:25 +0100 |
commit | 6be7aa112f6174c1406cfef5449836124a7f6f50 (patch) | |
tree | 5029bf9659caeab8702e9fabbbdeb9a2cd849bfa /lib/private/Http | |
parent | fbf1334dc8c192ebdd335663cacfb810daf4d841 (diff) | |
download | nextcloud-server-6be7aa112f6174c1406cfef5449836124a7f6f50.tar.gz nextcloud-server-6be7aa112f6174c1406cfef5449836124a7f6f50.zip |
Migrate from ILogger to LoggerInterface in lib/private
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib/private/Http')
-rw-r--r-- | lib/private/Http/Client/Client.php | 5 | ||||
-rw-r--r-- | lib/private/Http/Client/ClientService.php | 6 | ||||
-rw-r--r-- | lib/private/Http/Client/LocalAddressChecker.php | 7 |
3 files changed, 3 insertions, 15 deletions
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index 673f566e354..3ba85a2dd9f 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -39,7 +39,6 @@ use OCP\Http\Client\IClient; use OCP\Http\Client\IResponse; use OCP\ICertificateManager; use OCP\IConfig; -use OCP\ILogger; /** * Class Client @@ -51,8 +50,6 @@ class Client implements IClient { private $client; /** @var IConfig */ private $config; - /** @var ILogger */ - private $logger; /** @var ICertificateManager */ private $certificateManager; /** @var LocalAddressChecker */ @@ -60,13 +57,11 @@ class Client implements IClient { public function __construct( IConfig $config, - ILogger $logger, ICertificateManager $certificateManager, GuzzleClient $client, LocalAddressChecker $localAddressChecker ) { $this->config = $config; - $this->logger = $logger; $this->client = $client; $this->certificateManager = $certificateManager; $this->localAddressChecker = $localAddressChecker; diff --git a/lib/private/Http/Client/ClientService.php b/lib/private/Http/Client/ClientService.php index d1aed2d7883..e868d4af7a5 100644 --- a/lib/private/Http/Client/ClientService.php +++ b/lib/private/Http/Client/ClientService.php @@ -33,7 +33,6 @@ use OCP\Http\Client\IClient; use OCP\Http\Client\IClientService; use OCP\ICertificateManager; use OCP\IConfig; -use OCP\ILogger; /** * Class ClientService @@ -43,8 +42,6 @@ use OCP\ILogger; class ClientService implements IClientService { /** @var IConfig */ private $config; - /** @var ILogger */ - private $logger; /** @var ICertificateManager */ private $certificateManager; /** @var DnsPinMiddleware */ @@ -53,12 +50,10 @@ class ClientService implements IClientService { private $localAddressChecker; public function __construct(IConfig $config, - ILogger $logger, ICertificateManager $certificateManager, DnsPinMiddleware $dnsPinMiddleware, LocalAddressChecker $localAddressChecker) { $this->config = $config; - $this->logger = $logger; $this->certificateManager = $certificateManager; $this->dnsPinMiddleware = $dnsPinMiddleware; $this->localAddressChecker = $localAddressChecker; @@ -76,7 +71,6 @@ class ClientService implements IClientService { return new Client( $this->config, - $this->logger, $this->certificateManager, $client, $this->localAddressChecker diff --git a/lib/private/Http/Client/LocalAddressChecker.php b/lib/private/Http/Client/LocalAddressChecker.php index c534c5971d1..2789b1b5935 100644 --- a/lib/private/Http/Client/LocalAddressChecker.php +++ b/lib/private/Http/Client/LocalAddressChecker.php @@ -25,14 +25,13 @@ declare(strict_types=1); */ namespace OC\Http\Client; -use OCP\ILogger; use OCP\Http\Client\LocalServerException; +use Psr\Log\LoggerInterface; class LocalAddressChecker { - /** @var ILogger */ - private $logger; + private LoggerInterface $logger; - public function __construct(ILogger $logger) { + public function __construct(LoggerInterface $logger) { $this->logger = $logger; } |