Merge branch '7.0' into 7.1

javiereguiluz · javiereguiluz · commit 27771fcf40ea · 2024-04-26T16:38:34.000+02:00
* 7.0:
  docs: encodedEnvelope is already an array
diff --git a/messenger.rst b/messenger.rst
@@ -2991,12 +2991,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
`@@ -2991,12 +2991,10 @@ Let's say you want to create a message decoder::`
`2991`	`2991`	`{`
`2992`	`2992`	`public function decode(array $encodedEnvelope): Envelope`
`2993`	`2993`	`{`
`2994`		`- $envelope = \json_decode($encodedEnvelope, true);`
`2995`		`-`
`2996`	`2994`	`try {`
`2997`	`2995`	`// parse the data you received with your custom fields`
`2998`		`- $data = $envelope['data'];`
`2999`		`- $data['token'] = $envelope['token'];`
	`2996`	`+ $data = $encodedEnvelope['data'];`
	`2997`	`+ $data['token'] = $encodedEnvelope['token'];`
`3000`	`2998`
`3001`	`2999`	`// other operations like getting information from stamps`
`3002`	`3000`	`} catch (\Throwable $throwable) {`