22
33namespace Enqueue \AmqpLib ;
44
5+ use Interop \Amqp \AmqpConsumer as InteropAmqpConsumer ;
6+ use Interop \Amqp \AmqpMessage as InteropAmqpMessage ;
7+ use Interop \Amqp \AmqpQueue as InteropAmqpQueue ;
8+ use Interop \Amqp \Impl \AmqpMessage ;
59use Interop \Queue \Exception ;
610use Interop \Queue \InvalidMessageException ;
7- use Interop \Queue \PsrConsumer ;
811use Interop \Queue \PsrMessage ;
912use PhpAmqpLib \Channel \AMQPChannel ;
1013use PhpAmqpLib \Exception \AMQPTimeoutException ;
1114use PhpAmqpLib \Message \AMQPMessage as LibAMQPMessage ;
1215use PhpAmqpLib \Wire \AMQPTable ;
1316
14- class AmqpConsumer implements PsrConsumer
17+ class AmqpConsumer implements InteropAmqpConsumer
1518{
1619 /**
1720 * @var AMQPChannel
1821 */
1922 private $ channel ;
2023
2124 /**
22- * @var AmqpQueue
25+ * @var InteropAmqpQueue
2326 */
2427 private $ queue ;
2528
@@ -39,33 +42,87 @@ class AmqpConsumer implements PsrConsumer
3942 private $ receiveMethod ;
4043
4144 /**
42- * @var AmqpMessage
45+ * @var InteropAmqpMessage
4346 */
4447 private $ receivedMessage ;
4548
49+ /**
50+ * @var int
51+ */
52+ private $ flags ;
53+
4654 /**
4755 * @var string
4856 */
4957 private $ consumerTag ;
5058
5159 /**
52- * @param AMQPChannel $channel
53- * @param AmqpQueue $queue
54- * @param Buffer $buffer
55- * @param string $receiveMethod
60+ * @param AMQPChannel $channel
61+ * @param InteropAmqpQueue $queue
62+ * @param Buffer $buffer
63+ * @param string $receiveMethod
5664 */
57- public function __construct (AMQPChannel $ channel , AmqpQueue $ queue , Buffer $ buffer , $ receiveMethod )
65+ public function __construct (AMQPChannel $ channel , InteropAmqpQueue $ queue , Buffer $ buffer , $ receiveMethod )
5866 {
5967 $ this ->channel = $ channel ;
6068 $ this ->queue = $ queue ;
6169 $ this ->buffer = $ buffer ;
6270 $ this ->receiveMethod = $ receiveMethod ;
71+ $ this ->flags = self ::FLAG_NOPARAM ;
6372
6473 $ this ->isInit = false ;
6574 }
6675
6776 /**
68- * @return AmqpQueue
77+ * {@inheritdoc}
78+ */
79+ public function setConsumerTag ($ consumerTag )
80+ {
81+ $ this ->consumerTag = $ consumerTag ;
82+ }
83+
84+ /**
85+ * {@inheritdoc}
86+ */
87+ public function getConsumerTag ()
88+ {
89+ return $ this ->consumerTag ;
90+ }
91+
92+ /**
93+ * {@inheritdoc}
94+ */
95+ public function clearFlags ()
96+ {
97+ $ this ->flags = self ::FLAG_NOPARAM ;
98+ }
99+
100+ /**
101+ * {@inheritdoc}
102+ */
103+ public function addFlag ($ flag )
104+ {
105+ $ this ->flags |= $ flag ;
106+ }
107+
108+ /**
109+ * {@inheritdoc}
110+ */
111+ public function getFlags ()
112+ {
113+ return $ this ->flags ;
114+ }
115+
116+ /**
117+ * {@inheritdoc}
118+ */
119+ public function setFlags ($ flags )
120+ {
121+ $ this ->flags = $ flags ;
122+ }
123+
124+ /**
125+ * @return InteropAmqpQueue
69126 */
70127 public function getQueue ()
71128 {
@@ -75,7 +132,7 @@ public function getQueue()
75132 /**
76133 * {@inheritdoc}
77134 *
78- * @return AmqpMessage |null
135+ * @return InteropAmqpMessage |null
79136 */
80137 public function receive ($ timeout = 0 )
81138 {
@@ -91,40 +148,42 @@ public function receive($timeout = 0)
91148 }
92149
93150 /**
94- * @return AmqpMessage |null
151+ * @return InteropAmqpMessage |null
95152 */
96153 public function receiveNoWait ()
97154 {
98- if ($ message = $ this ->channel ->basic_get ($ this ->queue ->getQueueName ())) {
155+ if ($ message = $ this ->channel ->basic_get ($ this ->queue ->getQueueName (), !!( $ this -> getFlags () & InteropAmqpConsumer:: FLAG_NOACK ) )) {
99156 return $ this ->convertMessage ($ message );
100157 }
101158 }
102159
103160 /**
104- * @param AmqpMessage $message
161+ * @param InteropAmqpMessage $message
105162 */
106163 public function acknowledge (PsrMessage $ message )
107164 {
108- InvalidMessageException ::assertMessageInstanceOf ($ message , AmqpMessage::class);
165+ InvalidMessageException ::assertMessageInstanceOf ($ message , InteropAmqpMessage::class);
166+
167+ var_dump ($ message ->getDeliveryTag ());
109168
110169 $ this ->channel ->basic_ack ($ message ->getDeliveryTag ());
111170 }
112171
113172 /**
114- * @param AmqpMessage $message
115- * @param bool $requeue
173+ * @param InteropAmqpMessage $message
174+ * @param bool $requeue
116175 */
117176 public function reject (PsrMessage $ message , $ requeue = false )
118177 {
119- InvalidMessageException ::assertMessageInstanceOf ($ message , AmqpMessage ::class);
178+ InvalidMessageException ::assertMessageInstanceOf ($ message , InteropAmqpMessage ::class);
120179
121180 $ this ->channel ->basic_reject ($ message ->getDeliveryTag (), $ requeue );
122181 }
123182
124183 /**
125184 * @param LibAMQPMessage $amqpMessage
126185 *
127- * @return AmqpMessage
186+ * @return InteropAmqpMessage
128187 */
129188 private function convertMessage (LibAMQPMessage $ amqpMessage )
130189 {
@@ -147,7 +206,7 @@ private function convertMessage(LibAMQPMessage $amqpMessage)
147206 /**
148207 * @param int $timeout
149208 *
150- * @return AmqpMessage |null
209+ * @return InteropAmqpMessage |null
151210 */
152211 private function receiveBasicGet ($ timeout )
153212 {
@@ -165,32 +224,32 @@ private function receiveBasicGet($timeout)
165224 /**
166225 * @param int $timeout
167226 *
168- * @return AmqpMessage |null
227+ * @return InteropAmqpMessage |null
169228 */
170229 private function receiveBasicConsume ($ timeout )
171230 {
172231 if (false === $ this ->isInit ) {
173232 $ callback = function (LibAMQPMessage $ message ) {
174233 $ receivedMessage = $ this ->convertMessage ($ message );
175- $ consumerTag = $ message ->delivery_info ['consumer_tag ' ];
234+ $ receivedMessage -> setConsumerTag ( $ message ->delivery_info ['consumer_tag ' ]) ;
176235
177- if ($ this ->consumerTag === $ consumerTag ) {
236+ if ($ this ->consumerTag === $ receivedMessage -> getConsumerTag () ) {
178237 $ this ->receivedMessage = $ receivedMessage ;
179238 } else {
180239 // not our message, put it to buffer and continue.
181- $ this ->buffer ->push ($ consumerTag , $ receivedMessage );
240+ $ this ->buffer ->push ($ receivedMessage -> getConsumerTag () , $ receivedMessage );
182241 }
183242 };
184243
185244 $ this ->channel ->basic_qos (0 , 1 , false );
186245
187246 $ consumerTag = $ this ->channel ->basic_consume (
188247 $ this ->queue ->getQueueName (),
189- $ this ->queue ->getConsumerTag (),
190- $ this ->queue -> isNoLocal ( ),
191- $ this ->queue -> isNoAck ( ),
192- $ this ->queue -> isExclusive ( ),
193- $ this ->queue -> isNoWait ( ),
248+ $ this ->getConsumerTag () ?: $ this -> getQueue () ->getConsumerTag (),
249+ !!( $ this ->getFlags () & InteropAmqpConsumer:: FLAG_NOLOCAL ),
250+ !!( $ this ->getFlags () & InteropAmqpConsumer:: FLAG_NOACK ),
251+ !!( $ this ->getFlags () & InteropAmqpConsumer:: FLAG_EXCLUSIVE ),
252+ !!( $ this ->getFlags () & InteropAmqpConsumer:: FLAG_NOWAIT ),
194253 $ callback
195254 );
196255
@@ -210,8 +269,11 @@ private function receiveBasicConsume($timeout)
210269 $ this ->receivedMessage = null ;
211270
212271 try {
272+ echo 'here ' , PHP_EOL ;
213273 $ this ->channel ->wait (null , false , $ timeout );
274+ echo 'here1 ' , PHP_EOL ;
214275 } catch (AMQPTimeoutException $ e ) {
276+ echo 'here2 ' , PHP_EOL ;
215277 }
216278
217279 return $ this ->receivedMessage ;
0 commit comments