as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

111

Browse Source
This commit is contained in:
as2252258@163.com
2021-09-26 00:02:02 +08:00
parent ad6f85734b
commit 9b240f7b45
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-handler/Abstracts/Handler.php
+6 -6
View File
@@ -22,6 +22,9 @@ abstract class Handler implements RequestHandlerInterface
protected AspectProxy $aspectProxy; protected AspectProxy $aspectProxy;
protected int $offset = 0;
/** /**
* @param CHl $handler * @param CHl $handler
* @param null|Iterator $middlewares * @param null|Iterator $middlewares
@@ -39,16 +42,16 @@ abstract class Handler implements RequestHandlerInterface
*/ */
protected function execute(ServerRequestInterface $request): ResponseInterface protected function execute(ServerRequestInterface $request): ResponseInterface
{ {
if ($this->middlewares->count() < 1 || !$this->middlewares->valid()) { if ($this->middlewares->count() < 1) {
return $this->dispatcher($request); return $this->dispatcher($request);
} }
$middleware = $this->middlewares->current(); $middleware = $this->middlewares->offsetGet($this->offset);
if (!($middleware instanceof MiddlewareInterface)) { if (!($middleware instanceof MiddlewareInterface)) {
throw new \Exception('get_implements_class($middleware) not found method process.'); throw new \Exception('get_implements_class($middleware) not found method process.');
} }
$this->middlewares->next(); $this->offset++;
return $middleware->process($request, $this); return $middleware->process($request, $this);
} }
@@ -61,9 +64,6 @@ abstract class Handler implements RequestHandlerInterface
*/ */
protected function dispatcher(ServerRequestInterface $request): mixed protected function dispatcher(ServerRequestInterface $request): mixed
{ {
if ($this->middlewares->count() > 0) {
$this->middlewares->rewind();
}
$response = $this->aspectProxy->proxy($this->handler); $response = $this->aspectProxy->proxy($this->handler);
if (!($response instanceof ResponseInterface)) { if (!($response instanceof ResponseInterface)) {
$response = $this->transferToResponse($response); $response = $this->transferToResponse($response);