From fd7ff4d285a347311178944d3ca35b597f2cdc0d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 30 Apr 2022 11:16:59 +1000 Subject: [PATCH 1/6] Clean up --- app/Jobs/Account/CreateAccount.php | 39 ------------------------------ app/Jobs/Util/StartMigration.php | 1 - 2 files changed, 40 deletions(-) diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php index e74b56aa5f28..59560b803318 100644 --- a/app/Jobs/Account/CreateAccount.php +++ b/app/Jobs/Account/CreateAccount.php @@ -156,45 +156,6 @@ class CreateAccount return $sp794f3f; } - // private function processSettings($settings) - // { - // if(Ninja::isHosted() && Cache::get('currencies')) - // { - - // $currency = Cache::get('currencies')->filter(function ($item) use ($currency_code) { - // return strtolower($item->code) == $currency_code; - // })->first(); - - // if ($currency) { - // $settings->currency_id = (string)$currency->id; - // } - - // $country = Cache::get('countries')->filter(function ($item) use ($country_code) { - // return strtolower($item->iso_3166_2) == $country_code || strtolower($item->iso_3166_3) == $country_code; - // })->first(); - - // if ($country) { - // $settings->country_id = (string)$country->id; - // } - - // $language = Cache::get('languages')->filter(function ($item) use ($currency_code) { - // return strtolower($item->locale) == $currency_code; - // })->first(); - - // if ($language) { - // $settings->language_id = (string)$language->id; - // } - - // if($timezone) { - // $settings->timezone_id = (string)$timezone->id; - // } - - // return $settings; - // } - - - // return $settings; - // } } diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index 94716c210a34..0368b37d98fd 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -132,7 +132,6 @@ class StartMigration implements ShouldQueue $this->company->update_products = $update_product_flag; $this->company->save(); - if(Ninja::isHosted()) app('sentry')->captureException($e); From 25aadf9202b500e95260b6c7977fe9d2a3c2ec67 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 30 Apr 2022 11:55:39 +1000 Subject: [PATCH 2/6] Email blacklists --- .../Requests/Account/CreateAccountRequest.php | 14 +++- app/Http/Requests/Login/LoginRequest.php | 3 +- .../Account/EmailBlackListRule.php | 47 +++++++++++++ .../EmailBlacklistValidationTest.php | 70 +++++++++++++++++++ 4 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 app/Http/ValidationRules/Account/EmailBlackListRule.php create mode 100644 tests/Unit/ValidationRules/EmailBlacklistValidationTest.php diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php index 363ec222b6d8..78661967c3fa 100644 --- a/app/Http/Requests/Account/CreateAccountRequest.php +++ b/app/Http/Requests/Account/CreateAccountRequest.php @@ -12,7 +12,10 @@ namespace App\Http\Requests\Account; use App\Http\Requests\Request; +use App\Http\ValidationRules\Account\BlackListRule; +use App\Http\ValidationRules\Account\EmailBlackListRule; use App\Http\ValidationRules\NewUniqueUserRule; +use App\Utils\Ninja; class CreateAccountRequest extends Request { @@ -33,13 +36,18 @@ class CreateAccountRequest extends Request */ public function rules() { + + if(Ninja::isHosted()) + $email_rules = ['required', 'email:rfc,dns', new NewUniqueUserRule, new BlackListRule, new EmailBlackListRule]; + else + $email_rules = ['required', 'email:rfc,dns', new NewUniqueUserRule]; + + return [ 'first_name' => 'string|max:100', 'last_name' => 'string:max:100', 'password' => 'required|string|min:6|max:1000', - // 'email' => 'bail|required|email:rfc,dns', - // 'email' => new NewUniqueUserRule(), - 'email' => ['required', 'email:rfc,dns', new NewUniqueUserRule], + 'email' => $email_rules, 'privacy_policy' => 'required|boolean', 'terms_of_service' => 'required|boolean', ]; diff --git a/app/Http/Requests/Login/LoginRequest.php b/app/Http/Requests/Login/LoginRequest.php index 2f8b42e0c3c0..01c67c281e4c 100644 --- a/app/Http/Requests/Login/LoginRequest.php +++ b/app/Http/Requests/Login/LoginRequest.php @@ -14,6 +14,7 @@ namespace App\Http\Requests\Login; use App\Http\Requests\Request; use App\Http\ValidationRules\Account\BlackListRule; +use App\Http\ValidationRules\Account\EmailBlackListRule; use App\Utils\Ninja; class LoginRequest extends Request @@ -38,7 +39,7 @@ class LoginRequest extends Request { if(Ninja::isHosted()) - $email_rules = ['required', new BlackListRule]; + $email_rules = ['required', new BlackListRule, new EmailBlackListRule]; else $email_rules = 'required'; diff --git a/app/Http/ValidationRules/Account/EmailBlackListRule.php b/app/Http/ValidationRules/Account/EmailBlackListRule.php new file mode 100644 index 000000000000..06a5f854a986 --- /dev/null +++ b/app/Http/ValidationRules/Account/EmailBlackListRule.php @@ -0,0 +1,47 @@ +blacklist); + + } + + /** + * @return string + */ + public function message() + { + return "This email address is blacklisted, if you think this is in error, please email contact@invoiceninja.com"; + } + + +} diff --git a/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php b/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php new file mode 100644 index 000000000000..28527283741e --- /dev/null +++ b/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php @@ -0,0 +1,70 @@ +blacklist = ['gimmy@gmail.com']; + + $rules = [ + 'email' => [$email_rule] + ]; + + $data = [ + 'email' => "gimmy@gmail.com", + ]; + + $v = $this->app['validator']->make($data, $rules); + $this->assertFalse($v->passes()); + } + + + public function testInValidEmailRule() + { + + $rules = [ + 'email' => [new EmailBlackListRule] + ]; + + $data = [ + 'email' => "jimmy@candassociates.com", + ]; + + $v = $this->app['validator']->make($data, $rules); + $this->assertTrue($v->passes()); + } + + + + +} From 81e91b2ebcf8c78366e5989419400f7b89c629c0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 May 2022 07:44:14 +1000 Subject: [PATCH 3/6] Don't run migration on hosted - prevent blocking db --- ...tom_fields_column_from_varchar_to_text.php | 221 +++++++++--------- 1 file changed, 113 insertions(+), 108 deletions(-) diff --git a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php index 520730dca190..1b98756d6bc8 100644 --- a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php +++ b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php @@ -1,5 +1,6 @@ text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + if(Ninja::isSelfHost()) + { + Schema::table('credits', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('client_contacts', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('client_contacts', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('clients', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('clients', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('clients', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('clients', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('documents', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('documents', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('expenses', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('expenses', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('invoices', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('invoices', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('payments', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('payments', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('products', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('products', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('projects', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('projects', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('quotes', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('quotes', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('recurring_invoices', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('recurring_invoices', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('recurring_quotes', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('recurring_quotes', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('recurring_expenses', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('recurring_expenses', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('tasks', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('tasks', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('users', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('users', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('vendors', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('vendors', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); - Schema::table('vendor_contacts', function (Blueprint $table) { + }); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + Schema::table('vendor_contacts', function (Blueprint $table) { - }); + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value3')->change(); + }); + } + } /** From 75f4d9a4a89b96cbe4c5e200e29bc88a54450b99 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 May 2022 08:18:00 +1000 Subject: [PATCH 4/6] Fixes for column type changes --- ...tom_fields_column_from_varchar_to_text.php | 221 +++++++++--------- 1 file changed, 109 insertions(+), 112 deletions(-) diff --git a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php index 1b98756d6bc8..77a4f065f374 100644 --- a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php +++ b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php @@ -16,171 +16,168 @@ class ConvertCustomFieldsColumnFromVarcharToText extends Migration { set_time_limit(0); + Schema::table('credits', function (Blueprint $table) { - if(Ninja::isSelfHost()) - { - Schema::table('credits', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('client_contacts', function (Blueprint $table) { - Schema::table('client_contacts', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('clients', function (Blueprint $table) { - Schema::table('clients', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('clients', function (Blueprint $table) { - Schema::table('clients', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('documents', function (Blueprint $table) { - Schema::table('documents', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('expenses', function (Blueprint $table) { - Schema::table('expenses', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('invoices', function (Blueprint $table) { - Schema::table('invoices', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('payments', function (Blueprint $table) { - Schema::table('payments', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('products', function (Blueprint $table) { - Schema::table('products', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('projects', function (Blueprint $table) { - Schema::table('projects', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('quotes', function (Blueprint $table) { - Schema::table('quotes', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('recurring_invoices', function (Blueprint $table) { - Schema::table('recurring_invoices', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('recurring_quotes', function (Blueprint $table) { - Schema::table('recurring_quotes', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('recurring_expenses', function (Blueprint $table) { - Schema::table('recurring_expenses', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('tasks', function (Blueprint $table) { - Schema::table('tasks', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('users', function (Blueprint $table) { - Schema::table('users', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('vendors', function (Blueprint $table) { - Schema::table('vendors', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); + }); - }); + Schema::table('vendor_contacts', function (Blueprint $table) { - Schema::table('vendor_contacts', function (Blueprint $table) { + $table->text('custom_value1')->change(); + $table->text('custom_value2')->change(); + $table->text('custom_value3')->change(); + $table->text('custom_value4')->change(); - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value3')->change(); - - }); - } + }); + } From e72c8d93c2557d651e5a4b3f16e00ecd5f87ccec Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 May 2022 15:27:14 +1000 Subject: [PATCH 5/6] Fixes for phpunit --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index bc1b6f1cf5b9..3ce1032ce9c1 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: ['ubuntu-18.04', 'ubuntu-20.04', 'ubuntu-22.04'] + operating-system: ['ubuntu-18.04', 'ubuntu-20.04'] php-versions: ['7.4','8.0','8.1'] phpunit-versions: ['latest'] From 5c5a6af20475f05d97c01f855ad3fd7c052bb899 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 May 2022 15:29:26 +1000 Subject: [PATCH 6/6] Clean up migrations --- ...nvert_custom_fields_column_from_varchar_to_text.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php index 77a4f065f374..47d4da044a75 100644 --- a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php +++ b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php @@ -43,15 +43,6 @@ class ConvertCustomFieldsColumnFromVarcharToText extends Migration }); - Schema::table('clients', function (Blueprint $table) { - - $table->text('custom_value1')->change(); - $table->text('custom_value2')->change(); - $table->text('custom_value3')->change(); - $table->text('custom_value4')->change(); - - }); - Schema::table('documents', function (Blueprint $table) { $table->text('custom_value1')->change(); @@ -178,7 +169,6 @@ class ConvertCustomFieldsColumnFromVarcharToText extends Migration }); - } /**