Merge branch 'feature/broker_service' into feature/multi_broker_merge

Signed-off-by: Domingo Oropeza <[email protected]>
DIOHz0r · Dec 14, 2018 · ac241f3 · ac241f3
2 parents 78ee0e3 + 0ceb9df
commit ac241f3
Show file tree

Hide file tree

Showing 62 changed files with 4,704 additions and 1,554 deletions.
diff --git a/ajax/mqtt_test.php b/ajax/mqtt_test.php
@@ -78,7 +78,7 @@
    exit();
 }
 $clientid = "flyvemdm-test";
-$mqttClient = PluginFlyvemdmMqttclient::getInstance();
+$mqttClient = \GlpiPlugin\Flyvemdm\Mqtt\MqttConnection::getInstance();
 $statusMessage = 'Test message not sent';
 if ($mqttClient->sendTestMessage($address, $port, $isTls, $sslCiphers)) {
    $statusMessage = 'Test message sent';

diff --git a/composer.json b/composer.json
@@ -26,7 +26,8 @@
         "sskaje/mqtt": "dev-master",
         "tufanbarisyildirim/php-apk-parser": "dev-master",
         "docopt/docopt": "^1.0",
-        "twig/twig": "^1.0"
+        "twig/twig": "^1.0",
+        "sly/notification-pusher": "^2.3"
     },
     "require-dev": {
         "ext-bz2": "*",
@@ -44,6 +45,11 @@
             "no-api": true
         }
     ],
+    "autoload": {
+        "psr-4": {
+            "GlpiPlugin\\Flyvemdm\\": "inc/"
+        }
+    },
     "autoload-dev": {
         "psr-4": {
             "Flyvemdm\\Tests\\": "tests/src/Flyvemdm/Tests/",