Add LoggerAwareInterface to ScopingHttpClient and TraceableHttpClient

pierredup · pierredup · commit 7348fb23b618 · 2020-01-09T09:12:32.000+02:00
diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.1.0
+-----
+
+* added `LoggerAwareInterface` to `ScopingHttpClient` and `TraceableHttpClient`
+
 4.4.0
 -----
 
diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\HttpClient;
 
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -22,7 +24,7 @@
  *
  * @author Anthony Martin <anthony.martin@sensiolabs.com>
  */
-class ScopingHttpClient implements HttpClientInterface, ResetInterface
+class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface
 {
     use HttpClientTrait;
 
@@ -98,4 +100,14 @@ public function reset()
             $this->client->reset();
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        if ($this->client instanceof LoggerAwareInterface) {
+            $this->client->setLogger($logger);
+        }
+    }
 }
diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\HttpClient;
 
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
@@ -19,7 +21,7 @@
 /**
  * @author Jérémy Romey <jeremy@free-agent.fr>
  */
-final class TraceableHttpClient implements HttpClientInterface, ResetInterface
+final class TraceableHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface
 {
     private $client;
     private $tracedRequests = [];
@@ -75,4 +77,14 @@ public function reset()
 
         $this->tracedRequests = [];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        if ($this->client instanceof LoggerAwareInterface) {
+            $this->client->setLogger($logger);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpClient;`
`13`	`13`
	`14`	`+use Psr\Log\LoggerAwareInterface;`
	`15`	`+use Psr\Log\LoggerInterface;`
`14`	`16`	`use Symfony\Component\HttpClient\Exception\InvalidArgumentException;`
`15`	`17`	`use Symfony\Contracts\HttpClient\HttpClientInterface;`
`16`	`18`	`use Symfony\Contracts\HttpClient\ResponseInterface;`
`@@ -22,7 +24,7 @@`
`22`	`24`	`*`
`23`	`25`	`* @author Anthony Martin <anthony.martin@sensiolabs.com>`
`24`	`26`	`*/`
`25`		`-class ScopingHttpClient implements HttpClientInterface, ResetInterface`
	`27`	`+class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface`
`26`	`28`	`{`
`27`	`29`	`use HttpClientTrait;`
`28`	`30`
`@@ -98,4 +100,14 @@ public function reset()`
`98`	`100`	`$this->client->reset();`
`99`	`101`	`}`
`100`	`102`	`}`
	`103`	`+`
	`104`	`+ /**`
	`105`	`+ * {@inheritdoc}`
	`106`	`+ */`
	`107`	`+ public function setLogger(LoggerInterface $logger)`
	`108`	`+ {`
	`109`	`+ if ($this->client instanceof LoggerAwareInterface) {`
	`110`	`+ $this->client->setLogger($logger);`
	`111`	`+ }`
	`112`	`+ }`
`101`	`113`	`}`