Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
#	composer.json

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.9...master)
+## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.10...master)
+
+
+## [v8.6.10 (2021-12-22)](https://github.com/laravel/laravel/compare/v8.6.9...v8.6.10)
+
+### Changed
+- Bump Laravel to v8.75 ([#5750](https://github.com/laravel/laravel/pull/5750))
+- Simplify the maintenance file call ([#5752](https://github.com/laravel/laravel/pull/5752))
+- Add enum translation ([#5753](https://github.com/laravel/laravel/pull/5753))
+- Add mac_address validation message ([#5754](https://github.com/laravel/laravel/pull/5754))
+
+### Removed
+- Delete web.config ([#5744](https://github.com/laravel/laravel/pull/5744))
 
 
 ## [v8.6.9 (2021-12-07)](https://github.com/laravel/laravel/compare/v8.6.8...v8.6.9)

composer.json

@@ -9,7 +9,8 @@
         "fruitcake/laravel-cors": "dev-develop",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^9.0",
-        "laravel/sanctum": "^2.11|dev-develop"
+        "laravel/sanctum": "^2.11|dev-develop",
+        "laravel/tinker": "^2.5|dev-develop"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

lang/en/validation.php

@@ -45,6 +45,7 @@
     '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 @@
     '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.',

public/index.php

@@ -16,8 +16,8 @@
 |
 */
 
-if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) {
+if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
-    require __DIR__.'/../storage/framework/maintenance.php';
+    require $maintenance;
 }
 
 /*

public/web.config

@@ -1,28 +0,0 @@
-<!--
-    Rewrites requires Microsoft URL Rewrite Module for IIS
-    Download: https://www.iis.net/downloads/microsoft/url-rewrite
-    Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
--->
-<configuration>
-  <system.webServer>
-    <rewrite>
-      <rules>
-        <rule name="Imported Rule 1" stopProcessing="true">
-          <match url="^(.*)/$" ignoreCase="false" />
-          <conditions>
-            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
-          </conditions>
-          <action type="Redirect" redirectType="Permanent" url="/{R:1}" />
-        </rule>
-        <rule name="Imported Rule 2" stopProcessing="true">
-          <match url="^" ignoreCase="false" />
-          <conditions>
-            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
-            <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
-          </conditions>
-          <action type="Rewrite" url="index.php" />
-        </rule>
-      </rules>
-    </rewrite>
-  </system.webServer>
-</configuration>