RetailCRM-Mirror/mailgun-php
1
0
Fork 0
mirror of https://github.com/retailcrm/mailgun-php.git synced 2025-02-06 08:19:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #138 from Nyholm/issue-122

Browse Source 
Build a string query form array
This commit is contained in:
Sergey Obukhov 2016-07-20 14:56:59 -07:00 committed by GitHub
commit b8a0abc075
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mailgun/Connection/RestClient.php
View File

@ -62,7 +62,7 @@ class RestClient
/** /**
* @param string $method * @param string $method
* @param string $uri * @param string $uri
* @param array $body * @param mixed $body
* @param array $files * @param array $files
* @param array $headers * @param array $headers
* *
@ -81,6 +81,9 @@ class RestClient
if (!empty($files)) { if (!empty($files)) {
$body = new MultipartStream($files); $body = new MultipartStream($files);
$headers['Content-Type'] = 'multipart/form-data; boundary='.$body->getBoundary(); $headers['Content-Type'] = 'multipart/form-data; boundary='.$body->getBoundary();
} elseif (is_array($body)) {
$body = http_build_query($body);
$headers['Content-Type'] = 'application/x-www-form-urlencoded';
} }
$request = new Request($method, $this->getApiUrl($uri), $headers, $body); $request = new Request($method, $this->getApiUrl($uri), $headers, $body);
@ -101,7 +104,7 @@ class RestClient
* @throws MissingEndpoint * @throws MissingEndpoint
* @throws MissingRequiredParameters * @throws MissingRequiredParameters
*/ */
public function post($endpointUrl, $postData = array(), $files = array()) public function post($endpointUrl, array $postData = array(), $files = array())
{ {
$postFiles = []; $postFiles = [];
@ -171,7 +174,7 @@ class RestClient
/** /**
* @param string $endpointUrl * @param string $endpointUrl
* @param array $putData * @param mixed $putData
* *
* @return \stdClass * @return \stdClass
* *

2
tests/Mailgun/Tests/Mock/Connection/TestBroker.php
View File

@ -19,7 +19,7 @@ class TestBroker extends RestClient
$this->apiEndpoint = $apiHost; $this->apiEndpoint = $apiHost;
} }
public function post($endpointUrl, $postData = array(), $files = array()) public function post($endpointUrl, array $postData = array(), $files = array())
{ {
return $this->testResponseHandler($endpointUrl, $httpResponseCode = 200); return $this->testResponseHandler($endpointUrl, $httpResponseCode = 200);
} }