Merge pull request #13 from hcgcloud/develop

Remove requirement of illuminate/support & Ability to merge required variables for resource

composer.json

@@ -15,8 +15,7 @@
     ],
     "require": {
         "php": ">=5.6.4",
-        "guzzlehttp/guzzle": "~6.0",
-        "illuminate/support": "5.7.*"
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "mockery/mockery": "0.9.*",

src/MakesHttpRequests.php

@@ -92,8 +92,8 @@ private function request($verb, $uri, array $payload = [])
         $token = $this->apiKey;
 
         $options['body'] = $body;
-        $options = array_add($options, 'debug', false);
-        $options['headers'] = array_add($options, 'Authorization', 'Bearer '.$token);
+        $options['debug'] = false;
+        $options['headers']['Authorization'] = 'Bearer '.$token;
 
         $response = $this->guzzle->request($verb, $uri, $options);
 

src/Resources/Allocation.php

@@ -7,7 +7,7 @@ class Allocation extends Resource
     /**
      * The id of the allocation.
      *
-     * @var integer
+     * @var int
      */
     public $id;
 
@@ -28,14 +28,14 @@ class Allocation extends Resource
     /**
      * The port of the allocation.
      *
-     * @var integer
+     * @var int
      */
     public $port;
 
     /**
      * The assign status of the allocation.
      *
-     * @var boolean
+     * @var bool
      */
     public $assigned;
 }

src/Resources/Location.php

@@ -61,8 +61,13 @@ public function delete()
      *
      * @return void
      */
-    public function update(array $data)
+    public function update(array $data = [])
     {
+        $data = array_merge([
+            'short' => $this->short,
+            'long'  => $this->long,
+        ], $data);
+
         return $this->pterodactyl->updateLocation($this->id, $data);
     }
 }

src/Resources/Server.php

@@ -95,13 +95,27 @@ class Server extends Resource
      */
     public $limits = [];
 
+    /**
+     * The feature limits of the server.
+     *
+     * @var array
+     */
+    public $featureLimits = [];
+
     /**
      * The allocations of the server.
      *
      * @var array
      */
     public $allocations = [];
 
+    /**
+     * The container of the server.
+     *
+     * @var array
+     */
+    public $container = [];
+
     /**
      * Delete the given server.
      *
@@ -147,8 +161,13 @@ public function unsuspend()
      *
      * @return void
      */
-    public function updateDetails(array $data)
+    public function updateDetails(array $data = [])
     {
+        $data = array_merge([
+            'name' => $this->name,
+            'user' => $this->user,
+        ], $data);
+
         return $this->pterodactyl->updateServerDetails($this->id, $data);
     }
 
@@ -157,8 +176,14 @@ public function updateDetails(array $data)
      *
      * @return void
      */
-    public function updateBuild(array $data)
+    public function updateBuild(array $data = [])
     {
+        $data = array_merge([
+            'allocation'     => $this->allocation,
+            'limits'         => $this->limits,
+            'feature_limits' => $this->featureLimits,
+        ], $data);
+
         return $this->pterodactyl->updateServerBuild($this->id, $data);
     }
 
@@ -167,8 +192,16 @@ public function updateBuild(array $data)
      *
      * @return void
      */
-    public function updateStartup(array $data)
+    public function updateStartup(array $data = [])
     {
+        $data = array_merge([
+            'startup'      => $this->container['startup_command'],
+            'egg'          => $this->egg,
+            'image'        => $this->container['image'],
+            'environment'  => $this->container['environment'],
+            'skip_scripts' => 0,
+        ], $data);
+
         return $this->pterodactyl->updateServerStartup($this->id, $data);
     }
 

src/Resources/User.php

@@ -7,21 +7,21 @@ class User extends Resource
     /**
      * The id of the user.
      *
-     * @var integer
+     * @var int
      */
     public $id;
 
     /**
      * The external id of the user.
      *
-     * @var integer
+     * @var int
      */
     public $externalId;
 
     /**
      * The uuid of the user.
      *
-     * @var integer
+     * @var int
      */
     public $uuid;
 
@@ -63,7 +63,7 @@ class User extends Resource
     /**
      * If a user is an admin.
      *
-     * @var integer
+     * @var int
      */
     public $rootAdmin;
 
@@ -103,8 +103,15 @@ public function delete()
      *
      * @return void
      */
-    public function update(array $data)
+    public function update(array $data = [])
     {
+        $data = array_merge([
+            'username'   => $this->username,
+            'email'      => $this->email,
+            'first_name' => $this->firstName,
+            'last_name'  => $this->lastName,
+        ], $data);
+
         return $this->pterodactyl->updateUser($this->id, $data);
     }
 }