Reorganizing messenger serializer config and replacing base64_encode with addslashes

Author: weaverryan

Tests/Transport/Serialization/PhpSerializerTest.php

@@ -25,7 +25,9 @@ public function testEncodedIsDecodable()
 
         $envelope = new Envelope(new DummyMessage('Hello'));
 
-        $this->assertEquals($envelope, $serializer->decode($serializer->encode($envelope)));
+        $encoded = $serializer->encode($envelope);
+        $this->assertNotContains("\0", $encoded['body'], 'Does not contain the binary characters');
+        $this->assertEquals($envelope, $serializer->decode($encoded));
     }
 
     public function testDecodingFailsWithMissingBodyKey()
@@ -58,7 +60,7 @@ public function testDecodingFailsWithBadClass()
         $serializer = new PhpSerializer();
 
         $serializer->decode([
-            'body' => base64_encode('O:13:"ReceivedSt0mp":0:{}'),
+            'body' => 'O:13:"ReceivedSt0mp":0:{}',
         ]);
     }
 }

Transport/Serialization/PhpSerializer.php

@@ -30,11 +30,7 @@ public function decode(array $encodedEnvelope): Envelope
             throw new MessageDecodingFailedException('Encoded envelope should have at least a "body".');
         }
 
-        $serializeEnvelope = base64_decode($encodedEnvelope['body']);
-
-        if (false === $serializeEnvelope) {
-            throw new MessageDecodingFailedException('The "body" key could not be base64 decoded.');
-        }
+        $serializeEnvelope = stripslashes($encodedEnvelope['body']);
 
         return $this->safelyUnserialize($serializeEnvelope);
     }
@@ -44,8 +40,10 @@ public function decode(array $encodedEnvelope): Envelope
      */
     public function encode(Envelope $envelope): array
     {
+        $body = addslashes(serialize($envelope));
+
         return [
-            'body' => base64_encode(serialize($envelope)),
+            'body' => $body,
         ];
     }