From 746b6ffc7a70b762e88daa37ac743d2562eed6cf Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 11 Oct 2021 23:28:41 +0200 Subject: [PATCH] fix missing sendmail for mail --- tests/Message/Mail/MailHandlerTest.php | 32 +++++++++++++++++++------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/tests/Message/Mail/MailHandlerTest.php b/tests/Message/Mail/MailHandlerTest.php index bb82a4d3e..cc237f61a 100644 --- a/tests/Message/Mail/MailHandlerTest.php +++ b/tests/Message/Mail/MailHandlerTest.php @@ -43,7 +43,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -93,7 +95,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -153,7 +157,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -191,7 +197,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -225,7 +233,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -259,7 +269,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -299,7 +311,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); } @@ -335,7 +349,9 @@ class MailHandlerTest extends \PHPUnit\Framework\TestCase { $this->handler->setMailer(SubmitType::MAIL); - if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) { + if (($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) + || ($this->handler->mailerTool === '' && OperatingSystem::getSystem() !== SystemType::WIN && \stripos($sendmailPath = \ini_get('sendmail_path'), 'sendmail') === false) + ) { self::markTestSkipped(); }