Merge branch '11.x'

Author: kartolo

Classes/Dmailer.php

@@ -247,8 +247,8 @@ public function prepare(array $row): void
         }
 
         //$this->encoding          = $row['encoding'];
-        $this->theParts          = unserialize(base64_decode($row['mailContent']));
-        $this->messageid         = $this->theParts['messageid'];
+        $this->theParts          = unserialize(base64_decode((string)$row['mailContent'])) ?: [];
+        $this->messageid         = $this->theParts['messageid'] ?? 0;
         $this->subject           = $this->ensureCorrectEncoding($row['subject']);
         $this->fromEmail         = $row['from_email'];
         $this->fromName          = $this->ensureCorrectEncoding($row['from_name']);
@@ -262,7 +262,7 @@ public function prepare(array $row): void
         $this->dmailer['sectionBoundary']    = '<!--DMAILER_SECTION_BOUNDARY';
         $this->dmailer['html_content']       = $this->theParts['html']['content'] ?? '';
         $this->dmailer['plain_content']      = $this->theParts['plain']['content'] ?? '';
-        $this->dmailer['messageID']          = $this->theParts['messageid'];
+        $this->dmailer['messageID']          = $this->theParts['messageid'] ?? 0;
         $this->dmailer['sys_dmail_uid']      = $row['uid'];
         $this->dmailer['sys_dmail_rec']      = $row;
         $this->dmailer['boundaryParts_html'] = explode($this->dmailer['sectionBoundary'], '_END-->' . $this->dmailer['html_content']);

Classes/Module/DmailController.php

@@ -328,7 +328,7 @@ protected function moduleContent()
                         $data['info']['dmail']['cmd'] = 'send_test';
 
                         // add attachment here, since attachment added in 2nd step
-                        $unserializedMailContent = unserialize(base64_decode($row['mailContent']));
+                        $unserializedMailContent = unserialize(base64_decode((string)$row['mailContent']));
                         $temp = $this->compileQuickMail($row, $unserializedMailContent['plain']['content'] ?? '', false);
                         if ($temp['errorTitle']) {
                             $this->messageQueue->addMessage($this->createFlashMessage($temp['errorText'], $temp['errorTitle'], 2, false));

composer.json

@@ -24,7 +24,7 @@
   "require": {
     "typo3/cms-core": "^11.5",
     "typo3/cms-dashboard": "^11.5",
-	  "php": "^7.4 || ^8.0 || ^8.1",
+	  "php": "^7.4 || ^8.0 || ^8.1 || ^8.2",
     "friendsoftypo3/tt-address": "^6.0 || ^7.0 || ^8.0",
     "tedivm/fetch": "0.7.*"
   },

ext_emconf.php

@@ -9,7 +9,7 @@
     'author_company' => 'd.k.d Internet Service GmbH',
     'state' => 'stable',
     'clearcacheonload' => 0,
-    'version' => '9.4.0',
+    'version' => '9.5.1',
     'constraints' => [
         'depends' => [
             'typo3' => '11.5.0-11.99.99',