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

改名

Browse Source
This commit is contained in:
Mr·x
2021-09-24 18:16:39 +08:00
parent 0f988a4c3b
commit ed44026f12
2 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-handler/Abstracts/Handler.php
+3 -5
View File
@@ -2,7 +2,6 @@
namespace Http\Handler\Abstracts; namespace Http\Handler\Abstracts;
use Annotation\Inject;
use Http\Handler\Handler as CHl; use Http\Handler\Handler as CHl;
use Http\Message\ServerRequest; use Http\Message\ServerRequest;
use Kiri\Core\Help; use Kiri\Core\Help;
@@ -24,9 +23,9 @@ abstract class Handler implements RequestHandlerInterface
/** /**
* @param CHl $handler * @param CHl $handler
* @param Iterator $middlewares * @param null|Iterator $middlewares
*/ */
public function __construct(public CHl $handler, public Iterator $middlewares) public function __construct(public CHl $handler, public ?Iterator $middlewares)
{ {
$this->aspectProxy = Kiri::getDi()->get(AspectProxy::class); $this->aspectProxy = Kiri::getDi()->get(AspectProxy::class);
} }
@@ -39,8 +38,7 @@ abstract class Handler implements RequestHandlerInterface
*/ */
protected function execute(ServerRequestInterface $request): ResponseInterface protected function execute(ServerRequestInterface $request): ResponseInterface
{ {
$middleware = $this->middlewares->current(); if (empty($this->middlewares) || !($middleware = $this->middlewares->current())) {
if (empty($middleware)) {
return $this->dispatcher($request); return $this->dispatcher($request);
} }
if (!($middleware instanceof MiddlewareInterface)) { if (!($middleware instanceof MiddlewareInterface)) {
http-server/Service/Http.php
+1 -3
View File
@@ -16,7 +16,6 @@ use Http\Message\Stream;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Kiri\Pool\Helper\SplQueue;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Server\Abstracts\Utility\EventDispatchHelper; use Server\Abstracts\Utility\EventDispatchHelper;
use Server\Abstracts\Utility\ResponseHelper; use Server\Abstracts\Utility\ResponseHelper;
@@ -115,8 +114,7 @@ class Http implements OnCloseInterface, OnConnectInterface, OnRequestInterface
{ {
$middlewares = MiddlewareManager::get($handler->callback); $middlewares = MiddlewareManager::get($handler->callback);
$dispatcher = new Dispatcher($handler, empty($middlewares) ? null : new Iterator($middlewares));
$dispatcher = new Dispatcher($handler, new Iterator($middlewares));
return $dispatcher->handle($PsrRequest); return $dispatcher->handle($PsrRequest);
} }