From 1e5b9989c3d789e7ed4269c88e45ed0c1c2b8ce9 Mon Sep 17 00:00:00 2001 From: Surajit Basak Date: Tue, 28 Sep 2021 18:29:24 +0530 Subject: [PATCH 1/6] [8.x] Add failover in supported mail configurations comment section (#5692) Co-authored-by: Surajit Basak --- config/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index db9633658..e86074948 100644 --- a/config/mail.php +++ b/config/mail.php @@ -29,7 +29,7 @@ return [ | mailers below. You are free to add additional mailers as required. | | Supported: "smtp", "sendmail", "mailgun", "ses", - | "postmark", "log", "array" + | "postmark", "log", "array", "failover" | */ From 5f7395b289f32e5e5f5ece1dddb7d4ecf7ddadcc Mon Sep 17 00:00:00 2001 From: JuanDMeGon Date: Tue, 28 Sep 2021 08:03:31 -0500 Subject: [PATCH 2/6] Keeping access tokens migration id consistent (#5691) This is just a tiny "fix," using id(); to be consistent with the other migrations already included in the framework. --- .../2019_12_14_000001_create_personal_access_tokens_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php index 3ce00023a..4315e16a8 100644 --- a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php +++ b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php @@ -14,7 +14,7 @@ class CreatePersonalAccessTokensTable extends Migration public function up() { Schema::create('personal_access_tokens', function (Blueprint $table) { - $table->bigIncrements('id'); + $table->id(); $table->morphs('tokenable'); $table->string('name'); $table->string('token', 64)->unique(); From aa9cb884d2caef6d1e606ffbb61e92c90f9bd6de Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 29 Sep 2021 11:51:32 +0200 Subject: [PATCH 3/6] Bump Mockery and PHPUnit --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4f6a92801..aec77332e 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,9 @@ "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", "laravel/sail": "^1.0.1", - "mockery/mockery": "^1.4.2", + "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^5.0", - "phpunit/phpunit": "^9.3.3" + "phpunit/phpunit": "^9.5.8" }, "autoload": { "psr-4": { From ef9d0e4c78a097fb61218b38dd4e4c55a2278178 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Wed, 29 Sep 2021 14:17:58 +0100 Subject: [PATCH 4/6] Ensures downloaded version of Collision supports PHP 8.1 (#5697) Co-authored-by: Taylor Otwell --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aec77332e..3c6d778d1 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "fakerphp/faker": "^1.9.1", "laravel/sail": "^1.0.1", "mockery/mockery": "^1.4.4", - "nunomaduro/collision": "^5.0", + "nunomaduro/collision": "^5.10", "phpunit/phpunit": "^9.5.8" }, "autoload": { From 4578193d52f148c79b16a552db65e29a65fee209 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Wed, 29 Sep 2021 14:20:24 +0100 Subject: [PATCH 5/6] Uses `LazilyRefreshDatabase` by default (#5696) --- composer.json | 2 +- tests/Feature/ExampleTest.php | 1 - tests/TestCase.php | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 3c6d778d1..fc3dfc6be 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "php": "^7.3|^8.0", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", - "laravel/framework": "^8.54", + "laravel/framework": "^8.62", "laravel/sanctum": "^2.11", "laravel/tinker": "^2.5" }, diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 4ae02bc51..0894c608d 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -2,7 +2,6 @@ namespace Tests\Feature; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class ExampleTest extends TestCase diff --git a/tests/TestCase.php b/tests/TestCase.php index 2932d4a69..d665b2a87 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,9 +2,10 @@ namespace Tests; +use Illuminate\Foundation\Testing\LazilyRefreshDatabase; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { - use CreatesApplication; + use CreatesApplication, LazilyRefreshDatabase; } From 78e1d56c4285392f96fd90b445fef2faa7a8b9c7 Mon Sep 17 00:00:00 2001 From: Alex Elkins Date: Wed, 29 Sep 2021 16:29:27 -0400 Subject: [PATCH 6/6] Update validation.php (#5699) modify the grammar for lte and gte validation to have a parallel structure --- resources/lang/en/validation.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 21791139b..9fab4d928 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -53,9 +53,9 @@ return [ 'array' => 'The :attribute must have more than :value items.', ], 'gte' => [ - 'numeric' => 'The :attribute must be greater than or equal :value.', - 'file' => 'The :attribute must be greater than or equal :value kilobytes.', - 'string' => 'The :attribute must be greater than or equal :value characters.', + 'numeric' => 'The :attribute must be greater than or equal to :value.', + 'file' => 'The :attribute must be greater than or equal to :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal to :value characters.', 'array' => 'The :attribute must have :value items or more.', ], 'image' => 'The :attribute must be an image.', @@ -73,9 +73,9 @@ return [ 'array' => 'The :attribute must have less than :value items.', ], 'lte' => [ - 'numeric' => 'The :attribute must be less than or equal :value.', - 'file' => 'The :attribute must be less than or equal :value kilobytes.', - 'string' => 'The :attribute must be less than or equal :value characters.', + 'numeric' => 'The :attribute must be less than or equal to :value.', + 'file' => 'The :attribute must be less than or equal to :value kilobytes.', + 'string' => 'The :attribute must be less than or equal to :value characters.', 'array' => 'The :attribute must not have more than :value items.', ], 'max' => [