minor #40047 [HttpClient] Remove unnecessary "?" in url query (michaljusiega)

fabpot · fabpot · commit d9f490a8b2fa · 2021-02-01T16:03:21.000+01:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [HttpClient] Remove unnecessary "?" in url query | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | When creating the Request with passing nullable values as query parameters `HttpClientTrait::resolveUrl` method keeps at the end of URL "?" (IMO unnecessary) character. Before: ``` $client = HttpClient::create(); $response = $client->request('GET', 'http://example.com/', ['query' => ['a' => null]]); $url = $response->getInfo('url'); // http://example.com/? ``` After: ``` $client = HttpClient::create(); $response = $client->request('GET', 'http://example.com/', ['query' => ['a' => null]]); $url = $response->getInfo('url'); // http://example.com/ ``` Commits ------- 55831a8 Fix Query URL
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -436,6 +436,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault
             $url['path'] = '/';
         }
 
+        if ('?' === ($url['query'] ?? '')) {
+            $url['query'] = null;
+        }
+
         return $url;
     }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/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' => '']];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault`
`436`	`436`	`$url['path'] = '/';`
`437`	`437`	`}`
`438`	`438`
	`439`	`+ if ('?' === ($url['query'] ?? '')) {`
	`440`	`+ $url['query'] = null;`
	`441`	`+ }`
	`442`	`+`
`439`	`443`	`return $url;`
`440`	`444`	`}`
`441`	`445`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ public function providePrepareRequestUrl(): iterable`
`44`	`44`	`yield ['http://example.com/?a=2&b=b', '.?a=2'];`
`45`	`45`	`yield ['http://example.com/?a=3&b=b', '.', ['a' => 3]];`
`46`	`46`	`yield ['http://example.com/?a=3&b=b', '.?a=0', ['a' => 3]];`
	`47`	`+ yield ['http://example.com/', 'http://example.com/', ['a' => null]];`
	`48`	`+ yield ['http://example.com/?b=', 'http://example.com/', ['b' => '']];`
	`49`	`+ yield ['http://example.com/?b=', 'http://example.com/', ['a' => null, 'b' => '']];`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`/**`