Skip to content

Remove Laminas\Mail dependency to be compatible with Magento 2.4.8 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Basvanderlouw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove Laminas\Mail dependency to be compatible with Magento 2.4.8 #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions Plugin/TransportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
use Flowmailer\API\Flowmailer;
use Flowmailer\API\Model\SubmitMessage;
use Flowmailer\M2Connector\Registry\MessageData;
use Laminas\Mail\Message;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Encryption\EncryptorInterface;
use Magento\Framework\Exception\MailException;
use Magento\Framework\Mail\MessageInterface;
use Magento\Framework\Mail\TransportInterface;
use Magento\Framework\Module\Manager;
use Magento\Framework\Phrase;
Expand Down Expand Up @@ -66,15 +66,13 @@ public function __construct(

private function getSubmitMessages(TransportInterface $transport): \Generator
{
$raw = $transport->getMessage()->getRawMessage();
$rawb64 = base64_encode($raw);
$originalMessage = Message::fromString($raw);
$originalMessage = $transport->getMessage();

$from = '';
$fromName = '';
if ($originalMessage->getFrom()->count() > 0) {
$from = $originalMessage->getFrom()->current()->getEmail();
$fromName = $originalMessage->getFrom()->current()->getName();
if ($originalMessage->getFrom() !== null && count($originalMessage->getFrom()) > 0) {
$from = current($originalMessage->getFrom())->getEmail();
$fromName = current($originalMessage->getFrom())->getName();
}

$recipients = $this->getRecipients($originalMessage);
Expand All @@ -86,7 +84,7 @@ private function getSubmitMessages(TransportInterface $transport): \Generator
->setHeaderFromAddress($from)
->setHeaderFromName($fromName)
->setRecipientAddress(trim($recipient))
->setMimedata($rawb64)
->setMimedata(base64_encode($originalMessage->getRawMessage()))
->setData(
json_decode(json_encode($this->messageData->getTemplateVars()))
)
Expand Down Expand Up @@ -135,17 +133,21 @@ private function submitMessages(\Generator $messages): void
}
}

private function getRecipients(Message $originalMessage): array
private function getRecipients(MessageInterface $originalMessage): array
{
$recipients = [];
foreach ($originalMessage->getTo() as $recipient) {
$recipients[] = $recipient->getEmail();
}
foreach ($originalMessage->getCc() as $recipient) {
$recipients[] = $recipient->getEmail();
if ($originalMessage->getCc() !== null) {
foreach ($originalMessage->getCc() as $recipient) {
$recipients[] = $recipient->getEmail();
}
}
foreach ($originalMessage->getBcc() as $recipient) {
$recipients[] = $recipient->getEmail();
if ($originalMessage->getBcc() !== null) {
foreach ($originalMessage->getBcc() as $recipient) {
$recipients[] = $recipient->getEmail();
}
}

return $recipients;
Expand Down