From 338dbb26a119d2009a0c538d7ed4f0650b7df374 Mon Sep 17 00:00:00 2001
From: jayvirsinh_gohil <gohiljsyvirsinh02@gmail.com>
Date: Wed, 4 Dec 2019 13:02:38 +0530
Subject: [PATCH] refactor database connection failed error message

---
 .../Controllers/EnvironmentController.php     |  4 ++++
 app/Space/EnvironmentManager.php              | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/EnvironmentController.php b/app/Http/Controllers/EnvironmentController.php
index 4aee5794..5da15687 100755
--- a/app/Http/Controllers/EnvironmentController.php
+++ b/app/Http/Controllers/EnvironmentController.php
@@ -33,10 +33,14 @@ class EnvironmentController extends Controller
      */
     public function saveDatabaseEnvironment(DatabaseEnvironmentRequest $request)
     {
+        Artisan::call('config:clear');
+        Artisan::call('cache:clear');
+
         $results = $this->EnvironmentManager->saveDatabaseVariables($request);
 
         if(array_key_exists("success", $results)) {
             Artisan::call('config:clear');
+            Artisan::call('cache:clear');
             Artisan::call('storage:link');
             Artisan::call('key:generate --force');
             Artisan::call('migrate --seed --force');
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index 75a00331..cf740b04 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -48,19 +48,21 @@ class EnvironmentManager
             'DB_USERNAME='.$request->database_username."\n".
             'DB_PASSWORD='.$request->database_password."\n\n";
 
-        if (! $this->checkDatabaseConnection($request)) {
-
-            return [
-                'error' => $this->checkDatabaseConnection($request)
-            ];
-        } else {
-            if(\Schema::hasTable('users') ) {
-                return [
-                    'error' => 'database_should_be_empty'
-                ];
+        try {
+            if ($this->checkDatabaseConnection($request)) {
+                if(\Schema::hasTable('users') ) {
+                    return [
+                        'error' => 'database_should_be_empty'
+                    ];
+                }
             }
+        } catch (Exception $e) {
+            return [
+                'error' => $e->getMessage()
+            ];
         }
 
+
         try {
 
             file_put_contents($this->envPath, str_replace(
@@ -321,7 +323,7 @@ class EnvironmentManager
 
             return true;
         } catch (Exception $e) {
-            return $e->getMessage();
+            return $e;
         }
     }
 }