From 56157b9cd201b5dc6fbe5f9f73014fa32e5a7838 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 11 Sep 2019 13:10:18 +0100 Subject: [PATCH 01/11] Revert "According to PHP Bug 78516 Argon2 requires at least 8KB (#5097)" (#5102) This reverts commit 74d84e9371b2d2486edcc8f458adc9f22957d68b. --- config/hashing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hashing.php b/config/hashing.php index 9146bfd9..84257708 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -44,7 +44,7 @@ return [ */ 'argon' => [ - 'memory' => 8192, + 'memory' => 1024, 'threads' => 2, 'time' => 2, ], From cba8d19f8603fc409c2a72a0f33a4b0a7fab2ee5 Mon Sep 17 00:00:00 2001 From: James Merrix Date: Thu, 12 Sep 2019 13:48:34 +0100 Subject: [PATCH 02/11] Added Appoly sponsor (#5105) --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index f95b2ec9..89a2a28c 100644 --- a/readme.md +++ b/readme.md @@ -58,6 +58,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel - [Understand.io](https://www.understand.io/) - [Abdel Elrafa](https://abdelelrafa.com) - [Hyper Host](https://hyper.host) +- [Appoly](https://www.appoly.co.uk) ## Contributing From 42e864f3f5f8fe5bfbdbac66dc2e4b95159fedcb Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Fri, 13 Sep 2019 22:19:06 +1000 Subject: [PATCH 03/11] remove testing bootstrap extension (#5107) --- phpunit.xml | 8 -------- tests/Bootstrap.php | 42 ------------------------------------------ 2 files changed, 50 deletions(-) delete mode 100644 tests/Bootstrap.php diff --git a/phpunit.xml b/phpunit.xml index 61b6b64b..da4add30 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -22,9 +22,6 @@ ./app - - - @@ -32,10 +29,5 @@ - - - - - diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php deleted file mode 100644 index 5fa7829c..00000000 --- a/tests/Bootstrap.php +++ /dev/null @@ -1,42 +0,0 @@ -createApplication()->make(Kernel::class); - - $commands = [ - 'config:cache', - 'event:cache', - ]; - - foreach ($commands as $command) { - $console->call($command); - } - } - - public function executeAfterLastTest(): void - { - array_map('unlink', glob('bootstrap/cache/*.phpunit.php')); - } -} From c70c986e58fe1a14f7c74626e6e97032d4084d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Vil=C3=A0?= Date: Fri, 13 Sep 2019 21:47:34 +0200 Subject: [PATCH 04/11] [6.x] Add 'null' logging channel (#5106) * Add 'none' logging channel * Remove extra spaces * Rename 'none' channel to 'null' * Update logging.php --- config/logging.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/logging.php b/config/logging.php index d09cd7d2..0df82129 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,5 +1,6 @@ 'errorlog', 'level' => 'debug', ], + + 'null' => [ + 'driver' => 'monolog', + 'handler' => NullHandler::class, + ], ], ]; From 51a1297a2486e2b68883bba9e534ec903f0c10d4 Mon Sep 17 00:00:00 2001 From: Sangrak Choi Date: Thu, 26 Sep 2019 21:24:53 +0900 Subject: [PATCH 05/11] [6.x] Added OP.GG sponsor (#5121) * Added OP.GG sponsor * Update readme.md --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 89a2a28c..73dddea2 100644 --- a/readme.md +++ b/readme.md @@ -59,6 +59,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel - [Abdel Elrafa](https://abdelelrafa.com) - [Hyper Host](https://hyper.host) - [Appoly](https://www.appoly.co.uk) +- [OP.GG](https://op.gg) ## Contributing From 050c1d880ec1d48ef40d7a0f2b2f1040c23cebb9 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 8 Oct 2019 11:26:03 +0200 Subject: [PATCH 06/11] Add new password rule 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 e1d879f3..ce1d80dd 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -93,6 +93,7 @@ return [ 'not_in' => 'The selected :attribute is invalid.', 'not_regex' => 'The :attribute format is invalid.', 'numeric' => 'The :attribute must be a number.', + 'password' => 'The password is incorrect.', 'present' => 'The :attribute field must be present.', 'regex' => 'The :attribute format is invalid.', 'required' => 'The :attribute field is required.', From 4036f17416549758816894dc52dc54eabcc13914 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 8 Oct 2019 13:39:57 +0200 Subject: [PATCH 07/11] Remove middleware from password reset It's not necessary for the user to be logged out when resetting their password. This allows users to reset their password while logged in. Can be used in combination with the new RequiresPassword middleware. --- app/Http/Controllers/Auth/ForgotPasswordController.php | 10 ---------- app/Http/Controllers/Auth/ResetPasswordController.php | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 6a247fef..465c39cc 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -19,14 +19,4 @@ class ForgotPasswordController extends Controller */ use SendsPasswordResetEmails; - - /** - * Create a new controller instance. - * - * @return void - */ - public function __construct() - { - $this->middleware('guest'); - } } diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index cf726eec..fe965b24 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -26,14 +26,4 @@ class ResetPasswordController extends Controller * @var string */ protected $redirectTo = '/home'; - - /** - * Create a new controller instance. - * - * @return void - */ - public function __construct() - { - $this->middleware('guest'); - } } From ba3aae6c338314c2ba1779f336278c2532071b7c Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 8 Oct 2019 13:45:40 +0200 Subject: [PATCH 08/11] Implement password confirmation --- .../Auth/ConfirmPasswordController.php | 39 +++++++++++++++++++ app/Http/Kernel.php | 1 + config/auth.php | 13 +++++++ 3 files changed, 53 insertions(+) create mode 100644 app/Http/Controllers/Auth/ConfirmPasswordController.php diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php new file mode 100644 index 00000000..5b9042c5 --- /dev/null +++ b/app/Http/Controllers/Auth/ConfirmPasswordController.php @@ -0,0 +1,39 @@ +middleware('auth'); + } +} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 0d7d8c15..2741c0a3 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -57,6 +57,7 @@ class Kernel extends HttpKernel 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'can' => \Illuminate\Auth\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class, 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, diff --git a/config/auth.php b/config/auth.php index 897dc826..204a378d 100644 --- a/config/auth.php +++ b/config/auth.php @@ -100,4 +100,17 @@ return [ ], ], + /* + |-------------------------------------------------------------------------- + | Password Confirmation Timeout + |-------------------------------------------------------------------------- + | + | Here you may specify the amount of seconds before a password confirmation + | is timed out and the user's prompted to give their password again on the + | confirmation screen. By default the timeout lasts for three hours. + | + */ + + 'password_timeout' => 10800, + ]; From d1f7a5a886039e28a434905447865ca952032284 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Oct 2019 07:27:05 -0500 Subject: [PATCH 09/11] formatting --- config/auth.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/auth.php b/config/auth.php index 204a378d..f1e9b2da 100644 --- a/config/auth.php +++ b/config/auth.php @@ -105,9 +105,9 @@ return [ | Password Confirmation Timeout |-------------------------------------------------------------------------- | - | Here you may specify the amount of seconds before a password confirmation - | is timed out and the user's prompted to give their password again on the - | confirmation screen. By default the timeout lasts for three hours. + | Here you may define the amount of seconds before a password confirmation + | times out and the user is prompted to re-enter their password via the + | confirmation screen. By default, the timeout lasts for three hours. | */ From 9bc23ee468e1fb3e5b4efccdc35f1fcee5a8b6bc Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Oct 2019 07:35:48 -0500 Subject: [PATCH 10/11] formatting --- app/Http/Controllers/Auth/ConfirmPasswordController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php index 5b9042c5..3559954c 100644 --- a/app/Http/Controllers/Auth/ConfirmPasswordController.php +++ b/app/Http/Controllers/Auth/ConfirmPasswordController.php @@ -12,9 +12,9 @@ class ConfirmPasswordController extends Controller | Confirm Password Controller |-------------------------------------------------------------------------- | - | This controller is responsible for handling password confirmations - | and uses a simple trait to include this behavior. You're free to - | explore this trait and override any methods you wish to tweak. + | This controller is responsible for handling password confirmations and + | uses a simple trait to include the behavior. You're free to explore + | this trait and override any functions that require customization. | */ From 39c28801e8d8a8cfc99c3eed4756c6acc7367e0c Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 8 Oct 2019 18:38:02 +0200 Subject: [PATCH 11/11] Update CHANGELOG.md --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25493a4f..424c9ce9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v6.0.2...master) +## [Unreleased](https://github.com/laravel/laravel/compare/v6.2.0...master) + + +## [v6.2.0 (2019-10-08)](https://github.com/laravel/laravel/compare/v6.0.2...v6.2.0) + +### Added +- Add 'null' logging channel ([#5106](https://github.com/laravel/laravel/pull/5106)) +- Add Password confirmation ([#5129](https://github.com/laravel/laravel/pull/5129), [d1f7a5a](https://github.com/laravel/laravel/commit/d1f7a5a886039e28a434905447865ca952032284), [9bc23ee](https://github.com/laravel/laravel/commit/9bc23ee468e1fb3e5b4efccdc35f1fcee5a8b6bc)) + +### Removed +- Remove testing bootstrap extension ([#5107](https://github.com/laravel/laravel/pull/5107)) + +### Fixed +- Revert "[6.x] According to PHP Bug 78516 Argon2 requires at least 8KB" ([#5102]()https://github.com/laravel/laravel/pull/5102) ## [v6.0.2 (2019-09-10)](https://github.com/laravel/laravel/compare/v6.0.1...v6.0.2)