From 6c782599f1e2e4a07a102aa28d5f70d39300bf95 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Tue, 19 Feb 2019 10:54:42 +0100
Subject: [PATCH] Make IOInterface implement psr-4 LoggerInterface, fixes #5180

---
 src/Composer/IO/BaseIO.php                | 3 +--
 src/Composer/IO/IOInterface.php           | 3 ++-
 src/Composer/Util/Http/CurlDownloader.php | 1 -
 src/Composer/Util/HttpDownloader.php      | 4 +---
 src/Composer/Util/RemoteFilesystem.php    | 4 +---
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Composer/IO/BaseIO.php b/src/Composer/IO/BaseIO.php
index b327f1bbf..b63b59484 100644
--- a/src/Composer/IO/BaseIO.php
+++ b/src/Composer/IO/BaseIO.php
@@ -14,10 +14,9 @@ namespace Composer\IO;
 
 use Composer\Config;
 use Composer\Util\ProcessExecutor;
-use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
-abstract class BaseIO implements IOInterface, LoggerInterface
+abstract class BaseIO implements IOInterface
 {
     protected $authentications = array();
 
diff --git a/src/Composer/IO/IOInterface.php b/src/Composer/IO/IOInterface.php
index 5766ba479..46302088f 100644
--- a/src/Composer/IO/IOInterface.php
+++ b/src/Composer/IO/IOInterface.php
@@ -13,13 +13,14 @@
 namespace Composer\IO;
 
 use Composer\Config;
+use Psr\Log\LoggerInterface;
 
 /**
  * The Input/Output helper interface.
  *
  * @author François Pluchino <francois.pluchino@opendisplay.com>
  */
-interface IOInterface
+interface IOInterface extends LoggerInterface
 {
     const QUIET = 1;
     const NORMAL = 2;
diff --git a/src/Composer/Util/Http/CurlDownloader.php b/src/Composer/Util/Http/CurlDownloader.php
index ff31bf695..ab0dae91e 100644
--- a/src/Composer/Util/Http/CurlDownloader.php
+++ b/src/Composer/Util/Http/CurlDownloader.php
@@ -20,7 +20,6 @@ use Composer\Util\RemoteFilesystem;
 use Composer\Util\StreamContextFactory;
 use Composer\Util\AuthHelper;
 use Composer\Util\Url;
-use Psr\Log\LoggerInterface;
 use React\Promise\Promise;
 
 /**
diff --git a/src/Composer/Util/HttpDownloader.php b/src/Composer/Util/HttpDownloader.php
index 172ea875a..68e11a4a4 100644
--- a/src/Composer/Util/HttpDownloader.php
+++ b/src/Composer/Util/HttpDownloader.php
@@ -17,7 +17,6 @@ use Composer\IO\IOInterface;
 use Composer\Downloader\TransportException;
 use Composer\CaBundle\CaBundle;
 use Composer\Util\Http\Response;
-use Psr\Log\LoggerInterface;
 use React\Promise\Promise;
 
 /**
@@ -58,8 +57,7 @@ class HttpDownloader
         // Setup TLS options
         // The cafile option can be set via config.json
         if ($disableTls === false) {
-            $logger = $io instanceof LoggerInterface ? $io : null;
-            $this->options = StreamContextFactory::getTlsDefaults($options, $logger);
+            $this->options = StreamContextFactory::getTlsDefaults($options, $io);
         } else {
             $this->disableTls = true;
         }
diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php
index 2709f7006..e2c50472c 100644
--- a/src/Composer/Util/RemoteFilesystem.php
+++ b/src/Composer/Util/RemoteFilesystem.php
@@ -16,7 +16,6 @@ use Composer\Config;
 use Composer\IO\IOInterface;
 use Composer\Downloader\TransportException;
 use Composer\CaBundle\CaBundle;
-use Psr\Log\LoggerInterface;
 
 /**
  * @author François Pluchino <francois.pluchino@opendisplay.com>
@@ -61,8 +60,7 @@ class RemoteFilesystem
         // Setup TLS options
         // The cafile option can be set via config.json
         if ($disableTls === false) {
-            $logger = $io instanceof LoggerInterface ? $io : null;
-            $this->options = StreamContextFactory::getTlsDefaults($options, $logger);
+            $this->options = StreamContextFactory::getTlsDefaults($options, $io);
         } else {
             $this->disableTls = true;
         }