Merge Push and Consume middlewares

src/Debug/QueueCollector.php

@@ -4,11 +4,11 @@
 
 namespace Yiisoft\Queue\Debug;
 
+use Yiisoft\Queue\Middleware\MiddlewareInterface;
 use Yiisoft\Yii\Debug\Collector\CollectorTrait;
 use Yiisoft\Yii\Debug\Collector\SummaryCollectorInterface;
 use Yiisoft\Queue\Enum\JobStatus;
 use Yiisoft\Queue\Message\MessageInterface;
-use Yiisoft\Queue\Middleware\Push\MiddlewarePushInterface;
 use Yiisoft\Queue\QueueInterface;
 
 final class QueueCollector implements SummaryCollectorInterface
@@ -53,7 +53,7 @@ public function collectStatus(string $id, JobStatus $status): void
     public function collectPush(
         string $channel,
         MessageInterface $message,
-        string|array|callable|MiddlewarePushInterface ...$middlewareDefinitions,
+        string|array|callable|MiddlewareInterface ...$middlewareDefinitions,
     ): void {
         if (!$this->isActive()) {
             return;

src/Debug/QueueDecorator.php

@@ -7,7 +7,7 @@
 use Yiisoft\Queue\Adapter\AdapterInterface;
 use Yiisoft\Queue\Enum\JobStatus;
 use Yiisoft\Queue\Message\MessageInterface;
-use Yiisoft\Queue\Middleware\Push\MiddlewarePushInterface;
+use Yiisoft\Queue\Middleware\MiddlewareInterface;
 use Yiisoft\Queue\QueueInterface;
 
 final class QueueDecorator implements QueueInterface
@@ -28,7 +28,7 @@
 
     public function push(
         MessageInterface $message,
-        string|array|callable|MiddlewarePushInterface ...$middlewareDefinitions
+        string|array|callable|MiddlewareInterface ...$middlewareDefinitions
     ): MessageInterface {
         $message = $this->queue->push($message, ...$middlewareDefinitions);
         $this->collector->collectPush($this->queue->getChannelName(), $message, ...$middlewareDefinitions);
@@ -61,4 +61,9 @@
         $new->queue = $this->queue->withChannelName($channel);
         return $new;
     }
+
+    public function getAdapter(): ?AdapterInterface
+    {
+        return $this->queue->getAdapter();
+    }
 }

src/Middleware/Push/AdapterPushHandler.php → src/Middleware/AdapterHandler.php

@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\Middleware\Push;
+namespace Yiisoft\Queue\Middleware;
 
 use Yiisoft\Queue\Exception\AdapterConfiguration\AdapterNotConfiguredException;
 
 /**
  * @internal
  */
-final class AdapterPushHandler implements MessageHandlerPushInterface
+final class AdapterHandler implements MessageHandlerInterface
 {
-    public function handlePush(PushRequest $request): PushRequest
+    public function handle(Request $request): Request
     {
         if (($adapter = $request->getAdapter()) === null) {
             throw new AdapterNotConfiguredException();