Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2021-11-16 17:50:11 +01:00
commit 21c3ef96f4
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
3 changed files with 24 additions and 1 deletions

View File

@ -1,6 +1,13 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.6...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.7...master)
## [v8.6.7 (2021-11-16)](https://github.com/laravel/laravel/compare/v8.6.6...v8.6.7)
### Changed
- Added `declined` and `declined_if` validation rules ([#5723](https://github.com/laravel/laravel/pull/5723))
- Should be identical with current sanctum config file ([#5725](https://github.com/laravel/laravel/pull/5725))
## [v8.6.6 (2021-11-09)](https://github.com/laravel/laravel/compare/v8.6.5...v8.6.6) ## [v8.6.6 (2021-11-09)](https://github.com/laravel/laravel/compare/v8.6.5...v8.6.6)

View File

@ -19,6 +19,20 @@
env('APP_URL') ? ','.parse_url(env('APP_URL'), PHP_URL_HOST) : '' env('APP_URL') ? ','.parse_url(env('APP_URL'), PHP_URL_HOST) : ''
))), ))),
/*
|--------------------------------------------------------------------------
| Sanctum Guards
|--------------------------------------------------------------------------
|
| This array contains the authentication guards that will be checked when
| Sanctum is trying to authenticate a request. If none of these guards
| are able to authenticate the request, Sanctum will use the bearer
| token that's present on an incoming request for authentication.
|
*/
'guard' => ['web'],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Expiration Minutes | Expiration Minutes

View File

@ -36,6 +36,8 @@
'date' => 'The :attribute is not a valid date.', 'date' => 'The :attribute is not a valid date.',
'date_equals' => 'The :attribute must be a date equal to :date.', 'date_equals' => 'The :attribute must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.', 'date_format' => 'The :attribute does not match the format :format.',
'declined' => 'The :attribute must be declined.',
'declined_if' => 'The :attribute must be declined when :other is :value.',
'different' => 'The :attribute and :other must be different.', 'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.', 'digits' => 'The :attribute must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.', 'digits_between' => 'The :attribute must be between :min and :max digits.',