Merge branch 'LKDevelopment:master' into master

Author: BenjaminLeibinger

.github/workflows/php.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.0', '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4']
     steps:
     - uses: actions/checkout@v2
     - name: Setup PHP

README.md

@@ -20,6 +20,9 @@ foreach ($hetznerClient->servers()->all() as $server) {
     echo 'ID: '.$server->id.' Name:'.$server->name.' Status: '.$server->status.PHP_EOL;
 }
 ```
+### PHP Support
+
+We test on all supported PHP Versions. The library can still work on older versions, however it is no longer actively tested.
 
 ### Old Releases: v1.x
 [Version 1.x](https://github.com/LKDevelopment/hetzner-cloud-php-sdk/tree/v1) is abandoned and will not receive any new updates or features. V2 was created with Backward Compatibility in mind. So it should work as a drop-in replacement. Therefor it does not give a "Migration to v2"-Guide. It should just work!

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "lkdevelopment/hetzner-cloud-php-sdk",
-  "description": "A inofficial PHP SDK for the Hetzner Cloud API.",
+  "description": "An unofficial PHP SDK for the Hetzner Cloud API.",
   "type": "library",
   "keywords": [
     "hetzner",
@@ -9,14 +9,14 @@
     "cloud php library"
   ],
   "require": {
-    "php": "^7.1|^8.0",
+    "php": "^8.1",
     "ext-json": "*",
     "guzzlehttp/guzzle": "^6.3|^7.0",
-    "illuminate/collections": "^5.5|^v6.18|^7.0|^8.0|^11.0"
+    "illuminate/collections": "^5.5|^v6.18|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0|^8.5.5|^9.0",
-    "phpstan/phpstan": "^0.12.43"
+    "phpstan/phpstan": "^0.12.43 || ^1.0.0"
   },
   "license": "MIT",
   "authors": [

src/APIException.php

@@ -17,7 +17,7 @@ class APIException extends \Exception
      * @param  int  $code
      * @param  \Throwable|null  $previous
      */
-    public function __construct(APIResponse $response, string $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(APIResponse $response, string $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         $this->response = $response;
         parent::__construct($message, $code, $previous);

src/APIResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: lkaemmerling
@@ -36,7 +37,7 @@ public function getResponse(): array
      * @param  string|null  $resource
      * @return Model|string|bool
      */
-    public function getResponsePart(string $resource = null)
+    public function getResponsePart(?string $resource = null)
     {
         return (array_key_exists($resource, $this->response)) ? $this->response[$resource] : false;
     }

src/Clients/GuzzleClient.php

@@ -5,8 +5,10 @@
 use GuzzleHttp\Client;
 use LKDev\HetznerCloud\HetznerAPIClient;
 
-class GuzzleClient extends Client
+class GuzzleClient
 {
+    protected Client $client;
+
     /**
      * @param  HetznerAPIClient  $client
      * @param  array  $additionalGuzzleConfig
@@ -21,6 +23,11 @@ public function __construct(HetznerAPIClient $client, $additionalGuzzleConfig =
                 'User-Agent' => ((strlen($client->getUserAgent()) > 0) ? $client->getUserAgent().' ' : '').'hcloud-php/'.HetznerAPIClient::VERSION,
             ],
         ], $additionalGuzzleConfig);
-        parent::__construct($guzzleConfig);
+        $this->client = new Client($guzzleConfig);
+    }
+
+    public function __call($name, $arguments)
+    {
+        return $this->client->$name(...$arguments);
     }
 }

src/HetznerAPIClient.php

@@ -14,6 +14,7 @@
 use LKDev\HetznerCloud\Models\LoadBalancers\LoadBalancers;
 use LKDev\HetznerCloud\Models\LoadBalancerTypes\LoadBalancerTypes;
 use LKDev\HetznerCloud\Models\Networks\Networks;
+use LKDev\HetznerCloud\Models\PlacementGroups\PlacementGroups;
 use LKDev\HetznerCloud\Models\Prices\Prices;
 use LKDev\HetznerCloud\Models\PrimaryIps\PrimaryIps;
 use LKDev\HetznerCloud\Models\Servers\Servers;
@@ -30,7 +31,7 @@ class HetznerAPIClient
     /**
      * Version of the API Client.
      */
-    const VERSION = '2.7.1';
+    const VERSION = '2.8.1';
 
     const MAX_ENTITIES_PER_PAGE = 50;
 
@@ -286,6 +287,14 @@ public function networks()
         return new Networks($this->httpClient);
     }
 
+    /**
+     * @return PlacementGroups
+     */
+    public function placementGroups()
+    {
+        return new PlacementGroups($this->httpClient);
+    }
+
     /**
      * @return Certificates
      */

src/Models/Actions/Action.php

@@ -67,7 +67,7 @@ public function __construct(
         int $progress,
         string $status,
         string $started,
-        string $finished = null,
+        ?string $finished = null,
         $resources = null,
         $error = null
     ) {
@@ -148,6 +148,6 @@ public static function parse($input)
             return;
         }
 
-        return new self($input->id, $input->command, $input->progress, $input->status, $input->started, $input->finished, $input->resources, $input->error);
+        return new self($input->id, $input->command, $input->progress, $input->status, $input->started, $input->finished, $input->resources, $input->error ?? null);
     }
 }

src/Models/Actions/ActionRequestOpts.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: lukaskammerling
@@ -30,7 +31,7 @@ class ActionRequestOpts extends RequestOpts
      * @param  $page
      * @param  $labelSelector
      */
-    public function __construct(string $status = null, string $sort = null, int $perPage = null, int $page = null, string $labelSelector = null)
+    public function __construct(?string $status = null, ?string $sort = null, ?int $perPage = null, ?int $page = null, ?string $labelSelector = null)
     {
         parent::__construct($perPage, $page, $labelSelector);
         $this->status = $status;

src/Models/Actions/Actions.php

@@ -20,7 +20,7 @@ class Actions extends Model implements Resources
      */
     protected $actions;
 
-    public function all(RequestOpts $requestOpts = null): array
+    public function all(?RequestOpts $requestOpts = null): array
     {
         if ($requestOpts == null) {
             $requestOpts = new RequestOpts();
@@ -35,7 +35,7 @@ public function all(RequestOpts $requestOpts = null): array
      *
      * @throws \LKDev\HetznerCloud\APIException
      */
-    public function list(RequestOpts $requestOpts = null): ?APIResponse
+    public function list(?RequestOpts $requestOpts = null): ?APIResponse
     {
         if ($requestOpts == null) {
             $requestOpts = new RequestOpts();