Revert to previous DB configuration structure

Author: vdauchy

config/websockets.php

@@ -42,34 +42,35 @@
 
         'app' => \BeyondCode\LaravelWebSockets\Apps\ConfigAppManager::class,
 
-        'database' => [
-            /*
-            |--------------------------------------------------------------------------
-            | SQLite application manager
-            |--------------------------------------------------------------------------
-            |
-            | The SQLite database to use when using the SQLite application manager.
-            |
-            */
-            'driver' => 'sqlite',
-            'database' => storage_path('laravel-websockets.sqlite'),
+        /*
+        |--------------------------------------------------------------------------
+        | SQLite application manager
+        |--------------------------------------------------------------------------
+        |
+        | The SQLite database to use when using the SQLite application manager.
+        |
+        */
 
-            /*
-            |--------------------------------------------------------------------------
-            | MySql application manager
-            |--------------------------------------------------------------------------
-            |
-            | The MySql database to use when using the MySql application manager.
-            |
-            */
-            // 'driver' => 'mysql',
-            // 'host' => 'localhost',
-            // 'port' => 3306,
-            // 'database' => 'default',
-            // 'username' => 'root',
-            // 'password' => 'root',
+        'sqlite' => [
+            'database' => storage_path('laravel-websockets.sqlite'),
         ],
 
+        /*
+        |--------------------------------------------------------------------------
+        | MySql application manager
+        |--------------------------------------------------------------------------
+        |
+        | The MySql database to use when using the MySql application manager.
+        |
+        */
+
+        'mysql' => [
+            'host' => 'localhost',
+            'port' => 3306,
+            'database' => 'default',
+            'username' => 'root',
+            'password' => 'root',
+        ]
     ],
 
     /*

src/WebSocketsServiceProvider.php

@@ -50,13 +50,9 @@ public function boot()
 
         $this->registerEventLoop();
 
-        if (config('websockets.managers.database.driver') === 'sqlite') {
-            $this->registerSQLiteDatabase();
-        }
+        $this->registerSQLiteDatabase();
 
-        if (config('websockets.managers.database.driver') === 'mysql') {
-            $this->registerMySqlDatabase();
-        }
+        $this->registerMySqlDatabase();
 
         $this->registerAsyncRedisQueueDriver();
 
@@ -106,7 +102,7 @@ protected function registerSQLiteDatabase()
             $factory = new SQLiteFactory($this->app->make(LoopInterface::class));
 
             $database = $factory->openLazy(
-                config('websockets.managers.database.database', ':memory:')
+                config('websockets.managers.sqlite.database', ':memory:')
             );
 
             $migrations = (new Finder())
@@ -129,9 +125,9 @@ protected function registerMySqlDatabase()
         $this->app->singleton(ConnectionInterface::class, function () {
             $factory = new MySQLFactory($this->app->make(LoopInterface::class));
 
-            $auth = trim(config('websockets.managers.database.username').':'.config('websockets.managers.database.password'), ':');
-            $connection = trim(config('websockets.managers.database.host').':'.config('websockets.managers.database.port'), ':');
-            $database = config('websockets.managers.database.database');
+            $auth = trim(config('websockets.managers.mysql.username').':'.config('websockets.managers.mysql.password'), ':');
+            $connection = trim(config('websockets.managers.mysql.host').':'.config('websockets.managers.mysql.port'), ':');
+            $database = config('websockets.managers.mysql.database');
 
             $database = $factory->createLazyConnection(trim("{$auth}@{$connection}/{$database}", '@'));