Skip to content

replace GuzzleHttp\Psr7\build_query by GuzzleHttp\Psr7\Query:build #165

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

Merged
merged 3 commits into from
Aug 25, 2021
Merged

replace GuzzleHttp\Psr7\build_query by GuzzleHttp\Psr7\Query:build #165

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57c0570
replace GuzzleHttp\Psr7\build_query by GuzzleHttp\Psr7\Query:build
bastiendonjon Aug 13, 2021
0b9defc
fix compsoer alias
bastiendonjon Aug 13, 2021
f69e0b2
rollback extra object
bastiendonjon Aug 25, 2021
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
7 changes: 1 addition & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"guzzlehttp/guzzle": "<=7.0.0"
"guzzlehttp/guzzle": "<=7.3.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
Expand All @@ -34,10 +34,5 @@
},
"autoload-dev": {
"psr-4": { "SendinBlue\\Client\\" : "test/" }
},
Copy link
Contributor

@rajatsib rajatsib Aug 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @bastiendonjon

Can you please retain this part (extra object)?
It is needed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

"extra": {
"branch-alias": {
"dev-master": "7.x.x-dev"
}
}
}
4 changes: 2 additions & 2 deletions lib/Api/AccountApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ protected function getAccountRequest()

} else {
// for HTTP post (form)
$httpBody = \GuzzleHttp\Psr7\build_query($formParams);
$httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
}
}

Expand All @@ -338,7 +338,7 @@ protected function getAccountRequest()
$headers
);

$query = \GuzzleHttp\Psr7\build_query($queryParams);
$query = \GuzzleHttp\Psr7\Query::build($queryParams);
return new Request(
'GET',
$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
Expand Down
16 changes: 8 additions & 8 deletions lib/Api/AttributesApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ protected function createAttributeRequest($attributeCategory, $attributeName, $c

} else {
// for HTTP post (form)
$httpBody = \GuzzleHttp\Psr7\build_query($formParams);
$httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
}
}

Expand All @@ -361,7 +361,7 @@ protected function createAttributeRequest($attributeCategory, $attributeName, $c
$headers
);

$query = \GuzzleHttp\Psr7\build_query($queryParams);
$query = \GuzzleHttp\Psr7\Query::build($queryParams);
return new Request(
'POST',
$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
Expand Down Expand Up @@ -612,7 +612,7 @@ protected function deleteAttributeRequest($attributeCategory, $attributeName)

} else {
// for HTTP post (form)
$httpBody = \GuzzleHttp\Psr7\build_query($formParams);
$httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
}
}

Expand All @@ -638,7 +638,7 @@ protected function deleteAttributeRequest($attributeCategory, $attributeName)
$headers
);

$query = \GuzzleHttp\Psr7\build_query($queryParams);
$query = \GuzzleHttp\Psr7\Query::build($queryParams);
return new Request(
'DELETE',
$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
Expand Down Expand Up @@ -872,7 +872,7 @@ protected function getAttributesRequest()

} else {
// for HTTP post (form)
$httpBody = \GuzzleHttp\Psr7\build_query($formParams);
$httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
}
}

Expand All @@ -898,7 +898,7 @@ protected function getAttributesRequest()
$headers
);

$query = \GuzzleHttp\Psr7\build_query($queryParams);
$query = \GuzzleHttp\Psr7\Query::build($queryParams);
return new Request(
'GET',
$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
Expand Down Expand Up @@ -1163,7 +1163,7 @@ protected function updateAttributeRequest($attributeCategory, $attributeName, $u

} else {
// for HTTP post (form)
$httpBody = \GuzzleHttp\Psr7\build_query($formParams);
$httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
}
}

Expand All @@ -1189,7 +1189,7 @@ protected function updateAttributeRequest($attributeCategory, $attributeName, $u
$headers
);

$query = \GuzzleHttp\Psr7\build_query($queryParams);
$query = \GuzzleHttp\Psr7\Query::build($queryParams);
return new Request(
'PUT',
$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
Expand Down
Loading