This commit is contained in:
2021-04-20 11:56:01 +08:00
parent 97bbff35fd
commit 017a5b19dc
2 changed files with 5 additions and 10 deletions
+4 -4
View File
@@ -529,14 +529,14 @@ class Node extends HttpService
private function httpFilter(): mixed private function httpFilter(): mixed
{ {
try { try {
$dispatchParams = func_num_args(); $dispatchParams = func_get_args();
if (empty($dispatchParams)) { if (empty($dispatchParams)) {
$dispatchParams = \request(); $dispatchParams = [\request()];
} }
if ($this->handler instanceof Closure) { if ($this->handler instanceof Closure) {
return call_user_func($this->handler, $dispatchParams); return call_user_func($this->handler, ...$dispatchParams);
} }
return $this->runWith($this->callback, $dispatchParams); return $this->runWith($this->callback, ...$dispatchParams);
return $this->runFilter(...$dispatchParams); return $this->runFilter(...$dispatchParams);
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$this->addError($throwable, 'throwable'); $this->addError($throwable, 'throwable');
+1 -6
View File
@@ -6,7 +6,6 @@ namespace HttpServer\Route;
use Closure; use Closure;
use HttpServer\IInterface\After; use HttpServer\IInterface\After;
use HttpServer\IInterface\Middleware;
use Snowflake\Core\Json; use Snowflake\Core\Json;
class Reduce class Reduce
@@ -53,11 +52,7 @@ class Reduce
{ {
return function ($stack, $pipe) { return function ($stack, $pipe) {
return function ($passable) use ($stack, $pipe) { return function ($passable) use ($stack, $pipe) {
if ($pipe instanceof Middleware) { return call_user_func($pipe, $passable, $stack);
return $pipe->onHandler($passable, $stack);
} else {
return call_user_func($pipe, $passable, $stack);
}
}; };
}; };
} }