From b0421b83212a016a8d57beaed41232f7dc4b2263 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 25 Mar 2015 22:00:00 +0200 Subject: [PATCH] Working on setup page --- app/Http/Controllers/AppController.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php index 1a55b92c0e76..03b1acea1750 100644 --- a/app/Http/Controllers/AppController.php +++ b/app/Http/Controllers/AppController.php @@ -154,16 +154,12 @@ class AppController extends BaseController } } - // QUSTION: Does this actually get used??? public function install() { if (!Utils::isNinja() && !Utils::isDatabaseSetup()) { try { - // DB Migrate & Seed - // I Really don't want to do it this way but its the best I've found so far. See Above. - $process = new \Symfony\Component\Process\Process('cd ' . base_path() . ' && php artisan migrate --seed'); - $process->run(); - + Artisan::call('migrate', array('--force' => true)); + Artisan::call('db:seed', array('--force' => true)); } catch (Exception $e) { Response::make($e->getMessage(), 500); } @@ -176,12 +172,7 @@ class AppController extends BaseController { if (!Utils::isNinja()) { try { - // DB Migrate & Seed - // I Really don't want to do it this way but its the best I've found so far. See Above. - $process = new \Symfony\Component\Process\Process('cd ' . base_path() . ' && php artisan migrate'); - $process->run(); - - // Artisan::call('migrate'); + Artisan::call('migrate', array('--force' => true)); Cache::flush(); } catch (Exception $e) { Response::make($e->getMessage(), 500);