Build the receiver and sender within the factory

sroze · sroze · commit bb31661b88ee · 2018-04-04T11:02:55.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -373,7 +373,6 @@
         <xsd:sequence>
             <xsd:element name="option" type="messenger_adapter_option" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
-
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="dsn" type="xsd:string" />
     </xsd:complexType>
diff --git a/src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpAdapter.php b/src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpAdapter.php
@@ -22,25 +22,25 @@
  */
 class AmqpAdapter implements AdapterInterface
 {
-    private $encoder;
-    private $decoder;
+    private $receiver;
+    private $sender;
     private $connection;
 
-    public function __construct(EncoderInterface $encoder, DecoderInterface $decoder, Connection $connection)
+    public function __construct(ReceiverInterface $receiver, SenderInterface $sender, Connection $connection)
     {
-        $this->encoder = $encoder;
-        $this->decoder = $decoder;
+        $this->receiver = $receiver;
+        $this->sender = $sender;
         $this->connection = $connection;
     }
 
     public function receiver(): ReceiverInterface
     {
-        return new AmqpReceiver($this->decoder, $this->connection);
+        return $this->receiver;
     }
 
     public function sender(): SenderInterface
     {
-        return new AmqpSender($this->encoder, $this->connection);
+        return $this->sender;
     }
 
     public function connection(): Connection
diff --git a/src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpAdapterFactory.php b/src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpAdapterFactory.php
@@ -34,7 +34,11 @@ public function __construct(EncoderInterface $encoder, DecoderInterface $decoder
 
     public function create(string $dsn, array $options): AdapterInterface
     {
-        return new AmqpAdapter($this->encoder, $this->decoder, Connection::fromDsn($dsn, $options, $this->debug));
+        return new AmqpAdapter(
+            new AmqpReceiver($this->decoder, $this->connection),
+            new AmqpSender($this->encoder, $this->connection),
+            Connection::fromDsn($dsn, $options, $this->debug)
+        );
     }
 
     public function supports(string $dsn, array $options): bool

Original file line number	Diff line number	Diff line change
`@@ -22,25 +22,25 @@`
`22`	`22`	`*/`
`23`	`23`	`class AmqpAdapter implements AdapterInterface`
`24`	`24`	`{`
`25`		`- private $encoder;`
`26`		`- private $decoder;`
	`25`	`+ private $receiver;`
	`26`	`+ private $sender;`
`27`	`27`	`private $connection;`
`28`	`28`
`29`		`- public function __construct(EncoderInterface $encoder, DecoderInterface $decoder, Connection $connection)`
	`29`	`+ public function __construct(ReceiverInterface $receiver, SenderInterface $sender, Connection $connection)`
`30`	`30`	`{`
`31`		`- $this->encoder = $encoder;`
`32`		`- $this->decoder = $decoder;`
	`31`	`+ $this->receiver = $receiver;`
	`32`	`+ $this->sender = $sender;`
`33`	`33`	`$this->connection = $connection;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function receiver(): ReceiverInterface`
`37`	`37`	`{`
`38`		`- return new AmqpReceiver($this->decoder, $this->connection);`
	`38`	`+ return $this->receiver;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function sender(): SenderInterface`
`42`	`42`	`{`
`43`		`- return new AmqpSender($this->encoder, $this->connection);`
	`43`	`+ return $this->sender;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function connection(): Connection`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,11 @@ public function __construct(EncoderInterface $encoder, DecoderInterface $decoder`
`34`	`34`
`35`	`35`	`public function create(string $dsn, array $options): AdapterInterface`
`36`	`36`	`{`
`37`		`- return new AmqpAdapter($this->encoder, $this->decoder, Connection::fromDsn($dsn, $options, $this->debug));`
	`37`	`+ return new AmqpAdapter(`
	`38`	`+ new AmqpReceiver($this->decoder, $this->connection),`
	`39`	`+ new AmqpSender($this->encoder, $this->connection),`
	`40`	`+ Connection::fromDsn($dsn, $options, $this->debug)`
	`41`	`+ );`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`public function supports(string $dsn, array $options): bool`