Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor MetaInfo::getConfirmationMetaInfo() to use Doctrine

Browse Source 
This method is used only inside
ConfirmationEmailMailer::sendConfirmationEmail(). So I figured it was
best to refactor it as well to use SubscriberEntity instead of the old
Subscriber model as part of the task to do the same for the
ConfirmationEmailMailer class. I opted for this approach since it was a
straightforward change.

[MAILPOET-3815]
This commit is contained in:
Rodrigo Primo
2021-11-25 14:49:46 -03:00
committed by Veljko V
parent 2e57e87951
commit 1dbedea50f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Mailer/MetaInfo.php
View File

@@ -27,8 +27,8 @@ class MetaInfo {
); );
} }
public function getConfirmationMetaInfo(Subscriber $subscriber) { public function getConfirmationMetaInfo(SubscriberEntity $subscriber) {
return $this->makeMetaInfo('confirmation', $subscriber->status, $subscriber->source); return $this->makeMetaInfo('confirmation', $subscriber->getStatus(), $subscriber->getSource());
} }
public function getNewSubscriberNotificationMetaInfo() { public function getNewSubscriberNotificationMetaInfo() {

2
lib/Subscribers/ConfirmationEmailMailer.php
View File

@@ -121,7 +121,7 @@ class ConfirmationEmailMailer {
// send email // send email
try { try {
$extraParams = [ $extraParams = [
'meta' => $this->mailerMetaInfo->getConfirmationMetaInfo($subscriber), 'meta' => $this->mailerMetaInfo->getConfirmationMetaInfo($subscriberEntity),
]; ];
$result = $this->mailer->send($email, $subscriber, $extraParams); $result = $this->mailer->send($email, $subscriber, $extraParams);
if ($result['response'] === false) { if ($result['response'] === false) {

9
tests/integration/Mailer/MetaInfoTest.php
View File

@@ -6,6 +6,7 @@ use MailPoet\Entities\SubscriberEntity;
use MailPoet\Mailer\MetaInfo; use MailPoet\Mailer\MetaInfo;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Test\DataFactories\Subscriber as SubscriberFactory;
class MetaInfoTest extends \MailPoetTest { class MetaInfoTest extends \MailPoetTest {
/** @var MetaInfo */ /** @var MetaInfo */
@@ -59,11 +60,9 @@ class MetaInfoTest extends \MailPoetTest {
} }
public function testItGetsMetaInfoForConfirmationEmails() { public function testItGetsMetaInfoForConfirmationEmails() {
$subscriber = Subscriber::create(); $subscriberFactory = new SubscriberFactory();
$subscriber->hydrate([ $subscriber = $subscriberFactory->withStatus('unconfirmed')->withSource('form')->create();
'status' => 'unconfirmed',
'source' => 'form',
]);
expect($this->meta->getConfirmationMetaInfo($subscriber))->equals([ expect($this->meta->getConfirmationMetaInfo($subscriber))->equals([
'email_type' => 'confirmation', 'email_type' => 'confirmation',
'subscriber_status' => 'unconfirmed', 'subscriber_status' => 'unconfirmed',