Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
#	composer.json
This commit is contained in:
Dries Vints
2021-12-22 11:09:09 +01:00
5 changed files with 19 additions and 32 deletions

View File

@@ -45,6 +45,7 @@ return [
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values.',
'enum' => 'The selected :attribute is invalid.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
@@ -67,6 +68,7 @@ return [
'ip' => 'The :attribute must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.',
'mac_address' => 'The :attribute must be a valid MAC address.',
'json' => 'The :attribute must be a valid JSON string.',
'lt' => [
'numeric' => 'The :attribute must be less than :value.',