@@ -22,12 +22,20 @@ class CMQQueue extends Queue implements QueueContract
22
22
* @var array
23
23
*/
24
24
protected $ queueOptions ;
25
+
26
+ /**
27
+ * @var array
28
+ */
25
29
protected $ topicOptions ;
26
30
27
31
/**
28
32
* @var Account
29
33
*/
30
34
private $ queueAccount ;
35
+
36
+ /**
37
+ * @var Account
38
+ */
31
39
private $ topicAccount ;
32
40
33
41
/**
@@ -42,9 +50,11 @@ class CMQQueue extends Queue implements QueueContract
42
50
43
51
/**
44
52
* CMQQueue constructor.
53
+ *
45
54
* @param Account $queueAccount
46
55
* @param Account $topicAccount
47
56
* @param array $config
57
+ *
48
58
* @throws \ReflectionException
49
59
*/
50
60
public function __construct (Account $ queueAccount , Account $ topicAccount , array $ config )
@@ -65,7 +75,7 @@ public function __construct(Account $queueAccount, Account $topicAccount, array
65
75
*/
66
76
public function isPlain ()
67
77
{
68
- return Arr::get ($ this ->plainOptions , 'enable ' , false );
78
+ return ( bool ) Arr::get ($ this ->plainOptions , 'enable ' );
69
79
}
70
80
71
81
/**
@@ -106,11 +116,9 @@ public function push($job, $data = '', $queue = null)
106
116
return $ this ->pushRaw ($ job ->getPayload (), $ queue );
107
117
}
108
118
109
- if (self ::$ createPayload ->getNumberOfParameters () === 3 ) { // version >= 5.7
110
- $ payload = $ this ->createPayload ($ job , $ queue , $ data );
111
- } else {
112
- $ payload = $ this ->createPayload ($ job , $ data );
113
- }
119
+ $ payload = self ::$ createPayload ->getNumberOfParameters () === 3
120
+ ? $ this ->createPayload ($ job , $ queue , $ data ) // version >= 5.7
121
+ : $ this ->createPayload ($ job , $ data );
114
122
115
123
return $ this ->pushRaw ($ payload , $ queue );
116
124
}
@@ -178,11 +186,9 @@ public function later($delay, $job, $data = '', $queue = null)
178
186
return $ this ->pushRaw ($ job ->getPayload (), $ queue , ['delay ' => $ delay ]);
179
187
}
180
188
181
- if (self ::$ createPayload ->getNumberOfParameters () === 3 ) { // version >= 5.7
182
- $ payload = $ this ->createPayload ($ job , $ queue , $ data );
183
- } else {
184
- $ payload = $ this ->createPayload ($ job , $ data );
185
- }
189
+ $ payload = self ::$ createPayload ->getNumberOfParameters () === 3
190
+ ? $ this ->createPayload ($ job , $ queue , $ data ) // version >= 5.7
191
+ : $ this ->createPayload ($ job , $ data );
186
192
187
193
return $ this ->pushRaw ($ payload , $ queue , ['delay ' => $ delay ]);
188
194
}
@@ -200,7 +206,7 @@ public function pop($queue = null)
200
206
$ queue = $ this ->getQueue ($ queue );
201
207
$ message = $ queue ->receive_message ($ this ->queueOptions ['polling_wait_seconds ' ]);
202
208
} catch (CMQServerException $ e ) {
203
- if (self ::CMQ_QUEUE_NO_MESSAGE_CODE === (int )$ e ->getCode ()) { //ignore no message
209
+ if (self ::CMQ_QUEUE_NO_MESSAGE_CODE === (int )$ e ->getCode ()) { // ignore no message
204
210
return null ;
205
211
}
206
212
throw $ e ;
0 commit comments