[CHN] how to get current db connection

config/easy_panel_config.php

@@ -1,5 +1,9 @@
 <?php
 
+use EasyPanel\Services\LangService;
+use EasyPanel\Support\Auth\AdminIdentifier;
+use EasyPanel\Support\User\UserProvider;
+
 return [
 
     // Enable whole module
@@ -19,13 +23,13 @@
 
     // How to authenticate admin
     // You may use other ways to authenticate a admin (tables or ..) you can manage it with this class
-    'auth_class' => \EasyPanel\Support\Auth\AdminIdentifier::class,
+    'auth_class' => AdminIdentifier::class,
 
     // With this class you can manage how to create a admin or remove it.
-    'admin_provider_class' => \EasyPanel\Support\User\UserProvider::class,
+    'admin_provider_class' => UserProvider::class,
 
     //The namespace of lang manager class
-    'lang_manager_class' => \EasyPanel\Services\LangService::class,
+    'lang_manager_class' => LangService::class,
 
     // it's a place where a user if not authenticated will be redirected
     'redirect_unauthorized' => '/',
@@ -43,9 +47,9 @@
     'lazy_mode' => true,
 
     // database configure
-    'database'=>[
-        'connection'=> env('EASY_PANEL_DB_CONNECTION'),
-        'panel_admin_table'=>'panel_admins',
-        'crud_table'=> 'cruds'
+    'database' => [
+        'connection' => env('EASY_PANEL_DB_CONNECTION', env('DB_CONNECTION', 'mysql')),
+        'panel_admin_table' => 'panel_admins',
+        'crud_table' => 'cruds'
     ]
 ];

database/migrations/cruds_table.php

@@ -11,7 +11,7 @@ class CreateCrudsTableEasypanel extends Migration
      */
     public function getConnection()
     {
-        return config('easy_panel.database.connection') ?: config('database.default');
+        return config('easy_panel.database.connection');
     }
 
     /**

database/migrations/panel_admins_table.php

@@ -11,8 +11,9 @@ class CreatePanelAdminsTableEasypanel extends Migration
      */
     public function getConnection()
     {
-        return config('easy_panel.database.connection') ?: config('database.default');
+        return config('easy_panel.database.connection');
     }
+
     /**
      * Run the migrations.
      *

src/EasyPanelServiceProvider.php

@@ -160,8 +160,7 @@ private function loadLivewireComponent()
     private function isDBConnected()
     {
         try {
-            $connection = config('easy_panel.database.connection') ?: config('database.default');
-            DB::connection($connection)->getPDO();
+            DB::connection(config('easy_panel.database.connection'))->getPDO();
         } catch (Exception $e) {
             Log::error('Please check your DB connection \n  Can not load routes of EasyPanel');
             Log::error($e->getMessage());

src/Models/CRUD.php

@@ -8,25 +8,22 @@
 
 class CRUD extends Model
 {
+    protected $guarded = [];
+
     /**
      * Create a new Eloquent model instance.
      *
      * @param array $attributes
      */
     public function __construct(array $attributes = [])
     {
-        $connection = config('easy_panel.database.connection') ?: config('database.default');
-        $table = config('easy_panel.database.crud_table') ?: 'cruds';
-
-        $this->setConnection($connection);
-
-        $this->setTable($table);
+
+        $this->setConnection(config('easy_panel.database.connection'));
+        $this->setTable(config('easy_panel.database.crud_table'));
 
         parent::__construct($attributes);
     }
 
-    protected $guarded = [];
-
     public function scopeActive($query)
     {
         return $query->where('built', true)->where('active', true)->get();

src/Models/PanelAdmin.php

@@ -9,25 +9,22 @@
 class PanelAdmin extends Model
 {
 
+    protected $guarded = [];
+
     /**
-    * Create a new Eloquent model instance.
-    *
-    * @param array $attributes
-    */
+     * Create a new Eloquent model instance.
+     *
+     * @param array $attributes
+     */
     public function __construct(array $attributes = [])
     {
-        $connection = config('easy_panel.database.connection') ?: config('database.default');
-        $table = config('easy_panel.database.panel_admin_table') ?: 'panel_admins';
-
-        $this->setConnection($connection);
 
-        $this->setTable($table);
+        $this->setConnection(config('easy_panel.database.connection'));
+        $this->setTable(config('easy_panel.database.panel_admin_table'));
 
         parent::__construct($attributes);
     }
 
-    protected $guarded = [];
-
     public function user()
     {
         return $this->belongsTo(config('easy_panel.user_model'));