diff --git a/src/MessageAccessor.php b/src/MessageAccessor.php index 72eca77..338791b 100644 --- a/src/MessageAccessor.php +++ b/src/MessageAccessor.php @@ -18,12 +18,12 @@ class MessageAccessor private string $replace; public function __construct( - array $values = [], - array $queryFilters = [], - array $headersFilters = [], - array $jsonFilers = [], + array $values = [], + array $queryFilters = [], + array $headersFilters = [], + array $jsonFilers = [], string $replace = '********' - ){ + ) { $this->values = $values; $this->queryFilters = $queryFilters; $this->headersFilters = $headersFilters; @@ -49,16 +49,16 @@ public function getBase(RequestInterface $request): string $base = ''; if ($uri->getScheme()) { - $base .= $uri->getScheme() . '://'; + $base .= $uri->getScheme().'://'; } if ($uri->getUserInfo()) { - $base .= $uri->getUserInfo() . '@'; + $base .= $uri->getUserInfo().'@'; } if ($uri->getHost()) { $base .= $uri->getHost(); } if ($uri->getPort()) { - $base .= ':' . $uri->getPort(); + $base .= ':'.$uri->getPort(); } return $base; @@ -87,7 +87,9 @@ public function getHeaders(MessageInterface $message): array * Determine if the request is JSON. * * @see vendor/laravel/framework/src/Illuminate/Http/Client/Request.php + * * @param MessageInterface $message + * * @return bool */ public function isJson(MessageInterface $message): bool @@ -112,7 +114,7 @@ public function getContent(MessageInterface $message): string $body = json_encode($this->getJson($message)); } else { $body = $message->getBody()->__toString(); - foreach($this->values as $value) { + foreach ($this->values as $value) { $body = str_replace($value, $this->replace, $body); } } @@ -139,9 +141,9 @@ protected function replaceParameters(array $array, array $parameters, array $val } } - array_walk_recursive( $array, function (&$item) use ($values, $replace, $strict) { + array_walk_recursive($array, function (&$item) use ($values, $replace, $strict) { foreach ($values as $value) { - if (! $strict && str_contains($item, $value)) { + if (!$strict && str_contains($item, $value)) { $item = str_replace($value, $replace, $item); } elseif ($strict && $value === $item) { $item = $replace; diff --git a/tests/MessageAccessorTest.php b/tests/MessageAccessorTest.php index 32a98ea..42fc704 100644 --- a/tests/MessageAccessorTest.php +++ b/tests/MessageAccessorTest.php @@ -30,8 +30,8 @@ public function setUp(): void 'POST', 'https://user:secret@secret.example.com:9000/some-path/secret/should-not-be-removed?test=true&search=foo&filter[field1]=A&filter[field2]=B#anchor', [ - 'Accept' => 'application/json', - 'Content-Type' => 'application/json', + 'Accept' => 'application/json', + 'Content-Type' => 'application/json', 'Authorization' => 'Bearer 1234567890', ], json_encode([ @@ -39,12 +39,12 @@ public function setUp(): void 'foo' => 'bar', 'baz' => [ [ - 'field_1' => 'value1', - 'field_2' => 'value2', + 'field_1' => 'value1', + 'field_2' => 'value2', 'password' => '123456', - 'secret' => 'this is not for everyone', - ] - ] + 'secret' => 'this is not for everyone', + ], + ], ], ]) ); @@ -66,8 +66,10 @@ public function test_get_uri() public function test_get_base() { - $this->assertEquals('https://user:********@********.example.com:9000', - urldecode($this->messageAccessor->getBase($this->request))); + $this->assertEquals( + 'https://user:********@********.example.com:9000', + urldecode($this->messageAccessor->getBase($this->request)) + ); } public function test_get_query() @@ -76,7 +78,7 @@ public function test_get_query() $this->assertIsArray($query); $this->assertEquals([ - 'test' => 'true', + 'test' => 'true', 'search' => '********', 'filter' => [ 'field1' => 'A', @@ -91,10 +93,10 @@ public function test_get_headers() $this->assertIsArray($headers); $this->assertEquals([ - 'Accept' => ['application/json'], - 'Content-Type' => ['application/json'], + 'Accept' => ['application/json'], + 'Content-Type' => ['application/json'], 'Authorization' => ['********'], - 'Host' => ['********.example.com:9000'], + 'Host' => ['********.example.com:9000'], ], $headers); } @@ -114,12 +116,12 @@ public function test_get_json() 'foo' => 'bar', 'baz' => [ [ - 'field_1' => 'value1', - 'field_2' => 'value2', + 'field_1' => 'value1', + 'field_2' => 'value2', 'password' => '********', - 'secret' => 'this is not for everyone', // Note that keys are NOT filtered - ] - ] + 'secret' => 'this is not for everyone', // Note that keys are NOT filtered + ], + ], ], ], $json); } @@ -133,12 +135,12 @@ public function test_get_content() 'foo' => 'bar', 'baz' => [ [ - 'field_1' => 'value1', - 'field_2' => 'value2', + 'field_1' => 'value1', + 'field_2' => 'value2', 'password' => '********', - 'secret' => 'this is not for everyone', // Note that keys are NOT filtered - ] - ] + 'secret' => 'this is not for everyone', // Note that keys are NOT filtered + ], + ], ], ]), $content); }