Skip to content

Commit 10bbeb9

Browse files
committed
use new middleware queue
1 parent 403c7dc commit 10bbeb9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/MiddlewarePipeline.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
namespace Antidot\React;
66

77
use Antidot\Application\Http\Handler\NextHandler;
8+
use Antidot\Application\Http\Middleware\MiddlewareQueue;
89
use Antidot\Application\Http\Middleware\Pipeline;
10+
use Antidot\Application\Http\Middleware\SyncMiddlewareQueue;
911
use Psr\Http\Message\ResponseInterface;
1012
use Psr\Http\Message\ServerRequestInterface;
1113
use Psr\Http\Server\MiddlewareInterface;
@@ -18,14 +20,14 @@
1820

1921
class MiddlewarePipeline implements Pipeline
2022
{
21-
/** @var array<SplQueue> */
23+
/** @var array<MiddlewareQueue> */
2224
public array $concurrentPipelines;
2325
/** @var array<MiddlewareInterface> */
2426
private array $middlewareCollection;
2527

2628
/**
2729
* @param array<MiddlewareInterface> $middlewareCollection
28-
* @param array<SplQueue> $concurrentPipelines
30+
* @param array<MiddlewareQueue> $concurrentPipelines
2931
*/
3032
public function __construct(
3133
array $middlewareCollection = [],
@@ -82,7 +84,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
8284
/** @var string $requestId */
8385
$requestId = $request->getAttribute('request_id');
8486
try {
85-
/** @var SplQueue<MiddlewareInterface> $queue */
87+
/** @var MiddlewareQueue $queue */
8688
$queue = $this->concurrentPipelines[$requestId];
8789
$next = new NextHandler($queue, $handler);
8890

@@ -98,7 +100,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
98100
private function setCurrentPipeline(string $requestId): void
99101
{
100102
if (empty($this->concurrentPipelines[$requestId])) {
101-
$queue = new SplQueue();
103+
$queue = new SyncMiddlewareQueue();
102104
foreach ($this->middlewareCollection as $middlewareName) {
103105
$queue->enqueue($middlewareName);
104106
}

src/ReactApplication.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ public function options(string $uri, array $middleware, string $name): void
7676
$this->route($uri, $middleware, ['OPTIONS'], $name);
7777
}
7878

79-
public function route(string $uri, array $middleware, array $method, string $name): void
79+
public function route(string $uri, array $middleware, array $methods, string $name): void
8080
{
8181
$this->router->append(
82-
$this->routeFactory->create([$method], $middleware, $uri, $name)
82+
$this->routeFactory->create($methods, $middleware, $uri, $name)
8383
);
8484
}
8585

0 commit comments

Comments
 (0)