Cleanup Queue

Author: vjik

src/Queue.php

@@ -48,16 +48,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
@@ -157,13 +154,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
      */