summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Goldman <avrahamymgoldman@gmail.com>2017-01-04 12:21:41 -0500
committerAvi Goldman <avrahamymgoldman@gmail.com>2017-01-04 12:21:41 -0500
commitc5b9494cedd45f1013da083b0c072b8d242d22dc (patch)
tree974780dbd84c1e4f770bc27d58910aba305d6e51
parentde9677df5a119469a7ce4b01d85ec78d37081146 (diff)
downloadphp-sparkpost-c5b9494cedd45f1013da083b0c072b8d242d22dc.zip
php-sparkpost-c5b9494cedd45f1013da083b0c072b8d242d22dc.tar.gz
php-sparkpost-c5b9494cedd45f1013da083b0c072b8d242d22dc.tar.bz2
added back in buildRequest as a single function
-rw-r--r--lib/SparkPost/SparkPost.php19
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/SparkPost/SparkPost.php b/lib/SparkPost/SparkPost.php
index 24b71bf..601d063 100644
--- a/lib/SparkPost/SparkPost.php
+++ b/lib/SparkPost/SparkPost.php
@@ -95,7 +95,7 @@ class SparkPost
public function syncRequest($method = 'GET', $uri = '', $payload = [], $headers = [])
{
$requestValues = $this->buildRequestValues($method, $uri, $payload, $headers);
- $request = $this->buildRequest($requestValues);
+ $request = call_user_func_array(array($this, 'buildRequestInstance'), $requestValues);
try {
return new SparkPostResponse($this->httpClient->sendRequest($request), $this->ifDebug($requestValues));
@@ -118,7 +118,7 @@ class SparkPost
{
if ($this->httpClient instanceof HttpAsyncClient) {
$requestValues = $this->buildRequestValues($method, $uri, $payload, $headers);
- $request = call_user_func_array(array($this, 'buildRequest'), $requestValues);
+ $request = call_user_func_array(array($this, 'buildRequestInstance'), $requestValues);
return new SparkPostPromise($this->httpClient->sendAsyncRequest($request), $this->ifDebug($requestValues));
} else {
@@ -172,12 +172,25 @@ class SparkPost
*
* @return RequestInterface
*/
- public function buildRequest($method, $uri, $headers, $body)
+ public function buildRequestInstance($method, $uri, $headers, $body)
{
return $this->getMessageFactory()->createRequest($method, $uri, $headers, $body);
}
/**
+ * Build RequestInterface from given params.
+ *
+ * @param array $requestValues
+ *
+ * @return RequestInterface
+ */
+ public function buildRequest($method, $uri, $payload, $headers)
+ {
+ $requestValues = $this->buildRequestValues($method, $uri, $payload, $headers);
+ return call_user_func_array(array($this, 'buildRequestInstance'), $requestValues);
+ }
+
+ /**
* Returns an array for the request headers.
*
* @param array $headers - any custom headers for the request