mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Improve sendmail formatting logic and enhance related tests

This commit is contained in:
SirLouen 2025-12-07 03:13:29 +01:00
parent 31e3d491aa
commit 34b209f864
No known key found for this signature in database
GPG Key ID: 87796BFBFE09911B
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PHPMailer.php
View File

@ -1865,7 +1865,11 @@ class PHPMailer
if ($this->Mailer === 'qmail') {
$sendmailFmt = '%s -f%s';
} else {
$sendmailFmt = '%s -oi -f%s -t';
if (strpos($this->Sendmail, '-f') === false) {
$sendmailFmt = '%s -f%s -oi -t';
} else {
$sendmailFmt = '%s -oi -t';
}
}
} elseif ($this->Mailer === 'qmail') {
$sendmailFmt = '%s';

35
test/PHPMailer/MailTransportTest.php
View File

@ -123,11 +123,14 @@ final class MailTransportTest extends SendTestCase
* Test running required with:
* php -d sendmail_path="/usr/sbin/sendmail -t -i -frpath@example.org" ./vendor/bin/phpunit
*
* @group sendmailparams
* @covers \PHPMailer\PHPMailer\PHPMailer::isMail
*/
public function testMailSendWithSendmailParams()
{
if (strpos(ini_get('sendmail_path'), 'rpath@example.org') === false) {
$sender = 'rpath@example.org';
if (strpos(ini_get('sendmail_path'), $sender) === false) {
self::markTestSkipped('Custom Sendmail php.ini not available');
}
@ -137,12 +140,38 @@ final class MailTransportTest extends SendTestCase
$this->Mail->clearAddresses();
$this->setAddress('testmailsend@example.com', 'totest');
$sender = 'rpath@example.org';
ini_set('sendmail_from', $sender);
$this->Mail->createHeader();
$this->Mail->isMail();
self::assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
}
/**
* Test sending using SendMail with Sender address
* and explicit sendmail_from ini set.
* Test running required with:
* php -d sendmail_path="/usr/sbin/sendmail -t -i -frpath@example.org" ./vendor/bin/phpunit
*
* @group sendmailparams
* @covers \PHPMailer\PHPMailer\PHPMailer::isSendmail
*/
public function testSendmailSendWithSendmailParams()
{
$sender = 'rpath@example.org';
if (strpos(ini_get('sendmail_path'), $sender) === false) {
self::markTestSkipped('Custom Sendmail php.ini not available');
}
$this->Mail->Body = 'Sending via sendmail';
$this->buildBody();
$subject = $this->Mail->Subject;
$this->Mail->Subject = $subject . ': sendmail';
ini_set('sendmail_from', $sender);
$this->Mail->isSendmail();
self::assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
}
}