Skip to content

#528: Use array_merge_recursive() to combine options #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#528: Use array_merge_recursive() to combine options #527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Connector/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ public function getVersion(): string
*/
public function modifyOptions(): array
{
// Combine options set globally e.g. headers with options set by individual API calls e.g. form_params.
$options = $this->options + $this->requestOptions;
// Combine options set globally e.g. headers with options set by individual API calls e.g. form_params,
// using array_merge_recursive to ensure nested arrays like headers are merged rather than overwritten.
$options = array_merge_recursive($this->requestOptions, $this->options);

// This library can be standalone or as a dependency. Dependent libraries may also set their own user agent
// which will make $options['headers']['User-Agent'] an array.
Expand Down
Loading