$httpOptions for \GuzzleHttp\Client

Author: actionm

README.md

@@ -223,7 +223,7 @@ $gql = $builder->getQuery();
 # Constructing The Client
 
 A Client object can easily be instantiated by providing the GraphQL endpoint
-URL. The Client constructor also receives an optional "authorizationHeaders"
+URL. The Client constructor also receives an optional "httpOptions"
 array, which can be used to add authorization headers to all requests being sent
 to the GraphQL server.
 
@@ -232,7 +232,9 @@ Example:
 ```
 $client = new Client(
     'http://api.graphql.com',
-    ['Authorization' => 'Basic xyz']
+    [ 
+        'headers' => ['Authorization' => 'Basic xyz']
+    ]
 );
 ```
 

src/Client.php

@@ -20,25 +20,25 @@ class Client
     protected $endpointUrl;
 
     /**
-     * @var array
+     * @var \GuzzleHttp\Client
      */
-    protected $authorizationHeaders;
+    protected $httpClient;
 
     /**
-     * @var \GuzzleHttp\Client
+     * @var array
      */
-    protected $httpClient;
+    protected $httpOptions;
 
     /**
      * Client constructor.
      *
      * @param string $endpointUrl
-     * @param array  $authorizationHeaders
+     * @param array $httpOptions
      */
-    public function __construct(string $endpointUrl, array $authorizationHeaders = [])
+    public function __construct(string $endpointUrl, array $httpOptions = [])
     {
         $this->endpointUrl          = $endpointUrl;
-        $this->authorizationHeaders = $authorizationHeaders;
+        $this->httpOptions          = $httpOptions;
         $this->httpClient           = new \GuzzleHttp\Client();
     }
 
@@ -73,10 +73,9 @@ public function runQuery($query, bool $resultsAsArray = false, array $variables
      */
     public function runRawQuery(string $queryString, $resultsAsArray = false, array $variables = []): ?Results
     {
-        // Set request headers for authorization and content type
-        if (!empty($this->authorizationHeaders)) {
-            $options['headers'] = $this->authorizationHeaders;
-        }
+        // Set request options for \GuzzleHttp\Client
+        $options = (!empty($this->httpOptions)) ? $this->httpOptions : [];
+
         $options['headers']['Content-Type'] = 'application/json';
 
         // Convert empty variables array to empty json object

tests/ClientTest.php

@@ -7,6 +7,7 @@
 use GraphQL\QueryBuilder\QueryBuilder;
 use GraphQL\RawObject;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
@@ -62,7 +63,7 @@ public function testConstructClient()
         $client = new MockClient('', $handler);
         $client->runRawQuery('query_string');
 
-        $client = new MockClient('', $handler, ['Authorization' => 'Basic xyz']);
+        $client = new MockClient('', $handler, [ 'headers' => [ 'Authorization' => 'Basic xyz'] ]);
         $client->runRawQuery('query_string');
 
         $client = new MockClient('', $handler);
@@ -232,4 +233,16 @@ public function testInternalServerErrorResponse()
         $this->expectException(ServerException::class);
         $this->client->runRawQuery('');
     }
+
+    /**
+     * @covers \GraphQL\Client::runRawQuery
+     */
+    public function testConnectTimeoutResponse()
+    {
+        $this->mockHandler->append(new ConnectException('Time Out', new Request('post', '')));
+
+        $this->expectException(ConnectException::class);
+        $this->client->runRawQuery('');
+    }
+
 }

tests/MockClient.php

@@ -16,11 +16,11 @@ class MockClient extends Client
      *
      * @param string $endpointUrl
      * @param object $handler
-     * @param array  $authorizationHeaders
+     * @param array $httpOptions
      */
-    public function __construct(string $endpointUrl, $handler, array $authorizationHeaders = [])
+    public function __construct(string $endpointUrl, $handler, array $httpOptions = [])
     {
-        parent::__construct($endpointUrl, $authorizationHeaders);
+        parent::__construct($endpointUrl, $httpOptions);
         $this->httpClient = new \GuzzleHttp\Client(['handler' => $handler]);
     }
 }