RetailCRM-Mirror/mailgun-php
1
0
Fork 0
mirror of https://github.com/retailcrm/mailgun-php.git synced 2024-11-22 20:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Updated rest client to use PSR7. No phpunit tests yet; will come soon. Manual sending message to mailgun API works.

Browse Source
This commit is contained in:
Anders Munk 2015-07-23 14:25:28 +02:00
parent ffab6c9e39
commit 04f1baa2fd
1 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,16 +3,15 @@
namespace Mailgun\Connection; namespace Mailgun\Connection;
use GuzzleHttp\Client as Guzzle; use GuzzleHttp\Client as Guzzle;
use GuzzleHttp\Message\ResponseInterface; use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Post\PostBodyInterface; use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Post\PostFile;
use GuzzleHttp\Query;
use Mailgun\Connection\Exceptions\GenericHTTPError; use Mailgun\Connection\Exceptions\GenericHTTPError;
use Mailgun\Connection\Exceptions\InvalidCredentials; use Mailgun\Connection\Exceptions\InvalidCredentials;
use Mailgun\Connection\Exceptions\MissingRequiredParameters; use Mailgun\Connection\Exceptions\MissingRequiredParameters;
use Mailgun\Connection\Exceptions\MissingEndpoint; use Mailgun\Connection\Exceptions\MissingEndpoint;
use Mailgun\Constants\Api; use Mailgun\Constants\Api;
use Mailgun\Constants\ExceptionMessages; use Mailgun\Constants\ExceptionMessages;
use Psr\Http\Message\ResponseInterface;
/** /**
* This class is a wrapper for the Guzzle (HTTP Client Library). * This class is a wrapper for the Guzzle (HTTP Client Library).
@ -39,14 +38,12 @@ class RestClient
{ {
$this->apiKey = $apiKey; $this->apiKey = $apiKey;
$this->mgClient = new Guzzle([ $this->mgClient = new Guzzle([
'base_url'=>$this->generateEndpoint($apiEndpoint, $apiVersion, $ssl), 'base_uri'=>$this->generateEndpoint($apiEndpoint, $apiVersion, $ssl),
'defaults'=>[ 'auth' => array(Api::API_USER, $this->apiKey),
'auth' => array(Api::API_USER, $this->apiKey), 'exceptions' => false,
'exceptions' => false, 'config' => ['curl' => [ CURLOPT_FORBID_REUSE => true ]],
'config' => ['curl' => [ CURLOPT_FORBID_REUSE => true ]], 'headers' => [
'headers' => [ 'User-Agent' => Api::SDK_USER_AGENT.'/'.Api::SDK_VERSION,
'User-Agent' => Api::SDK_USER_AGENT.'/'.Api::SDK_VERSION,
],
], ],
]); ]);
} }
@ -65,26 +62,47 @@ class RestClient
*/ */
public function post($endpointUrl, $postData = array(), $files = array()) public function post($endpointUrl, $postData = array(), $files = array())
{ {
$request = $this->mgClient->createRequest('POST', $endpointUrl, ['body' => $postData]); $request = new Request('post', $endpointUrl);
/** @var \GuzzleHttp\Post\PostBodyInterface $postBody */ $postFiles = [];
$postBody = $request->getBody();
$postBody->setAggregator(Query::duplicateAggregator());
$fields = ['message', 'attachment', 'inline']; $fields = ['message', 'attachment', 'inline'];
foreach ($fields as $fieldName) { foreach ($fields as $fieldName) {
if (isset($files[$fieldName])) { if (isset($files[$fieldName])) {
if (is_array($files[$fieldName])) { if (is_array($files[$fieldName])) {
foreach ($files[$fieldName] as $file) { foreach ($files[$fieldName] as $file) {
$this->addFile($postBody, $fieldName, $file); $postFiles[] = $this->addFile($fieldName, $file);
} }
} else { } else {
$this->addFile($postBody, $fieldName, $files[$fieldName]); $postFiles[] = $this->addFile($fieldName, $files[$fieldName]);
} }
} }
} }
$response = $this->mgClient->send($request); $postDataMultipart = [];
foreach($postData AS $key => $value)
{
if (is_array($value))
{
foreach($value AS $subValue)
{
$postDataMultipart[] = [
'name' => $key,
'contents' => $subValue
];
}
}
else
{
$postDataMultipart[] = [
'name' => $key,
'contents' => $value
];
}
}
$response = $this->mgClient->send($request, [
'multipart' => array_merge($postDataMultipart, $postFiles)
]);
return $this->responseHandler($response); return $this->responseHandler($response);
} }
@ -102,7 +120,6 @@ class RestClient
public function get($endpointUrl, $queryString = array()) public function get($endpointUrl, $queryString = array())
{ {
$response = $this->mgClient->get($endpointUrl, ['query' => $queryString]); $response = $this->mgClient->get($endpointUrl, ['query' => $queryString]);
return $this->responseHandler($response); return $this->responseHandler($response);
} }
@ -119,7 +136,6 @@ class RestClient
public function delete($endpointUrl) public function delete($endpointUrl)
{ {
$response = $this->mgClient->delete($endpointUrl); $response = $this->mgClient->delete($endpointUrl);
return $this->responseHandler($response); return $this->responseHandler($response);
} }
@ -136,18 +152,12 @@ class RestClient
*/ */
public function put($endpointUrl, $putData) public function put($endpointUrl, $putData)
{ {
$request = $this->mgClient->createRequest('PUT', $endpointUrl, ['body' => $putData]); $response = $this->mgClient->request('PUT', $endpointUrl, ['body' => $putData]);
/** @var \GuzzleHttp\Post\PostBodyInterface $postBody */
$postBody = $request->getBody();
$postBody->setAggregator(Query::duplicateAggregator());
$response = $this->mgClient->send($request);
return $this->responseHandler($response); return $this->responseHandler($response);
} }
/** /**
* @param ResponseInterface $responseObj * @param Response $responseObj
* *
* @return \stdClass * @return \stdClass
* *
@ -180,11 +190,11 @@ class RestClient
} }
/** /**
* @param \Guzzle\Http\Message\Response $responseObj * @param Response $responseObj
* *
* @return string * @return string
*/ */
protected function getResponseExceptionMessage(\GuzzleHttp\Message\Response $responseObj) protected function getResponseExceptionMessage(Response $responseObj)
{ {
$body = (string) $responseObj->getBody(); $body = (string) $responseObj->getBody();
$response = json_decode($body); $response = json_decode($body);
@ -200,7 +210,7 @@ class RestClient
* *
* @return string * @return string
*/ */
private function generateEndpoint($apiEndpoint, $apiVersion, $ssl) protected function generateEndpoint($apiEndpoint, $apiVersion, $ssl)
{ {
if (!$ssl) { if (!$ssl) {
return "http://".$apiEndpoint."/".$apiVersion."/"; return "http://".$apiEndpoint."/".$apiVersion."/";
@ -212,11 +222,11 @@ class RestClient
/** /**
* Add a file to the postBody. * Add a file to the postBody.
* *
* @param PostBodyInterface $postBody * @param \GuzzleHttp\Psr7\Stream $postBody
* @param string $fieldName * @param string $fieldName
* @param string|array $filePath * @param string|array $filePath
*/ */
private function addFile(PostBodyInterface $postBody, $fieldName, $filePath) protected function addFile($fieldName, $filePath)
{ {
$filename = null; $filename = null;
// Backward compatibility code // Backward compatibility code
@ -230,6 +240,10 @@ class RestClient
$filePath = substr($filePath, 1); $filePath = substr($filePath, 1);
} }
$postBody->addFile(new PostFile($fieldName, fopen($filePath, 'r'), $filename)); return [
'name' => $fieldName,
'contents' => fopen($filePath, 'r'),
'filename' => $filename
];
} }
} }