After review 0

Author: tatevikg1

src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php

@@ -159,8 +159,11 @@ private function handleEmailSending(mixed $campaign, Subscriber $subscriber, Use
             $this->checkMessageSizeOrSuspendCampaign($campaign, $email, $subscriber->hasHtmlEmail());
             $this->updateUserMessageStatus($userMessage, UserMessageStatus::Sent);
         } catch (MessageSizeLimitExceededException $e) {
+            // stop after the first message if size is exceeded
             $this->updateMessageStatus($campaign, MessageStatus::Suspended);
             $this->updateUserMessageStatus($userMessage, UserMessageStatus::Sent);
+
+            throw $e;
         } catch (Throwable $e) {
             $this->updateUserMessageStatus($userMessage, UserMessageStatus::NotSent);
             $this->logger->error($e->getMessage(), [

src/Domain/Messaging/Service/Manager/MessageDataManager.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Messaging\Service\Manager;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\MessageData;
 use PhpList\Core\Domain\Messaging\Repository\MessageDataRepository;
@@ -12,6 +13,7 @@ class MessageDataManager
 {
     public function __construct(
         private readonly MessageDataRepository $messageDataRepository,
+        private readonly EntityManagerInterface $entityManager,
     ) {
     }
 
@@ -91,7 +93,7 @@ private function normalizeValueByName(string $name, mixed $value)
             'subject', 'campaigntitle' => is_string($value) ? strip_tags($value) : $value,
             'message' => is_string($value) ? $this->disableJavascript($value) : $value,
             'excludelist' => is_array($value) ? array_filter($value, fn ($val) => is_numeric($val)) : $value,
-            'footer' => preg_replace('/<!--.*-->/', '', $value),
+            'footer' => is_string($value) ? preg_replace('/<!--.*?-->/', '', $value) : $value,
             default => $value,
         };
     }
@@ -103,7 +105,7 @@ private function getOrCreateMessageDataEntity(Message $campaign, string $name)
             $entity = (new MessageData())
                 ->setId($campaign->getId())
                 ->setName($name);
-            $this->messageDataRepository->persist($entity);
+            $this->entityManager->persist($entity);
         }
 
         return $entity;

src/Domain/Messaging/Service/MessageProcessingPreparator.php

@@ -95,7 +95,7 @@ private function replaceLinks(array $savedLinks, string $htmlText): string
     {
         foreach ($savedLinks as $linkTrack) {
             $originalUrl = $linkTrack->getUrl();
-            $trackUrl = '/' . self::LINK_TRACK_ENDPOINT . '?id=' . $linkTrack->getId();
+            $trackUrl = self::LINK_TRACK_ENDPOINT . '?id=' . $linkTrack->getId();
             $htmlText = str_replace('href="' . $originalUrl . '"', 'href="' . $trackUrl . '"', $htmlText);
         }
 

tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php

@@ -206,11 +206,11 @@ public function testProcessMessageLinksWithLinksExtracted(): void
 
         $content->expects($this->once())
             ->method('setText')
-            ->with($this->stringContains('/' . MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1'));
+            ->with($this->stringContains( MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1'));
 
         $content->expects($this->once())
             ->method('setFooter')
-            ->with($this->stringContains('/' . MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1'));
+            ->with($this->stringContains(MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1'));
 
         $result = $this->preparator->processMessageLinks($message, $subscriber);