From 3399464a7452ac8067cef8fb224b2413e8991a4b Mon Sep 17 00:00:00 2001 From: Dwight Watson Date: Wed, 18 Aug 2021 23:14:34 +1000 Subject: [PATCH 1/6] Add failover driver to default mail config file (#5672) * Add failover driver to default mail config file * Remove empty spaces --- config/mail.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/mail.php b/config/mail.php index 54299aab..db963365 100644 --- a/config/mail.php +++ b/config/mail.php @@ -70,6 +70,14 @@ 'array' => [ 'transport' => 'array', ], + + 'failover' => [ + 'transport' => 'failover', + 'mailers' => [ + 'smtp', + 'log', + ], + ], ], /* From c512ba2b160d1e87205dd45b60d8c0cfab230025 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 19 Aug 2021 16:03:02 +0200 Subject: [PATCH 2/6] Update app.php (#5674) --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index c9b8f5ae..adc6aa5f 100644 --- a/config/app.php +++ b/config/app.php @@ -121,7 +121,7 @@ 'key' => env('APP_KEY'), - 'cipher' => 'AES-256-CBC', + 'cipher' => 'AES-256-GCM', /* |-------------------------------------------------------------------------- From 52de5d84f6c309e93910e0d250b8c42fd656931b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 20 Aug 2021 07:59:36 -0500 Subject: [PATCH 3/6] wip --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index adc6aa5f..c9b8f5ae 100644 --- a/config/app.php +++ b/config/app.php @@ -121,7 +121,7 @@ 'key' => env('APP_KEY'), - 'cipher' => 'AES-256-GCM', + 'cipher' => 'AES-256-CBC', /* |-------------------------------------------------------------------------- From 8677c94a50f15dd0b21f938c799126efa5d1cc89 Mon Sep 17 00:00:00 2001 From: Gabriel Pillet Date: Mon, 23 Aug 2021 15:42:15 +0200 Subject: [PATCH 4/6] Fixing "Line exceeds 120 characters" in TrustProxies (#5677) To comply with PSR-2 --- app/Http/Middleware/TrustProxies.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index d11dd5f0..0c7d3b6b 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -19,5 +19,10 @@ class TrustProxies extends Middleware * * @var int */ - protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB; + protected $headers = + Request::HEADER_X_FORWARDED_FOR | + Request::HEADER_X_FORWARDED_HOST | + Request::HEADER_X_FORWARDED_PORT | + Request::HEADER_X_FORWARDED_PROTO | + Request::HEADER_X_FORWARDED_AWS_ELB; } From 7c993468018d950d549fae77241a53cb4f68e2ad Mon Sep 17 00:00:00 2001 From: Maarten Buis Date: Mon, 23 Aug 2021 15:47:37 +0200 Subject: [PATCH 5/6] [8.x] Use PHPDoc comments from base class in User model (#5676) * Use phpdoc comments from Model class * Update User.php --- app/Models/User.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 93afd766..e23e0905 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -15,7 +15,7 @@ class User extends Authenticatable /** * The attributes that are mass assignable. * - * @var array + * @var string[] */ protected $fillable = [ 'name', @@ -24,7 +24,7 @@ class User extends Authenticatable ]; /** - * The attributes that should be hidden for arrays. + * The attributes that should be hidden for serialization. * * @var array */ @@ -34,7 +34,7 @@ class User extends Authenticatable ]; /** - * The attributes that should be cast to native types. + * The attributes that should be cast. * * @var array */ From 75a7dba9c44ce3555cc57dd1826467839fd9774f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 24 Aug 2021 17:59:48 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91450cb7..c9038778 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.0...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.1...8.x) + + +## [v8.6.1 (2021-08-24)](https://github.com/laravel/laravel/compare/v8.6.0...v8.6.1) + +### Changed +- Add failover driver to default mail config file ([#5672](https://github.com/laravel/laravel/pull/5672)) ## [v8.6.0 (2021-08-17)](https://github.com/laravel/laravel/compare/v8.5.24...v8.6.0)