Merge branch '5.4' into 6.4

javiereguiluz · javiereguiluz · commit ba6f65de789c · 2024-04-26T16:38:29.000+02:00
* 5.4:
  docs: encodedEnvelope is already an array
diff --git a/messenger.rst b/messenger.rst
@@ -3062,12 +3062,10 @@ Let's say you want to create a message decoder::
     {
         public function decode(array $encodedEnvelope): Envelope
         {
-            $envelope = \json_decode($encodedEnvelope, true);
-
             try {
                 // parse the data you received with your custom fields
-                $data = $envelope['data'];
-                $data['token'] = $envelope['token'];
+                $data = $encodedEnvelope['data'];
+                $data['token'] = $encodedEnvelope['token'];
 
                 // other operations like getting information from stamps
             } catch (\Throwable $throwable) {

Original file line number	Diff line number	Diff line change
`@@ -3062,12 +3062,10 @@ Let's say you want to create a message decoder::`
`3062`	`3062`	`{`
`3063`	`3063`	`public function decode(array $encodedEnvelope): Envelope`
`3064`	`3064`	`{`
`3065`		`- $envelope = \json_decode($encodedEnvelope, true);`
`3066`		`-`
`3067`	`3065`	`try {`
`3068`	`3066`	`// parse the data you received with your custom fields`
`3069`		`- $data = $envelope['data'];`
`3070`		`- $data['token'] = $envelope['token'];`
	`3067`	`+ $data = $encodedEnvelope['data'];`
	`3068`	`+ $data['token'] = $encodedEnvelope['token'];`
`3071`	`3069`
`3072`	`3070`	`// other operations like getting information from stamps`
`3073`	`3071`	`} catch (\Throwable $throwable) {`