Allow overriding of client configuration on custom GuzzleClient. (#40)

Author: LKaemmerling

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## master
+* Bugfix: Fix wrong Guzzle Client Type on Server, Volume and FloatingIp Model.
+* Feature: Allow overriding of Guzzle Client configuration on `LKDev\HetznerCloud\Clients\GuzzleClient`
+
 ## 2.0.1 (29.01.2020)
 * Bugfix: Floating IP description which can be null [#36](https://github.com/LKDevelopment/hetzner-cloud-php-sdk/pull/36)
 

src/APIException.php

@@ -2,8 +2,6 @@
 
 namespace LKDev\HetznerCloud;
 
-use GuzzleHttp\Psr7\Response;
-
 class APIException extends \Exception
 {
     /**

src/Clients/GuzzleClient.php

@@ -9,16 +9,18 @@ class GuzzleClient extends Client
 {
     /**
      * @param HetznerAPIClient $client
+     * @param array $additionalGuzzleConfig
      */
-    public function __construct(HetznerAPIClient $client)
+    public function __construct(HetznerAPIClient $client, $additionalGuzzleConfig = [])
     {
-        parent::__construct([
+        $guzzleConfig = array_merge([
             'base_uri' => $client->getBaseUrl(),
             'headers' => [
                 'Authorization' => 'Bearer '.$client->getApiToken(),
                 'Content-Type' => 'application/json',
                 'User-Agent' => ((strlen($client->getUserAgent()) > 0) ? $client->getUserAgent().' ' : '').'hcloud-php/'.HetznerAPIClient::VERSION,
             ],
-        ]);
+        ], $additionalGuzzleConfig);
+        parent::__construct($guzzleConfig);
     }
 }

src/Models/FloatingIps/FloatingIp.php

@@ -256,7 +256,7 @@ public function changeReverseDNS(string $ip, string $dnsPtr): APIResponse
 
     /**
      * @param  $input
-     * @return \LKDev\HetznerCloud\Models\FloatingIps\FloatingIp|static
+     * @return \LKDev\HetznerCloud\Models\FloatingIps\FloatingIp|static|null
      */
     public static function parse($input): self
     {

src/Models/Model.php

@@ -3,19 +3,18 @@
 namespace LKDev\HetznerCloud\Models;
 
 use GuzzleHttp\Client;
-use LKDev\HetznerCloud\Clients\GuzzleClient;
 use LKDev\HetznerCloud\HetznerAPIClient;
 
 abstract class Model
 {
     /**
-     * @var \LKDev\HetznerCloud\Clients\GuzzleClient
+     * @var \GuzzleHttp\Client
      */
     protected $httpClient;
 
     /**
      * Model constructor.
-     * @param GuzzleClient $httpClient
+     * @param Client $httpClient
      */
     public function __construct(Client $httpClient = null)
     {

src/Models/Networks/Network.php

@@ -2,8 +2,8 @@
 
 namespace LKDev\HetznerCloud\Models\Networks;
 
+use GuzzleHttp\Client;
 use LKDev\HetznerCloud\APIResponse;
-use LKDev\HetznerCloud\Clients\GuzzleClient;
 use LKDev\HetznerCloud\HetznerAPIClient;
 use LKDev\HetznerCloud\Models\Actions\Action;
 use LKDev\HetznerCloud\Models\Contracts\Resource;
@@ -56,9 +56,9 @@ class Network extends Model implements Resource
     /**
      * Network constructor.
      * @param int $id
-     * @param GuzzleClient|null $httpClient
+     * @param Client|null $httpClient
      */
-    public function __construct(int $id, GuzzleClient $httpClient = null)
+    public function __construct(int $id, Client $httpClient = null)
     {
         $this->id = $id;
         parent::__construct($httpClient);

src/Models/Networks/Route.php

@@ -2,6 +2,7 @@
 
 namespace LKDev\HetznerCloud\Models\Networks;
 
+use GuzzleHttp\Client;
 use LKDev\HetznerCloud\Clients\GuzzleClient;
 use LKDev\HetznerCloud\Models\Model;
 
@@ -23,9 +24,9 @@ class Route extends Model
      * Subnet constructor.
      * @param string $destination
      * @param string $gateway
-     * @param GuzzleClient|null $client
+     * @param Client|null $client
      */
-    public function __construct(string $destination, string $gateway, GuzzleClient $client = null)
+    public function __construct(string $destination, string $gateway, Client $client = null)
     {
         $this->destination = $destination;
         $this->gateway = $gateway;

src/Models/Networks/Subnet.php

@@ -2,6 +2,7 @@
 
 namespace LKDev\HetznerCloud\Models\Networks;
 
+use GuzzleHttp\Client;
 use LKDev\HetznerCloud\Clients\GuzzleClient;
 use LKDev\HetznerCloud\Models\Model;
 
@@ -11,6 +12,7 @@
 class Subnet extends Model
 {
     const TYPE_SERVER = 'server';
+    const TYPE_CLOUD = 'cloud';
     /**
      * @var string
      */
@@ -34,9 +36,9 @@ class Subnet extends Model
      * @param string $ipRange
      * @param string $networkZone
      * @param string $gateway
-     * @param GuzzleClient|null $client
+     * @param Client|null $client
      */
-    public function __construct(string $type, string $ipRange, string $networkZone, string $gateway = null, GuzzleClient $client = null)
+    public function __construct(string $type, string $ipRange, string $networkZone, string $gateway = null, Client $client = null)
     {
         $this->type = $type;
         $this->ipRange = $ipRange;

src/Models/Servers/Server.php

@@ -8,8 +8,8 @@
 
 namespace LKDev\HetznerCloud\Models\Servers;
 
+use GuzzleHttp\Client;
 use LKDev\HetznerCloud\APIResponse;
-use LKDev\HetznerCloud\Clients\GuzzleClient;
 use LKDev\HetznerCloud\HetznerAPIClient;
 use LKDev\HetznerCloud\Models\Actions\Action;
 use LKDev\HetznerCloud\Models\Contracts\Resource;
@@ -119,9 +119,9 @@ class Server extends Model implements Resource
 
     /**
      * @param int $serverId
-     * @param GuzzleClient|null $httpClient
+     * @param Client|null $httpClient
      */
-    public function __construct(int $serverId, GuzzleClient $httpClient = null)
+    public function __construct(int $serverId, Client $httpClient = null)
     {
         $this->id = $serverId;
         parent::__construct($httpClient);

src/Models/Volumes/Volume.php

@@ -8,8 +8,8 @@
 
 namespace LKDev\HetznerCloud\Models\Volumes;
 
+use GuzzleHttp\Client;
 use LKDev\HetznerCloud\APIResponse;
-use LKDev\HetznerCloud\Clients\GuzzleClient;
 use LKDev\HetznerCloud\HetznerAPIClient;
 use LKDev\HetznerCloud\Models\Actions\Action;
 use LKDev\HetznerCloud\Models\Contracts\Resource;
@@ -64,9 +64,9 @@ class Volume extends Model implements Resource
 
     /**
      * @param int $volumeId
-     * @param GuzzleClient|null $httpClient
+     * @param Client|null $httpClient
      */
-    public function __construct(int $volumeId = null, GuzzleClient $httpClient = null)
+    public function __construct(int $volumeId = null, Client $httpClient = null)
     {
         $this->id = $volumeId;
         parent::__construct($httpClient);