33namespace Enqueue \AmqpExt \Client ;
44
55use Enqueue \AmqpExt \AmqpContext ;
6- use Enqueue \AmqpExt \AmqpMessage ;
7- use Enqueue \AmqpExt \AmqpQueue ;
8- use Enqueue \AmqpExt \AmqpTopic ;
9- use Enqueue \AmqpExt \DeliveryMode ;
106use Enqueue \Client \Config ;
117use Enqueue \Client \DriverInterface ;
128use Enqueue \Client \Message ;
139use Enqueue \Client \Meta \QueueMetaRegistry ;
10+ use Interop \Amqp \AmqpMessage ;
11+ use Interop \Amqp \AmqpQueue ;
12+ use Interop \Amqp \AmqpTopic ;
13+ use Interop \Amqp \Impl \AmqpBind ;
1414use Interop \Queue \PsrMessage ;
1515use Psr \Log \LoggerInterface ;
1616use Psr \Log \NullLogger ;
@@ -97,7 +97,7 @@ public function setupBroker(LoggerInterface $logger = null)
9797 $ log ('Declare router queue: %s ' , $ routerQueue ->getQueueName ());
9898 $ this ->context ->declareQueue ($ routerQueue );
9999 $ log ('Bind router queue to exchange: %s -> %s ' , $ routerQueue ->getQueueName (), $ routerTopic ->getTopicName ());
100- $ this ->context ->bind ($ routerTopic , $ routerQueue );
100+ $ this ->context ->bind (new AmqpBind ( $ routerTopic , $ routerQueue, $ routerQueue -> getQueueName ()) );
101101
102102 // setup queues
103103 foreach ($ this ->queueMetaRegistry ->getQueuesMeta () as $ meta ) {
@@ -118,7 +118,7 @@ public function createQueue($queueName)
118118 $ transportName = $ this ->queueMetaRegistry ->getQueueMeta ($ queueName )->getTransportName ();
119119
120120 $ queue = $ this ->context ->createQueue ($ transportName );
121- $ queue ->addFlag (AMQP_DURABLE );
121+ $ queue ->addFlag (AmqpQueue:: FLAG_DURABLE );
122122
123123 return $ queue ;
124124 }
@@ -133,14 +133,6 @@ public function createTransportMessage(Message $message)
133133 $ headers = $ message ->getHeaders ();
134134 $ properties = $ message ->getProperties ();
135135
136- $ headers ['content_type ' ] = $ message ->getContentType ();
137-
138- if ($ message ->getExpire ()) {
139- $ headers ['expiration ' ] = (string ) ($ message ->getExpire () * 1000 );
140- }
141-
142- $ headers ['delivery_mode ' ] = DeliveryMode::PERSISTENT ;
143-
144136 $ transportMessage = $ this ->context ->createMessage ();
145137 $ transportMessage ->setBody ($ message ->getBody ());
146138 $ transportMessage ->setHeaders ($ headers );
@@ -149,6 +141,12 @@ public function createTransportMessage(Message $message)
149141 $ transportMessage ->setTimestamp ($ message ->getTimestamp ());
150142 $ transportMessage ->setReplyTo ($ message ->getReplyTo ());
151143 $ transportMessage ->setCorrelationId ($ message ->getCorrelationId ());
144+ $ transportMessage ->setContentType ($ message ->getContentType ());
145+ $ transportMessage ->setDeliveryMode (AmqpMessage::DELIVERY_MODE_PERSISTENT );
146+
147+ if ($ message ->getExpire ()) {
148+ $ transportMessage ->setExpiration ((string ) ($ message ->getExpire () * 1000 ));
149+ }
152150
153151 return $ transportMessage ;
154152 }
@@ -165,10 +163,9 @@ public function createClientMessage(PsrMessage $message)
165163 $ clientMessage ->setBody ($ message ->getBody ());
166164 $ clientMessage ->setHeaders ($ message ->getHeaders ());
167165 $ clientMessage ->setProperties ($ message ->getProperties ());
166+ $ clientMessage ->setContentType ($ message ->getContentType ());
168167
169- $ clientMessage ->setContentType ($ message ->getHeader ('content_type ' ));
170-
171- if ($ expiration = $ message ->getHeader ('expiration ' )) {
168+ if ($ expiration = $ message ->getExpiration ()) {
172169 if (false == is_numeric ($ expiration )) {
173170 throw new \LogicException (sprintf ('expiration header is not numeric. "%s" ' , $ expiration ));
174171 }
@@ -200,8 +197,8 @@ private function createRouterTopic()
200197 $ topic = $ this ->context ->createTopic (
201198 $ this ->config ->createTransportRouterTopicName ($ this ->config ->getRouterTopicName ())
202199 );
203- $ topic ->setType (AMQP_EX_TYPE_FANOUT );
204- $ topic ->addFlag (AMQP_DURABLE );
200+ $ topic ->setType (AmqpTopic:: TYPE_FANOUT );
201+ $ topic ->addFlag (AmqpTopic:: FLAG_DURABLE );
205202
206203 return $ topic ;
207204 }
0 commit comments