From 5cfa5f5a953cda71263f56ca24876497dc0744bb Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 30 Sep 2022 14:29:21 +0200 Subject: [PATCH] fix bugs --- Utils/StringUtils.php | 3 +- Views/View.php | 17 +++- tests/Message/Mail/MailHandlerMailTrait.php | 92 +++++++++---------- .../Message/Mail/MailHandlerSendmailTrait.php | 92 +++++++++---------- tests/Message/Mail/MailHandlerSmtpTrait.php | 92 +++++++++---------- tests/Message/Mail/MailHandlerTest.php | 2 +- tests/Uri/ArgumentTest.php | 4 +- 7 files changed, 157 insertions(+), 145 deletions(-) diff --git a/Utils/StringUtils.php b/Utils/StringUtils.php index 86b0e453b..c4f281a03 100644 --- a/Utils/StringUtils.php +++ b/Utils/StringUtils.php @@ -290,7 +290,8 @@ final class StringUtils break; } - return \str_replace(['', ''], ['', ''], $result); + // @todo: this should not be necessary + return \str_replace(['', '', '', ''], ['', '', '', ''], $result); } /** diff --git a/Views/View.php b/Views/View.php index 2eda79f7c..c383c0b14 100644 --- a/Views/View.php +++ b/Views/View.php @@ -237,8 +237,11 @@ class View extends ViewAbstract } $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); } @@ -269,8 +272,16 @@ class View extends ViewAbstract $this->theme = '0'; } - $start = $start + \strlen($match); - $end = \strpos($this->template, '/', $start); + $start = $start + \strlen($match); + 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); if ($this->theme === false) { diff --git a/tests/Message/Mail/MailHandlerMailTrait.php b/tests/Message/Mail/MailHandlerMailTrait.php index 0e3f2dbd3..af063b7a6 100644 --- a/tests/Message/Mail/MailHandlerMailTrait.php +++ b/tests/Message/Mail/MailHandlerMailTrait.php @@ -36,12 +36,12 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); - $mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); - $mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); - $mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); + $mail->addCC('test2@jingga.app', 'Dennis Eichhorn'); + $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn'); + $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendTextWithMail'; $mail->body = "This is some content\n\Image: \"image\""; $mail->altBody = 'Alt body'; @@ -65,12 +65,12 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); - $mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); - $mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); - $mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); + $mail->addCC('test2@jingga.app', 'Dennis Eichhorn'); + $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn'); + $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendHtmlWithMail'; $message = \file_get_contents(__DIR__ . '/files/utf8.html'); $mail->charset = CharsetType::UTF_8; @@ -99,9 +99,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendInlineWithMail'; $mail->setHtml(true); $mail->msgHTML("\"image\""); @@ -122,9 +122,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAttachmentWithMail'; $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); @@ -143,9 +143,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltWithMail'; $mail->altBody = 'Alt body'; @@ -164,9 +164,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltInlineWithMail'; $mail->altBody = 'Alt body'; $mail->setHtml(true); @@ -188,9 +188,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltAttachmentWithMail'; $mail->altBody = 'Alt body'; $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); @@ -210,9 +210,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainWithMail'; $mail->body = 'Body'; @@ -231,9 +231,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainDKIMWithMail'; $mail->body = 'Body'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; @@ -253,13 +253,13 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainDKIMSignWithMail'; $mail->body = 'Body'; - $mail->dkimDomain = 'karaka.email'; + $mail->dkimDomain = 'jingga.app'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimSelector = 'phpOMS'; $mail->dkimPass = ''; @@ -279,9 +279,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainSignWithMail'; $mail->body = 'Body'; @@ -305,9 +305,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendICalAltWithMail'; $mail->body = 'Ical test'; $mail->altBody = 'Ical test'; @@ -362,9 +362,9 @@ trait MailHandlerMailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->subject = 'testSendICalAltAttachmentWithMail'; $mail->body = 'Ical test'; diff --git a/tests/Message/Mail/MailHandlerSendmailTrait.php b/tests/Message/Mail/MailHandlerSendmailTrait.php index 69051ca02..81976526a 100644 --- a/tests/Message/Mail/MailHandlerSendmailTrait.php +++ b/tests/Message/Mail/MailHandlerSendmailTrait.php @@ -32,12 +32,12 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); - $mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); - $mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); - $mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); + $mail->addCC('test2@jingga.app', 'Dennis Eichhorn'); + $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn'); + $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendTextWithSendmail'; $mail->body = "This is some content\n\Image: \"image\""; $mail->altBody = 'Alt body'; @@ -59,12 +59,12 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); - $mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); - $mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); - $mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); + $mail->addCC('test2@jingga.app', 'Dennis Eichhorn'); + $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn'); + $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendHtmlWithSendmail'; $message = \file_get_contents(__DIR__ . '/files/utf8.html'); $mail->charset = CharsetType::UTF_8; @@ -91,9 +91,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendInlineWithSendmail'; $mail->setHtml(true); $mail->msgHTML("\"image\""); @@ -112,9 +112,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAttachmentWithSendmail'; $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); @@ -131,9 +131,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltWithSendmail'; $mail->altBody = 'Alt body'; @@ -150,9 +150,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltInlineWithSendmail'; $mail->altBody = 'Alt body'; $mail->setHtml(true); @@ -172,9 +172,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltAttachmentWithSendmail'; $mail->altBody = 'Alt body'; $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); @@ -192,9 +192,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainWithSendmail'; $mail->body = 'Body'; @@ -211,9 +211,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainDKIMWithSendmail'; $mail->body = 'Body'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; @@ -231,13 +231,13 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainDKIMSignWithSendmail'; $mail->body = 'Body'; - $mail->dkimDomain = 'karaka.email'; + $mail->dkimDomain = 'jingga.app'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimSelector = 'phpOMS'; $mail->dkimPass = ''; @@ -255,9 +255,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainSignWithSendmail'; $mail->body = 'Body'; @@ -279,9 +279,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendICalAltWithSendmail'; $mail->body = 'Ical test'; $mail->altBody = 'Ical test'; @@ -334,9 +334,9 @@ trait MailHandlerSendmailTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->subject = 'testSendICalAltAttachmentWithSendmail'; $mail->body = 'Ical test'; diff --git a/tests/Message/Mail/MailHandlerSmtpTrait.php b/tests/Message/Mail/MailHandlerSmtpTrait.php index 383360dc5..c81cade82 100644 --- a/tests/Message/Mail/MailHandlerSmtpTrait.php +++ b/tests/Message/Mail/MailHandlerSmtpTrait.php @@ -39,12 +39,12 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); - $mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); - $mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); - $mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); + $mail->addCC('test2@jingga.app', 'Dennis Eichhorn'); + $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn'); + $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendTextWithSmtp'; $mail->body = "This is some content\n\Image: \"image\""; $mail->altBody = 'Alt body'; @@ -72,12 +72,12 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); - $mail->addCC('test2@karaka.email', 'Dennis Eichhorn'); - $mail->addBCC('test3@karaka.email', 'Dennis Eichhorn'); - $mail->addReplyTo('test4@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); + $mail->addCC('test2@jingga.app', 'Dennis Eichhorn'); + $mail->addBCC('test3@jingga.app', 'Dennis Eichhorn'); + $mail->addReplyTo('test4@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendHtmlWithSmtp'; $message = \file_get_contents(__DIR__ . '/files/utf8.html'); $mail->charset = CharsetType::UTF_8; @@ -110,9 +110,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendInlineWithSmtp'; $mail->setHtml(true); $mail->msgHTML("\"image\""); @@ -137,9 +137,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAttachmentWithSmtp'; $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); @@ -162,9 +162,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltWithSmtp'; $mail->altBody = 'Alt body'; @@ -187,9 +187,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltInlineWithSmtp'; $mail->altBody = 'Alt body'; $mail->setHtml(true); @@ -215,9 +215,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendAltAttachmentWithSmtp'; $mail->altBody = 'Alt body'; $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); @@ -241,9 +241,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainWithSmtp'; $mail->body = 'Body'; @@ -266,9 +266,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainDKIMWithSmtp'; $mail->body = 'Body'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; @@ -292,13 +292,13 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainDKIMSignWithSmtp'; $mail->body = 'Body'; - $mail->dkimDomain = 'karaka.email'; + $mail->dkimDomain = 'jingga.app'; $mail->dkimPrivatePath = __DIR__ . '/dkim.pem'; $mail->dkimSelector = 'phpOMS'; $mail->dkimPass = ''; @@ -322,9 +322,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendPlainSignWithSmtp'; $mail->body = 'Body'; @@ -352,9 +352,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->subject = 'testSendICalAltWithSmtp'; $mail->body = 'Ical test'; $mail->altBody = 'Ical test'; @@ -413,9 +413,9 @@ trait MailHandlerSmtpTrait $mail = new Email(); $mail->priority = 1; - $mail->confirmationAddress = 'test1@karaka.email'; - $mail->setFrom('test1@karaka.email', 'Dennis Eichhorn'); - $mail->addTo('test@karaka.email', 'Dennis Eichhorn'); + $mail->confirmationAddress = 'test1@jingga.app'; + $mail->setFrom('test1@jingga.app', 'Dennis Eichhorn'); + $mail->addTo('test@jingga.app', 'Dennis Eichhorn'); $mail->addAttachment(__DIR__ . '/files/logo.png', 'logo'); $mail->subject = 'testSendICalAltAttachmentWithSmtp'; $mail->body = 'Ical test'; diff --git a/tests/Message/Mail/MailHandlerTest.php b/tests/Message/Mail/MailHandlerTest.php index f2f008b62..c90fc06da 100644 --- a/tests/Message/Mail/MailHandlerTest.php +++ b/tests/Message/Mail/MailHandlerTest.php @@ -45,7 +45,7 @@ final class MailHandlerTest extends \PHPUnit\Framework\TestCase 'organizationName' => 'Karaka', 'organizationalUnitName' => 'Framework', 'commonName' => 'Karaka Test', - 'emailAddress' => 'test@karaka.email', + 'emailAddress' => 'test@jingga.app', ]; $keyconfig = [ 'digest_alg' => 'sha256', diff --git a/tests/Uri/ArgumentTest.php b/tests/Uri/ArgumentTest.php index 6b658ca65..42a7d3b14 100644 --- a/tests/Uri/ArgumentTest.php +++ b/tests/Uri/ArgumentTest.php @@ -72,7 +72,7 @@ final class ArgumentTest extends \PHPUnit\Framework\TestCase self::assertEquals(':modules/admin/test/path.php', $obj->getPath()); self::assertEquals(':modules', $obj->getPathElement(0)); self::assertEquals( - [':modules', 'admin', 'test', 'path'], + [':modules', 'admin', 'test', 'path.php'], $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->getQueryArray()); - self::assertEquals('2', $obj->getQuery('para2')); + self::assertEquals('?para1=abc', $obj->getQuery('1')); } /**