MessageUtil::toJSON(): add query parameters as array

Author: codemasher

src/MessageUtil.php

@@ -102,15 +102,23 @@ public static function toString(MessageInterface $message, bool|null $appendBody
 	 */
 	public static function toJSON(MessageInterface $message, bool|null $appendBody = null):string{
 		$appendBody ??= true;
-		$msg          = [];
+		$msg          = ['headers' => []];
 
 		if($message instanceof RequestInterface){
+			$uri = $message->getUri();
+
 			$msg['request'] = [
-				'url'    => (string)$message->getUri(),
+				'url'    => (string)$uri,
+				'params' => QueryUtil::parse($uri->getQuery()),
 				'method' => $message->getMethod(),
 				'target' => $message->getRequestTarget(),
 				'http'   => $message->getProtocolVersion(),
 			];
+
+			if(!$message->hasHeader('host')){
+				$msg['headers']['Host'] = $message->getUri()->getHost();
+			}
+
 		}
 		elseif($message instanceof ResponseInterface){
 			$msg['response'] = [
@@ -120,12 +128,6 @@ public static function toJSON(MessageInterface $message, bool|null $appendBody =
 			];
 		}
 
-		$msg['headers'] = [];
-
-		if($message instanceof RequestInterface && !$message->hasHeader('host')){
-			$msg['headers']['Host'] = $message->getUri()->getHost();
-		}
-
 		foreach($message->getHeaders() as $name => $values){
 			$msg['headers'][$name] = implode(', ', $values);
 		}

tests/Client/EchoClientTest.php

@@ -21,12 +21,13 @@ class EchoClientTest extends HTTPClientTestAbstract{
 	protected string $HTTP_CLIENT_FACTORY = EchoClientFactory::class;
 
 	public function testSendRequest():void{
-		$url      = 'https://httpbin.org/get';
+		$url      = 'https://httpbin.org/get?whatever=value';
 		$response = $this->httpClient->sendRequest($this->requestFactory->createRequest('GET', $url));
 		$json     = MessageUtil::decodeJSON($response);
 
 		$this::assertSame($url, $json->request->url);
 		$this::assertSame('GET', $json->request->method);
+		$this::assertSame('value', $json->request->params->{'whatever'});
 		$this::assertSame('httpbin.org', $json->headers->{'Host'});
 	}