Merge pull request #10 from SinusBot/refactored

Refactored

Author: mxschmitt

.travis.yml

@@ -5,12 +5,14 @@ before_script:
   - composer install --no-interaction
 script:
   - cd $TRAVIS_BUILD_DIR
-  - php vendor/bin/phpdoc -d . -t docs --ignore vendor/,docs/,examples/
+  - ./vendor/bin/phpcs --standard=PSR2 src
+  - ./vendor/bin/phpcbf --standard=PSR2 src
+  - php vendor/bin/phpdoc -d src -t docs --ignore vendor/,docs/,examples/
+
 deploy:
   provider: pages
   github-token: $GITHUB_TOKEN
   skip-cleanup: true
   local-dir: docs
-branches:
-   only:
-   - master
+  on:
+    branch: master

composer.json

@@ -2,6 +2,7 @@
     "name": "sinusbot/sinusbot-api-php",
     "description": "PHP Wrapper to communicate with the SinusBot API.",
     "require-dev": {
-        "phpdocumentor/phpdocumentor": "2.*"
+        "phpdocumentor/phpdocumentor": "2.*",
+        "squizlabs/php_codesniffer": "3.*"
     }
 }

examples/currentTrack.php

@@ -1,15 +1,19 @@
 <?php
-include("sinusbot.class.php");
-$sinusbot = new SinusBot("http://127.0.0.1:8087");
+
+include_once("../src/autoload.php");
+
+$sinusbot = new SinusBot\API("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,20 @@
 <?php
-include("sinusbot.class.php");
-$sinusbot = new SinusBot("http://127.0.0.1:8087");
+
+include_once("../src/autoload.php");
+
+$sinusbot = new SinusBot\API("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,16 @@
 <?php
-include("sinusbot.class.php");
-$sinusbot = new SinusBot("http://127.0.0.1:8087");
+
+include_once("../src/autoload.php");
+
+$sinusbot = new SinusBot\API("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);