diff --git a/src/MiddlewarePipeline.php b/src/MiddlewarePipeline.php index 8497d10..5ba31ca 100644 --- a/src/MiddlewarePipeline.php +++ b/src/MiddlewarePipeline.php @@ -5,7 +5,9 @@ namespace Antidot\React; use Antidot\Application\Http\Handler\NextHandler; +use Antidot\Application\Http\Middleware\MiddlewareQueue; use Antidot\Application\Http\Middleware\Pipeline; +use Antidot\Application\Http\Middleware\SyncMiddlewareQueue; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; @@ -18,14 +20,14 @@ class MiddlewarePipeline implements Pipeline { - /** @var array */ + /** @var array */ public array $concurrentPipelines; /** @var array */ private array $middlewareCollection; /** * @param array $middlewareCollection - * @param array $concurrentPipelines + * @param array $concurrentPipelines */ public function __construct( array $middlewareCollection = [], @@ -82,7 +84,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface /** @var string $requestId */ $requestId = $request->getAttribute('request_id'); try { - /** @var SplQueue $queue */ + /** @var MiddlewareQueue $queue */ $queue = $this->concurrentPipelines[$requestId]; $next = new NextHandler($queue, $handler); @@ -98,7 +100,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface private function setCurrentPipeline(string $requestId): void { if (empty($this->concurrentPipelines[$requestId])) { - $queue = new SplQueue(); + $queue = new SyncMiddlewareQueue(); foreach ($this->middlewareCollection as $middlewareName) { $queue->enqueue($middlewareName); } diff --git a/src/ReactApplication.php b/src/ReactApplication.php index 5733fa8..5e74a61 100644 --- a/src/ReactApplication.php +++ b/src/ReactApplication.php @@ -76,10 +76,10 @@ public function options(string $uri, array $middleware, string $name): void $this->route($uri, $middleware, ['OPTIONS'], $name); } - public function route(string $uri, array $middleware, array $method, string $name): void + public function route(string $uri, array $middleware, array $methods, string $name): void { $this->router->append( - $this->routeFactory->create([$method], $middleware, $uri, $name) + $this->routeFactory->create($methods, $middleware, $uri, $name) ); }