Merge branch 'log-context'

Author: dbu

CHANGELOG.md

@@ -7,6 +7,8 @@
   If you use a logger that does not log `info` severity and want the request
   logged when an error happened, use a Fingerscrossed log handler to also log
   info if any error is logged.
+- Removed the request and response from the log context. They did not get
+  printed because they don't implement `__toString`.
 
 ## 1.2.2 - 2021-07-26
 

spec/LoggerPluginSpec.php

@@ -45,20 +45,16 @@ function it_logs_request_and_response(
         $logger->info(
             "Sending request:\nGET / 1.1",
             Argument::that(
-                function(array $context) use ($request) {
-                    return $context['request'] === $request->getWrappedObject()
-                        && is_string($context['uid'])
-                    ;
+                function(array $context) {
+                    return is_string($context['uid']);
                 }
             )
         )->shouldBeCalled();
         $logger->info(
             "Received response:\n200 OK 1.1",
             Argument::that(
-                function(array $context) use ($request, $response) {
-                    return $context['request'] === $request->getWrappedObject()
-                        && $context['response'] === $response->getWrappedObject()
-                        && is_int($context['milliseconds'])
+                function(array $context) {
+                    return is_int($context['milliseconds'])
                         && is_string($context['uid'])
                     ;
                 }
@@ -81,19 +77,16 @@ function it_logs_exception(LoggerInterface $logger, Formatter $formatter, Reques
         $logger->info(
             "Sending request:\nGET / 1.1",
             Argument::that(
-                function(array $context) use ($request) {
-                    return $context['request'] === $request->getWrappedObject()
-                        && is_string($context['uid'])
-                        ;
+                function(array $context) {
+                    return is_string($context['uid']);
                 }
             )
         )->shouldBeCalled();
         $logger->error(
             "Error:\nCannot connect\nwhen sending request:\nGET / 1.1",
             Argument::that(
-                function(array $context) use ($request, $exception) {
-                    return $context['request'] === $request->getWrappedObject()
-                        && $context['exception'] === $exception
+                function(array $context) use ($exception) {
+                    return $context['exception'] === $exception
                         && is_int($context['milliseconds'])
                         && is_string($context['uid'])
                     ;
@@ -122,20 +115,16 @@ function it_logs_response_within_exception(
         $logger->info(
             "Sending request:\nGET / 1.1",
             Argument::that(
-                function(array $context) use ($request) {
-                    return $context['request'] === $request->getWrappedObject()
-                        && is_string($context['uid'])
-                    ;
+                function(array $context) {
+                    return is_string($context['uid']);
                 }
             )
         )->shouldBeCalled();
         $logger->error(
             "Error:\nForbidden\nwith response:\n403 Forbidden 1.1",
             Argument::that(
-                function(array $context) use ($request, $response, $exception) {
-                    return $context['request'] === $request->getWrappedObject()
-                        && $context['response'] === $response->getWrappedObject()
-                        && $context['exception'] === $exception
+                function(array $context) use ($exception) {
+                    return $context['exception'] === $exception
                         && is_int($context['milliseconds'])
                         && is_string($context['uid'])
                     ;

src/LoggerPlugin.php

@@ -35,13 +35,11 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
         $uid = uniqid('', true);
         $this->logger->info(sprintf("Sending request:\n%s", $this->formatter->formatRequest($request)), ['request' => $request, 'uid' => $uid]);
 
-        return $next($request)->then(function (ResponseInterface $response) use ($request, $start, $uid) {
+        return $next($request)->then(function (ResponseInterface $response) use ($start, $uid) {
             $milliseconds = (int) round(hrtime(true) / 1E6 - $start);
             $this->logger->info(
                 sprintf("Received response:\n%s", $this->formatter->formatResponse($response)),
                 [
-                    'request' => $request,
-                    'response' => $response,
                     'milliseconds' => $milliseconds,
                     'uid' => $uid,
                 ]
@@ -54,8 +52,6 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
                 $this->logger->error(
                     sprintf("Error:\n%s\nwith response:\n%s", $exception->getMessage(), $this->formatter->formatResponse($exception->getResponse())),
                     [
-                        'request' => $request,
-                        'response' => $exception->getResponse(),
                         'exception' => $exception,
                         'milliseconds' => $milliseconds,
                         'uid' => $uid,
@@ -65,7 +61,6 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
                 $this->logger->error(
                     sprintf("Error:\n%s\nwhen sending request:\n%s", $exception->getMessage(), $this->formatter->formatRequest($request)),
                     [
-                        'request' => $request,
                         'exception' => $exception,
                         'milliseconds' => $milliseconds,
                         'uid' => $uid,