From dd0817709bfcfb327bdb8c0c12bd2101bf706739 Mon Sep 17 00:00:00 2001 From: raishvaria Date: Fri, 22 Nov 2019 15:11:11 +0530 Subject: [PATCH] fix installation issue & add ver update listener --- .../Requests/DatabaseEnvironmentRequest.php | 8 ++-- app/Http/Requests/MailEnvironmentRequest.php | 44 +++++++++---------- app/Listeners/Updates/v1/Version110.php | 39 ++++++++++++++++ app/Providers/EventServiceProvider.php | 2 + app/Space/EnvironmentManager.php | 2 +- 5 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 app/Listeners/Updates/v1/Version110.php diff --git a/app/Http/Requests/DatabaseEnvironmentRequest.php b/app/Http/Requests/DatabaseEnvironmentRequest.php index 8c9e67aa..e1130225 100644 --- a/app/Http/Requests/DatabaseEnvironmentRequest.php +++ b/app/Http/Requests/DatabaseEnvironmentRequest.php @@ -25,11 +25,11 @@ class DatabaseEnvironmentRequest extends FormRequest { return [ 'app_url' => 'required|url', - 'database_connection' => 'required|string|max:50', - 'database_hostname' => 'required|string|max:50', + 'database_connection' => 'required|string', + 'database_hostname' => 'required|string', 'database_port' => 'required|numeric', - 'database_name' => 'required|string|max:50', - 'database_username' => 'required|string|max:50', + 'database_name' => 'required|string', + 'database_username' => 'required|string', ]; } } diff --git a/app/Http/Requests/MailEnvironmentRequest.php b/app/Http/Requests/MailEnvironmentRequest.php index 652964cb..6ee72a20 100644 --- a/app/Http/Requests/MailEnvironmentRequest.php +++ b/app/Http/Requests/MailEnvironmentRequest.php @@ -26,55 +26,55 @@ class MailEnvironmentRequest extends FormRequest switch ($this->get('mail_driver')) { case 'smtp': return [ - 'mail_driver' => 'required|string|max:50', - 'mail_host' => 'required|string|max:50', - 'mail_port' => 'required|max:50', + 'mail_driver' => 'required|string', + 'mail_host' => 'required|string', + 'mail_port' => 'required', 'mail_username' => 'required|string', 'mail_password' => 'required|string', - 'mail_encryption' => 'required|string|max:50', - 'from_name' => 'required|string|max:50', - 'from_mail' => 'required|string|max:50', + 'mail_encryption' => 'required|string', + 'from_name' => 'required|string', + 'from_mail' => 'required|string', ]; break; case 'mailgun': return [ - 'mail_driver' => 'required|string|max:50', - 'mail_host' => 'required|string|max:50', - 'mail_port' => 'required|max:50', + 'mail_driver' => 'required|string', + 'mail_host' => 'required|string', + 'mail_port' => 'required', 'mail_mailgun_domain' => 'required|string', 'mail_mailgun_secret' => 'required|string', 'mail_mailgun_endpoint' => 'required|string', - 'mail_encryption' => 'required|string|max:50', - 'from_name' => 'required|string|max:50', - 'from_mail' => 'required|string|max:50', + 'mail_encryption' => 'required|string', + 'from_name' => 'required|string', + 'from_mail' => 'required|string', ]; break; case 'ses': return [ - 'mail_driver' => 'required|string|max:50', - 'mail_host' => 'required|string|max:50', - 'mail_port' => 'required|max:50', + 'mail_driver' => 'required|string', + 'mail_host' => 'required|string', + 'mail_port' => 'required', 'mail_ses_key' => 'required|string', 'mail_ses_secret' => 'required|string', - 'mail_encryption' => 'required|string|max:50', - 'from_name' => 'required|string|max:50', - 'from_mail' => 'required|string|max:50', + 'mail_encryption' => 'required|string', + 'from_name' => 'required|string', + 'from_mail' => 'required|string', ]; break; case 'mail': return [ - 'from_name' => 'required|string|max:50', - 'from_mail' => 'required|string|max:50', + 'from_name' => 'required|string', + 'from_mail' => 'required|string', ]; break; case 'sendmail': return [ - 'from_name' => 'required|string|max:50', - 'from_mail' => 'required|string|max:50', + 'from_name' => 'required|string', + 'from_mail' => 'required|string', ]; break; } diff --git a/app/Listeners/Updates/v1/Version110.php b/app/Listeners/Updates/v1/Version110.php new file mode 100644 index 00000000..1dc39c26 --- /dev/null +++ b/app/Listeners/Updates/v1/Version110.php @@ -0,0 +1,39 @@ +check($event)) { + return; + } + + // Update Crater app version + Setting::setSetting('version', static::VERSION); + } +} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index dcb39372..78028330 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -5,6 +5,7 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Crater\Events\UpdateFinished; +use Crater\Listeners\Updates\v1\Version110; class EventServiceProvider extends ServiceProvider { @@ -15,6 +16,7 @@ class EventServiceProvider extends ServiceProvider */ protected $listen = [ UpdateFinished::class=> [ + Version110::class, ], Registered::class => [ SendEmailVerificationNotification::class, diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php index a8a6419f..ca769c20 100755 --- a/app/Space/EnvironmentManager.php +++ b/app/Space/EnvironmentManager.php @@ -54,7 +54,7 @@ class EnvironmentManager 'error' => 'connection_failed' ]; } else { - if(count(DB::connection()->select('SHOW TABLES'))) { + if(\Schema::hasTable('users') ) { return [ 'error' => 'database_should_be_empty' ];