fix: Optimize the usage of option 'baseURI' for CURLRequest #9273
Conversation
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
samsonasik
reviewed
Nov 13, 2024
| @@ -208,10 +209,12 @@ public static function curlrequest(array $options = [], ?ResponseInterface $resp | |||
|
|
|||
| $config ??= config(App::class); | |||
| $response ??= new Response($config); | |||
| $uri = new URI($options['baseURI'] ?? ($options['base_uri'] ?? null)); | |||
There was a problem hiding this comment.
parentheses should not needed:
Suggested change
| $uri = new URI($options['baseURI'] ?? ($options['base_uri'] ?? null)); | |
| $uri = new URI($options['baseURI'] ?? $options['base_uri'] ?? null); |
samsonasik
reviewed
Nov 13, 2024
| * | ||
| * @var URI | ||
| */ | ||
| protected $baseURI; |
There was a problem hiding this comment.
Excuse me, this is my first time to submit pull request. What's meaning 'bc break'? And what should I do next?
There was a problem hiding this comment.
backward compatibility break, remove protected property is not allowed on fix pr.
There was a problem hiding this comment.
Thanks! Maybe I should submit to next version.
samsonasik
reviewed
Nov 13, 2024
| */ | ||
| protected function prepareURL(string $url): string | ||
| protected function prepareURL(string $url, URI $uri): string |
|
@warmbook The only thing that needs to be changed is one line: - $uri = new URI($options['base_uri'] ?? null);
+ $uri = new URI($options['baseURI'] ?? null);It was a bug - in this particular case, there is no need to worry about deprecating anything. Just add an entry to the changelog with a description that it has been fixed. |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#9265
Description
Use option 'baseURI' first in Config\Services->curlrequest.
Use the property 'uri' of OutgoingRequest as default baseURI instead of the property 'baseURI' of CURLRequest.
Remove the property 'baseURI' of CURLRequest.
Nolonger parse 'baseURI' in 'parseOptions' method.
If 'baseURI' exists in 'request' method's options, create a new URI instance with it. Otherwise, use the property 'uri' of OutgoingRequest.
Use the param '$uri' passed in rather than the property 'baseURI' of CURLRequest in 'prepareURL' method.
Checklist: