Skip to content

use new middleware queue #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2021
Merged

use new middleware queue #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/MiddlewarePipeline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,14 +20,14 @@

class MiddlewarePipeline implements Pipeline
{
/** @var array<SplQueue> */
/** @var array<MiddlewareQueue> */
public array $concurrentPipelines;
/** @var array<MiddlewareInterface> */
private array $middlewareCollection;

/**
* @param array<MiddlewareInterface> $middlewareCollection
* @param array<SplQueue> $concurrentPipelines
* @param array<MiddlewareQueue> $concurrentPipelines
*/
public function __construct(
array $middlewareCollection = [],
Expand Down Expand Up @@ -82,7 +84,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
/** @var string $requestId */
$requestId = $request->getAttribute('request_id');
try {
/** @var SplQueue<MiddlewareInterface> $queue */
/** @var MiddlewareQueue $queue */
$queue = $this->concurrentPipelines[$requestId];
$next = new NextHandler($queue, $handler);

Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/ReactApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}

Expand Down