MessageDataLoader types

Author: tatevikg1

src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php

@@ -26,6 +26,6 @@ class MessagePrecacheDto
 //    public string $htmlCharset= 'UTF-8';
 //    public string $textCharset= 'UTF-8';
     public bool $userSpecificUrl = false;
-    public ?string $googleTrack = null;
+    public bool $googleTrack = false;
     public array $adminAttributes = [];
 }

src/Domain/Messaging/Service/MessageDataLoader.php

@@ -11,6 +11,7 @@
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use Psr\Log\LoggerInterface;
 
+// todo: check types
 class MessageDataLoader
 {
     private const AS_FORMAT_FIELDS = ['astext', 'ashtml', 'astextandhtml', 'aspdf', 'astextandpdf'];
@@ -70,9 +71,9 @@ private function buildDefaultMessageData(): array
             'textmessage' => '',
             'rsstemplate' => '',
             'embargo' => $this->getDateArray(),
-            'repeatinterval' => 0,
+            'repeatinterval' => '0',
             'repeatuntil' => $this->getDateArray(),
-            'requeueinterval' => 0,
+            'requeueinterval' => '0',
             'requeueuntil' => $this->getDateArray(),
             'finishsending' => $this->getDateArray($finishSending),
             'fromfield' => '',
@@ -95,7 +96,7 @@ private function buildDefaultMessageData(): array
                 filter: FILTER_VALIDATE_BOOL
             ),
             'excludelist' => [],
-            'sentastest' => 0,
+            'sentastest' => '0',
         ];
     }
 

src/Domain/Messaging/Service/MessagePrecacheService.php

@@ -44,7 +44,7 @@ public function __construct(
      * Retrieve the base (unpersonalized) message content for a campaign from cache,
      * or cache it on first access. Handle [URL:] token fetch and basic placeholder replacements.
      */
-    public function precacheMessage(Message $campaign, $loadedMessageData, ?bool $forwardContent = false): bool
+    public function precacheMessage(Message $campaign, array $loadedMessageData, ?bool $forwardContent = false): bool
     {
         $cacheKey = sprintf('messaging.message.base.%d.%d', $campaign->getId(), (int) $forwardContent);
         $cached = $this->cache->get($cacheKey);
@@ -65,7 +65,7 @@ public function precacheMessage(Message $campaign, $loadedMessageData, ?bool $fo
 
         //# if we are sending a URL that contains user attributes, we cannot pre-parse the message here
         //# but that has quite some impact on speed. So check if that's the case and apply
-        $messagePrecacheDto->userSpecificUrl = preg_match('/\[.+\]/', $loadedMessageData['sendurl']);
+        $messagePrecacheDto->userSpecificUrl = (bool) preg_match('/\[.+\]/', $loadedMessageData['sendurl']);
 
         if (!$this->applyRemoteContentIfPresent($messagePrecacheDto, $loadedMessageData)) {
             return false;

src/Migrations/Version20260204094237.php

@@ -31,15 +31,11 @@ public function up(Schema $schema): void
             get_class($platform)
         ));
 
-        $this->addSql('ALTER TABLE phplist_linktrack_forward ALTER url TYPE VARCHAR(255)');
-
         $this->addSql('ALTER TABLE phplist_message ALTER astext TYPE INT USING astext::integer');
         $this->addSql('ALTER TABLE phplist_message ALTER ashtml TYPE INT USING ashtml::integer');
         $this->addSql('ALTER TABLE phplist_message ALTER aspdf TYPE INT USING aspdf::integer');
         $this->addSql('ALTER TABLE phplist_message ALTER astextandhtml TYPE INT USING astextandhtml::integer');
         $this->addSql('ALTER TABLE phplist_message ALTER astextandpdf TYPE INT USING astextandpdf::integer');
-
-        $this->addSql('ALTER TABLE phplist_urlcache ALTER url TYPE VARCHAR(255)');
     }
 
     public function down(Schema $schema): void
@@ -50,14 +46,10 @@ public function down(Schema $schema): void
             get_class($platform)
         ));
 
-        $this->addSql('ALTER TABLE phplist_linktrack_forward ALTER url TYPE VARCHAR(2083)');
-
         $this->addSql('ALTER TABLE phplist_message ALTER astext TYPE BOOLEAN USING (astext::integer <> 0)');
         $this->addSql('ALTER TABLE phplist_message ALTER ashtml TYPE BOOLEAN USING (ashtml::integer <> 0)');
         $this->addSql('ALTER TABLE phplist_message ALTER aspdf TYPE BOOLEAN USING (aspdf::integer <> 0)');
         $this->addSql('ALTER TABLE phplist_message ALTER astextandhtml TYPE BOOLEAN USING (astextandhtml::integer <> 0)');
         $this->addSql('ALTER TABLE phplist_message ALTER astextandpdf TYPE BOOLEAN USING (astextandpdf::integer <> 0)');
-
-        $this->addSql('ALTER TABLE phplist_urlcache ALTER url TYPE VARCHAR(2083)');
     }
 }