diff --git a/.gitignore b/.gitignore
index 778fb078..e27cff1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,6 @@ phpcs.xml
.phpcs-cache
/.rnd
test/PHPMailerTest.php*nonexistent_file.txt
+test/*/PHPMailerTest.php*nonexistent_file.txt
phpunit.xml
/.phpunit.result.cache
diff --git a/test/PHPMailerLangTest.php b/test/Language/PHPMailerLangTest.php
similarity index 96%
rename from test/PHPMailerLangTest.php
rename to test/Language/PHPMailerLangTest.php
index 3cc08a43..de5af9b0 100644
--- a/test/PHPMailerLangTest.php
+++ b/test/Language/PHPMailerLangTest.php
@@ -12,7 +12,7 @@
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
*/
-namespace PHPMailer\Test;
+namespace PHPMailer\Test\Language;
use PHPMailer\PHPMailer\PHPMailer;
use Yoast\PHPUnitPolyfills\TestCases\TestCase;
@@ -48,7 +48,7 @@ final class PHPMailerLangTest extends TestCase
$this->Mail->setLanguage('en');
$definedStrings = $this->Mail->getTranslations();
$err = '';
- foreach (new \DirectoryIterator(__DIR__ . '/../language') as $fileInfo) {
+ foreach (new \DirectoryIterator(__DIR__ . '/../../language') as $fileInfo) {
if ($fileInfo->isDot()) {
continue;
}
diff --git a/test/PHPMailerTest.php b/test/PHPMailer/PHPMailerTest.php
similarity index 90%
rename from test/PHPMailerTest.php
rename to test/PHPMailer/PHPMailerTest.php
index e9c5d614..a340417b 100644
--- a/test/PHPMailerTest.php
+++ b/test/PHPMailer/PHPMailerTest.php
@@ -11,299 +11,20 @@
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
*/
-namespace PHPMailer\Test;
+namespace PHPMailer\Test\PHPMailer;
use PHPMailer\PHPMailer\Exception;
use PHPMailer\PHPMailer\OAuth;
use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\PHPMailer\POP3;
use PHPMailer\PHPMailer\SMTP;
-use Yoast\PHPUnitPolyfills\TestCases\TestCase;
-
-require_once __DIR__ . '/validators.php';
+use PHPMailer\Test\TestCase;
/**
* PHPMailer - PHP email transport unit test class.
*/
final class PHPMailerTest extends TestCase
{
- /**
- * Holds the PHPMailer instance.
- *
- * @var PHPMailer
- */
- private $Mail;
-
- /**
- * Holds the SMTP mail host.
- *
- * @var string
- */
- private $Host = '';
-
- /**
- * Holds the change log.
- *
- * @var string[]
- */
- private $ChangeLog = [];
-
- /**
- * Holds the note log.
- *
- * @var string[]
- */
- private $NoteLog = [];
-
- /**
- * Default include path.
- *
- * @var string
- */
- private $INCLUDE_DIR = '..';
-
- /**
- * PIDs of any processes we need to kill.
- *
- * @var array
- */
- private $pids = [];
-
- /**
- * Run before each test is started.
- */
- protected function set_up()
- {
- $this->INCLUDE_DIR = dirname(__DIR__); //Default to the dir above the test dir, i.e. the project home dir
- if (file_exists($this->INCLUDE_DIR . '/test/testbootstrap.php')) {
- include $this->INCLUDE_DIR . '/test/testbootstrap.php'; //Overrides go in here
- }
- $this->Mail = new PHPMailer();
- $this->Mail->SMTPDebug = SMTP::DEBUG_CONNECTION; //Full debug output
- $this->Mail->Debugoutput = ['PHPMailer\Test\DebugLogTestListener', 'debugLog'];
- $this->Mail->Priority = 3;
- $this->Mail->Encoding = '8bit';
- $this->Mail->CharSet = PHPMailer::CHARSET_ISO88591;
- if (array_key_exists('mail_from', $_REQUEST)) {
- $this->Mail->From = $_REQUEST['mail_from'];
- } else {
- $this->Mail->From = 'unit_test@phpmailer.example.com';
- }
- $this->Mail->FromName = 'Unit Tester';
- $this->Mail->Sender = '';
- $this->Mail->Subject = 'Unit Test';
- $this->Mail->Body = '';
- $this->Mail->AltBody = '';
- $this->Mail->WordWrap = 0;
- if (array_key_exists('mail_host', $_REQUEST)) {
- $this->Mail->Host = $_REQUEST['mail_host'];
- } else {
- $this->Mail->Host = 'mail.example.com';
- }
- if (array_key_exists('mail_port', $_REQUEST)) {
- $this->Mail->Port = $_REQUEST['mail_port'];
- } else {
- $this->Mail->Port = 25;
- }
- $this->Mail->Helo = 'localhost.localdomain';
- $this->Mail->SMTPAuth = false;
- $this->Mail->Username = '';
- $this->Mail->Password = '';
- if (array_key_exists('mail_useauth', $_REQUEST)) {
- $this->Mail->SMTPAuth = $_REQUEST['mail_useauth'];
- }
- if (array_key_exists('mail_username', $_REQUEST)) {
- $this->Mail->Username = $_REQUEST['mail_username'];
- }
- if (array_key_exists('mail_userpass', $_REQUEST)) {
- $this->Mail->Password = $_REQUEST['mail_userpass'];
- }
- $this->Mail->addReplyTo('no_reply@phpmailer.example.com', 'Reply Guy');
- $this->Mail->Sender = 'unit_test@phpmailer.example.com';
- if ($this->Mail->Host != '') {
- $this->Mail->isSMTP();
- } else {
- $this->Mail->isMail();
- }
- if (array_key_exists('mail_to', $_REQUEST)) {
- $this->setAddress($_REQUEST['mail_to'], 'Test User', 'to');
- }
- if (array_key_exists('mail_cc', $_REQUEST) && $_REQUEST['mail_cc'] !== '') {
- $this->setAddress($_REQUEST['mail_cc'], 'Carbon User', 'cc');
- }
- }
-
- /**
- * Run after each test is completed.
- */
- protected function tear_down()
- {
- //Clean global variables
- $this->Mail = null;
- $this->ChangeLog = [];
- $this->NoteLog = [];
-
- foreach ($this->pids as $pid) {
- $p = escapeshellarg($pid);
- shell_exec("ps $p && kill -TERM $p");
- }
- }
-
- /**
- * Build the body of the message in the appropriate format.
- */
- private function buildBody()
- {
- $this->checkChanges();
-
- //Determine line endings for message
- if ('text/html' === $this->Mail->ContentType || $this->Mail->AltBody !== '') {
- $eol = "
\r\n";
- $bullet_start = '';
- $bullet_end = "\r\n";
- $list_start = "\r\n";
- } else {
- $eol = "\r\n";
- $bullet_start = ' - ';
- $bullet_end = "\r\n";
- $list_start = '';
- $list_end = '';
- }
-
- $ReportBody = '';
-
- $ReportBody .= '---------------------' . $eol;
- $ReportBody .= 'Unit Test Information' . $eol;
- $ReportBody .= '---------------------' . $eol;
- $ReportBody .= 'phpmailer version: ' . PHPMailer::VERSION . $eol;
- $ReportBody .= 'Content Type: ' . $this->Mail->ContentType . $eol;
- $ReportBody .= 'CharSet: ' . $this->Mail->CharSet . $eol;
-
- if ($this->Mail->Host !== '') {
- $ReportBody .= 'Host: ' . $this->Mail->Host . $eol;
- }
-
- //If attachments then create an attachment list
- $attachments = $this->Mail->getAttachments();
- if (count($attachments) > 0) {
- $ReportBody .= 'Attachments:' . $eol;
- $ReportBody .= $list_start;
- foreach ($attachments as $attachment) {
- $ReportBody .= $bullet_start . 'Name: ' . $attachment[1] . ', ';
- $ReportBody .= 'Encoding: ' . $attachment[3] . ', ';
- $ReportBody .= 'Type: ' . $attachment[4] . $bullet_end;
- }
- $ReportBody .= $list_end . $eol;
- }
-
- //If there are changes then list them
- if (count($this->ChangeLog) > 0) {
- $ReportBody .= 'Changes' . $eol;
- $ReportBody .= '-------' . $eol;
-
- $ReportBody .= $list_start;
- foreach ($this->ChangeLog as $iValue) {
- $ReportBody .= $bullet_start . $iValue[0] . ' was changed to [' .
- $iValue[1] . ']' . $bullet_end;
- }
- $ReportBody .= $list_end . $eol . $eol;
- }
-
- //If there are notes then list them
- if (count($this->NoteLog) > 0) {
- $ReportBody .= 'Notes' . $eol;
- $ReportBody .= '-----' . $eol;
-
- $ReportBody .= $list_start;
- foreach ($this->NoteLog as $iValue) {
- $ReportBody .= $bullet_start . $iValue . $bullet_end;
- }
- $ReportBody .= $list_end;
- }
-
- //Re-attach the original body
- $this->Mail->Body .= $eol . $ReportBody;
- }
-
- /**
- * Check which default settings have been changed for the report.
- */
- private function checkChanges()
- {
- if (3 != $this->Mail->Priority) {
- $this->addChange('Priority', $this->Mail->Priority);
- }
- if (PHPMailer::ENCODING_8BIT !== $this->Mail->Encoding) {
- $this->addChange('Encoding', $this->Mail->Encoding);
- }
- if (PHPMailer::CHARSET_ISO88591 !== $this->Mail->CharSet) {
- $this->addChange('CharSet', $this->Mail->CharSet);
- }
- if ('' != $this->Mail->Sender) {
- $this->addChange('Sender', $this->Mail->Sender);
- }
- if (0 != $this->Mail->WordWrap) {
- $this->addChange('WordWrap', $this->Mail->WordWrap);
- }
- if ('mail' !== $this->Mail->Mailer) {
- $this->addChange('Mailer', $this->Mail->Mailer);
- }
- if (25 != $this->Mail->Port) {
- $this->addChange('Port', $this->Mail->Port);
- }
- if ('localhost.localdomain' !== $this->Mail->Helo) {
- $this->addChange('Helo', $this->Mail->Helo);
- }
- if ($this->Mail->SMTPAuth) {
- $this->addChange('SMTPAuth', 'true');
- }
- }
-
- /**
- * Add a changelog entry.
- *
- * @param string $sName
- * @param string $sNewValue
- */
- private function addChange($sName, $sNewValue)
- {
- $this->ChangeLog[] = [$sName, $sNewValue];
- }
-
- /**
- * Adds a simple note to the message.
- *
- * @param string $sValue
- */
- private function addNote($sValue)
- {
- $this->NoteLog[] = $sValue;
- }
-
- /**
- * Adds all of the addresses.
- *
- * @param string $sAddress
- * @param string $sName
- * @param string $sType
- *
- * @return bool
- */
- private function setAddress($sAddress, $sName = '', $sType = 'to')
- {
- switch ($sType) {
- case 'to':
- return $this->Mail->addAddress($sAddress, $sName);
- case 'cc':
- return $this->Mail->addCC($sAddress, $sName);
- case 'bcc':
- return $this->Mail->addBCC($sAddress, $sName);
- }
-
- return false;
- }
-
/**
* Check that we have loaded default test params.
* Pretty much everything will fail due to unset recipient if this is not done.
@@ -311,7 +32,7 @@ final class PHPMailerTest extends TestCase
public function testBootstrap()
{
self::assertFileExists(
- $this->INCLUDE_DIR . '/test/testbootstrap.php',
+ \PHPMAILER_INCLUDE_DIR . '/test/testbootstrap.php',
'Test config params missing - copy testbootstrap.php to testbootstrap-dist.php and change as appropriate'
);
}
@@ -810,7 +531,7 @@ final class PHPMailerTest extends TestCase
$this->Mail->Body = 'Here is the text body';
$this->Mail->Subject .= ': Plain + Multiple FileAttachments';
- if (!$this->Mail->addAttachment(realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'))) {
+ if (!$this->Mail->addAttachment(realpath(\PHPMAILER_INCLUDE_DIR . '/examples/images/phpmailer.png'))) {
self::assertTrue(false, $this->Mail->ErrorInfo);
return;
@@ -1068,7 +789,7 @@ EOT;
//This file is in ISO-8859-1 charset
//Needs to be external because this file is in UTF-8
- $content = file_get_contents(realpath($this->INCLUDE_DIR . '/examples/contents.html'));
+ $content = file_get_contents(realpath(\PHPMAILER_INCLUDE_DIR . '/examples/contents.html'));
//This is the string 'éèîüçÅñæß' in ISO-8859-1, base-64 encoded
$check = base64_decode('6eju/OfF8ebf');
//Make sure it really is in ISO-8859-1!
@@ -1078,7 +799,7 @@ EOT;
'ISO-8859-1',
mb_detect_encoding($content, 'UTF-8, ISO-8859-1, ISO-8859-15', true)
),
- realpath($this->INCLUDE_DIR . '/examples')
+ realpath(\PHPMAILER_INCLUDE_DIR . '/examples')
);
$this->buildBody();
self::assertStringContainsString($check, $this->Mail->Body, 'ISO message body does not contain expected text');
@@ -1141,7 +862,7 @@ EOT;