8000 Merge branch '8.x' · laravel/laravel@ec9ff4c · GitHub
[go: up one dir, main page]

Skip to content

Commit ec9ff4c

Browse files
committed
Merge branch '8.x'
# Conflicts: # CHANGELOG.md
2 parents 6b946ca + 75a7dba commit ec9ff4c

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.0...master)
3+
## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.1...master)
4+
5+
6+
## [v8.6.1 (2021-08-24)](https://github.com/laravel/laravel/compare/v8.6.0...v8.6.1)
7+
8+
### Changed
9+
- Add failover driver to default mail config file ([#5672](https://github.com/laravel/laravel/pull/5672))
410

511

612
## [v8.6.0 (2021-08-17)](https://github.com/laravel/laravel/compare/v8.5.24...v8.6.0)

app/Http/Middleware/TrustProxies.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
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;
22+
protected $headers =
23+
Request::HEADER_X_FORWARDED_FOR |
24+
Request::HEADER_X_FORWARDED_HOST |
25+
Request::HEADER_X_FORWARDED_PORT |
26+
Request::HEADER_X_FORWARDED_PROTO |
27+
Request::HEADER_X_FORWARDED_AWS_ELB;
2328
}

app/Models/User.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class User extends Authenticatable
1515
/**
1616
* The attributes that are mass assignable.
1717
*
18-
* @var array
18+
* @var string[]
1919
*/
2020
protected $fillable = [
2121
'name',
@@ -24,7 +24,7 @@ class User extends Authenticatable
2424
];
2525

2626
/**
27-
* The attributes that should be hidden for arrays.
27+
* The attributes that should be hidden for serialization.
2828
*
2929
* @var array
3030
*/
@@ -34,7 +34,7 @@ class User extends Authenticatable
3434
];
3535

3636
/**
37-
* The attributes that should be cast to native types.
37+
* The attributes that should be cast.
3838
*
3939
* @var array
4040
*/

config/mail.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070
'array' => [
7171
'transport' => 'array',
7272
],
73+
74+
'failover' => [
75+
'transport' => 'failover',
76+
'mailers' => [
77+
'smtp',
78+
'log',
79+
],
80+
],
7381
],
7482

7583
/*

0 commit comments

Comments
 (0)
0