Merge branch '6.4' into 7.0

javiereguiluz · javiereguiluz · commit e20fd2f13616 · 2024-04-26T16:38:32.000+02:00
* 6.4:
  docs: encodedEnvelope is already an array
diff --git a/messenger.rst b/messenger.rst
@@ -2965,12 +2965,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
`@@ -2965,12 +2965,10 @@ Let's say you want to create a message decoder::`
`2965`	`2965`	`{`
`2966`	`2966`	`public function decode(array $encodedEnvelope): Envelope`
`2967`	`2967`	`{`
`2968`		`- $envelope = \json_decode($encodedEnvelope, true);`
`2969`		`-`
`2970`	`2968`	`try {`
`2971`	`2969`	`// parse the data you received with your custom fields`
`2972`		`- $data = $envelope['data'];`
`2973`		`- $data['token'] = $envelope['token'];`
	`2970`	`+ $data = $encodedEnvelope['data'];`
	`2971`	`+ $data['token'] = $encodedEnvelope['token'];`
`2974`	`2972`
`2975`	`2973`	`// other operations like getting information from stamps`
`2976`	`2974`	`} catch (\Throwable $throwable) {`