[FrameworkBundle] Add integration of http-client component #30419
Prev
Previous commit
work with attributes for xml config
- Loading branch information
commit f2d2cf3021f9a86b8603d3c6696fd428feea606f
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |
| use Symfony\Component\Config\Definition\ConfigurationInterface; | ||
| use Symfony\Component\DependencyInjection\Exception\LogicException; | ||
| use Symfony\Component\Form\Form; | ||
| use Symfony\Component\HttpClient\HttpClient; | ||
| use Symfony\Component\HttpFoundation\Cookie; | ||
| use Symfony\Component\Lock\Lock; | ||
| use Symfony\Component\Lock\Store\SemaphoreStore; | ||
|
|
@@ -1179,7 +1180,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode) | |
| ->children() | ||
| ->arrayNode('http_client') | ||
| ->info('HTTP Client configuration') | ||
| ->{!class_exists(FullStack::class) && class_exists(HttpClient::class) ? 'canBeDisabled' : 'canBeEnabled'}() | ||
| ->fixXmlConfig('client') | ||
| ->children(); | ||
|
|
||
|
|
@@ -1213,12 +1214,27 @@ private function addHttpClientOptionsSection(NodeBuilder $rootNode) | |
| ->arrayNode('default_options') | ||
| ->fixXmlConfig('header') | ||
| ->children() | ||
| ->scalarNode('auth_basic') | ||
| ->info('An HTTP Basic authentication "username:password".') | ||
| ->end() | ||
| ->scalarNode('auth_bearer') | ||
| ->info('A token enabling HTTP Bearer authorization.') | ||
| ->end() | ||
| ->arrayNode('query') | ||
| ->info('Associative array of query string values merged with URL parameters.') | ||
| ->useAttributeAsKey('key') | ||
| ->beforeNormalization() | ||
| ->always(function ($config) { | ||
| if (!\is_array($config)) { | ||
| return []; | ||
| } | ||
| if (!isset($config['key'])) { | ||
| return $config; | ||
| } | ||
|
|
||
| return [$config['key'] => $config['value']]; | ||
| }) | ||
| ->end() | ||
| ->normalizeKeys(false) | ||
| ->scalarPrototype()->end() | ||
| ->end() | ||
|
|
@@ -1237,12 +1253,21 @@ private function addHttpClientOptionsSection(NodeBuilder $rootNode) | |
| ->scalarNode('base_uri') | ||
| ->info('The URI to resolve relative URLs, following rules in RFC 3986, section 2.') | ||
| ->end() | ||
| ->arrayNode('resolve') | ||
| ->info('Associative array: domain => IP.') | ||
| ->useAttributeAsKey('host') | ||
| ->beforeNormalization() | ||
| ->always(function ($config) { | ||
| if (!\is_array($config)) { | ||
| return []; | ||
| } | ||
| if (!isset($config['host'])) { | ||
| return $config; | ||
| } | ||
|
|
||
| return [$config['host'] => $config['value']]; | ||
| }) | ||
| ->end() | ||
| ->normalizeKeys(false) | ||
| ->scalarPrototype()->end() | ||
| ->end() | ||
|
|
@@ -1284,9 +1309,12 @@ private function addHttpClientOptionsSection(NodeBuilder $rootNode) | |
| ->end() | ||
| ->arrayNode('peer_fingerprint') | ||
| ->info('Associative array: hashing algorithm => hash(es).') | ||
| ->normalizeKeys(false) | ||
| ->children() | ||
| ->variableNode('sha1')->end() | ||
| ->variableNode('pin-sha256')->end() | ||
| ->variableNode('md5')->end() | ||
| ->end() | ||
| ->end() | ||
| ->end() | ||
| ->end() | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
These are the default options for each request that's made. What about
default_request_options(it's even documented asDefault requests' optionsinHttpClientphpdoc). And also, should we make these options not automatically be used as the "default options" for all the other HTTP clients?The problem is that there are 2 concepts conflicting right now. Does "default" mean:
A) default options for the request that can be overridden on each request
OR
B) default options that will be applied to all other HTTP clients
Right now, it's both - that confused me. It's really (A), so maybe we should make it only (A) and clarify the name.
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.
right now, it is default options applied to all other HTTP clients for their default request options...
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.
exactly - the "default" means to things - it's (A) and (B).
Uh oh!
There was an error while loading. Please reload this page.
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.
Correct, it's A and B. If one wants to configure the default request options for the default client only, one should set them under
framework.http_client.clients.http_client.default_options(sincehttp_clientis the name of the service that is aliased forHttpClientInterface).I'm not sure I understand how your suggestion would apply. To me, all is fine :)
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.
I was suggesting that we remove (B), but it's subjective. The question is: is it valuable for these options to cascade onto other clients? Or is it annoying/surprising, and then I am unsetting options on my individual clients, because I don't want them to cascade from my default client?
I'm not convinced that re-using options across clients will be all that common - things like auth, base_uri, headers all seem very client-specific. I could argue that it might be surprising if my auth on my default client starts getting sent to another server via another client (because I didn't realize the options would cascade down to my client).
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.
e.g. cabundle/capath: you want to configure them once for all
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.
Hmm, ok, really fine by me then.