Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 57352a8

Browse filesBrowse files
committed
Merge branch '6.4' into 7.0
* 6.4: Revert "fix PHP 7 compatibility"
2 parents c9d7256 + 7e23cea commit 57352a8
Copy full SHA for 57352a8

File tree

Expand file treeCollapse file tree

1 file changed

+2
-9
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-9
lines changed

‎src/Symfony/Component/Mime/Message.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Message.php
+2-9Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,11 @@ public function toIterable(): iterable
124124

125125
public function ensureValidity(): void
126126
{
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) {
127+
if (!$this->headers->get('To')?->getBody() && !$this->headers->get('Cc')?->getBody() && !$this->headers->get('Bcc')?->getBody()) {
132128
throw new LogicException('An email must have a "To", "Cc", or "Bcc" header.');
133129
}
134130

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) {
131+
if (!$this->headers->get('From')?->getBody() && !$this->headers->get('Sender')?->getBody()) {
139132
throw new LogicException('An email must have a "From" or a "Sender" header.');
140133
}
141134

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.