FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error handling around reset install; clear cache

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-08-08 13:42:43 -04:00
parent a08c9db284
commit 380c9d13b6
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Console/Commands/DevCommands.php
View File

@@ -9,6 +9,8 @@ use App\Models\Pirep;
use App\Models\User; use App\Models\User;
use App\Services\AwardService; use App\Services\AwardService;
use App\Services\DatabaseService; use App\Services\DatabaseService;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use PDO; use PDO;
@@ -225,21 +227,35 @@ class DevCommands extends Command
exit(0); exit(0);
} }
if (config('database.default') === 'mysql') { try {
DB::statement('SET foreign_key_checks=0'); if (config('database.default') === 'mysql') {
} DB::statement('SET foreign_key_checks=0');
}
$this->info('Dropping all tables'); $this->info('Dropping all tables');
$tables = DB::connection()->getDoctrineSchemaManager()->listTableNames(); $tables = DB::connection()->getDoctrineSchemaManager()->listTableNames();
foreach ($tables as $table) { foreach ($tables as $table) {
Schema::dropIfExists($table); Schema::dropIfExists($table);
}
} catch (QueryException $e) {
$this->error('DB error: '.$e->getMessage());
} }
$this->info('Deleting config file'); $this->info('Deleting config file');
unlink('config.php'); try {
unlink('config.php');
} catch (\Exception $e) { }
$this->info('Deleting env file'); $this->info('Deleting env file');
unlink('env.php'); try {
unlink('env.php');
} catch (\Exception $e) { }
$this->info('Clearing caches');
Artisan::call('cache:clear');
Artisan::call('route:clear');
Artisan::call('config:clear');
Artisan::call('view:clear');
$this->info('Done!'); $this->info('Done!');
} }

2
config/modules.php
View File

@@ -121,7 +121,7 @@ return [
'cache' => [ 'cache' => [
'enabled' => true, 'enabled' => true,
'key' => 'phpvms-modules', 'key' => 'phpvms-modules',
'lifetime' => 60, 'lifetime' => 10,
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
modules/Installer/Http/Controllers/InstallerController.php
View File

@@ -279,7 +279,7 @@ class InstallerController extends Controller
{ {
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'airline_name' => 'required', 'airline_name' => 'required',
'airline_icao' => 'required|unique:airlines,icao', 'airline_icao' => 'required|size:3|unique:airlines,icao',
'airline_country' => 'required', 'airline_country' => 'required',
'name' => 'required', 'name' => 'required',
'email' => 'required|email|unique:users,email', 'email' => 'required|email|unique:users,email',