Merge branch 'v5.4'

Author: vyuldashev

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -101,7 +101,6 @@ public function pushRaw($payload, $queue = null, array $options = [])
     {
         try {
             $queue = $this->getQueueName($queue);
-            $this->declareQueue($queue);
             if (isset($options['delay']) && $options['delay'] > 0) {
                 list($queue, $exchange) = $this->declareDelayedQueue($queue, $options['delay']);
             } else {
@@ -113,7 +112,7 @@ public function pushRaw($payload, $queue = null, array $options = [])
                 'delivery_mode' => 2,
             ];
 
-            if (isset($this->retryAfter) === true) {
+            if ($this->retryAfter !== null) {
                 $headers['application_headers'] = [self::ATTEMPT_COUNT_HEADERS_KEY => ['I', $this->retryAfter]];
             }
 
@@ -201,7 +200,7 @@ private function declareQueue($name)
         $name = $this->getQueueName($name);
         $exchange = $this->configExchange['name'] ?: $name;
 
-        if ($this->declareExchange && !in_array($exchange, $this->declaredExchanges)) {
+        if ($this->declareExchange && !in_array($exchange, $this->declaredExchanges, true)) {
             // declare exchange
             $this->channel->exchange_declare(
                 $exchange,
@@ -214,7 +213,7 @@ private function declareQueue($name)
             $this->declaredExchanges[] = $exchange;
         }
 
-        if ($this->declareBindQueue && !in_array($name, $this->declaredQueues)) {
+        if ($this->declareBindQueue && !in_array($name, $this->declaredQueues, true)) {
             // declare queue
             $this->channel->queue_declare(
                 $name,
@@ -237,7 +236,7 @@ private function declareQueue($name)
      * @param string       $destination
      * @param DateTime|int $delay
      *
-     * @return string
+     * @return array
      */
     private function declareDelayedQueue($destination, $delay)
     {
@@ -248,7 +247,7 @@ private function declareDelayedQueue($destination, $delay)
         $exchange = $this->configExchange['name'] ?: $destination;
 
         // declare exchange
-        if (!in_array($exchange, $this->declaredExchanges)) {
+        if (!in_array($exchange, $this->declaredExchanges, true)) {
             $this->channel->exchange_declare(
                 $exchange,
                 $this->configExchange['type'],
@@ -259,7 +258,7 @@ private function declareDelayedQueue($destination, $delay)
         }
 
         // declare queue
-        if (!in_array($name, $this->declaredQueues)) {
+        if (!in_array($name, $this->declaredQueues, true)) {
             $this->channel->queue_declare(
                 $name,
                 $this->configQueue['passive'],
@@ -312,7 +311,7 @@ public function setCorrelationId($id)
      */
     public function getCorrelationId()
     {
-        return $this->correlationId ?: uniqid();
+        return $this->correlationId ?: uniqid('', true);
     }
 
     /**

tests/RabbitMQQueueTest.php

@@ -82,7 +82,7 @@ public function test_push()
 
         $correlationId = $this->queue->push($job, $data);
 
-        $this->assertEquals(13, strlen($correlationId));
+        $this->assertEquals(23, strlen($correlationId));
     }
 
     public function test_later()
@@ -119,7 +119,7 @@ public function test_later()
 
         $correlationId = $this->queue->later($delay, $job, $data);
 
-        $this->assertEquals(13, strlen($correlationId));
+        $this->assertEquals(23, strlen($correlationId));
     }
 
     public function test_pop()