Merge branch '8.x'

driesvints · driesvints · commit 274d1bdd7294 · 2021-12-07T17:10:58.000+01:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.8...master)
+## [Unreleased](https://github.com/laravel/laravel/compare/v8.6.9...master)
+
+
+## [v8.6.9 (2021-12-07)](https://github.com/laravel/laravel/compare/v8.6.8...v8.6.9)
+
+### Changed
+- Improves generic types on the skeleton ([#5740](https://github.com/laravel/laravel/pull/5740))
+- Add option to set sendmail path ([#5741](https://github.com/laravel/laravel/pull/5741))
+
+### Fixed
+- Fix asset publishing if they were already published ([#5734](https://github.com/laravel/laravel/pull/5734))
 
 
 ## [v8.6.8 (2021-11-23)](https://github.com/laravel/laravel/compare/v8.6.7...v8.6.8)
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -10,7 +10,7 @@ class Handler extends ExceptionHandler
     /**
      * A list of the exception types that are not reported.
      *
-     * @var string[]
+     * @var array<int, class-string<Throwable>>
      */
     protected $dontReport = [
         //
@@ -19,7 +19,7 @@ class Handler extends ExceptionHandler
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @var string[]
+     * @var array<int, string>
      */
     protected $dontFlash = [
         'current_password',
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -11,7 +11,7 @@ class Kernel extends HttpKernel
      *
      * These middleware are run during every request to your application.
      *
-     * @var array
+     * @var array<int, class-string|string>
      */
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
@@ -26,7 +26,7 @@ class Kernel extends HttpKernel
     /**
      * The application's route middleware groups.
      *
-     * @var array
+     * @var array<string, array<int, class-string|string>>
      */
     protected $middlewareGroups = [
         'web' => [
@@ -51,7 +51,7 @@ class Kernel extends HttpKernel
      *
      * These middleware may be assigned to groups or used individually.
      *
-     * @var array
+     * @var array<string, class-string|string>
      */
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
@@ -9,7 +9,7 @@ class EncryptCookies extends Middleware
     /**
      * The names of the cookies that should not be encrypted.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //
diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php
@@ -9,7 +9,7 @@ class PreventRequestsDuringMaintenance extends Middleware
     /**
      * The URIs that should be reachable while maintenance mode is enabled.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -13,9 +13,9 @@ class RedirectIfAuthenticated
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
      * @param  string|null  ...$guards
-     * @return mixed
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
     public function handle(Request $request, Closure $next, ...$guards)
     {
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
@@ -9,7 +9,7 @@ class TrimStrings extends Middleware
     /**
      * The names of the attributes that should not be trimmed.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         'current_password',
diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php
@@ -9,7 +9,7 @@ class TrustHosts extends Middleware
     /**
      * Get the host patterns that should be trusted.
      *
-     * @return array
+     * @return array<int, string|null>
      */
     public function hosts()
     {
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -10,7 +10,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string|null
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -9,7 +9,7 @@ class VerifyCsrfToken extends Middleware
     /**
      * The URIs that should be excluded from CSRF verification.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -15,7 +15,7 @@ class User extends Authenticatable
     /**
      * The attributes that are mass assignable.
      *
-     * @var string[]
+     * @var array<int, string>
      */
     protected $fillable = [
         'name',
@@ -26,7 +26,7 @@ class User extends Authenticatable
     /**
      * The attributes that should be hidden for serialization.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $hidden = [
         'password',
@@ -36,7 +36,7 @@ class User extends Authenticatable
     /**
      * The attributes that should be cast.
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $casts = [
         'email_verified_at' => 'datetime',
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -10,7 +10,7 @@ class AuthServiceProvider extends ServiceProvider
     /**
      * The policy mappings for the application.
      *
-     * @var array
+     * @var array<class-string, class-string>
      */
     protected $policies = [
         // 'App\Models\Model' => 'App\Policies\ModelPolicy',
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -12,7 +12,7 @@ class EventServiceProvider extends ServiceProvider
     /**
      * The event listener mappings for the application.
      *
-     * @var array
+     * @var array<class-string, array<int, class-string>>
      */
     protected $listen = [
         Registered::class => [
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
             "@php artisan package:discover --ansi"
         ],
         "post-update-cmd": [
-            "@php artisan vendor:publish --tag=laravel-assets --ansi"
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
diff --git a/config/mail.php b/config/mail.php
@@ -58,7 +58,7 @@
 
         'sendmail' => [
             'transport' => 'sendmail',
-            'path' => '/usr/sbin/sendmail -bs',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
         ],
 
         'log' => [

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class Kernel extends HttpKernel`
`11`	`11`	`*`
`12`	`12`	`* These middleware are run during every request to your application.`
`13`	`13`	`*`
`14`		`- * @var array`
	`14`	`+ * @var array<int, class-string\|string>`
`15`	`15`	`*/`
`16`	`16`	`protected $middleware = [`
`17`	`17`	`// \App\Http\Middleware\TrustHosts::class,`
`@@ -26,7 +26,7 @@ class Kernel extends HttpKernel`
`26`	`26`	`/**`
`27`	`27`	`* The application's route middleware groups.`
`28`	`28`	`*`
`29`		`- * @var array`
	`29`	`+ * @var array<string, array<int, class-string\|string>>`
`30`	`30`	`*/`
`31`	`31`	`protected $middlewareGroups = [`
`32`	`32`	`'web' => [`
`@@ -51,7 +51,7 @@ class Kernel extends HttpKernel`
`51`	`51`	`*`
`52`	`52`	`* These middleware may be assigned to groups or used individually.`
`53`	`53`	`*`
`54`		`- * @var array`
	`54`	`+ * @var array<string, class-string\|string>`
`55`	`55`	`*/`
`56`	`56`	`protected $routeMiddleware = [`
`57`	`57`	`'auth' => \App\Http\Middleware\Authenticate::class,`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class EncryptCookies extends Middleware`
`9`	`9`	`/**`
`10`	`10`	`* The names of the cookies that should not be encrypted.`
`11`	`11`	`*`
`12`		`- * @var array`
	`12`	`+ * @var array<int, string>`
`13`	`13`	`*/`
`14`	`14`	`protected $except = [`
`15`	`15`	`//`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class PreventRequestsDuringMaintenance extends Middleware`
`9`	`9`	`/**`
`10`	`10`	`* The URIs that should be reachable while maintenance mode is enabled.`
`11`	`11`	`*`
`12`		`- * @var array`
	`12`	`+ * @var array<int, string>`
`13`	`13`	`*/`
`14`	`14`	`protected $except = [`
`15`	`15`	`//`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ class RedirectIfAuthenticated`
`13`	`13`	`* Handle an incoming request.`
`14`	`14`	`*`
`15`	`15`	`* @param \Illuminate\Http\Request $request`
`16`		`- * @param \Closure $next`
	`16`	`+ * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response\|\Illuminate\Http\RedirectResponse) $next`
`17`	`17`	`* @param string\|null ...$guards`
`18`		`- * @return mixed`
	`18`	`+ * @return \Illuminate\Http\Response\|\Illuminate\Http\RedirectResponse`
`19`	`19`	`*/`
`20`	`20`	`public function handle(Request $request, Closure $next, ...$guards)`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class TrimStrings extends Middleware`
`9`	`9`	`/**`
`10`	`10`	`* The names of the attributes that should not be trimmed.`
`11`	`11`	`*`
`12`		`- * @var array`
	`12`	`+ * @var array<int, string>`
`13`	`13`	`*/`
`14`	`14`	`protected $except = [`
`15`	`15`	`'current_password',`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class TrustHosts extends Middleware`
`9`	`9`	`/**`
`10`	`10`	`* Get the host patterns that should be trusted.`
`11`	`11`	`*`
`12`		`- * @return array`
	`12`	`+ * @return array<int, string\|null>`
`13`	`13`	`*/`
`14`	`14`	`public function hosts()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class TrustProxies extends Middleware`
`10`	`10`	`/**`
`11`	`11`	`* The trusted proxies for this application.`
`12`	`12`	`*`
`13`		`- * @var array\|string\|null`
	`13`	`+ * @var array<int, string>\|string\|null`
`14`	`14`	`*/`
`15`	`15`	`protected $proxies;`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class VerifyCsrfToken extends Middleware`
`9`	`9`	`/**`
`10`	`10`	`* The URIs that should be excluded from CSRF verification.`
`11`	`11`	`*`
`12`		`- * @var array`
	`12`	`+ * @var array<int, string>`
`13`	`13`	`*/`
`14`	`14`	`protected $except = [`
`15`	`15`	`//`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class AuthServiceProvider extends ServiceProvider`
`10`	`10`	`/**`
`11`	`11`	`* The policy mappings for the application.`
`12`	`12`	`*`
`13`		`- * @var array`
	`13`	`+ * @var array<class-string, class-string>`
`14`	`14`	`*/`
`15`	`15`	`protected $policies = [`
`16`	`16`	`// 'App\Models\Model' => 'App\Policies\ModelPolicy',`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class EventServiceProvider extends ServiceProvider`
`12`	`12`	`/**`
`13`	`13`	`* The event listener mappings for the application.`
`14`	`14`	`*`
`15`		`- * @var array`
	`15`	`+ * @var array<class-string, array<int, class-string>>`
`16`	`16`	`*/`
`17`	`17`	`protected $listen = [`
`18`	`18`	`Registered::class => [`