bug #57228 [Mime] fix PHP 7 compatibility (xabbuh)

fabpot · fabpot · commit 8d08a7335006 · 2024-05-29T17:14:23.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Mime] fix PHP 7 compatibility | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | following #57065 | License | MIT Commits ------- c5c6f08 fix PHP 7 compatibility
diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php
@@ -124,11 +124,18 @@ public function toIterable(): iterable
 
     public function ensureValidity()
     {
-        if (!$this->headers->get('To')?->getBody() && !$this->headers->get('Cc')?->getBody() && !$this->headers->get('Bcc')?->getBody()) {
+        $to = (null !== $header = $this->headers->get('To')) ? $header->getBody() : null;
+        $cc = (null !== $header = $this->headers->get('Cc')) ? $header->getBody() : null;
+        $bcc = (null !== $header = $this->headers->get('Bcc')) ? $header->getBody() : null;
+
+        if (!$to && !$cc && !$bcc) {
             throw new LogicException('An email must have a "To", "Cc", or "Bcc" header.');
         }
 
-        if (!$this->headers->get('From')?->getBody() && !$this->headers->get('Sender')?->getBody()) {
+        $from = (null !== $header = $this->headers->get('From')) ? $header->getBody() : null;
+        $sender = (null !== $header = $this->headers->get('Sender')) ? $header->getBody() : null;
+
+        if (!$from && !$sender) {
             throw new LogicException('An email must have a "From" or a "Sender" header.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,18 @@ public function toIterable(): iterable`
`124`	`124`
`125`	`125`	`public function ensureValidity()`
`126`	`126`	`{`
`127`		`- if (!$this->headers->get('To')?->getBody() && !$this->headers->get('Cc')?->getBody() && !$this->headers->get('Bcc')?->getBody()) {`
	`127`	`+ $to = (null !== $header = $this->headers->get('To')) ? $header->getBody() : null;`
	`128`	`+ $cc = (null !== $header = $this->headers->get('Cc')) ? $header->getBody() : null;`
	`129`	`+ $bcc = (null !== $header = $this->headers->get('Bcc')) ? $header->getBody() : null;`
	`130`	`+`
	`131`	`+ if (!$to && !$cc && !$bcc) {`
`128`	`132`	`throw new LogicException('An email must have a "To", "Cc", or "Bcc" header.');`
`129`	`133`	`}`
`130`	`134`
`131`		`- if (!$this->headers->get('From')?->getBody() && !$this->headers->get('Sender')?->getBody()) {`
	`135`	`+ $from = (null !== $header = $this->headers->get('From')) ? $header->getBody() : null;`
	`136`	`+ $sender = (null !== $header = $this->headers->get('Sender')) ? $header->getBody() : null;`
	`137`	`+`
	`138`	`+ if (!$from && !$sender) {`
`132`	`139`	`throw new LogicException('An email must have a "From" or a "Sender" header.');`
`133`	`140`	`}`
`134`	`141`