Skip to content

修复路由中间件数组传参，和withoutMiddleware的冲突问题 #3175

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.

Sign up for GitHub

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

Open
onlomk wants to merge 1 commit into
base: 8.x
Choose a base branch
from
+9 −1
Open

修复路由中间件数组传参，和withoutMiddleware的冲突问题 #3175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/think/route/Dispatch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,15 @@ protected function doRouteAfter(): void
// 添加中间件
if (!empty($option['middleware'])) {
if (isset($option['without_middleware'])) {
$middleware = !empty($option['without_middleware']) ? array_diff($option['middleware'], $option['without_middleware']) : [];
$middleware = [];
foreach ($option['middleware'] as $m) {
// $m 可能是 [类名, 参数数组] 或 字符串类名/闭包
$classOrClosure = is_array($m) ? $m[0] : $m;
// 如果不在排除列表里，保留原始 $m
if (empty($option['without_middleware']) || !in_array($classOrClosure, $option['without_middleware'], true)) {
$middleware[] = $m;
}
}
} else {
$middleware = $option['middleware'];
}
Expand Down