Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-09-30 14:29:21 +02:00
parent f3124aafdf
commit 5cfa5f5a95
7 changed files with 157 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Utils/StringUtils.php
View File

@ -290,7 +290,8 @@ final class StringUtils
break; break;
} }
return \str_replace(['<ins></ins>', '<del></del>'], ['', ''], $result); // @todo: this should not be necessary
return \str_replace(['<ins></ins>', '<del></del>', '</ins><ins>', '</del><del>'], ['', '', '', ''], $result);
} }
/** /**

17
Views/View.php
View File

@ -237,8 +237,11 @@ class View extends ViewAbstract
} }
$start = $start + \strlen($match); $start = $start + \strlen($match);
$end = \strpos($this->template, '/', $start); if (\strlen($this->template) < $start) {
throw new InvalidModuleException($this->template);
}
$end = \strpos($this->template, '/', $start);
if ($end === false) { if ($end === false) {
throw new InvalidModuleException($this->template); throw new InvalidModuleException($this->template);
} }
@ -269,8 +272,16 @@ class View extends ViewAbstract
$this->theme = '0'; $this->theme = '0';
} }
$start = $start + \strlen($match); $start = $start + \strlen($match);
$end = \strpos($this->template, '/', $start); if (\strlen($this->template) < $start) {
throw new InvalidModuleException($this->template);
}
$end = \strpos($this->template, '/', $start);
if ($end === false) {
throw new InvalidModuleException($this->template);
}
$this->theme = \substr($this->template, $start, $end - $start); $this->theme = \substr($this->template, $start, $end - $start);
if ($this->theme === false) { if ($this->theme === false) {

92
tests/Message/Mail/MailHandlerMailTrait.php
View File

@ -36,12 +36,12 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); $mail->addCC('test2@jingga.app', 'Dennis Eichhorn');
$mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn');
$mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendTextWithMail'; $mail->subject = 'testSendTextWithMail';
$mail->body = "This is some content\n\Image: <img alt=\"image\" src=\"cid:cid1\">"; $mail->body = "This is some content\n\Image: <img alt=\"image\" src=\"cid:cid1\">";
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
@ -65,12 +65,12 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); $mail->addCC('test2@jingga.app', 'Dennis Eichhorn');
$mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn');
$mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendHtmlWithMail'; $mail->subject = 'testSendHtmlWithMail';
$message = \file_get_contents(__DIR__ . '/files/utf8.html'); $message = \file_get_contents(__DIR__ . '/files/utf8.html');
$mail->charset = CharsetType::UTF_8; $mail->charset = CharsetType::UTF_8;
@ -99,9 +99,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendInlineWithMail'; $mail->subject = 'testSendInlineWithMail';
$mail->setHtml(true); $mail->setHtml(true);
$mail->msgHTML("<img alt=\"image\" src=\"cid:cid1\">"); $mail->msgHTML("<img alt=\"image\" src=\"cid:cid1\">");
@ -122,9 +122,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAttachmentWithMail'; $mail->subject = 'testSendAttachmentWithMail';
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
@ -143,9 +143,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltWithMail'; $mail->subject = 'testSendAltWithMail';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
@ -164,9 +164,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltInlineWithMail'; $mail->subject = 'testSendAltInlineWithMail';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
$mail->setHtml(true); $mail->setHtml(true);
@ -188,9 +188,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltAttachmentWithMail'; $mail->subject = 'testSendAltAttachmentWithMail';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
@ -210,9 +210,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainWithMail'; $mail->subject = 'testSendPlainWithMail';
$mail->body = 'Body'; $mail->body = 'Body';
@ -231,9 +231,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainDKIMWithMail'; $mail->subject = 'testSendPlainDKIMWithMail';
$mail->body = 'Body'; $mail->body = 'Body';
$mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem';
@ -253,13 +253,13 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainDKIMSignWithMail'; $mail->subject = 'testSendPlainDKIMSignWithMail';
$mail->body = 'Body'; $mail->body = 'Body';
$mail->dkimDomain = 'karaka.email'; $mail->dkimDomain = 'jingga.app';
$mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem';
$mail->dkimSelector = 'phpOMS'; $mail->dkimSelector = 'phpOMS';
$mail->dkimPass = ''; $mail->dkimPass = '';
@ -279,9 +279,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainSignWithMail'; $mail->subject = 'testSendPlainSignWithMail';
$mail->body = 'Body'; $mail->body = 'Body';
@ -305,9 +305,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendICalAltWithMail'; $mail->subject = 'testSendICalAltWithMail';
$mail->body = 'Ical test'; $mail->body = 'Ical test';
$mail->altBody = 'Ical test'; $mail->altBody = 'Ical test';
@ -362,9 +362,9 @@ trait MailHandlerMailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
$mail->subject = 'testSendICalAltAttachmentWithMail'; $mail->subject = 'testSendICalAltAttachmentWithMail';
$mail->body = 'Ical test'; $mail->body = 'Ical test';

92
tests/Message/Mail/MailHandlerSendmailTrait.php
View File

@ -32,12 +32,12 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); $mail->addCC('test2@jingga.app', 'Dennis Eichhorn');
$mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn');
$mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendTextWithSendmail'; $mail->subject = 'testSendTextWithSendmail';
$mail->body = "This is some content\n\Image: <img alt=\"image\" src=\"cid:cid1\">"; $mail->body = "This is some content\n\Image: <img alt=\"image\" src=\"cid:cid1\">";
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
@ -59,12 +59,12 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); $mail->addCC('test2@jingga.app', 'Dennis Eichhorn');
$mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn');
$mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendHtmlWithSendmail'; $mail->subject = 'testSendHtmlWithSendmail';
$message = \file_get_contents(__DIR__ . '/files/utf8.html'); $message = \file_get_contents(__DIR__ . '/files/utf8.html');
$mail->charset = CharsetType::UTF_8; $mail->charset = CharsetType::UTF_8;
@ -91,9 +91,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendInlineWithSendmail'; $mail->subject = 'testSendInlineWithSendmail';
$mail->setHtml(true); $mail->setHtml(true);
$mail->msgHTML("<img alt=\"image\" src=\"cid:cid1\">"); $mail->msgHTML("<img alt=\"image\" src=\"cid:cid1\">");
@ -112,9 +112,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAttachmentWithSendmail'; $mail->subject = 'testSendAttachmentWithSendmail';
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
@ -131,9 +131,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltWithSendmail'; $mail->subject = 'testSendAltWithSendmail';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
@ -150,9 +150,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltInlineWithSendmail'; $mail->subject = 'testSendAltInlineWithSendmail';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
$mail->setHtml(true); $mail->setHtml(true);
@ -172,9 +172,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltAttachmentWithSendmail'; $mail->subject = 'testSendAltAttachmentWithSendmail';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
@ -192,9 +192,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainWithSendmail'; $mail->subject = 'testSendPlainWithSendmail';
$mail->body = 'Body'; $mail->body = 'Body';
@ -211,9 +211,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainDKIMWithSendmail'; $mail->subject = 'testSendPlainDKIMWithSendmail';
$mail->body = 'Body'; $mail->body = 'Body';
$mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem';
@ -231,13 +231,13 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainDKIMSignWithSendmail'; $mail->subject = 'testSendPlainDKIMSignWithSendmail';
$mail->body = 'Body'; $mail->body = 'Body';
$mail->dkimDomain = 'karaka.email'; $mail->dkimDomain = 'jingga.app';
$mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem';
$mail->dkimSelector = 'phpOMS'; $mail->dkimSelector = 'phpOMS';
$mail->dkimPass = ''; $mail->dkimPass = '';
@ -255,9 +255,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainSignWithSendmail'; $mail->subject = 'testSendPlainSignWithSendmail';
$mail->body = 'Body'; $mail->body = 'Body';
@ -279,9 +279,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendICalAltWithSendmail'; $mail->subject = 'testSendICalAltWithSendmail';
$mail->body = 'Ical test'; $mail->body = 'Ical test';
$mail->altBody = 'Ical test'; $mail->altBody = 'Ical test';
@ -334,9 +334,9 @@ trait MailHandlerSendmailTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
$mail->subject = 'testSendICalAltAttachmentWithSendmail'; $mail->subject = 'testSendICalAltAttachmentWithSendmail';
$mail->body = 'Ical test'; $mail->body = 'Ical test';

92
tests/Message/Mail/MailHandlerSmtpTrait.php
View File

@ -39,12 +39,12 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); $mail->addCC('test2@jingga.app', 'Dennis Eichhorn');
$mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn');
$mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendTextWithSmtp'; $mail->subject = 'testSendTextWithSmtp';
$mail->body = "This is some content\n\Image: <img alt=\"image\" src=\"cid:cid1\">"; $mail->body = "This is some content\n\Image: <img alt=\"image\" src=\"cid:cid1\">";
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
@ -72,12 +72,12 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); $mail->addCC('test2@jingga.app', 'Dennis Eichhorn');
$mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn');
$mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendHtmlWithSmtp'; $mail->subject = 'testSendHtmlWithSmtp';
$message = \file_get_contents(__DIR__ . '/files/utf8.html'); $message = \file_get_contents(__DIR__ . '/files/utf8.html');
$mail->charset = CharsetType::UTF_8; $mail->charset = CharsetType::UTF_8;
@ -110,9 +110,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendInlineWithSmtp'; $mail->subject = 'testSendInlineWithSmtp';
$mail->setHtml(true); $mail->setHtml(true);
$mail->msgHTML("<img alt=\"image\" src=\"cid:cid1\">"); $mail->msgHTML("<img alt=\"image\" src=\"cid:cid1\">");
@ -137,9 +137,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAttachmentWithSmtp'; $mail->subject = 'testSendAttachmentWithSmtp';
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
@ -162,9 +162,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltWithSmtp'; $mail->subject = 'testSendAltWithSmtp';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
@ -187,9 +187,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltInlineWithSmtp'; $mail->subject = 'testSendAltInlineWithSmtp';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
$mail->setHtml(true); $mail->setHtml(true);
@ -215,9 +215,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendAltAttachmentWithSmtp'; $mail->subject = 'testSendAltAttachmentWithSmtp';
$mail->altBody = 'Alt body'; $mail->altBody = 'Alt body';
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
@ -241,9 +241,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainWithSmtp'; $mail->subject = 'testSendPlainWithSmtp';
$mail->body = 'Body'; $mail->body = 'Body';
@ -266,9 +266,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainDKIMWithSmtp'; $mail->subject = 'testSendPlainDKIMWithSmtp';
$mail->body = 'Body'; $mail->body = 'Body';
$mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem';
@ -292,13 +292,13 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainDKIMSignWithSmtp'; $mail->subject = 'testSendPlainDKIMSignWithSmtp';
$mail->body = 'Body'; $mail->body = 'Body';
$mail->dkimDomain = 'karaka.email'; $mail->dkimDomain = 'jingga.app';
$mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem';
$mail->dkimSelector = 'phpOMS'; $mail->dkimSelector = 'phpOMS';
$mail->dkimPass = ''; $mail->dkimPass = '';
@ -322,9 +322,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendPlainSignWithSmtp'; $mail->subject = 'testSendPlainSignWithSmtp';
$mail->body = 'Body'; $mail->body = 'Body';
@ -352,9 +352,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->subject = 'testSendICalAltWithSmtp'; $mail->subject = 'testSendICalAltWithSmtp';
$mail->body = 'Ical test'; $mail->body = 'Ical test';
$mail->altBody = 'Ical test'; $mail->altBody = 'Ical test';
@ -413,9 +413,9 @@ trait MailHandlerSmtpTrait
$mail = new Email(); $mail = new Email();
$mail->priority = 1; $mail->priority = 1;
$mail->confirmationAddress = 'test1@karaka.email'; $mail->confirmationAddress = 'test1@jingga.app';
$mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn');
$mail->addTo('test@karaka.email', 'Dennis Eichhorn'); $mail->addTo('test@jingga.app', 'Dennis Eichhorn');
$mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo');
$mail->subject = 'testSendICalAltAttachmentWithSmtp'; $mail->subject = 'testSendICalAltAttachmentWithSmtp';
$mail->body = 'Ical test'; $mail->body = 'Ical test';

2
tests/Message/Mail/MailHandlerTest.php
View File

@ -45,7 +45,7 @@ final class MailHandlerTest extends \PHPUnit\Framework\TestCase
'organizationName' => 'Karaka', 'organizationName' => 'Karaka',
'organizationalUnitName' => 'Framework', 'organizationalUnitName' => 'Framework',
'commonName' => 'Karaka Test', 'commonName' => 'Karaka Test',
'emailAddress' => 'test@karaka.email', 'emailAddress' => 'test@jingga.app',
]; ];
$keyconfig = [ $keyconfig = [
'digest_alg' => 'sha256', 'digest_alg' => 'sha256',

4
tests/Uri/ArgumentTest.php
View File

@ -72,7 +72,7 @@ final class ArgumentTest extends \PHPUnit\Framework\TestCase
self::assertEquals(':modules/admin/test/path.php', $obj->getPath()); self::assertEquals(':modules/admin/test/path.php', $obj->getPath());
self::assertEquals(':modules', $obj->getPathElement(0)); self::assertEquals(':modules', $obj->getPathElement(0));
self::assertEquals( self::assertEquals(
[':modules', 'admin', 'test', 'path'], [':modules', 'admin', 'test', 'path.php'],
$obj->getPathElements() $obj->getPathElements()
); );
} }
@ -185,7 +185,7 @@ final class ArgumentTest extends \PHPUnit\Framework\TestCase
self::assertEquals('?para1=abc ?para2=2 #frag', $obj->getQuery()); self::assertEquals('?para1=abc ?para2=2 #frag', $obj->getQuery());
self::assertEquals(['?para1=abc', '?para2=2', '#frag'], $obj->getQueryArray()); self::assertEquals(['?para1=abc', '?para2=2', '#frag'], $obj->getQueryArray());
self::assertEquals('2', $obj->getQuery('para2')); self::assertEquals('?para1=abc', $obj->getQuery('1'));
} }
/** /**