Optimized the serialization of Hyperf\AsyncQueue\JobMessage (#6511)

Author: huangdijia

src/JobMessage.php

@@ -29,18 +29,29 @@ public function __serialize(): array
             $this->job = $this->job->compress();
         }
 
-        return [$this->job, $this->attempts];
+        return [
+            'job' => $this->job,
+            'attempts' => $this->attempts,
+        ];
     }
 
     public function __unserialize(array $data): void
     {
-        [$job, $attempts] = $data;
+        if (array_is_list($data)) { // Compatible with old version, will be removed at v3.2
+            $data = [
+                'job' => $data[0],
+                'attempts' => $data[1],
+            ];
+        }
+
+        $job = $data['job'];
+
         if ($job instanceof UnCompressInterface) {
             $job = $job->uncompress();
         }
 
         $this->job = $job;
-        $this->attempts = $attempts;
+        $this->attempts = $data['attempts'];
     }
 
     public function job(): JobInterface

tests/JobMessageTest.php

@@ -32,10 +32,47 @@ public function testJobMessageSerialize()
             new DemoJob($id)
         );
 
+        $serialized = $message->__serialize();
+        $this->assertArrayHasKey('job', $serialized);
+        $this->assertArrayHasKey('attempts', $serialized);
+
+        $this->assertInstanceOf(MessageInterface::class, $message);
+        $this->assertInstanceOf(JobInterface::class, $message->job());
+        $this->assertInstanceOf(JobInterface::class, $message->job());
+        $this->assertInstanceOf(DemoJob::class, $message->job());
+        $this->assertSame($id, $message->job()->id);
+    }
+
+    public function testJobMessageSerializeCompatible()
+    {
+        $id = rand(0, 9999);
+        $message = new JobMessage(
+            new DemoJob($id)
+        );
+
+        $serialized = $message->__serialize();
+
+        $serialized = [
+            'job' => $serialized['job'],
+            'attempts' => 3,
+        ];
+        $message->__unserialize($serialized);
+
+        $this->assertInstanceOf(MessageInterface::class, $message);
+        $this->assertInstanceOf(JobInterface::class, $message->job());
+        $this->assertInstanceOf(JobInterface::class, $message->job());
+        $this->assertInstanceOf(DemoJob::class, $message->job());
+        $this->assertSame($id, $message->job()->id);
+        $this->assertSame(3, $message->getAttempts());
+
+        $serialized = [new DemoJob($id), 5];
+        $message->__unserialize($serialized);
+
         $this->assertInstanceOf(MessageInterface::class, $message);
         $this->assertInstanceOf(JobInterface::class, $message->job());
         $this->assertInstanceOf(JobInterface::class, $message->job());
         $this->assertInstanceOf(DemoJob::class, $message->job());
         $this->assertSame($id, $message->job()->id);
+        $this->assertSame(5, $message->getAttempts());
     }
 }

tests/RedisDriverTest.php

@@ -115,7 +115,7 @@ public function testAsyncQueueJobGenerate()
         $driver->push(new DemoJob($id, $model));
 
         $serialized = (string) Context::get('test.async-queue.lpush.value');
-        $this->assertSame(231, strlen($serialized));
+        $this->assertSame(248, strlen($serialized));
 
         /** @var JobMessage $class */
         $class = $packer->unpack($serialized);