[Messenger] changed AmqpExt classes constructor signature

fabpot · fabpot · commit 75131bf27666 · 2018-09-10T08:18:00.000+02:00
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -4,11 +4,13 @@ CHANGELOG
 4.2.0
 -----
 
+ * [BC BREAK] The signature of Amqp* classes changed to take a `Connection` as a first argument and an optional
+   `Serializer` as a second argument.
  * [BC BREAK] `SenderLocator` has been renamed to `ContainerSenderLocator`
    Be careful as there is still a `SenderLocator` class, but it does not rely on a `ContainerInterface` to find senders.
    Instead, it accepts the sender instance itself instead of its identifier in the container.
  * [BC BREAK] `MessageSubscriberInterface::getHandledMessages()` return value has changed. The value of an array item
-   needs to be an associative array or the method name. 
+   needs to be an associative array or the method name.
  * `ValidationMiddleware::handle()` and `SendMessageMiddleware::handle()` now require an `Envelope` object
  * `EnvelopeItemInterface` doesn't extend `Serializable` anymore
  * [BC BREAK] The `ConsumeMessagesCommand` class now takes an instance of `Psr\Container\ContainerInterface` 
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
@@ -48,8 +48,8 @@ public function testItSendsAndReceivesMessages()
         $connection->setup();
         $connection->queue()->purge();
 
-        $sender = new AmqpSender($serializer, $connection);
-        $receiver = new AmqpReceiver($serializer, $connection);
+        $sender = new AmqpSender($connection, $serializer);
+        $receiver = new AmqpReceiver($connection, $serializer);
 
         $sender->send($first = Envelope::wrap(new DummyMessage('First')));
         $sender->send($second = Envelope::wrap(new DummyMessage('Second')));
@@ -74,7 +74,7 @@ public function testItReceivesSignals()
         $connection->setup();
         $connection->queue()->purge();
 
-        $sender = new AmqpSender($serializer, $connection);
+        $sender = new AmqpSender($connection, $serializer);
         $sender->send(Envelope::wrap(new DummyMessage('Hello')));
 
         $amqpReadTimeout = 30;
@@ -123,7 +123,7 @@ public function testItSupportsTimeoutAndTicksNullMessagesToTheHandler()
         $connection->setup();
         $connection->queue()->purge();
 
-        $receiver = new AmqpReceiver($serializer, $connection);
+        $receiver = new AmqpReceiver($connection, $serializer);
 
         $receivedMessages = 0;
         $receiver->receive(function (?Envelope $envelope) use ($receiver, &$receivedMessages) {
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php
@@ -44,7 +44,7 @@ public function testItSendTheDecodedMessageToTheHandlerAndAcknowledgeIt()
 
         $connection->expects($this->once())->method('ack')->with($envelope);
 
-        $receiver = new AmqpReceiver($serializer, $connection);
+        $receiver = new AmqpReceiver($connection, $serializer);
         $receiver->receive(function (?Envelope $envelope) use ($receiver) {
             $this->assertEquals(new DummyMessage('Hi'), $envelope->getMessage());
             $receiver->stop();
@@ -71,7 +71,7 @@ public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
 
         $connection->expects($this->once())->method('nack')->with($envelope);
 
-        $receiver = new AmqpReceiver($serializer, $connection);
+        $receiver = new AmqpReceiver($connection, $serializer);
         $receiver->receive(function () {
             throw new InterruptException('Well...');
         });
@@ -96,7 +96,7 @@ public function testItRejectsTheMessageIfTheExceptionIsARejectMessageExceptionIn
         $connection->method('get')->willReturn($envelope);
         $connection->expects($this->once())->method('reject')->with($envelope);
 
-        $receiver = new AmqpReceiver($serializer, $connection);
+        $receiver = new AmqpReceiver($connection, $serializer);
         $receiver->receive(function () {
             throw new WillNeverWorkException('Well...');
         });
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php
@@ -34,7 +34,7 @@ public function testItSendsTheEncodedMessage()
         $connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
         $connection->expects($this->once())->method('publish')->with($encoded['body'], $encoded['headers']);
 
-        $sender = new AmqpSender($serializer, $connection);
+        $sender = new AmqpSender($connection, $serializer);
         $sender->send($envelope);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportFactoryTest.php
@@ -38,7 +38,7 @@ public function testItCreatesTheTransport()
             true
         );
 
-        $expectedTransport = new AmqpTransport($serializer, Connection::fromDsn('amqp://localhost', array('foo' => 'bar'), true));
+        $expectedTransport = new AmqpTransport(Connection::fromDsn('amqp://localhost', array('foo' => 'bar'), true), $serializer);
 
         $this->assertEquals($expectedTransport, $factory->createTransport('amqp://localhost', array('foo' => 'bar')));
     }
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportTest.php
@@ -59,6 +59,6 @@ private function getTransport(SerializerInterface $serializer = null, Connection
         $serializer = $serializer ?: $this->getMockBuilder(SerializerInterface::class)->getMock();
         $connection = $connection ?: $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
 
-        return new AmqpTransport($serializer, $connection);
+        return new AmqpTransport($connection, $serializer);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Messenger\Transport\AmqpExt\Exception\RejectMessageExceptionInterface;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
+use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 /**
@@ -26,10 +27,10 @@ class AmqpReceiver implements ReceiverInterface
     private $connection;
     private $shouldStop;
 
-    public function __construct(SerializerInterface $serializer, Connection $connection)
+    public function __construct(Connection $connection, SerializerInterface $serializer = null)
     {
-        $this->serializer = $serializer;
         $this->connection = $connection;
+        $this->serializer = $serializer ?? Serializer::create();
     }
 
     /**
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Transport\SenderInterface;
+use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 /**
@@ -25,10 +26,10 @@ class AmqpSender implements SenderInterface
     private $serializer;
     private $connection;
 
-    public function __construct(SerializerInterface $serializer, Connection $connection)
+    public function __construct(Connection $connection, SerializerInterface $serializer = null)
     {
-        $this->serializer = $serializer;
         $this->connection = $connection;
+        $this->serializer = $serializer ?? Serializer::create();
     }
 
     /**
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransport.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransport.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
@@ -25,10 +26,10 @@ class AmqpTransport implements TransportInterface
     private $receiver;
     private $sender;
 
-    public function __construct(SerializerInterface $serializer, Connection $connection)
+    public function __construct(Connection $connection, SerializerInterface $serializer = null)
     {
-        $this->serializer = $serializer;
         $this->connection = $connection;
+        $this->serializer = $serializer ?? Serializer::create();
     }
 
     /**
@@ -57,11 +58,11 @@ public function send(Envelope $envelope): void
 
     private function getReceiver()
     {
-        return $this->receiver = new AmqpReceiver($this->serializer, $this->connection);
+        return $this->receiver = new AmqpReceiver($this->connection, $this->serializer);
     }
 
     private function getSender()
     {
-        return $this->sender = new AmqpSender($this->serializer, $this->connection);
+        return $this->sender = new AmqpSender($this->connection, $this->serializer);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
+use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
@@ -23,15 +24,15 @@ class AmqpTransportFactory implements TransportFactoryInterface
     private $serializer;
     private $debug;
 
-    public function __construct(SerializerInterface $serializer, bool $debug)
+    public function __construct(SerializerInterface $serializer = null, bool $debug = false)
     {
-        $this->serializer = $serializer;
+        $this->serializer = $serializer ?? Serializer::create();
         $this->debug = $debug;
     }
 
     public function createTransport(string $dsn, array $options): TransportInterface
     {
-        return new AmqpTransport($this->serializer, Connection::fromDsn($dsn, $options, $this->debug));
+        return new AmqpTransport(Connection::fromDsn($dsn, $options, $this->debug), $this->serializer);
     }
 
     public function supports(string $dsn, array $options): bool

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testItSendsTheEncodedMessage()`
`34`	`34`	`$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();`
`35`	`35`	`$connection->expects($this->once())->method('publish')->with($encoded['body'], $encoded['headers']);`
`36`	`36`
`37`		`- $sender = new AmqpSender($serializer, $connection);`
	`37`	`+ $sender = new AmqpSender($connection, $serializer);`
`38`	`38`	`$sender->send($envelope);`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function testItCreatesTheTransport()`
`38`	`38`	`true`
`39`	`39`	`);`
`40`	`40`
`41`		`- $expectedTransport = new AmqpTransport($serializer, Connection::fromDsn('amqp://localhost', array('foo' => 'bar'), true));`
	`41`	`+ $expectedTransport = new AmqpTransport(Connection::fromDsn('amqp://localhost', array('foo' => 'bar'), true), $serializer);`
`42`	`42`
`43`	`43`	`$this->assertEquals($expectedTransport, $factory->createTransport('amqp://localhost', array('foo' => 'bar')));`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ private function getTransport(SerializerInterface $serializer = null, Connection`
`59`	`59`	`$serializer = $serializer ?: $this->getMockBuilder(SerializerInterface::class)->getMock();`
`60`	`60`	`$connection = $connection ?: $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();`
`61`	`61`
`62`		`- return new AmqpTransport($serializer, $connection);`
	`62`	`+ return new AmqpTransport($connection, $serializer);`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Messenger\Transport\AmqpExt;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Messenger\Envelope;`
	`15`	`+use Symfony\Component\Messenger\Transport\Serialization\Serializer;`
`15`	`16`	`use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;`
`16`	`17`	`use Symfony\Component\Messenger\Transport\TransportInterface;`
`17`	`18`
`@@ -25,10 +26,10 @@ class AmqpTransport implements TransportInterface`
`25`	`26`	`private $receiver;`
`26`	`27`	`private $sender;`
`27`	`28`
`28`		`- public function __construct(SerializerInterface $serializer, Connection $connection)`
	`29`	`+ public function __construct(Connection $connection, SerializerInterface $serializer = null)`
`29`	`30`	`{`
`30`		`- $this->serializer = $serializer;`
`31`	`31`	`$this->connection = $connection;`
	`32`	`+ $this->serializer = $serializer ?? Serializer::create();`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`/**`
`@@ -57,11 +58,11 @@ public function send(Envelope $envelope): void`
`57`	`58`
`58`	`59`	`private function getReceiver()`
`59`	`60`	`{`
`60`		`- return $this->receiver = new AmqpReceiver($this->serializer, $this->connection);`
	`61`	`+ return $this->receiver = new AmqpReceiver($this->connection, $this->serializer);`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`private function getSender()`
`64`	`65`	`{`
`65`		`- return $this->sender = new AmqpSender($this->serializer, $this->connection);`
	`66`	`+ return $this->sender = new AmqpSender($this->connection, $this->serializer);`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Messenger\Transport\AmqpExt;`
`13`	`13`
	`14`	`+use Symfony\Component\Messenger\Transport\Serialization\Serializer;`
`14`	`15`	`use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;`
`15`	`16`	`use Symfony\Component\Messenger\Transport\TransportFactoryInterface;`
`16`	`17`	`use Symfony\Component\Messenger\Transport\TransportInterface;`
`@@ -23,15 +24,15 @@ class AmqpTransportFactory implements TransportFactoryInterface`
`23`	`24`	`private $serializer;`
`24`	`25`	`private $debug;`
`25`	`26`
`26`		`- public function __construct(SerializerInterface $serializer, bool $debug)`
	`27`	`+ public function __construct(SerializerInterface $serializer = null, bool $debug = false)`
`27`	`28`	`{`
`28`		`- $this->serializer = $serializer;`
	`29`	`+ $this->serializer = $serializer ?? Serializer::create();`
`29`	`30`	`$this->debug = $debug;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`public function createTransport(string $dsn, array $options): TransportInterface`
`33`	`34`	`{`
`34`		`- return new AmqpTransport($this->serializer, Connection::fromDsn($dsn, $options, $this->debug));`
	`35`	`+ return new AmqpTransport(Connection::fromDsn($dsn, $options, $this->debug), $this->serializer);`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public function supports(string $dsn, array $options): bool`