From 5629cd2fc10cf7262f43d77fe4fc9008ef73b625 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 11 Oct 2019 09:43:51 +0800 Subject: [PATCH] Prepare 3.9.3 release. Signed-off-by: Mior Muhammad Zaki --- CHANGELOG-3.9.md | 12 ++++++++++++ composer.json | 4 ++-- laravel/config/auth.php | 13 +++++++++++++ laravel/resources/lang/en/validation.php | 1 + src/Http/Kernel.php | 1 + 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-3.9.md b/CHANGELOG-3.9.md index 84c6f732b..cd4c137d0 100644 --- a/CHANGELOG-3.9.md +++ b/CHANGELOG-3.9.md @@ -2,6 +2,18 @@ This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`. +## 3.9.3 + +Released: 2019-10-11 + +### Changes + +* Update support for Laravel Framework v6.2. +* Update `Orchestra\Testbench\Http\Kernel::$routeMiddleware` to include `password.confirm` middleware. +* Update Laravel 6 skeleton: + - Add `auth.password_timeout` configuration. + - Add `password` value for `validation` language file. + ## 3.9.2 Released: 2019-09-15 diff --git a/composer.json b/composer.json index 16fd85f9a..469a7add7 100644 --- a/composer.json +++ b/composer.json @@ -30,13 +30,13 @@ "fzaninotto/faker": "^1.4" }, "require-dev": { - "laravel/framework": "^6.0", + "laravel/framework": "^6.2", "laravel/laravel": "dev-master", "mockery/mockery": "^1.2.3", "phpunit/phpunit": "^8.3" }, "suggest": { - "laravel/framework": "Required for testing (^6.0).", + "laravel/framework": "Required for testing (^6.2).", "mockery/mockery": "Allow to use Mockery for testing (^1.2).", "orchestra/testbench-browser-kit": "Allow to use legacy Laravel BrowserKit for testing (^3.9).", "orchestra/testbench-dusk": "Allow to use Laravel Dusk for testing (^3.9).", diff --git a/laravel/config/auth.php b/laravel/config/auth.php index 897dc8261..f1e9b2dad 100644 --- a/laravel/config/auth.php +++ b/laravel/config/auth.php @@ -100,4 +100,17 @@ ], ], + /* + |-------------------------------------------------------------------------- + | Password Confirmation Timeout + |-------------------------------------------------------------------------- + | + | 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. + | + */ + + 'password_timeout' => 10800, + ]; diff --git a/laravel/resources/lang/en/validation.php b/laravel/resources/lang/en/validation.php index e1d879f33..ce1d80dde 100644 --- a/laravel/resources/lang/en/validation.php +++ b/laravel/resources/lang/en/validation.php @@ -93,6 +93,7 @@ '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.', diff --git a/src/Http/Kernel.php b/src/Http/Kernel.php index 61413e827..c1f759917 100644 --- a/src/Http/Kernel.php +++ b/src/Http/Kernel.php @@ -61,6 +61,7 @@ class Kernel extends \Illuminate\Foundation\Http\Kernel 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'can' => \Illuminate\Auth\Middleware\Authorize::class, 'guest' => 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,