refactor(async-queue): remove JobMessage backward compatibility code (#7609)

Author: huangdijia

src/JobMessage.php

@@ -31,22 +31,13 @@ public function __serialize(): array
         }
 
         return [
-            $this->job,  // Compatible with old version, will be removed at v3.2
-            $this->attempts,  // Compatible with old version, will be removed at v3.2
             'job' => $this->job,
             'attempts' => $this->attempts,
         ];
     }
 
     public function __unserialize(array $data): void
     {
-        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) {

tests/JobMessageTest.php

@@ -16,7 +16,6 @@
 use Hyperf\AsyncQueue\JobMessage;
 use Hyperf\AsyncQueue\MessageInterface;
 use HyperfTest\AsyncQueue\Stub\DemoJob;
-use HyperfTest\AsyncQueue\Stub\OldJobMessage;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
 
@@ -36,19 +35,18 @@ public function testJobMessageSerialize()
 
         $serialized = $message->__serialize();
 
-        $this->assertEquals($serialized[0], $serialized['job']);
-        $this->assertEquals($serialized[1], $serialized['attempts']);
         $this->assertArrayHasKey('job', $serialized);
         $this->assertArrayHasKey('attempts', $serialized);
+        $this->assertInstanceOf(JobInterface::class, $serialized['job']);
+        $this->assertSame(0, $serialized['attempts']);
 
         $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()
+    public function testJobMessageUnserialize()
     {
         $id = rand(0, 9999);
         $message = new JobMessage(
@@ -57,61 +55,26 @@ public function testJobMessageSerializeCompatible()
 
         $serialized = $message->__serialize();
 
-        $this->assertEquals($serialized[0], $serialized['job']);
-        $this->assertEquals($serialized[1], $serialized['attempts']);
+        $this->assertArrayHasKey('job', $serialized);
+        $this->assertArrayHasKey('attempts', $serialized);
 
         $message = unserialize(serialize($message));
         $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(0, $message->getAttempts());
 
         $serialized = [
-            'job' => $serialized['job'] ?? $serialized[0],
+            '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());
-    }
-
-    public function testUnserializeAsOldJobMessage()
-    {
-        $id = rand(0, 9999);
-        $message = new JobMessage(
-            new DemoJob($id)
-        );
-
-        $serialized = serialize($message);
-        $serialized = str_replace(
-            sprintf('O:%d:"%s', strlen(JobMessage::class), JobMessage::class),
-            sprintf('O:%d:"%s', strlen(OldJobMessage::class), OldJobMessage::class),
-            $serialized
-        );
-        $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(0, $message->getAttempts());
     }
 }

tests/RedisDriverTest.php

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