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

Updates to the php-http library

Browse Source
This commit is contained in:
Tobias Nyholm 2015-10-30 14:36:08 +01:00
parent 78f252761e
commit a0edd0eb30
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
composer.json
View File

@ -2,15 +2,16 @@
"name": "mailgun/mailgun-php", "name": "mailgun/mailgun-php",
"description": "The Mailgun SDK provides methods for all API functions.", "description": "The Mailgun SDK provides methods for all API functions.",
"require": { "require": {
"php": ">=5.4.0",
"guzzlehttp/psr7": "~1.2", "guzzlehttp/psr7": "~1.2",
"php-http/httplug": "@dev",
"php-http/client-implementation": "@dev", "php-http/client-implementation": "@dev",
"php-http/discovery": "@dev" "php-http/discovery": "dev-master"
}, },
"require-dev": { "require-dev": {
"php": ">=5.4.0",
"phpunit/phpunit": "~4.6", "phpunit/phpunit": "~4.6",
"php-http/guzzle6-adapter": "@dev" "php-http/guzzle6-adapter": "dev-master",
"php-http/httplug": "dev-master",
"php-http/message-factory": "dev-master"
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {

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

@ -5,7 +5,7 @@ namespace Mailgun\Connection;
use GuzzleHttp\Psr7\MultipartStream; use GuzzleHttp\Psr7\MultipartStream;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Http\Client\HttpClient; use Http\Client\HttpClient;
use Http\Discovery\HttpAdapterDiscovery; use Http\Discovery\HttpClientDiscovery;
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;
@ -64,9 +64,7 @@ class RestClient
*/ */
protected function send($method, $uri, $body = null, $files = [], array $headers = []) protected function send($method, $uri, $body = null, $files = [], array $headers = [])
{ {
if ($this->httpClient === null) { $client = $this->getHttpClient();
$this->httpClient = HttpAdapterDiscovery::find();
}
$headers['User-Agent'] = Api::SDK_USER_AGENT.'/'.Api::SDK_VERSION; $headers['User-Agent'] = Api::SDK_USER_AGENT.'/'.Api::SDK_VERSION;
$headers['Authorization'] = 'Basic '.base64_encode(sprintf('%s:%s', Api::API_USER, $this->apiKey)); $headers['Authorization'] = 'Basic '.base64_encode(sprintf('%s:%s', Api::API_USER, $this->apiKey));
@ -77,7 +75,7 @@ class RestClient
} }
$request = new Request($method, $this->apiEndpoint.$uri, $headers, $body); $request = new Request($method, $this->apiEndpoint.$uri, $headers, $body);
$response = $this->httpClient->sendRequest($request); $response = $client->sendRequest($request);
return $this->responseHandler($response); return $this->responseHandler($response);
} }
@ -267,4 +265,18 @@ class RestClient
'filename' => $filename, 'filename' => $filename,
]; ];
} }
/**
*
* @return HttpClient
*/
protected function getHttpClient()
{
if ($this->httpClient === null) {
$this->httpClient = HttpClientDiscovery::find();
}
return $this->httpClient;
}
} }