Merge branch '2.x' into 3.x

huangdijia · huangdijia · commit b5db5338bbf5 · 2022-05-26T14:00:39.000+08:00
diff --git a/src/encryption/src/Encrypter.php b/src/encryption/src/Encrypter.php
@@ -153,7 +153,7 @@ public function encryptString($value)
      */
     public function decrypt($payload, $unserialize = true)
     {
-        $payload = $this->getJsonPayload($payload);
+        $payload = $this->getJsonPayload((string) $payload);
         $iv = base64_decode($payload['iv']);
         $tag = empty($payload['tag']) ? null : base64_decode($payload['tag']);
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function encryptString($value)`
`153`	`153`	`*/`
`154`	`154`	`public function decrypt($payload, $unserialize = true)`
`155`	`155`	`{`
`156`		`- $payload = $this->getJsonPayload($payload);`
	`156`	`+ $payload = $this->getJsonPayload((string) $payload);`
`157`	`157`	`$iv = base64_decode($payload['iv']);`
`158`	`158`	`$tag = empty($payload['tag']) ? null : base64_decode($payload['tag']);`
`159`	`159`