Fix accessor

Author: bilfeldt

src/MessageAccessor.php

@@ -122,15 +122,23 @@ public function getContent(MessageInterface $message): string
         return $body;
     }
 
-    public function filter(MessageInterface $message): MessageInterface
+    public function filterMessage(MessageInterface $message): MessageInterface
     {
         $body = $this->getContent($message);
 
         foreach ($this->getHeaders($message) as $header => $values) {
             $message = $message->withHeader($header, $values);
         }
 
-        return $message->withBody(Utils::streamFor($body));
+        return $message
+            ->withBody(Utils::streamFor($body));
+    }
+
+    public function filterRequest(RequestInterface $request): RequestInterface
+    {
+        /** @var RequestInterface $filtered */
+        $filtered = $this->filterMessage($request);
+        return $filtered->withUri($this->getUri($request));
     }
 
     protected function replaceParameters(array $array, array $parameters, array $values, string $replace, $strict = true): array

tests/MessageAccessorTest.php

@@ -145,7 +145,7 @@ public function test_get_content()
         ]), $content);
     }
 
-    public function test_filter()
+    public function test_filter_message()
     {
         $request = $this->messageAccessor->filter($this->request);
 
@@ -154,4 +154,14 @@ public function test_filter()
 
         $this->assertEquals($output, Message::toString($request));
     }
+
+    public function test_filter_request()
+    {
+        $request = $this->messageAccessor->filterRequest($this->request);
+
+        // Note that it is required to use double quotes for the Carriage Return (\r) to work and have it on one line to pass on Windows
+        $output = "POST /some-path/********/should-not-be-removed?test=true&search=%2A%2A%2A%2A%2A%2A%2A%2A&filter%5Bfield1%5D=A&filter%5Bfield2%5D=%2A%2A%2A%2A%2A%2A%2A%2A HTTP/1.1\r\nHost: ********.example.com:9000\r\nAccept: application/json\r\nContent-Type: application/json\r\nAuthorization: ********\r\n\r\n{\"data\":{\"foo\":\"bar\",\"baz\":[{\"field_1\":\"value1\",\"field_2\":\"value2\",\"password\":\"********\",\"secret\":\"this is not for everyone\"}]}}";
+
+        $this->assertEquals($output, Message::toString($request));
+    }
 }