Mise à jour des librairies vendor
This commit is contained in:
@@ -16,7 +16,11 @@
|
||||
*/
|
||||
namespace Google\Auth\HttpHandler;
|
||||
|
||||
use Exception;
|
||||
use GuzzleHttp\ClientInterface;
|
||||
use GuzzleHttp\Message\ResponseInterface as Guzzle5ResponseInterface;
|
||||
use GuzzleHttp\Promise\Promise;
|
||||
use GuzzleHttp\Promise\RejectedPromise;
|
||||
use GuzzleHttp\Psr7\Response;
|
||||
use Psr\Http\Message\RequestInterface;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
@@ -46,17 +50,73 @@ class Guzzle5HttpHandler
|
||||
*/
|
||||
public function __invoke(RequestInterface $request, array $options = [])
|
||||
{
|
||||
$request = $this->client->createRequest(
|
||||
$response = $this->client->send(
|
||||
$this->createGuzzle5Request($request, $options)
|
||||
);
|
||||
|
||||
return $this->createPsr7Response($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts a PSR-7 request and an array of options and returns a PromiseInterface
|
||||
*
|
||||
* @param RequestInterface $request
|
||||
* @param array $options
|
||||
*
|
||||
* @return Promise
|
||||
*/
|
||||
public function async(RequestInterface $request, array $options = [])
|
||||
{
|
||||
if (!class_exists('GuzzleHttp\Promise\Promise')) {
|
||||
throw new Exception('Install guzzlehttp/promises to use async with Guzzle 5');
|
||||
}
|
||||
|
||||
$futureResponse = $this->client->send(
|
||||
$this->createGuzzle5Request(
|
||||
$request,
|
||||
['future' => true] + $options
|
||||
)
|
||||
);
|
||||
|
||||
$promise = new Promise(
|
||||
function () use ($futureResponse) {
|
||||
try {
|
||||
$futureResponse->wait();
|
||||
} catch (Exception $e) {
|
||||
// The promise is already delivered when the exception is
|
||||
// thrown, so don't rethrow it.
|
||||
}
|
||||
},
|
||||
[$futureResponse, 'cancel']
|
||||
);
|
||||
|
||||
$futureResponse->then([$promise, 'resolve'], [$promise, 'reject']);
|
||||
|
||||
return $promise->then(
|
||||
function (Guzzle5ResponseInterface $response) {
|
||||
// Adapt the Guzzle 5 Response to a PSR-7 Response.
|
||||
return $this->createPsr7Response($response);
|
||||
},
|
||||
function (Exception $e) {
|
||||
return new RejectedPromise($e);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private function createGuzzle5Request(RequestInterface $request, array $options)
|
||||
{
|
||||
return $this->client->createRequest(
|
||||
$request->getMethod(),
|
||||
$request->getUri(),
|
||||
array_merge([
|
||||
array_merge_recursive([
|
||||
'headers' => $request->getHeaders(),
|
||||
'body' => $request->getBody(),
|
||||
], $options)
|
||||
);
|
||||
}
|
||||
|
||||
$response = $this->client->send($request);
|
||||
|
||||
private function createPsr7Response(Guzzle5ResponseInterface $response)
|
||||
{
|
||||
return new Response(
|
||||
$response->getStatusCode(),
|
||||
$response->getHeaders() ?: [],
|
||||
|
||||
@@ -33,4 +33,17 @@ class Guzzle6HttpHandler
|
||||
{
|
||||
return $this->client->send($request, $options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts a PSR-7 request and an array of options and returns a PromiseInterface
|
||||
*
|
||||
* @param RequestInterface $request
|
||||
* @param array $options
|
||||
*
|
||||
* @return \GuzzleHttp\Promise\Promise
|
||||
*/
|
||||
public function async(RequestInterface $request, array $options = [])
|
||||
{
|
||||
return $this->client->sendAsync($request, $options);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user