Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 2a4281557521 · 2022-12-14T17:38:34.000+01:00
* 6.2:
  Fix merge
diff --git a/src/Symfony/Component/Mime/Part/MessagePart.php b/src/Symfony/Component/Mime/Part/MessagePart.php
@@ -60,10 +60,7 @@ public function bodyToIterable(): iterable
         return $this->message->toIterable();
     }
 
-    /**
-     * @return array
-     */
-    public function __sleep()
+    public function __sleep(): array
     {
         return ['message'];
     }

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,7 @@ public function bodyToIterable(): iterable`
`60`	`60`	`return $this->message->toIterable();`
`61`	`61`	`}`
`62`	`62`
`63`		`- /**`
`64`		`- * @return array`
`65`		`- */`
`66`		`- public function __sleep()`
	`63`	`+ public function __sleep(): array`
`67`	`64`	`{`
`68`	`65`	`return ['message'];`
`69`	`66`	`}`