From 2b8f3aa506f1f2463dfdb43b063d17674b86c8cd Mon Sep 17 00:00:00 2001 From: Karel Faille Date: Tue, 2 Mar 2021 20:35:52 +0100 Subject: [PATCH 1/4] Use same default queue name for all drivers (#5549) --- config/queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/queue.php b/config/queue.php index 12222966..4cef37cc 100644 --- a/config/queue.php +++ b/config/queue.php @@ -54,7 +54,7 @@ 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), - 'queue' => env('SQS_QUEUE', 'your-queue-name'), + 'queue' => env('SQS_QUEUE', 'default'), 'suffix' => env('SQS_SUFFIX'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], From c9883355026d96703c27d1379e4c2cc27015eeb8 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 10 Mar 2021 00:23:56 +1100 Subject: [PATCH 2/4] Standarise "must" and "may" language in validation (#5552) Majority of the messages are in the format ":attribute must {conditions_to_be_met}", however a few inconsistently use "may" instead of "must". This PR fixes that and has them all use "must" instead. To highlight the inconsistency: ```php // "may" 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], // "must" 'min' => [ 'numeric' => 'The :attribute must be at least :min.', 'file' => 'The :attribute must be at least :min kilobytes.', 'string' => 'The :attribute must be at least :min characters.', 'array' => 'The :attribute must have at least :min items.', ], ``` --- resources/lang/en/validation.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index c77e41ce..9a8dfcf8 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -17,9 +17,9 @@ 'active_url' => 'The :attribute is not a valid URL.', 'after' => 'The :attribute must be a date after :date.', 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'alpha' => 'The :attribute must only contain letters.', + 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.', + 'alpha_num' => 'The :attribute must only contain letters and numbers.', 'array' => 'The :attribute must be an array.', 'before' => 'The :attribute must be a date before :date.', 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', @@ -77,10 +77,10 @@ 'array' => 'The :attribute must not have more than :value items.', ], 'max' => [ - 'numeric' => 'The :attribute may not be greater than :max.', - 'file' => 'The :attribute may not be greater than :max kilobytes.', - 'string' => 'The :attribute may not be greater than :max characters.', - 'array' => 'The :attribute may not have more than :max items.', + 'numeric' => 'The :attribute must not be greater than :max.', + 'file' => 'The :attribute must not be greater than :max kilobytes.', + 'string' => 'The :attribute must not be greater than :max characters.', + 'array' => 'The :attribute must not have more than :max items.', ], 'mimes' => 'The :attribute must be a file of type: :values.', 'mimetypes' => 'The :attribute must be a file of type: :values.', From 5cfd28df2d550c4d63417ba54f31c96887cd345b Mon Sep 17 00:00:00 2001 From: Brandon Surowiec Date: Tue, 9 Mar 2021 09:51:56 -0500 Subject: [PATCH 3/4] Add missing 'after_commit' attribute (#5554) There's a new `after_commit` config option that isn't in the default config: https://laravel.com/docs/8.x/queues#jobs-and-database-transactions For new projects it may be better to have these defaulted to `true`, but I left it as `false` for now. --- config/queue.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/queue.php b/config/queue.php index 4cef37cc..25ea5a81 100644 --- a/config/queue.php +++ b/config/queue.php @@ -39,6 +39,7 @@ 'table' => 'jobs', 'queue' => 'default', 'retry_after' => 90, + 'after_commit' => false, ], 'beanstalkd' => [ @@ -47,6 +48,7 @@ 'queue' => 'default', 'retry_after' => 90, 'block_for' => 0, + 'after_commit' => false, ], 'sqs' => [ @@ -57,6 +59,7 @@ 'queue' => env('SQS_QUEUE', 'default'), 'suffix' => env('SQS_SUFFIX'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'after_commit' => false, ], 'redis' => [ @@ -65,6 +68,7 @@ 'queue' => env('REDIS_QUEUE', 'default'), 'retry_after' => 90, 'block_for' => null, + 'after_commit' => false, ], ], From a315767e093ca2ba19ca7c60b02aa89467d81628 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 9 Mar 2021 20:09:48 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15074d56..cc72064f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.12...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.13...8.x) + + +## [v8.5.13 (2021-03-09)](https://github.com/laravel/laravel/compare/v8.5.12...v8.5.13) + +### Changed +- Use same default queue name for all drivers ([#5549](https://github.com/laravel/laravel/pull/5549)) +- Standardise "must" and "may" language in validation ([#5552](https://github.com/laravel/laravel/pull/5552)) +- Add missing 'after_commit' key to queue config ([#5554](https://github.com/laravel/laravel/pull/5554)) ## [v8.5.12 (2021-03-02)](https://github.com/laravel/laravel/compare/v8.5.11...v8.5.12)