From 6c6caa7f6cead87dd4581df61fed530bc2f6a7d6 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 25 May 2015 20:28:47 +0100 Subject: [PATCH] Don't call Artisan facade --- app/Http/Controllers/SetupController.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 7cc811df..c761970f 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -14,8 +14,8 @@ namespace CachetHQ\Cachet\Http\Controllers; use CachetHQ\Cachet\Models\Setting; use CachetHQ\Cachet\Models\User; use GrahamCampbell\Binput\Facades\Binput; -use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Response; @@ -55,7 +55,7 @@ class SetupController extends AbstractController // If we've copied the .env.example file, then we should try and reset it ready for Segment to kick in. if (getenv('APP_KEY') === 'SomeRandomString') { - Artisan::call('key:generate'); + $this->keyGenerate(); } return View::make('setup')->with([ @@ -233,4 +233,22 @@ class SetupController extends AbstractController )); } } + + /** + * Generate the app.key value. + * + * @return void + */ + protected function keyGenerate() + { + $key = str_random(42); + + $path = base_path('.env'); + + file_put_contents($path, str_replace( + Config::get('app.key'), $key, file_get_contents($path) + )); + + Config::set('app.key', $key); + } }