Updated to fix messenger component api changes

src/AppBundle/Messenger/SpoolTransport.php

@@ -11,27 +11,6 @@ class SpoolTransport implements TransportInterface
 
     private $envelopes = [];
 
-    /**
-     * Receive some messages to the given handler.
-     *
-     * The handler will have, as argument, the received {@link \Symfony\Component\Messenger\Envelope} containing the message.
-     * Note that this envelope can be `null` if the timeout to receive something has expired.
-     */
-    public function receive(callable $handler): void
-    {
-        foreach ($this->envelopes as $key => $envelope) {
-            unset($this->envelopes[$key]);
-            $handler($envelope);
-        }
-    }
-
-    /**
-     * Stop receiving some messages.
-     */
-    public function stop(): void
-    {
-    }
-
     /**
      * Sends the given envelope.
      *
@@ -46,14 +25,25 @@ public function send(Envelope $envelope): Envelope
 
     public function get(): iterable
     {
-        return [];
+        return $this->envelopes;
     }
 
     public function ack(Envelope $envelope): void
     {
+        $this->removeEnvelopeFromQueue($envelope);
     }
 
     public function reject(Envelope $envelope): void
     {
+        $this->removeEnvelopeFromQueue($envelope);
+    }
+
+    private function removeEnvelopeFromQueue(Envelope $envelope): void
+    {
+        foreach ($this->envelopes as $key => $queued) {
+            if ($queued->getMessage() === $envelope->getMessage()) {
+                unset($this->envelopes[$key]);
+            }
+        }
     }
 }

src/AppBundle/Messenger/SpoolTransportEventSubscriber.php

@@ -3,9 +3,11 @@
 namespace AppBundle\Messenger;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Messenger\Event\WorkerRunningEvent;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Worker;
 
@@ -59,12 +61,26 @@ public static function getSubscribedEvents()
     public function onKernelTerminate(PostResponseEvent $event)
     {
         if ($this->enveloperQueueDsn === 'spool://memory') {
+
+            $stopWhenFinishedEventDispatcher = new EventDispatcher();
+
+
             $worker = new Worker(
-                $this->receiverLocator->get('email_queue'),
-//                [
-//                    'email_queue' => $this->receiverLocator->get('email_queue')
-//                ],
-                $this->bus
+//                $this->receiverLocator->get('email_queue'),
+                [
+                    'email_queue' => $this->receiverLocator->get('email_queue')
+                ],
+                $this->bus,
+                $stopWhenFinishedEventDispatcher
+            );
+
+            $stopWhenFinishedEventDispatcher->addListener(
+                WorkerRunningEvent::class,
+                static function (WorkerRunningEvent $event) use ($worker) {
+                    if ($event->isWorkerIdle()) {
+                        $worker->stop();
+                    }
+                }
             );
             $worker->run();
         }

src/Outstack/Enveloper/Application/QueueEmailRequest.php

@@ -41,12 +41,6 @@ public function __invoke(EmailRequest $emailRequest)
 
         $this->messageResolver->validate($template, $emailRequest->getParameters());
         $this->emailRequestLog->recordInitialRequest($emailRequest);
-        $this->deliveryQueue->append(
-            $emailRequest,
-            $this->messageResolver->resolve(
-                $template,
-                $emailRequest->getParameters()
-            )
-        );
+        $this->deliveryQueue->append($emailRequest);
     }
 }