Added exchange declare helper

onliner · Aug 13, 2024 · e13bd25 · e13bd25
1 parent d32b53d
commit e13bd25
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 13 deletions.
diff --git a/examples/multi/consumer_bar.php b/examples/multi/consumer_bar.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Onliner\CommandBus\Builder;
+use Onliner\CommandBus\Remote\AMQP\Exchange;
 use Onliner\CommandBus\Remote\AMQP\Transport;
 use Onliner\CommandBus\Remote\AMQP\Consumer;
 
@@ -13,6 +14,8 @@
 });
 
 $transport = Transport::create('amqp://guest:guest@localhost:5673');
+$transport->declare(Exchange::create(['name' => 'bar']));
+
 $consumer = $transport->consume();
 $consumer->listen('#', 'bar');
 $consumer->run($builder->build());
diff --git a/examples/multi/consumer_foo.php b/examples/multi/consumer_foo.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Onliner\CommandBus\Builder;
+use Onliner\CommandBus\Remote\AMQP\Exchange;
 use Onliner\CommandBus\Remote\AMQP\Transport;
 use Onliner\CommandBus\Remote\AMQP\Consumer;
 
@@ -13,6 +14,8 @@
 });
 
 $transport = Transport::create('amqp://guest:guest@localhost:5672');
+$transport->declare(Exchange::create(['name' => 'foo']));
+
 $consumer = $transport->consume();
 $consumer->listen('#', 'foo');
 $consumer->run($builder->build());
diff --git a/examples/remote/consumer.php b/examples/remote/consumer.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Onliner\CommandBus\Builder;
+use Onliner\CommandBus\Remote\AMQP\Exchange;
 use Onliner\CommandBus\Remote\AMQP\Transport;
 use Onliner\CommandBus\Remote\AMQP\Consumer;
 use Onliner\CommandBus\Remote\AMQP\Queue;
@@ -16,6 +17,8 @@
 });
 
 $transport = Transport::create('amqp://guest:guest@localhost:5672');
+$transport->declare(Exchange::create(['name' => 'foo']));
+
 $consumer = $transport->consume();
 
 $pattern  = $argv[1] ?? '#';

diff --git a/examples/router/consumer_bar.php b/examples/router/consumer_bar.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Onliner\CommandBus\Builder;
+use Onliner\CommandBus\Remote\AMQP\Exchange;
 use Onliner\CommandBus\Remote\AMQP\Transport;
 use Onliner\CommandBus\Remote\AMQP\Consumer;
 
@@ -14,6 +15,7 @@
 
 $dispatcher = $builder->build();
 $transport = Transport::create('amqp://guest:guest@localhost:5672');
+$transport->declare(Exchange::create(['name' => 'bar']));
 
 /** @var Consumer $consumer */
 $consumer = $transport->consume();

diff --git a/examples/router/consumer_foo.php b/examples/router/consumer_foo.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Onliner\CommandBus\Builder;
+use Onliner\CommandBus\Remote\AMQP\Exchange;
 use Onliner\CommandBus\Remote\AMQP\Transport;
 use Onliner\CommandBus\Remote\AMQP\Consumer;
 
@@ -15,6 +16,7 @@
 $dispatcher = $builder->build();
 
 $transport = Transport::create('amqp://guest:guest@localhost:5672');
+$transport->declare(Exchange::create(['name' => 'foo']));
 
 /** @var Consumer $consumer */
 $consumer = $transport->consume();

diff --git a/src/Remote/AMQP/Exchange.php b/src/Remote/AMQP/Exchange.php
@@ -39,7 +39,7 @@ public static function create(array $options): self
             throw new InvalidArgumentException('Exchange type must be a string');
         }
 
-        $name = $options['exchange'] ?? sprintf('amqp.%s', $type);
+        $name = $options['name'] ?? sprintf('amqp.%s', $type);
         $args = $options['args'] ?? [];
 
         if (!is_string($name)) {

diff --git a/src/Remote/AMQP/Packager.php b/src/Remote/AMQP/Packager.php
@@ -30,13 +30,12 @@ public function __construct(
 
     public function pack(Envelope $envelope): AMQPMessage
     {
-        $headers = array_replace($envelope->headers, [
-            Headers::MESSAGE_TYPE => $envelope->class,
-        ]);
+        $headers = new AMQPTable($envelope->headers);
+        $headers->set(Headers::MESSAGE_TYPE, $envelope->class);
 
         return new AMQPMessage($envelope->payload, [
             'delivery_mode' => $this->deliveryMode,
-            'application_headers' => new AMQPTable($headers),
+            'application_headers' => $headers,
         ]);
     }
 

diff --git a/src/Remote/AMQP/Transport.php b/src/Remote/AMQP/Transport.php
@@ -45,4 +45,13 @@ public function consume(): Consumer
     {
         return new Consumer($this->connector, $this->packager, $this->logger);
     }
+
+    public function declare(Exchange|array $exchange): void
+    {
+        if (is_array($exchange)) {
+            $exchange = Exchange::create($exchange);
+        }
+
+        $exchange->declare($this->connector->connect());
+    }
 }
diff --git a/tests/Remote/AMQP/TransportTest.php b/tests/Remote/AMQP/TransportTest.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Onliner\CommandBus\Remote\AMQP\Connector;
+use Onliner\CommandBus\Remote\AMQP\Headers;
 use Onliner\CommandBus\Remote\AMQP\Packager;
 use Onliner\CommandBus\Remote\AMQP\SimpleRouter;
 use Onliner\CommandBus\Remote\AMQP\Transport;
@@ -44,28 +45,25 @@ public function testSend(): void
             'foo' => 'bar',
         ]);
 
-        $headers = $envelope->headers + [
-            'x-message-type' => $envelope->class,
-        ];
+        $headers = new AMQPTable($envelope->headers);
+        $headers->set(Headers::MESSAGE_TYPE, $envelope->class);
 
         $message = new AMQPMessage($envelope->payload, [
             'delivery_mode' => AMQPMessage::DELIVERY_MODE_PERSISTENT,
+            'application_headers' => $headers,
         ]);
-        $message->set('application_headers', new AMQPTable($headers));
 
         $channel = self::createMock(AMQPChannel::class);
         $channel
             ->expects(self::exactly(2))
             ->method('basic_publish')
-            ->with($message, 'foo', strtolower(str_replace('\\', '.', $envelope->class)), false, false)
-        ;
+            ->with($message, 'foo', strtolower(str_replace('\\', '.', $envelope->class)), false, false);
 
         $connector = self::createMock(Connector::class);
         $connector
             ->expects(self::exactly(2))
             ->method('connect')
-            ->willReturn($channel)
-        ;
+            ->willReturn($channel);
 
         $transport = new Transport($connector, new Packager(), new SimpleRouter('foo'));
         $transport->send($envelope);