Fix Query URL

Author: michaljusiega

HttpClientTrait.php

@@ -422,6 +422,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault
             $url['path'] = '/';
         }
 
+        if ('?' === ($url['query'] ?? '')) {
+            $url['query'] = null;
+        }
+
         return $url;
     }
 

Tests/HttpClientTraitTest.php

@@ -44,6 +44,9 @@ public function providePrepareRequestUrl(): iterable
         yield ['http://example.com/?a=2&b=b', '.?a=2'];
         yield ['http://example.com/?a=3&b=b', '.', ['a' => 3]];
         yield ['http://example.com/?a=3&b=b', '.?a=0', ['a' => 3]];
+        yield ['http://example.com/', 'http://example.com/', ['a' => null]];
+        yield ['http://example.com/?b=', 'http://example.com/', ['b' => '']];
+        yield ['http://example.com/?b=', 'http://example.com/', ['a' => null, 'b' => '']];
     }
 
     /**