Further testing and fixing

eighteen73 · Jan 18, 2023 · 9c7c882 · 9c7c882
1 parent 82719ec
commit 9c7c882
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Concerns/ApiAccess.php b/src/Concerns/ApiAccess.php
@@ -30,7 +30,7 @@ public static function createAccessToken(string $baseUrl, string $email, string
                 ]
             ]);
 
-            $token = json_decode($response->getBody()->getContents());
+            $token = json_decode($response->getBody()->getContents(), true);
         } catch (\Exception $e) {
             throw new \Exception('Unable to get access token: ' . $e->getMessage());
         }
@@ -74,6 +74,6 @@ protected function request(string $type, string $endpoint, ?array $query = null,
             'json' => $data,
         ]);
 
-        return json_decode($response->getBody()->getContents());
+        return json_decode($response->getBody()->getContents(), true);
     }
 }
diff --git a/src/Models/BaseModel.php b/src/Models/BaseModel.php
@@ -8,12 +8,14 @@ abstract class BaseModel {
 
     public static function fromArray(array $data): static
     {
-        $host = new static;
+        $model = new static;
 
         foreach ($data as $k => $v) {
-            if (property_exists($host, $k)) {
-                $host->{$k} = $v;
+            if (property_exists($model, $k)) {
+                $model->{$k} = $v;
             }
         }
+
+        return $model;
     }
 }
diff --git a/src/Models/Host.php b/src/Models/Host.php
@@ -32,7 +32,7 @@ class Host extends BaseModel implements Model
 
     public bool $http2_support = true;
 
-    public array $locations = [];
+    public ?array $locations = [];
 
     public array $meta = [
         'dns_challenge' => true,