choose the proper array element to decode the message

xabbuh · xabbuh · commit 59534bc23649 · 2021-10-22T15:43:12.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php
@@ -64,12 +64,14 @@ public function redisEnvelopeProvider(): \Generator
         yield [
             [
                 'id' => 1,
-                'data' => json_encode([
-                    'body' => '{"message": "Hi"}',
-                    'headers' => [
-                        'type' => DummyMessage::class,
-                    ],
-                ]),
+                'data' => [
+                    'message' => json_encode([
+                        'body' => '{"message": "Hi"}',
+                        'headers' => [
+                            'type' => DummyMessage::class,
+                        ],
+                    ]),
+                ],
             ],
             new DummyMessage('Hi'),
             new Serializer(
@@ -80,12 +82,14 @@ public function redisEnvelopeProvider(): \Generator
         yield [
             [
                 'id' => 2,
-                'data' => json_encode([
-                    'foo' => 'fooValue',
-                    'bar' => [
-                        'baz' => 'bazValue',
-                    ],
-                ]),
+                'data' => [
+                    'message' => json_encode([
+                        'foo' => 'fooValue',
+                        'bar' => [
+                            'baz' => 'bazValue',
+                        ],
+                    ]),
+                ],
             ],
             (new ExternalMessage('fooValue'))->setBar(['baz' => 'bazValue']),
             new ExternalMessageSerializer(),
@@ -97,24 +101,28 @@ public function rejectedRedisEnvelopeProvider(): \Generator
         yield [
             [
                 'id' => 1,
-                'data' => json_encode([
-                    'body' => '{"message": "Hi"}',
-                    'headers' => [
-                        'type' => DummyMessage::class,
-                    ],
-                ]),
+                'data' => [
+                    'message' => json_encode([
+                        'body' => '{"message": "Hi"}',
+                        'headers' => [
+                            'type' => DummyMessage::class,
+                        ],
+                    ]),
+                ],
             ],
         ];
 
         yield [
             [
                 'id' => 2,
-                'data' => json_encode([
-                    'foo' => 'fooValue',
-                    'bar' => [
-                        'baz' => 'bazValue',
-                    ],
-                ]),
+                'data' => [
+                    'message' => json_encode([
+                        'foo' => 'fooValue',
+                        'bar' => [
+                            'baz' => 'bazValue',
+                        ],
+                    ]),
+                ],
             ],
         ];
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php
@@ -39,10 +39,12 @@ public function testReceivesMessages()
 
         $redisEnvelope = [
             'id' => '5',
-            'data' => json_encode([
-                'body' => 'body',
-                'headers' => ['my' => 'header'],
-            ]),
+            'data' => [
+                'message' => json_encode([
+                    'body' => 'body',
+                    'headers' => ['my' => 'header'],
+                ]),
+            ],
         ];
 
         $serializer->method('decode')->with(['body' => 'body', 'headers' => ['my' => 'header']])->willReturn(new Envelope($decodedMessage));
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php
@@ -44,7 +44,7 @@ public function get(): iterable
             return [];
         }
 
-        $redisEnvelope = json_decode($message['data'], true);
+        $redisEnvelope = json_decode($message['data']['message'] ?? '', true);
 
         try {
             if (\array_key_exists('body', $redisEnvelope) && \array_key_exists('headers', $redisEnvelope)) {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function get(): iterable`
`44`	`44`	`return [];`
`45`	`45`	`}`
`46`	`46`
`47`		`- $redisEnvelope = json_decode($message['data'], true);`
	`47`	`+ $redisEnvelope = json_decode($message['data']['message'] ?? '', true);`
`48`	`48`
`49`	`49`	`try {`
`50`	`50`	`if (\array_key_exists('body', $redisEnvelope) && \array_key_exists('headers', $redisEnvelope)) {`