Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -39,6 +32,6 @@ protected function inExceptArray($request)
*/
public function getExcludedPaths()
{
return $this->except;
return $this->except ?? [];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
7 changes: 7 additions & 0 deletions src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down