Fixed bug that message will be lost when unpack failed. (#6516)

Author: limingxinleo

src/Driver/RedisDriver.php

@@ -85,13 +85,14 @@ public function pop(): array
         }
 
         $data = $res[1];
+
+        $this->redis->zadd($this->channel->getReserved(), time() + $this->handleTimeout, $data);
+
         $message = $this->packer->unpack($data);
         if (! $message) {
             return [false, null];
         }
 
-        $this->redis->zadd($this->channel->getReserved(), time() + $this->handleTimeout, $data);
-
         return [$data, $message];
     }
 

src/JobMessage.php

@@ -29,10 +29,7 @@ public function __serialize(): array
             $this->job = $this->job->compress();
         }
 
-        return [
-            'job' => $this->job,
-            'attempts' => $this->attempts,
-        ];
+        return [$this->job, $this->attempts];
     }
 
     public function __unserialize(array $data): void

tests/JobMessageTest.php

@@ -53,7 +53,7 @@ public function testJobMessageSerializeCompatible()
         $serialized = $message->__serialize();
 
         $serialized = [
-            'job' => $serialized['job'],
+            'job' => $serialized['job'] ?? $serialized[0],
             'attempts' => 3,
         ];
         $message->__unserialize($serialized);