From 0d12c05fb9bfdf16aa084d85c89064b772d46b2c Mon Sep 17 00:00:00 2001 From: David Remer Date: Mon, 27 Mar 2023 14:52:45 +0300 Subject: [PATCH] Improve readability [MAILPOET-4935] --- .../OrderSubjectToSubscriberSubjectTransformer.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/SubjectTransformers/OrderSubjectToSubscriberSubjectTransformer.php b/mailpoet/lib/Automation/Integrations/MailPoet/SubjectTransformers/OrderSubjectToSubscriberSubjectTransformer.php index 8396e25c48..af0dd040e1 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/SubjectTransformers/OrderSubjectToSubscriberSubjectTransformer.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/SubjectTransformers/OrderSubjectToSubscriberSubjectTransformer.php @@ -34,23 +34,23 @@ class OrderSubjectToSubscriberSubjectTransformer implements SubjectTransformer { public function transform(Subject $data): Subject { if ($this->accepts() !== $data->getKey()) { - throw new \InvalidArgumentException('Invalid subject type'); + throw new \InvalidArgumentException('Invalid subject type'); } $subscriber = $this->findOrCreateSubscriber($data); if (!$subscriber instanceof SubscriberEntity) { - throw new \InvalidArgumentException('Subscriber not found'); + throw new \InvalidArgumentException('Subscriber not found'); } - return new Subject(SubscriberSubject::KEY, ['subscriber_id' => $subscriber->getId()]); + return new Subject(SubscriberSubject::KEY, ['subscriber_id' => $subscriber->getId()]); } public function accepts(): string { - return OrderSubject::KEY; + return OrderSubject::KEY; } public function returns(): string { - return SubscriberSubject::KEY; + return SubscriberSubject::KEY; } private function findOrCreateSubscriber(Subject $order): ?SubscriberEntity { @@ -75,6 +75,8 @@ class OrderSubjectToSubscriberSubjectTransformer implements SubjectTransformer { } $wcOrder = $this->woocommerceHelper->wcGetOrder($orderId); $billingEmail = $wcOrder->get_billing_email(); - return $billingEmail ? $this->subscribersRepository->findOneBy(['email' => $billingEmail]) : $this->subscribersRepository->findOneBy(['wpUserId' => $wcOrder->get_user_id()]); + return $billingEmail ? + $this->subscribersRepository->findOneBy(['email' => $billingEmail]) : + $this->subscribersRepository->findOneBy(['wpUserId' => $wcOrder->get_user_id()]); } }