Skip to content

Cleanup Queue #318

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

Open
vjik wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −18
Open

Cleanup Queue #318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
061c940
Cleanup `Queue`
vjik Jul 9, 2026
2b33bfa
Apply PHP CS Fixer and Rector changes (CI)
github-actions[bot] Jul 9, 2026
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
25 changes: 7 additions & 18 deletions src/Queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use Yiisoft\Queue\Cli\LoopInterface;
use Yiisoft\Queue\Message\MessageInterface;
use Yiisoft\Queue\Middleware\Push\AdapterPushHandler;
use Yiisoft\Queue\Middleware\Push\PushHandlerInterface;
use Yiisoft\Queue\Middleware\Push\PushMiddlewareConfig;
use Yiisoft\Queue\Middleware\Push\PushMiddlewareDispatcher;
use Yiisoft\Queue\Middleware\Push\SynchronousPushHandler;
Expand Down Expand Up @@ -48,16 +47,13 @@ public function __construct(
mixed ...$middlewareDefinitions,
) {
$this->name = StringNormalizer::normalize($name);
$this->dispatcher = (new PushMiddlewareDispatcher(
$middlewareConfig->middlewareFactory,
$middlewareConfig->commonMiddlewareDefinitions,
$this->createFinalPushHandler(),
))->withMiddlewaresAdded($middlewareDefinitions);
}

public function __clone()
{
$this->dispatcher = $this->dispatcher->withFinishHandler($this->createFinalPushHandler());
$this->dispatcher = new PushMiddlewareDispatcher(
middlewareFactory: $middlewareConfig->middlewareFactory,
middlewareDefinitions: [...$middlewareConfig->commonMiddlewareDefinitions, ...$middlewareDefinitions],
finishHandler: $this->isSynchronous()
? new SynchronousPushHandler($this->worker, $this)
: new AdapterPushHandler($this->adapter),
);
}

public function getName(): string
Expand Down Expand Up @@ -157,13 +153,6 @@ private function handle(MessageInterface $message): bool
return $this->loop->canContinue();
}

private function createFinalPushHandler(): PushHandlerInterface
{
return $this->isSynchronous()
? new SynchronousPushHandler($this->worker, $this)
: new AdapterPushHandler($this->adapter);
}

/**
* @psalm-assert-if-false !null $this->adapter
*/
Expand Down
Loading