Skip to content

SendmailMailer: use CRLF endings for php >= 8.0 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dg merged 1 commit into from
Apr 16, 2021
Merged

SendmailMailer: use CRLF endings for php >= 8.0 #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Mail/SendmailMailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function send(Message $mail): void
str_replace(Message::EOL, PHP_EOL, (string) $mail->getEncodedHeader('To')),
str_replace(Message::EOL, PHP_EOL, (string) $mail->getEncodedHeader('Subject')),
str_replace(Message::EOL, PHP_EOL, $parts[1]),
str_replace(Message::EOL, PHP_EOL, $parts[0]),
str_replace(Message::EOL, PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL, $parts[0]),
Copy link
Member

@dg dg Apr 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this also apply to other parameters? Then it would probably be best to remove the workaround and use: (I mean in master)

		$args = [
			(string) $mail->getEncodedHeader('To'),
			(string) $mail->getEncodedHeader('Subject'),
			$parts[1],
			$parts[0],
		];

Copy link
Contributor Author

@ondrejcech ondrejcech Apr 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, this issue is related only to $additional_headers.

];

if ($from = $mail->getFrom()) {
Expand Down