Minor changes:

- updated examples
- fixed linting errors
- added namespace: SinusBot

Author: mxschmitt

examples/currentTrack.php

@@ -1,15 +1,21 @@
 <?php
-include("sinusbot.class.php");
+
+include_once("../src/SinusBot.class.php");
+
+use SinusBot\SinusBot;
+
 $sinusbot = new SinusBot("http://127.0.0.1:8087");
 $sinusbot->login("admin", "foobar");
 
 $instances = $sinusbot->getInstances();
-for ($i = 0; $i < count($instances); $i++) {
-  $status = $sinusbot->getStatus($instances[$i]['uuid']);
-  if ($status['playing']) {
-      echo $instances[$i]["nick"].' spielt '.(($status["currentTrack"]["type"] == "url") ? $status["currentTrack"]["tempTitle"] : $status["currentTrack"]["title"]).' von '.(($status["currentTrack"]["type"] == "url") ? $status["currentTrack"]["tempArtist"] : $status["currentTrack"]["artist"]).'<br>';
-  } else {
-      echo $instances[$i]["nick"].' ist gestoppt.<br>';
-  }
+
+foreach ($instances as $instance) {
+    $status = $instance->getStatus();
+    if ($status["playing"]) {
+        echo "Instance: ".$instance->instance["nick"]." is playing";
+    } else {
+        echo "Instance: ".$instance->instance["nick"]." is not playing";
+    }
+    echo "\n";
 }
 ?>

examples/getFiles.php

@@ -1,10 +1,22 @@
 <?php
-include("sinusbot.class.php");
+
+include_once("../src/SinusBot.class.php");
+
+use SinusBot\SinusBot;
+
 $sinusbot = new SinusBot("http://127.0.0.1:8087");
 $sinusbot->login("admin", "foobar");
 
 $files = $sinusbot->getFiles();
-for ($i = 0; $i < count($files); $i++) {
-  echo $files[$i]['uuid'].': '.$files[$i]['artist'].' - '.$files[$i]['title'].' ('.$files[$i]['album'].')<br>';
+
+function return_if_exists($key, $arr) {
+  if (array_key_exists($key, $arr)) {
+    return $arr[$key];
+  }
+  return "-";
+}
+
+foreach ($files as $file) {
+  echo "uuid: ".$file['uuid'].' artist: '.return_if_exists("artist", $file).' title: '.return_if_exists("title", $file)." album: ".(array_key_exists("album", $file)?("(".$file['album'].")"):"")."\n";
 }
 ?>

examples/renameInstance.php

@@ -1,9 +1,18 @@
 <?php
-include("sinusbot.class.php");
+
+include_once("../src/SinusBot.class.php");
+
+use SinusBot\SinusBot;
+
 $sinusbot = new SinusBot("http://127.0.0.1:8087");
 $sinusbot->login("admin", "foobar");
 
-$daten = array();
-$daten["nick"] = "Neuer Nickname";
-$sinusbot->editSettings($daten, "6421eedc-9705-4706-a269-cf6f38fa1a33");
-?>
+$instances = $sinusbot->getInstances();
+
+$instance = $instances[0];
+
+$settings = $instance->getSettings();
+
+$settings["name"] = $settings["nick"]." changed by php";
+
+$instance->setSettings($settings);

src/HttpClient.class.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace SinusBot;
+
 class HttpClient
 {
     protected $timeout = null;

src/Instance.class.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace SinusBot;
+
 class Instance extends HttpClient
 {
     public $uuid = null;
@@ -193,13 +195,13 @@ public function getSettings()
     }
 
   /**
-  * editSettings
+  * setSettings
   *
   * @param array $data array of properties
   * @return array status
   * @api
   */
-    public function editSettings($data)
+    public function setSettings($data)
     {
         return $this->request('/bot/i/'.$this->uuid.'/settings', 'POST', $data);
     }

src/Playlist.class.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace SinusBot;
+
 class Playlist extends HttpClient
 {
     public $playlist = null;

src/SinusBot.class.php

@@ -12,6 +12,10 @@
 
 namespace SinusBot;
 
+require_once("HttpClient.class.php");
+require_once("Instance.class.php");
+require_once("Playlist.class.php");
+
 class SinusBot extends HttpClient
 {
     public $uuid = null;
@@ -93,7 +97,7 @@ public function createPlaylist($playlistName)
         $resp = $this->request('/bot/playlists', 'POST', [
         "name" => $playlistName,
         ]);
-        return new Playlist($this->token, $this->url, $this->timeout, $resp["uuid"])
+        return new Playlist($this->token, $this->url, $this->timeout, $resp["uuid"]);
     }
 
   /**
@@ -459,7 +463,7 @@ public function getThumbnail($thumbnail)
   * @param  string  $uuid  4852efdc-9705-4706-e469-cfvf77favf33
   * @return void
   */
-    public public function __construct($url = 'http://127.0.0.1:8087', $uuid = null, $timeout = 8000)
+    public function __construct($url = 'http://127.0.0.1:8087', $uuid = null, $timeout = 8000)
     {
         $this->url = $url;
         $this->timeout = $timeout;