symfony · volkyeth · Apr 19, 2019 · nicolas-grekas · Apr 19, 2019
diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Messenger;
 
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
-use Symfony\Component\Messenger\Middleware\StackMiddleware;
+use Symfony\Component\Messenger\Middleware\Pipeline;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
@@ -23,30 +23,14 @@
  */
 class MessageBus implements MessageBusInterface
 {
-    private $middlewareAggregate;
+    private $middlewares;
 
     /**
      * @param MiddlewareInterface[]|iterable $middlewareHandlers
      */
-    public function __construct(iterable $middlewareHandlers = [])
+    public function __construct(array $middlewares = [])
     {
-        if ($middlewareHandlers instanceof \IteratorAggregate) {
-            $this->middlewareAggregate = $middlewareHandlers;
-        } elseif (\is_array($middlewareHandlers)) {
-            $this->middlewareAggregate = new \ArrayObject($middlewareHandlers);
-        } else {
-            $this->middlewareAggregate = new class() {
-                public $aggregate;
-                public $iterator;
-
-                public function getIterator()
-                {
-                    return $this->aggregate = new \ArrayObject(iterator_to_array($this->iterator, false));
-                }
-            };
-            $this->middlewareAggregate->aggregate = &$this->middlewareAggregate;
-            $this->middlewareAggregate->iterator = $middlewareHandlers;
-        }
+        $this->middlewares = $middlewares;
     }
 
     /**
@@ -57,19 +41,10 @@ public function dispatch($message, array $stamps = []): Envelope
         if (!\is_object($message)) {
             throw new \TypeError(sprintf('Invalid argument provided to "%s()": expected object, but got %s.', __METHOD__, \gettype($message)));
         }
-        $envelope = Envelope::wrap($message, $stamps);
-        $middlewareIterator = $this->middlewareAggregate->getIterator();
 
-        while ($middlewareIterator instanceof \IteratorAggregate) {
-            $middlewareIterator = $middlewareIterator->getIterator();
-        }
-        $middlewareIterator->rewind();
-
-        if (!$middlewareIterator->valid()) {
-            return $envelope;
-        }
-        $stack = new StackMiddleware($middlewareIterator);
+        $envelope = Envelope::wrap($message, $stamps);
+        $pipeline = new Pipeline($this->middlewares);
 
-        return $middlewareIterator->current()->handle($envelope, $stack);
+        return $pipeline->handle($envelope);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Middleware/Carrier.php b/src/Symfony/Component/Messenger/Middleware/Carrier.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\Messenger\Middleware;
+
+
+use Symfony\Component\Messenger\Envelope;
+
+class Carrier implements NextHandlerInterface
+{
+    /**
+     * @var MiddlewareInterface
+     */
+    private $currentMiddleware;
+
+    /**
+     * @var NextHandlerInterface
+     */
+    private $nextHandler;
+
+    /**
+     * @param MiddlewareInterface $currentMiddleware
+     * @param NextHandlerInterface $nextHandler
+     *
+     */
+    public function __construct(MiddlewareInterface $currentMiddleware, NextHandlerInterface $nextHandler)
+    {
+        $this->currentMiddleware = $currentMiddleware;
+        $this->nextHandler = $nextHandler;
+    }
+
+
+    public function handle(Envelope $envelope) : Envelope
+    {
+        return $this->currentMiddleware->handle($envelope, $this->nextHandler);
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php b/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php
@@ -20,5 +20,5 @@
  */
 interface MiddlewareInterface
 {
-    public function handle(Envelope $envelope, StackInterface $stack): Envelope;
+    public function handle(Envelope $envelope, NextHandlerInterface $next): Envelope;
 }
diff --git a/src/Symfony/Component/Messenger/Middleware/NextHandlerInterface.php b/src/Symfony/Component/Messenger/Middleware/NextHandlerInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\Messenger\Middleware;
+
+
+use Symfony\Component\Messenger\Envelope;
+
+interface NextHandlerInterface
+{
+    public function handle(Envelope $envelope) : Envelope;
+}
diff --git a/src/Symfony/Component/Messenger/Middleware/Pipeline.php b/src/Symfony/Component/Messenger/Middleware/Pipeline.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\Messenger\Middleware;
+
+
+use function array_reverse;
+use Symfony\Component\Messenger\Envelope;
+
+class Pipeline
+{
+    /**
+     * @var NextHandlerInterface
+     */
+    private $handler;
+
+    public function __construct(array $middlewares)
+    {
+        $this->handler = new Recipient();
+        foreach (array_reverse($middlewares) as $middleware) {
+            $this->handler = new Carrier($middleware, $this->handler);
+        }
+    }
+
+    public function handle(Envelope $envelope) : Envelope
+    {
+        return $this->handler->handle($envelope);
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Middleware/Recipient.php b/src/Symfony/Component/Messenger/Middleware/Recipient.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\Messenger\Middleware;
+
+
+use Symfony\Component\Messenger\Envelope;
+
+class Recipient implements NextHandlerInterface
+{
+
+    public function handle(Envelope $envelope) : Envelope
+    {
+        return $envelope;
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Middleware/StackInterface.php b/src/Symfony/Component/Messenger/Middleware/StackInterface.php
diff --git a/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php b/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php