Merge branch '2.4-develop' into spartans_pr_03092025

Author: glo71317

app/code/Magento/Stomp/Model/Bulk/Publisher.php

@@ -106,8 +106,9 @@ public function publish($topicName, $data)
 
         $publisher = $this->publisherConfig->getPublisher($topicName);
         $connectionName = $publisher->getConnection()->getName();
-        $queue = $this->queueRepository->get($connectionName, $publisher->getQueue());
-        $bulkQueue = $this->bulkQueueRepository->get($connectionName, $publisher->getQueue());
+        $queueName = $publisher->getQueue() ? $publisher->getQueue(): $topicName;
+        $queue = $this->queueRepository->get($connectionName, $queueName);
+        $bulkQueue = $this->bulkQueueRepository->get($connectionName, $queueName);
         $bulkQueue->push($queue, $topicName, $envelopes);
 
         return null;

app/code/Magento/Stomp/Model/MassPublisher.php

@@ -110,8 +110,9 @@ public function publish($topicName, $data)
 
         $publisher = $this->publisherConfig->getPublisher($topicName);
         $connectionName = $publisher->getConnection()->getName();
-        $queue = $this->queueRepository->get($connectionName, $publisher->getQueue());
-        $bulkQueue = $this->bulkQueueRepository->get($connectionName, $publisher->getQueue());
+        $queueName = $publisher->getQueue() ? $publisher->getQueue(): $topicName;
+        $queue = $this->queueRepository->get($connectionName, $queueName);
+        $bulkQueue = $this->bulkQueueRepository->get($connectionName, $queueName);
         $bulkQueue->push($queue, $topicName, $envelopes);
 
         return null;

app/code/Magento/Stomp/Model/Publisher.php

@@ -94,7 +94,8 @@ public function publish($topicName, $data)
 
         $publisher = $this->publisherConfig->getPublisher($topicName);
         $connectionName = $publisher->getConnection()->getName();
-        $queue = $this->queueRepository->get($connectionName, $publisher->getQueue());
+        $queueName = $publisher->getQueue() ? $publisher->getQueue(): $topicName;
+        $queue = $this->queueRepository->get($connectionName, $queueName);
 
         $queue->push($envelope);
         return null;

lib/internal/Magento/Framework/Mail/EmailMessage.php

@@ -284,17 +284,13 @@ public function getMessageBody(): MimeMessageInterface
      */
     public function getBodyText(): string
     {
-        return $this->symfonyMessage->getTextBody() ?? '';
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getBodyHtml(): string
-    {
-        return $this->symfonyMessage->getHtmlBody() ?? '';
+        $body = $this->symfonyMessage->getBody();
+        if ($body) {
+            return $body->bodyToString();
+        }
+        return '';
     }
-
+    
     /**
      * @inheritDoc
      */