[HttpClient] Add resolve to copy as Curl #45729
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -168,28 +168,127 @@ public function testItIsEmptyAfterReset() | |
|
|
||
| /** | ||
| * @requires extension openssl | ||
| * @dataProvider provideCurlRequests | ||
| */ | ||
| public function testItGeneratesCurlCommandsAsExpected(array $request, string $expectedCurlCommand) | ||
| { | ||
| $sut = new HttpClientDataCollector(); | ||
| $sut->registerClient('http_client', $this->httpClientThatHasTracedRequests([$request])); | ||
| $sut->collect(new Request(), new Response()); | ||
| $collectedData = $sut->getClients(); | ||
| self::assertCount(1, $collectedData['http_client']['traces']); | ||
| $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand']; | ||
| self::assertEquals(sprintf($expectedCurlCommand, '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand); | ||
| } | ||
|
|
||
| public function provideCurlRequests(): iterable | ||
| { | ||
| yield 'GET' => [ | ||
| [ | ||
| 'method' => 'GET', | ||
| 'url' => 'http://localhost:8057/json', | ||
| ], | ||
| 'curl \\ | ||
| --compressed \\ | ||
| --request GET \\ | ||
| --url %1$shttp://localhost:8057/json%1$s \\ | ||
| --header %1$sAccept: */*%1$s \\ | ||
| --header %1$sAccept-Encoding: gzip%1$s \\ | ||
| --header %1$sUser-Agent: Symfony HttpClient/Native%1$s', | ||
| ]; | ||
| yield 'GET with resolve' => [ | ||
| [ | ||
| 'method' => 'GET', | ||
| 'url' => 'http://localhost:8057/json', | ||
| 'options' => [ | ||
| 'resolve' => [ | ||
| 'localhost' => '127.0.0.1', | ||
| 'example.com' => null, | ||
| ], | ||
| ], | ||
| ], | ||
| 'curl \\ | ||
| --compressed \\ | ||
| --resolve %1$slocalhost:8057:127.0.0.1%1$s \\ | ||
| --request GET \\ | ||
| --url %1$shttp://localhost:8057/json%1$s \\ | ||
| --header %1$sAccept: */*%1$s \\ | ||
| --header %1$sAccept-Encoding: gzip%1$s \\ | ||
| --header %1$sUser-Agent: Symfony HttpClient/Native%1$s', | ||
| ]; | ||
| yield 'POST with string body' => [ | ||
| [ | ||
| 'method' => 'POST', | ||
| 'url' => 'http://localhost:8057/json', | ||
| 'options' => [ | ||
| 'body' => 'foobarbaz', | ||
| ], | ||
| ], | ||
| 'curl \\ | ||
| --compressed \\ | ||
| --request POST \\ | ||
| --url %1$shttp://localhost:8057/json%1$s \\ | ||
| --header %1$sAccept: */*%1$s \\ | ||
| --header %1$sContent-Length: 9%1$s \\ | ||
| --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\ | ||
| --header %1$sAccept-Encoding: gzip%1$s \\ | ||
| --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\ | ||
| --data %1$sfoobarbaz%1$s', | ||
| ]; | ||
| yield 'POST with array body' => [ | ||
| [ | ||
| 'method' => 'POST', | ||
| 'url' => 'http://localhost:8057/json', | ||
| 'options' => [ | ||
| 'body' => [ | ||
| 'foo' => 'fooval', | ||
| 'bar' => 'barval', | ||
| 'baz' => 'bazval', | ||
| ], | ||
| ], | ||
| ], | ||
| 'curl \\ | ||
| --compressed \\ | ||
| --request POST \\ | ||
| --url %1$shttp://localhost:8057/json%1$s \\ | ||
| --header %1$sAccept: */*%1$s \\ | ||
| --header %1$sContent-Length: 32%1$s \\ | ||
| --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\ | ||
| --header %1$sAccept-Encoding: gzip%1$s \\ | ||
| --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\ | ||
| --data %1$sfoo=fooval%1$s --data %1$sbar=barval%1$s --data %1$sbaz=bazval%1$s', | ||
| ]; | ||
|
|
||
| // escapeshellarg on Windows replaces double quotes with spaces | ||
| if ('\\' !== \DIRECTORY_SEPARATOR) { | ||
| yield 'POST with json' => [ | ||
| [ | ||
| 'method' => 'POST', | ||
| 'url' => 'http://localhost:8057/json', | ||
| 'options' => [ | ||
| 'json' => [ | ||
| 'foo' => [ | ||
| 'bar' => 'baz', | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| 'curl \\ | ||
| --compressed \\ | ||
| --request POST \\ | ||
| --url %1$shttp://localhost:8057/json%1$s \\ | ||
| --header %1$sContent-Type: application/json%1$s \\ | ||
| --header %1$sAccept: */*%1$s \\ | ||
| --header %1$sContent-Length: 21%1$s \\ | ||
| --header %1$sAccept-Encoding: gzip%1$s \\ | ||
| --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\ | ||
| --data %1$s{ | ||
| "foo": { | ||
| "bar": "baz" | ||
| } | ||
| }%1$s', | ||
| ]; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -199,20 +298,24 @@ public function testItDoesNotFollowRedirectionsWhenGeneratingCurlCommands() | |
| { | ||
| $sut = new HttpClientDataCollector(); | ||
| $sut->registerClient('http_client', $this->httpClientThatHasTracedRequests([ | ||
|
There was a problem hiding this comment. This case don't need to be updated. There was a problem hiding this comment. @GromNaN I changed it because the test was making a request to symfony.com, so I though it'd be better if it didn't rely on a 3rd party service. I can revert it if you want. There was a problem hiding this comment. Just for the records, this test's purpose was to check that the redirections are not followed (in this case http → https), so the returned cURL command corresponds exactly to the request. There was a problem hiding this comment. @Deuchnord Tnx for the info, I totally missed that. I've updated the test to go to a url that redirects. |
||
| [ | ||
| 'method' => 'GET', | ||
| 'url' => 'http://localhost:8057/301', | ||
| 'options' => [ | ||
| 'auth_basic' => 'foo:bar', | ||
| ], | ||
| ], | ||
| ])); | ||
| $sut->collect(new Request(), new Response()); | ||
| $collectedData = $sut->getClients(); | ||
| self::assertCount(1, $collectedData['http_client']['traces']); | ||
| $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand']; | ||
| self::assertEquals(sprintf('curl \\ | ||
| --compressed \\ | ||
| --request GET \\ | ||
| --url %1$shttp://localhost:8057/301%1$s \\ | ||
| --header %1$sAccept: */*%1$s \\ | ||
| --header %1$sAuthorization: Basic Zm9vOmJhcg==%1$s \\ | ||
| --header %1$sAccept-Encoding: gzip%1$s \\ | ||
| --header %1$sUser-Agent: Symfony HttpClient/Native%1$s', '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand | ||
| ); | ||
|
|
@@ -225,14 +328,14 @@ public function testItDoesNotGeneratesCurlCommandsForUnsupportedBodyType() | |
| { | ||
| $sut = new HttpClientDataCollector(); | ||
| $sut->registerClient('http_client', $this->httpClientThatHasTracedRequests([ | ||
| [ | ||
| 'method' => 'GET', | ||
| 'url' => 'http://localhost:8057/json', | ||
| 'options' => [ | ||
| 'body' => static fn (int $size): string => '', | ||
| ], | ||
| ], | ||
| ])); | ||
| $sut->collect(new Request(), new Response()); | ||
| $collectedData = $sut->getClients(); | ||
| self::assertCount(1, $collectedData['http_client']['traces']); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You didn't keep a case using the default port.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GromNaN Not sure what to do about this one, I could revert to symfony.com, but as mentioned, I was hoping to avoid making requests to 3rd party services.