[11.x] Remove $except property from ExcludesPaths trait (#50644)

* Remove $except from trait * Update getExcludedPaths method
laravel · Mar 19, 2024 · e6d01af · e6d01af
1 parent 578c882
commit e6d01af
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/Illuminate/Foundation/Http/Middleware/Concerns/ExcludesPaths.php b/src/Illuminate/Foundation/Http/Middleware/Concerns/ExcludesPaths.php
@@ -4,13 +4,6 @@
 
 trait ExcludesPaths
 {
-    /**
-     * The URIs that should be excluded.
-     *
-     * @var array<int, string>
-     */
-    protected $except = [];
-
     /**
      * Determine if the request has a URI that should be excluded.
      *
@@ -39,6 +32,6 @@ protected function inExceptArray($request)
      */
     public function getExcludedPaths()
     {
-        return $this->except;
+        return $this->except ?? [];
     }
 }
diff --git a/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php b/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php
@@ -21,6 +21,13 @@ class PreventRequestsDuringMaintenance
      */
     protected $app;
 
+    /**
+     * The URIs that should be excluded.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [];
+
     /**
      * The URIs that should be accessible during maintenance.
      *

diff --git a/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php b/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
@@ -34,6 +34,13 @@ class VerifyCsrfToken
      */
     protected $encrypter;
 
+    /**
+     * The URIs that should be excluded.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [];
+
     /**
      * The globally ignored URIs that should be excluded from CSRF verification.
      *