top-think / think

ThinkPHP Framework ——十年匠心的高性能PHP框架
http://www.thinkphp.cn
Other
7.83k stars 1.62k forks source link

thinkphp6.0.1 注解中间件 在类注解时无效 #1014

Open hardphp opened 4 years ago

hardphp commented 4 years ago

/**

--------------------------------------------原因在think/route/rule.php 中的方法合并分组参数mergeGroupOptions 问题,修复代码如下:--------------------------------

//类注解中间件无效 xiegaolei 2020-01-04 $middleware = []; if (isset($parentOption['middleware']) && $parentOption['middleware']) { $middleware = $parentOption['middleware']; } if (isset($this->option['middleware']) && $this->option['middleware']) { $middleware = array_merge($middleware, $this->option['middleware']); } $middleware = array_unique($middleware); $this->option = array_merge($parentOption, $this->option); $this->option['middleware'] = $middleware; //xiegaolei 2020-01-04