From 8d08717f15d1bddf3d28124b928ccc3a5cfdf84b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 6 Jan 2022 15:31:01 -0600 Subject: [PATCH 1/6] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 8878ec111f1..1b6397ce32f 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,8 @@ We would like to extend our thanks to the following sponsors for funding Laravel - **[DevSquad](https://devsquad.com)** - **[Curotec](https://www.curotec.com/services/technologies/laravel/)** - **[OP.GG](https://op.gg)** -- **[CMS Max](https://www.cmsmax.com/)** - **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)** - **[Lendio](https://lendio.com)** -- **[Romega Software](https://romegasoftware.com)** ## Contributing From 5ae2f24a0411d6907adca42ceb2d1e7f7ffa7fd9 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 1 Feb 2022 08:43:03 -0600 Subject: [PATCH 2/6] fix spacing --- config/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/auth.php b/config/auth.php index e29a3f7dc0b..d8c6cee7c19 100644 --- a/config/auth.php +++ b/config/auth.php @@ -80,7 +80,7 @@ | than one user table or model in the application and you want to have | separate password reset settings based on the specific user types. | - | The expire time is the number of minutes that the reset token should be + | The expire time is the number of minutes that each reset token will be | considered valid. This security feature keeps tokens short-lived so | they have less time to be guessed. You may change this as needed. | From 926c48e8562e36811159d615ba27ebb2929d0378 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 1 Feb 2022 11:48:12 -0600 Subject: [PATCH 3/6] add validation language line --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 87fb437c2a7..5fe5b4124e5 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -108,6 +108,7 @@ 'prohibits' => 'The :attribute field prohibits :other from being present.', 'regex' => 'The :attribute format is invalid.', 'required' => 'The :attribute field is required.', + 'required_array_keys' => 'The :attribute field must contain entries for: :values', 'required_if' => 'The :attribute field is required when :other is :value.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_with' => 'The :attribute field is required when :values is present.', From 9051a027c56a415e81063ad587a143b276956ad9 Mon Sep 17 00:00:00 2001 From: Emaia Date: Wed, 2 Feb 2022 22:57:23 -0300 Subject: [PATCH 4/6] Fix alphabetical order --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 5fe5b4124e5..d0e869542b3 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -68,7 +68,6 @@ 'ip' => 'The :attribute must be a valid IP address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.', - 'mac_address' => 'The :attribute must be a valid MAC address.', 'json' => 'The :attribute must be a valid JSON string.', 'lt' => [ 'numeric' => 'The :attribute must be less than :value.', @@ -82,6 +81,7 @@ 'string' => 'The :attribute must be less than or equal to :value characters.', 'array' => 'The :attribute must not have more than :value items.', ], + 'mac_address' => 'The :attribute must be a valid MAC address.', 'max' => [ 'numeric' => 'The :attribute must not be greater than :max.', 'file' => 'The :attribute must not be greater than :max kilobytes.', From 096638ea9a883495f4eddace63fde5a7fb1b2b1f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 3 Feb 2022 16:06:00 +0100 Subject: [PATCH 5/6] Update the default Argon2 options --- config/hashing.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hashing.php b/config/hashing.php index 842577087c0..bcd3be4c28a 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -44,9 +44,9 @@ */ 'argon' => [ - 'memory' => 1024, - 'threads' => 2, - 'time' => 2, + 'memory' => 65536, + 'threads' => 1, + 'time' => 4, ], ]; From 4c5b7742946736fc72d2e32a3d82ba75426ab784 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 7 Feb 2022 01:42:53 +0300 Subject: [PATCH 6/6] Added missing dot in `required_array_keys` validation rule (#5798) --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d0e869542b3..783003cfcca 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -108,7 +108,7 @@ 'prohibits' => 'The :attribute field prohibits :other from being present.', 'regex' => 'The :attribute format is invalid.', 'required' => 'The :attribute field is required.', - 'required_array_keys' => 'The :attribute field must contain entries for: :values', + 'required_array_keys' => 'The :attribute field must contain entries for: :values.', 'required_if' => 'The :attribute field is required when :other is :value.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_with' => 'The :attribute field is required when :values is present.',