Merge pull request #4 from cp6/dev

Dev to master 2.1

Author: cp6

README.md

@@ -25,13 +25,13 @@ echo $vultr->listServers();//Lists all server instances for account
 
 ### Current version
 
-2.0 Initial release (API v2) 7 Nov 2020 
+2.0 Initial release (Vultr API v2) 7 Nov 2020 
 
 ### Requires
 
 Vultr API key obtained form your Vultr account menu.
 
-Add the Vultr API key line 7: ```src/class.php```
+Add your Vultr API key line 7: ```src/class.php```
 
 ### Examples
 

composer.json

@@ -17,7 +17,8 @@
     }
   ],
   "require": {
-    "php": ">=7.4"
+    "php": ">=7.4",
+    "ext-curl": "*"
   },
   "autoload": {
     "psr-4": {

src/class.php

@@ -10,19 +10,12 @@ class VultrAPI
     protected $server_create_details = [];
     protected $call_data;
 
-    public function __construct(bool $json_header = false)
+    protected function apiKeyHeader(): array
     {
-        if ($json_header) {
-            header('Content-Type: application/json');
-        }
+        return array("Authorization: Bearer " . self::API_KEY, "Content-Type: application/json");
     }
 
-    public function apiKeyHeader(): array
-    {
-        return array("Authorization: Bearer " . self::API_KEY . "", "Content-Type: application/json");
-    }
-
-    public function doCurl(string $url, string $type = 'GET', bool $return_http_code = false, array $headers = [], array $post_fields = [])
+    protected function doCurl(string $url, string $type = 'GET', bool $return_http_code = false, array $headers = [], array $post_fields = [])
     {
         $crl = curl_init(self::API_URL . $url);
         curl_setopt($crl, CURLOPT_CUSTOMREQUEST, $type);
@@ -48,13 +41,11 @@ public function doCurl(string $url, string $type = 'GET', bool $return_http_code
         curl_close($crl);
         if ($return_http_code) {
             return $http_response_code;
-        } else {
-            if ($http_response_code == 200 || $http_response_code == 201 || $http_response_code == 202) {
-                return $this->call_data = $call_response;//Return data
-            } else {
-                return $this->call_data = array('http_response_code' => $http_response_code);//Call failed
-            }
         }
+        if ($http_response_code == 200 || $http_response_code == 201 || $http_response_code == 202) {
+            return $this->call_data = $call_response;//Return data
+        }
+        return $this->call_data = array('http_response_code' => $http_response_code);//Call failed
     }
 
     public function setSubid(string $instance_id): void
@@ -64,7 +55,7 @@ public function setSubid(string $instance_id): void
 
     public function checkSubidSet()
     {
-        if (is_null($this->instance_id) || empty($this->instance_id)) {
+        if (empty($this->instance_id)) {
             return array("No subid is set, it is needed to perform this action.");
         }
     }
@@ -149,11 +140,7 @@ public function instanceUpdate(array $values = [])
     public function instanceReinstall(string $hostname = '')
     {
         $this->checkSubidSet();
-        if (!empty($hostname)) {
-            $post = array("hostname" => $hostname);
-        } else {
-            $post = array();
-        }
+        (!empty($hostname)) ? $post = array("hostname" => $hostname) : $post = array();
         return $this->doCurl("v2/instances/$this->instance_id/reinstall", 'POST', true, $this->apiKeyHeader(), $post);
     }
 
@@ -365,20 +352,20 @@ public function serverCreatePlan(string $plan_id)
 
     public function serverCreateType(string $type = 'OS', string $type_id = '1')
     {
-        if ($type == 'OS') {
+        if ($type === 'OS') {
             $this->server_create_details = array_merge($this->server_create_details, array(
                 "os_id" => $type_id
             ));
-        } elseif ($type == 'SNAPSHOT') {
+        } elseif ($type === 'SNAPSHOT') {
             $this->server_create_details = array_merge($this->server_create_details, array(
                 "snapshot_id" => $type_id
             ));
-        } elseif ($type == 'ISO') {
+        } elseif ($type === 'ISO') {
             $this->server_create_details = array_merge($this->server_create_details, array(
                 "os_id" => 159,
                 "iso_id" => $type_id
             ));
-        } elseif ($type == 'APP') {
+        } elseif ($type === 'APP') {
             $this->server_create_details = array_merge($this->server_create_details, array(
                 "os_id" => 186,
                 "app_id" => $type_id
@@ -913,26 +900,24 @@ public function s3keyRegenObjectStorage(string $obj_id)
     */
     public function convertBytes(int $bytes, string $convert_to = 'GB', bool $format = true, int $decimals = 2)
     {
-        if ($convert_to == 'GB') {
+        if ($convert_to === 'GB') {
             $value = ($bytes / 1073741824);
-        } elseif ($convert_to == 'MB') {
+        } elseif ($convert_to === 'MB') {
             $value = ($bytes / 1048576);
-        } elseif ($convert_to == 'KB') {
+        } elseif ($convert_to === 'KB') {
             $value = ($bytes / 1024);
         } else {
             $value = $bytes;
         }
         if ($format) {
             return number_format($value, $decimals);
-        } else {
-            return $value;
         }
+        return $value;
     }
 
     public function boolToInt(bool $bool): int
     {
-        ($bool) ? $int = 1 : $int = 0;
-        return $int;
+        return ($bool) ? 1 : 0;
     }
 
     public function saveOutput(string $save_as, $output)