Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2021-11-23 18:31:32 +01:00
commit fcb4d9df1a
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
3 changed files with 12 additions and 14 deletions

View File

@ -1,6 +1,13 @@
# Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.7...master)
## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.8...master)
## [v8.6.8 (2021-11-23)](https://github.com/laravel/laravel/compare/v8.6.7...v8.6.8)
### Changed
- Order validation rules alphabetically ([#5728](https://github.com/laravel/laravel/pull/5728))
- Removes the Console\Kernel::$commands property ([#5727](https://github.com/laravel/laravel/pull/5727))
## [v8.6.7 (2021-11-16)](https://github.com/laravel/laravel/compare/v8.6.6...v8.6.7)

View File

@ -7,15 +7,6 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel
{
/**
* The Artisan commands provided by your application.
*
* @var array
*/
protected $commands = [
//
];
/**
* Define the application's command schedule.
*

View File

@ -100,6 +100,10 @@ return [
'numeric' => 'The :attribute must be a number.',
'password' => 'The password is incorrect.',
'present' => 'The :attribute field must be present.',
'prohibited' => 'The :attribute field is prohibited.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'prohibits' => 'The :attribute field prohibits :other from being present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
@ -108,10 +112,6 @@ return [
'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'prohibited' => 'The :attribute field is prohibited.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'prohibits' => 'The :attribute field prohibits :other from being present.',
'same' => 'The :attribute and :other must match.',
'size' => [
'numeric' => 'The :attribute must be :size.',