Fix labels (#27)

Author: LKaemmerling

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## 1.8.1 (21.10.2019)
+ + Fix labels translation from json to array in `Image`, `Network`, `SSHKey` and `Volume`
+
 ## 1.8.0 (18.09.2019)
- + Add ability to get `Datacenters`,`FloatingIPs`,`Images`,`Locations` and `ServerTypes` per name (`getByName`)
+ + Add ability to get `Datacenters`, `FloatingIPs`, `Images`, `Locations` and `ServerTypes` per name (`getByName`)
  + Add `name` support to Floating IPs
 
 ## 1.7.1  (01.08.2019) 

src/HetznerAPIClient.php

@@ -24,7 +24,7 @@ class HetznerAPIClient
     /**
      * Version of the API Client
      */
-    const VERSION = "1.8.0";
+    const VERSION = "1.8.1";
 
     /**
      * @var string

src/Models/Images/Image.php

@@ -228,6 +228,6 @@ public static function parse($input)
             return null;
         }
 
-        return new self($input->id, $input->type, (property_exists($input, 'status') ? $input->status : null), $input->name, $input->description, $input->image_size, $input->disk_size, $input->created, $input->created_from, $input->bound_to, $input->os_flavor, $input->os_version, $input->rapid_deploy, Protection::parse($input->protection));
+        return new self($input->id, $input->type, (property_exists($input, 'status') ? $input->status : null), $input->name, $input->description, $input->image_size, $input->disk_size, $input->created, $input->created_from, $input->bound_to, $input->os_flavor, $input->os_version, $input->rapid_deploy, Protection::parse($input->protection), get_object_vars($input->labels));
     }
 }

src/Models/Networks/Network.php

@@ -186,8 +186,7 @@ private function setAdditionalData($data)
             })->toArray();
         $this->protection = Protection::parse($data->protection);
 
-
-        $this->labels = $data->labels;
+        $this->labels = get_object_vars($data->labels);
         $this->created = $data->created;
         return $this;
     }

src/Models/Networks/Networks.php

@@ -6,9 +6,7 @@
 
 use LKDev\HetznerCloud\APIResponse;
 use LKDev\HetznerCloud\HetznerAPIClient;
-use LKDev\HetznerCloud\Models\Actions\Action;
 use LKDev\HetznerCloud\Models\Model;
-use LKDev\HetznerCloud\Models\Volumes\Volume;
 use LKDev\HetznerCloud\RequestOpts;
 
 /**

src/Models/SSHKeys/SSHKey.php

@@ -48,6 +48,7 @@ class SSHKey extends Model
      * @param string $name
      * @param string $fingerprint
      * @param string $publicKey
+     * @param array $labels
      */
     public function __construct(int $id, string $name, string $fingerprint, string $publicKey, array $labels = [])
     {
@@ -113,6 +114,6 @@ public function delete(): bool
      */
     public static function parse($input)
     {
-        return new self($input->id, $input->name, $input->fingerprint, $input->public_key);
+        return new self($input->id, $input->name, $input->fingerprint, $input->public_key, get_object_vars($input->labels));
     }
-}
+}

src/Models/Volumes/Volume.php

@@ -88,7 +88,7 @@ public function setAdditionalData($data)
         $this->server = $data->server;
         $this->location = Location::parse($data->location);
         $this->protection = $data->protection ?: Protection::parse($data->protection);
-        $this->labels = $data->labels;
+        $this->labels = get_object_vars($data->labels);
 
         return $this;
     }

tests/Integration/Images/ImagesTest.php

@@ -39,6 +39,8 @@ public function testGet()
         $image = $this->images->get(4711);
         $this->assertEquals($image->id, 4711);
         $this->assertEquals($image->name, 'ubuntu-16.04');
+
+        $this->assertEmpty($image->labels);
     }
     /**
      *
@@ -48,6 +50,8 @@ public function testGetByName()
         $image = $this->images->getByName('ubuntu-16.04');
         $this->assertEquals($image->id, 4711);
         $this->assertEquals($image->name, 'ubuntu-16.04');
+
+        $this->assertEmpty($image->labels);
     }
 
     /**

tests/Integration/Networks/NetworksTest.php

@@ -60,7 +60,7 @@ public function testGetByName()
 
         $this->assertInstanceOf(Protection::class, $network->protection);
 
-        $this->assertEmpty(get_object_vars($network->labels));
+        $this->assertEmpty($network->labels);
 
     }
 
@@ -84,7 +84,7 @@ public function testGet()
 
         $this->assertInstanceOf(Protection::class, $network->protection);
 
-        $this->assertEmpty(get_object_vars($network->labels));
+        $this->assertEmpty($network->labels);
     }
 
     /**