From dcbe8d82971e719b2463cb208338a6e21a64d7b3 Mon Sep 17 00:00:00 2001
From: lub <git@lubiland.de>
Date: Wed, 28 Aug 2019 12:09:48 +0200
Subject: [PATCH] switch to composer for ts3phpframework dependency management

---
 .gitmodules         |  3 ---
 Dockerfile          | 14 ++++++++++++--
 composer.json       |  5 +++++
 config.inc.php.dist |  2 --
 main.php            |  2 +-
 ts3phpframework     |  1 -
 6 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 composer.json
 delete mode 160000 ts3phpframework

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a94825b..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ts3phpframework"]
-	path = ts3phpframework
-	url = https://github.com/planetteamspeak/ts3phpframework.git
diff --git a/Dockerfile b/Dockerfile
index 9c2ece8..bd941ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,17 @@
+FROM docker.io/composer AS composer
+
+WORKDIR /app
+
+COPY composer.json main.php functions.php ./
+
+RUN composer install
+
+
+
 FROM docker.io/php:alpine
 
-WORKDIR /src
+COPY --from=composer /app /app
 
-COPY . ./
+WORKDIR /app
 
 ENTRYPOINT ["php", "main.php"]
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..f8bba61
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "planetteamspeak/ts3-php-framework": "*"
+    }
+}
diff --git a/config.inc.php.dist b/config.inc.php.dist
index d94fff4..ba72810 100644
--- a/config.inc.php.dist
+++ b/config.inc.php.dist
@@ -1,6 +1,4 @@
 <?php
-$framework = 'ts3phpframework/TeamSpeak3.php'; //get the TeamSpeak 3 PHP Framework from http://addons.teamspeak.com/directory/tools/integration/TeamSpeak-3-PHP-Framework.html
-
 $roots = array('Game Area', 'WoW');
 $exceptions = array('Ladder Room');
 $default = 'Group 1';
diff --git a/main.php b/main.php
index 288c418..b9f3d47 100644
--- a/main.php
+++ b/main.php
@@ -1,7 +1,7 @@
 <?php
 require_once('config.inc.php');
 require_once('functions.php');
-require_once($framework);
+require_once('vendor/autoload.php');
 
 $server = TeamSpeak3::factory('serverquery://'.$user.':'.$passwd.'@'.$host.':'.$queryport.'/?server_port='.$voiceport);
 
diff --git a/ts3phpframework b/ts3phpframework
deleted file mode 160000
index 3b7a20e..0000000
--- a/ts3phpframework
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3b7a20e68bc556981f9a41782adb9933394605a9