Skip to content

Commit c5b9494

Browse files
committed
added back in buildRequest as a single function
1 parent de9677d commit c5b9494

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

lib/SparkPost/SparkPost.php

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function request($method = 'GET', $uri = '', $payload = [], $headers = []
9595
public function syncRequest($method = 'GET', $uri = '', $payload = [], $headers = [])
9696
{
9797
$requestValues = $this->buildRequestValues($method, $uri, $payload, $headers);
98-
$request = $this->buildRequest($requestValues);
98+
$request = call_user_func_array(array($this, 'buildRequestInstance'), $requestValues);
9999

100100
try {
101101
return new SparkPostResponse($this->httpClient->sendRequest($request), $this->ifDebug($requestValues));
@@ -118,7 +118,7 @@ public function asyncRequest($method = 'GET', $uri = '', $payload = [], $headers
118118
{
119119
if ($this->httpClient instanceof HttpAsyncClient) {
120120
$requestValues = $this->buildRequestValues($method, $uri, $payload, $headers);
121-
$request = call_user_func_array(array($this, 'buildRequest'), $requestValues);
121+
$request = call_user_func_array(array($this, 'buildRequestInstance'), $requestValues);
122122

123123
return new SparkPostPromise($this->httpClient->sendAsyncRequest($request), $this->ifDebug($requestValues));
124124
} else {
@@ -172,11 +172,24 @@ public function buildRequestValues($method, $uri, $payload, $headers)
172172
*
173173
* @return RequestInterface
174174
*/
175-
public function buildRequest($method, $uri, $headers, $body)
175+
public function buildRequestInstance($method, $uri, $headers, $body)
176176
{
177177
return $this->getMessageFactory()->createRequest($method, $uri, $headers, $body);
178178
}
179179

180+
/**
181+
* Build RequestInterface from given params.
182+
*
183+
* @param array $requestValues
184+
*
185+
* @return RequestInterface
186+
*/
187+
public function buildRequest($method, $uri, $payload, $headers)
188+
{
189+
$requestValues = $this->buildRequestValues($method, $uri, $payload, $headers);
190+
return call_user_func_array(array($this, 'buildRequestInstance'), $requestValues);
191+
}
192+
180193
/**
181194
* Returns an array for the request headers.
182195
*

0 commit comments

Comments
 (0)