Use normalizer as @internal

Author: joelwurtz

spec/LoggerPluginSpec.php

@@ -15,9 +15,9 @@
 
 class LoggerPluginSpec extends ObjectBehavior
 {
-    function let(LoggerInterface $logger, Normalizer $normalizer)
+    function let(LoggerInterface $logger)
     {
-        $this->beConstructedWith($logger, $normalizer);
+        $this->beConstructedWith($logger);
     }
 
     function it_is_initializable()
@@ -30,13 +30,18 @@ function it_is_a_plugin()
         $this->shouldImplement('Http\Client\Plugin\Plugin');
     }
 
-    function it_logs(LoggerInterface $logger, Normalizer $normalizer, RequestInterface $request, ResponseInterface $response)
+    function it_logs_request_and_response(LoggerInterface $logger, RequestInterface $request, ResponseInterface $response)
     {
         $logger->info('Emit request: "GET / 1.1"', ['request' => $request])->shouldBeCalled();
         $logger->info('Receive response: "200 Ok 1.1" for request: "GET / 1.1"', ['request' => $request, 'response' => $response])->shouldBeCalled();
 
-        $normalizer->normalizeRequestToString($request)->willReturn('GET / 1.1');
-        $normalizer->normalizeResponseToString($response)->willReturn('200 Ok 1.1');
+        $request->getMethod()->willReturn('GET');
+        $request->getRequestTarget()->willReturn('/');
+        $request->getProtocolVersion()->willReturn('1.1');
+
+        $response->getReasonPhrase()->willReturn('Ok');
+        $response->getProtocolVersion()->willReturn('1.1');
+        $response->getStatusCode()->willReturn('200');
 
         $next = function () use ($response) {
             return new FulfilledPromise($response->getWrappedObject());
@@ -45,14 +50,16 @@ function it_logs(LoggerInterface $logger, Normalizer $normalizer, RequestInterfa
         $this->handleRequest($request, $next, function () {});
     }
 
-    function it_logs_exception(LoggerInterface $logger, Normalizer $normalizer, RequestInterface $request)
+    function it_logs_exception(LoggerInterface $logger, RequestInterface $request)
     {
         $exception = new NetworkException('Cannot connect', $request->getWrappedObject());
 
         $logger->info('Emit request: "GET / 1.1"', ['request' => $request])->shouldBeCalled();
         $logger->error('Error: "Cannot connect" when emitting request: "GET / 1.1"', ['request' => $request, 'exception' => $exception])->shouldBeCalled();
 
-        $normalizer->normalizeRequestToString($request)->willReturn('GET / 1.1');
+        $request->getMethod()->willReturn('GET');
+        $request->getRequestTarget()->willReturn('/');
+        $request->getProtocolVersion()->willReturn('1.1');
 
         $next = function () use ($exception) {
             return new RejectedPromise($exception);
@@ -61,7 +68,7 @@ function it_logs_exception(LoggerInterface $logger, Normalizer $normalizer, Requ
         $this->handleRequest($request, $next, function () {});
     }
 
-    function it_logs_response_within_exception(LoggerInterface $logger, Normalizer $normalizer, RequestInterface $request, ResponseInterface $response)
+    function it_logs_response_within_exception(LoggerInterface $logger, RequestInterface $request, ResponseInterface $response)
     {
         $exception = new HttpException('Forbidden', $request->getWrappedObject(), $response->getWrappedObject());
 
@@ -72,8 +79,13 @@ function it_logs_response_within_exception(LoggerInterface $logger, Normalizer $
             'exception' => $exception
         ])->shouldBeCalled();
 
-        $normalizer->normalizeRequestToString($request)->willReturn('GET / 1.1');
-        $normalizer->normalizeResponseToString($response)->willReturn('403 Forbidden 1.1');
+        $request->getMethod()->willReturn('GET');
+        $request->getRequestTarget()->willReturn('/');
+        $request->getProtocolVersion()->willReturn('1.1');
+
+        $response->getReasonPhrase()->willReturn('Forbidden');
+        $response->getProtocolVersion()->willReturn('1.1');
+        $response->getStatusCode()->willReturn('403');
 
         $next = function () use ($exception) {
             return new RejectedPromise($exception);

spec/Normalizer/NormalizerSpec.php

@@ -13,23 +13,23 @@ class NormalizerSpec extends ObjectBehavior
 {
     function it_is_initializable(LoggerInterface $logger)
     {
-        $this->beAnInstanceOf('Http\Client\Plugin\Normalizer\Normalizer');
+        $this->shouldHaveType('Http\Client\Plugin\Normalizer\Normalizer');
     }
 
     function it_normalize_request_to_string(RequestInterface $request)
     {
-        $request->getMethod()->shouldBeCalled()->willReturn('GET');
-        $request->getRequestTarget()->shouldBeCalled()->willReturn('/');
-        $request->getProtocolVersion()->shouldBeCalled()->willReturn('1.1');
+        $request->getMethod()->willReturn('GET');
+        $request->getRequestTarget()->willReturn('/');
+        $request->getProtocolVersion()->willReturn('1.1');
 
         $this->normalizeRequestToString($request)->shouldReturn('GET / 1.1');
     }
 
     function it_normalize_response_to_string(ResponseInterface $response)
     {
-        $response->getReasonPhrase()->shouldBeCalled()->willReturn('Ok');
-        $response->getProtocolVersion()->shouldBeCalled()->willReturn('1.1');
-        $response->getStatusCode()->shouldBeCalled()->willReturn('200');
+        $response->getReasonPhrase()->willReturn('Ok');
+        $response->getProtocolVersion()->willReturn('1.1');
+        $response->getStatusCode()->willReturn('200');
 
         $this->normalizeResponseToString($response)->shouldReturn('200 Ok 1.1');
     }

src/LoggerPlugin.php

@@ -16,19 +16,26 @@
 class LoggerPlugin implements Plugin
 {
     /**
-     * @var LoggerInterface Logger to log request / response / exception for a http call
+     * Logger to log request / response / exception for a http call
+     *
+     * @var LoggerInterface
      */
     private $logger;
 
     /**
-     * @var Normalizer Normalize request and response to string or array
+     * Normalize request and response to string or array
+     *
+     * @var Normalizer
      */
     private $normalizer;
 
-    public function __construct(LoggerInterface $logger, Normalizer $normalizer)
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
     {
         $this->logger     = $logger;
-        $this->normalizer = $normalizer;
+        $this->normalizer = new Normalizer();
     }
 
     /**

src/Normalizer/Normalizer.php

@@ -7,6 +7,10 @@
 
 /**
  * Normalize a request or a response into a string or an array
+ *
+ * @author Joel Wurtz <[email protected]>
+ *
+ * @internal Should not be used outside of the logger plugin
  */
 class Normalizer
 {
@@ -16,8 +20,6 @@ class Normalizer
      * @param RequestInterface $request
      *
      * @return string
-     *
-     * @internal
      */
     public function normalizeRequestToString(RequestInterface $request)
     {
@@ -30,12 +32,9 @@ public function normalizeRequestToString(RequestInterface $request)
      * @param ResponseInterface $response
      *
      * @return string
-     *
-     * @internal
      */
     public function normalizeResponseToString(ResponseInterface $response)
     {
         return sprintf("%s %s %s", $response->getStatusCode(), $response->getReasonPhrase(), $response->getProtocolVersion());
     }
 }
-