Merge pull request #349 from MyIgel/master

Changed container to Illuminate/Container and added service providers

2 files changed, 21 insertions, 4 deletions

diff --git a/config/app.php b/config/app.php
new file mode 100644
index 00000000..74eb2991
--- /dev/null
+++ b/config/app.php
@@ -0,0 +1,17 @@
+<?php
+
+// Application config
+
+return [
+    // Service providers
+    'providers' => [
+        \Engelsystem\Logger\LoggerServiceProvider::class,
+        \Engelsystem\Exceptions\ExceptionsServiceProvider::class,
+        \Engelsystem\Config\ConfigServiceProvider::class,
+        \Engelsystem\Routing\RoutingServiceProvider::class,
+        \Engelsystem\Renderer\RendererServiceProvider::class,
+        \Engelsystem\Database\DatabaseServiceProvider::class,
+        \Engelsystem\Http\RequestServiceProvider::class,
+        \Engelsystem\Http\SessionServiceProvider::class,
+    ],
+];
diff --git a/config/config.default.php b/config/config.default.php
index c2d742ef..1bad9668 100644
--- a/config/config.default.php
+++ b/config/config.default.php
@@ -5,10 +5,10 @@
 return [
     // MySQL-Connection Settings
     'database'                => [
-        'host' => 'localhost',
-        'user' => 'root',
-        'pw'   => '',
-        'db'   => 'engelsystem',
+        'host' => env('MYSQL_HOST', (env('CI', false) ? 'mysql' : 'localhost')),
+        'user' => env('MYSQL_USER', 'root'),
+        'pw'   => env('MYSQL_PASSWORD', ''),
+        'db'   => env('MYSQL_DATABASE', 'engelsystem'),
     ],
 
     // For accessing stats