Merge pull request #5 from holtkamp/patch-use-PlainMessage

Use PlainMessage instead of the deprecated DefaultMessage

Author: ruudk

src/BernardConsumer.php

@@ -2,7 +2,7 @@
 
 namespace SimpleBus\BernardBundleBridge;
 
-use Bernard\Message\DefaultMessage;
+use Bernard\Message\PlainMessage;
 use SimpleBus\Asynchronous\Consumer\SerializedEnvelopeConsumer;
 
 class BernardConsumer
@@ -14,7 +14,7 @@ public function __construct(SerializedEnvelopeConsumer $consumer)
         $this->consumer = $consumer;
     }
 
-    public function __invoke(DefaultMessage $message)
+    public function __invoke(PlainMessage $message)
     {
         $this->consumer->consume($message->get('data'));
     }

src/BernardPublisher.php

@@ -2,7 +2,7 @@
 
 namespace SimpleBus\BernardBundleBridge;
 
-use Bernard\Message\DefaultMessage;
+use Bernard\Message\PlainMessage;
 use Bernard\Producer;
 use SimpleBus\Asynchronous\Publisher\Publisher;
 use SimpleBus\Asynchronous\Routing\RoutingKeyResolver;
@@ -28,6 +28,6 @@ public function publish($message)
         $queue = $this->queueResolver->resolveRoutingKeyFor($message);
         $data = $this->serializer->wrapAndSerialize($message);
 
-        $this->bernard->produce(new DefaultMessage($queue, ['data' => $data, 'type' => $this->type]), $queue);
+        $this->bernard->produce(new PlainMessage($queue, ['data' => $data, 'type' => $this->type]), $queue);
     }
 }

src/BernardRouter.php

@@ -17,7 +17,7 @@ public function __construct(ContainerInterface $container)
 
     public function map(Envelope $envelope)
     {
-        /* @var \Bernard\Message\DefaultMessage $message */
+        /* @var \Bernard\Message\PlainMessage $message */
         $message = $envelope->getMessage();
 
         $serviceId = sprintf('simple_bus.bernard_bundle_bridge.%s_consumer', $message->get('type'));

src/EventListener/LoggerListener.php

@@ -27,7 +27,7 @@ public static function getSubscribedEvents()
 
     public function onProduce(EnvelopeEvent $event)
     {
-        /* @var \Bernard\Message\DefaultMessage $message */
+        /* @var \Bernard\Message\PlainMessage $message */
         $message = $event->getEnvelope()->getMessage();
 
         $this->logger->info(sprintf('Produced %s into "%s" queue', $message->get('type'), $message->getName()), [
@@ -38,7 +38,7 @@ public function onProduce(EnvelopeEvent $event)
 
     public function onInvoke(EnvelopeEvent $event)
     {
-        /* @var \Bernard\Message\DefaultMessage $message */
+        /* @var \Bernard\Message\PlainMessage $message */
         $message = $event->getEnvelope()->getMessage();
 
         $this->logger->info(sprintf('Invoking %s from "%s" queue', $message->get('type'), $message->getName()), [
@@ -49,7 +49,7 @@ public function onInvoke(EnvelopeEvent $event)
 
     public function onReject(RejectEnvelopeEvent $event)
     {
-        /* @var \Bernard\Message\DefaultMessage $message */
+        /* @var \Bernard\Message\PlainMessage $message */
         $message = $event->getEnvelope()->getMessage();
 
         $this->logger->error(sprintf('Error processing %s from "%s" queue', $message->get('type'), $message->getName()), [

tests/BernardConsumerTest.php

@@ -2,7 +2,7 @@
 
 namespace SimpleBus\BernardBundleBridge\Tests;
 
-use Bernard\Message\DefaultMessage;
+use Bernard\Message\PlainMessage;
 use SimpleBus\BernardBundleBridge\BernardConsumer;
 
 class BernardConsumerTest extends \PHPUnit_Framework_TestCase
@@ -21,6 +21,6 @@ public function it_should_consume_a_message()
 
         $bernard = new BernardConsumer($consumer);
 
-        $bernard(new DefaultMessage('name', ['data' => '__data__']));
+        $bernard(new PlainMessage('name', ['data' => '__data__']));
     }
 }

tests/BernardPublisherTest.php

@@ -36,7 +36,7 @@ public function it_should_produce_a_message_with_bernard()
         $publisher = new BernardPublisher($serializer, $producer, $queueResolver, 'foo');
         $publisher->publish($message);
 
-        $this->assertInstanceOf('Bernard\Message\DefaultMessage', $producer->message);
+        $this->assertInstanceOf('Bernard\Message\PlainMessage', $producer->message);
         $this->assertEquals('queue_name', $producer->queueName);
         $this->assertEquals('serialized_data', $producer->message->get('data'));
         $this->assertEquals('foo', $producer->message->get('type'));
@@ -46,7 +46,7 @@ public function it_should_produce_a_message_with_bernard()
 
 class CaptureProducer extends Producer
 {
-    /** @var \Bernard\Message\DefaultMessage */
+    /** @var \Bernard\Message\PlainMessage */
     public $message;
     public $queueName;
 

tests/BernardRouterTest.php

@@ -3,7 +3,7 @@
 namespace SimpleBus\BernardBundleBridge\Tests;
 
 use Bernard\Envelope;
-use Bernard\Message\DefaultMessage;
+use Bernard\Message\PlainMessage;
 use SimpleBus\BernardBundleBridge\BernardRouter;
 
 class BernardRouterTest extends \PHPUnit_Framework_TestCase
@@ -25,7 +25,7 @@ public function it_should_retrieve_a_consumer_for_type()
 
         $router = new BernardRouter($container);
 
-        $router->map(new Envelope(new DefaultMessage('name', ['type' => 'foo'])));
-        $router->map(new Envelope(new DefaultMessage('name', ['type' => 'bar'])));
+        $router->map(new Envelope(new PlainMessage('name', ['type' => 'foo'])));
+        $router->map(new Envelope(new PlainMessage('name', ['type' => 'bar'])));
     }
 }

tests/EventListener/LoggerListenerTest.php

@@ -5,7 +5,7 @@
 use Bernard\Envelope;
 use Bernard\Event\EnvelopeEvent;
 use Bernard\Event\RejectEnvelopeEvent;
-use Bernard\Message\DefaultMessage;
+use Bernard\Message\PlainMessage;
 use Psr\Log\AbstractLogger;
 use Psr\Log\LogLevel;
 use SimpleBus\BernardBundleBridge\EventListener\LoggerListener;
@@ -31,7 +31,7 @@ public function setUp()
      */
     public function it_should_log_on_produce()
     {
-        $message  = new DefaultMessage('test', ['type' => 'command']);
+        $message  = new PlainMessage('test', ['type' => 'command']);
         $envelope = new Envelope($message);
         $event    = new EnvelopeEvent($envelope, $this->getMock('Bernard\Queue'));
 
@@ -52,7 +52,7 @@ public function it_should_log_on_produce()
      */
     public function it_should_log_on_invoke()
     {
-        $message  = new DefaultMessage('test', ['type' => 'event']);
+        $message  = new PlainMessage('test', ['type' => 'event']);
         $envelope = new Envelope($message);
         $event    = new EnvelopeEvent($envelope, $this->getMock('Bernard\Queue'));
 
@@ -74,7 +74,7 @@ public function it_should_log_on_invoke()
     public function it_should_log_on_reject()
     {
         $exception = new \RuntimeException();
-        $message   = new DefaultMessage('test', ['type' => 'event']);
+        $message   = new PlainMessage('test', ['type' => 'event']);
         $envelope  = new Envelope($message);
         $event     = new RejectEnvelopeEvent($envelope, $this->getMock('Bernard\Queue'), $exception);