fixed bugs and simplified Classes

Author: mxschmitt

src/API.class.php

@@ -85,7 +85,7 @@ public function getPlaylists()
         $playlists = $this->request('/bot/playlists');
         $out = [];
         foreach ($playlists as $playlist) {
-            array_push($out, new Playlist($this->token, $this->url, $this->timeout, $playlist));
+            array_push($out, new Playlist($this->token, $this->url, $this->timeout, $playlist["uuid"]));
         }
         return $out;
     }
@@ -398,7 +398,7 @@ public function getInstances()
         $instances =  $this->request('/bot/instances');
         $out = [];
         foreach ($instances as $instance) {
-            array_push($out, new Instance($this->token, $this->url, $this->timeout, $instance));
+            array_push($out, new Instance($this->token, $this->url, $this->timeout, $instance["uuid"]));
         }
         return $out;
     }

src/Instance.class.php

@@ -23,11 +23,6 @@ class Instance extends RestClient
   */
     public $uuid = null;
   /**
-  * Instance holds the Instance array
-  * @var array
-  */
-    public $instance = null;
-  /**
   * __construct
   *
   * @param  string  $token    SinusBot auth token
@@ -36,13 +31,12 @@ class Instance extends RestClient
   * @param  array   $instance SinusBot Instance array.
   * @return void
   */
-    public function __construct($token, $url, $timeout, $instance)
+    public function __construct($token, $url, $timeout, $uuid)
     {
         $this->token = $token;
         $this->url = $url;
         $this->timeout = $timeout;
-        $this->instance = $instance;
-        $this->uuid = $instance["uuid"];
+        $this->uuid = $uuid;
     }
   /**
   * isPlaying returns true when the instance is playing something
@@ -78,7 +72,7 @@ public function delete()
 
 
   /**
-  * spawn starts the instance
+  * spawn spawns the instance
   *
   * @return array status
   */
@@ -391,8 +385,7 @@ public function playPrevious()
         return $this->request('/bot/i/'.$this->uuid.'/playPrevious', 'POST', '');
     }
 
-  
-/**
+  /**
   * playNext will play the next track
   *
   * @return array status
@@ -426,7 +419,7 @@ public function playShuffle($shuffleState = 1)
 
 
 /**
-  * stop stops the instance
+  * stop stops the playback
   *
   * @return array status
   */

src/Playlist.class.php

@@ -18,11 +18,6 @@
 class Playlist extends RestClient
 {
   /**
-  * Playlist holds the Playlist array
-  * @var array
-  */
-    public $playlist = null;
-  /**
   * UUID holds the Playlist UUID
   * @var array
   */
@@ -36,13 +31,12 @@ class Playlist extends RestClient
   * @param  array   $playlist SinusBot Playlist array.
   * @return void
   */
-    public function __construct($token, $url, $timeout, $playlist)
+    public function __construct($token, $url, $timeout, $uuid)
     {
         $this->token = $token;
         $this->url = $url;
         $this->timeout = $timeout;
-        $this->playlist = $playlist;
-        $this->uuid = $playlist["uuid"];
+        $this->uuid = $uuid;
     }
 
   /**