Feedback

VincentLanglet · VincentLanglet · commit 9b7f7312213e · 2024-05-16T08:18:39.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsSerializerTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsSerializerTest.php
@@ -36,7 +36,7 @@ public function testDecodingFailsWithMissingBodyKey()
         $serializer = new AmazonSqsSerializer();
 
         $this->expectException(MessageDecodingFailedException::class);
-        $this->expectExceptionMessage('Encoded envelope should have at least a "body", or maybe you should implement your own serializer');
+        $this->expectExceptionMessage('Encoded envelope should have at least a "body"');
 
         $serializer->decode([]);
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSerializer.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSerializer.php
@@ -11,13 +11,18 @@
 
 namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Transport;
 
+use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 
 class AmazonSqsSerializer extends PhpSerializer
 {
-    protected function shouldBeEncoded(string $body): bool
+    public function encode(Envelope $envelope): array
     {
-        return parent::shouldBeEncoded($body)
-            || preg_match('/[^\x20-\x{D7FF}\xA\xD\x9\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]/u', $body);
+        $encoded = parent::encode($envelope);
+        if (preg_match('/[^\x20-\x{D7FF}\xA\xD\x9\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]/u', $encoded['body'])) {
+            $encoded['body'] = base64_encode($encoded['body']);
+        }
+
+        return $encoded;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json
@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "async-aws/core": "^1.5",
         "async-aws/sqs": "^1.0|^2.0",
-        "symfony/messenger": "^5.4.40|^6.4.8",
+        "symfony/messenger": "^4.4.19|^5.0|^6.0",
         "symfony/service-contracts": "^1.1|^2|^3",
         "psr/log": "^1|^2|^3"
     },
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
@@ -41,7 +41,7 @@ public function encode(Envelope $envelope): array
 
         $body = addslashes(serialize($envelope));
 
-        if ($this->shouldBeEncoded($body)) {
+        if (!preg_match('//u', $body)) {
             $body = base64_encode($body);
         }
 
@@ -50,14 +50,6 @@ public function encode(Envelope $envelope): array
         ];
     }
 
-    /**
-     * Entry point to use stricter condition for base64 encoding.
-     */
-    protected function shouldBeEncoded(string $body): bool
-    {
-        return !preg_match('//u', $body);
-    }
-
     private function safelyUnserialize(string $contents)
     {
         if ('' === $contents) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function testDecodingFailsWithMissingBodyKey()`
`36`	`36`	`$serializer = new AmazonSqsSerializer();`
`37`	`37`
`38`	`38`	`$this->expectException(MessageDecodingFailedException::class);`
`39`		`- $this->expectExceptionMessage('Encoded envelope should have at least a "body", or maybe you should implement your own serializer');`
	`39`	`+ $this->expectExceptionMessage('Encoded envelope should have at least a "body"');`
`40`	`40`
`41`	`41`	`$serializer->decode([]);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,18 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Transport;`
`13`	`13`
	`14`	`+use Symfony\Component\Messenger\Envelope;`
`14`	`15`	`use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;`
`15`	`16`
`16`	`17`	`class AmazonSqsSerializer extends PhpSerializer`
`17`	`18`	`{`
`18`		`- protected function shouldBeEncoded(string $body): bool`
	`19`	`+ public function encode(Envelope $envelope): array`
`19`	`20`	`{`
`20`		`- return parent::shouldBeEncoded($body)`
`21`		`- \|\| preg_match('/[^\x20-\x{D7FF}\xA\xD\x9\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]/u', $body);`
	`21`	`+ $encoded = parent::encode($envelope);`
	`22`	`+ if (preg_match('/[^\x20-\x{D7FF}\xA\xD\x9\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]/u', $encoded['body'])) {`
	`23`	`+ $encoded['body'] = base64_encode($encoded['body']);`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ return $encoded;`
`22`	`27`	`}`
`23`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function encode(Envelope $envelope): array`
`41`	`41`
`42`	`42`	`$body = addslashes(serialize($envelope));`
`43`	`43`
`44`		`- if ($this->shouldBeEncoded($body)) {`
	`44`	`+ if (!preg_match('//u', $body)) {`
`45`	`45`	`$body = base64_encode($body);`
`46`	`46`	`}`
`47`	`47`
`@@ -50,14 +50,6 @@ public function encode(Envelope $envelope): array`
`50`	`50`	`];`
`51`	`51`	`}`
`52`	`52`
`53`		`- /**`
`54`		`- * Entry point to use stricter condition for base64 encoding.`
`55`		`- */`
`56`		`- protected function shouldBeEncoded(string $body): bool`
`57`		`- {`
`58`		`- return !preg_match('//u', $body);`
`59`		`- }`
`60`		`-`
`61`	`53`	`private function safelyUnserialize(string $contents)`
`62`	`54`	`{`
`63`	`55`	`if ('' === $contents) {`