diff --git a/Classes/Command/AnalyzeBounceMailCommand.php b/Classes/Command/AnalyzeBounceMailCommand.php
index 998e7f875..f9a7d34fa 100644
--- a/Classes/Command/AnalyzeBounceMailCommand.php
+++ b/Classes/Command/AnalyzeBounceMailCommand.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Command;
 
-use DirectMailTeam\DirectMail\Dmailer;
 use DirectMailTeam\DirectMail\Repository\SysDmailMaillogRepository;
 use DirectMailTeam\DirectMail\Utility\ReadmailUtility;
 use Fetch\Server;
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($input->getOption('type')) {
             $type = $input->getOption('type');
             //$io->writeln($type);
-            if(!in_array($type, ['imap', 'pop3'])) {
+            if (!in_array($type, ['imap', 'pop3'])) {
                 $io->warning('Type: only imap or pop3');
                 return Command::FAILURE;
             }
@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we are connected to mail server
             // get unread mails
             $messages = $mailServer->search('UNSEEN', $count);
-            if(count($messages)) {
+            if (count($messages)) {
                 /** @var Message $message The message object */
                 foreach ($messages as $message) {
                     // process the mail
@@ -130,8 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         //$io->writeln($message->getSubject());
                         // set delete
                         $message->delete();
-                    }
-                    else {
+                    } else {
                         $message->setFlag('SEEN');
                     }
                 }
@@ -141,9 +140,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             imap_close($mailServer->getImapStream());
             return Command::SUCCESS;
         }
-        else {
-            return Command::FAILURE;
-        }
+
+        return Command::FAILURE;
 
         return Command::SUCCESS;
     }
@@ -167,13 +165,12 @@ private function processBounceMail($message)
                 $bouncedMail = $attachment->getData();
                 // Find mail id
                 $midArray = $readMail->find_XTypo3MID($bouncedMail);
-                if (false === empty($midArray)) {
+                if (empty($midArray) === false) {
                     // if mid, rid and rtbl are found, then stop looping
                     break;
                 }
             }
-        }
-        else {
+        } else {
             // search in MessageBody (see rfc822-headers as Attachments placed )
             $midArray = $readMail->find_XTypo3MID($message->getMessageBody());
         }
@@ -191,7 +188,6 @@ private function processBounceMail($message)
 
         // only write to log table, if we found a corresponding recipient record
         if (!empty($row)) {
-
             $midArray['email'] = $row['email'];
             try {
                 return $sysDmailMaillogRepository->analyzeBounceMailAddToMailLog(
@@ -204,8 +200,7 @@ private function processBounceMail($message)
                 // Log $e->getMessage();
                 return false;
             }
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -240,24 +235,22 @@ private function connectMailServer(string $server, int $port, string $type, stri
             $imapStream = $mailServer->getImapStream();
             return $mailServer;
         } catch (\Exception $e) {
-            $io->error($this->languageService->getLL('scheduler.bounceMail.dataVerification').$e->getMessage());
+            $io->error($this->languageService->getLL('scheduler.bounceMail.dataVerification') . $e->getMessage());
             return false;
         }
     }
 
     /**
-     *
      * @return int
      */
-    private function getTimestampFromAspect(): int {
+    private function getTimestampFromAspect(): int
+    {
         $context = GeneralUtility::makeInstance(Context::class);
         return $context->getPropertyFromAspect('date', 'timestamp');
     }
 
-    /**
-     * @return void
-     */
-    private function setLanguageService(): void {
+    private function setLanguageService(): void
+    {
         $languageServiceFactory = GeneralUtility::makeInstance(LanguageServiceFactory::class);
         $this->languageService = $languageServiceFactory->create('en'); //@TODO
         $this->languageService->includeLLFile('EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf');
diff --git a/Classes/Command/DirectmailCommand.php b/Classes/Command/DirectmailCommand.php
index 0ff004a51..03800a4b9 100644
--- a/Classes/Command/DirectmailCommand.php
+++ b/Classes/Command/DirectmailCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Command;
 
 use DirectMailTeam\DirectMail\Dmailer;
diff --git a/Classes/Command/InvokeMailerEngineCommand.php b/Classes/Command/InvokeMailerEngineCommand.php
index 6a1f756c7..47f7beec5 100644
--- a/Classes/Command/InvokeMailerEngineCommand.php
+++ b/Classes/Command/InvokeMailerEngineCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Command;
 
 /*
@@ -32,14 +33,11 @@
  * This class replaces the earlier version of EXT:direct_mail/cli/cli_direct_mail.php from Ivan Kartolo, (c) 2008
  * Executes the earlier solely option named 'masssend' which has been dropped as optional argument
  *
- * @package TYPO3
- * @subpackage tx_directmail
  * @author 2019 J.Kummer
  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 2
  */
 class InvokeMailerEngineCommand extends Command
 {
-
     /**
      * Configure the command by defining the name, options and arguments
      */
@@ -71,9 +69,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (filemtime($lockfile) > (time() - (60 * 60 * 24))) {
                 $io->warning('TYPO3 Direct Mail Cron: Aborting, another process is already running!');
                 return Command::FAILURE;
-            } else {
-                $io->writeln('TYPO3 Direct Mail Cron: A .lock file was found but it is older than 1 day! Processing mails ...');
             }
+            $io->writeln('TYPO3 Direct Mail Cron: A .lock file was found but it is older than 1 day! Processing mails ...');
         }
 
         touch($lockfile);
diff --git a/Classes/Container.php b/Classes/Container.php
index 97ec7ff1a..e943eafd0 100644
--- a/Classes/Container.php
+++ b/Classes/Container.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail;
 
 /*
@@ -26,9 +27,6 @@
  *
  * @author		Kasper Skårhøj <kasperYYYY>@typo3.com>
  * @author		Thorsten Kahler <thorsten.kahler@dkd.de>
- *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
  */
 class Container
 {
@@ -71,7 +69,7 @@ public function insert_dMailer_boundaries($content, $conf = [])
             if ($content != '') {
                 // setting the default
                 $categoryList = '';
-                if (intval($this->cObj->data['module_sys_dmail_category']) >= 1) {
+                if ((int)($this->cObj->data['module_sys_dmail_category']) >= 1) {
                     // if content type "RECORDS" we have to strip off
                     // boundaries from indcluded records
                     if ($this->cObj->data['CType'] == 'shortcut') {
@@ -122,7 +120,7 @@ public function stripInnerBoundaries($content)
     public function breakLines($content, array $conf)
     {
         $linebreak = $GLOBALS['TSFE']->cObj->stdWrap(($conf['linebreak'] ? $conf['linebreak'] : chr(32) . LF), $conf['linebreak.']);
-        $charWidth = $GLOBALS['TSFE']->cObj->stdWrap(($conf['charWidth'] ? intval($conf['charWidth']) : 76), $conf['charWidth.']);
+        $charWidth = $GLOBALS['TSFE']->cObj->stdWrap(($conf['charWidth'] ? (int)($conf['charWidth']) : 76), $conf['charWidth.']);
 
         return MailUtility::breakLinesForEmail($content, $linebreak, $charWidth);
     }
diff --git a/Classes/DirectMailUtility.php b/Classes/DirectMailUtility.php
index daab8cf49..0e2efad83 100644
--- a/Classes/DirectMailUtility.php
+++ b/Classes/DirectMailUtility.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail;
 
 /*
@@ -17,9 +18,9 @@
 use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
 use DirectMailTeam\DirectMail\Utility\DmRegistryUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Messaging\FlashMessageRendererResolver;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Messaging\FlashMessageRendererResolver;
 use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
@@ -33,9 +34,6 @@
  * @author  	Jan-Erik Revsbech <jer@moccompany.com>
  * @author  	Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
  * @author		Ivan-Dharma Kartolo	<ivan.kartolo@dkd.de>
- *
- * @package 	TYPO3
- * @subpackage	tx_directmail
  */
 class DirectMailUtility
 {
@@ -64,7 +62,7 @@ public static function getLanguageService(): LanguageService
      *
      * @param string $url
      *
-     * @return string & or ?
+     * @return string&or ?
      */
     public static function getURLGlue(string $url): string
     {
@@ -80,15 +78,14 @@ public static function getTypolinkURL(
         string $parameter,
         bool $forceAbsoluteUrl = true,
         bool $linkAccessRestrictedPages = true
-    ): string
-    {
+    ): string {
         $typolinkPageUrl = 't3://page?uid=';
         $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
 
         return $cObj->typolink_URL([
             'parameter' => $typolinkPageUrl . $parameter,
             'forceAbsoluteUrl' => $forceAbsoluteUrl,
-            'linkAccessRestrictedPages' => $linkAccessRestrictedPages
+            'linkAccessRestrictedPages' => $linkAccessRestrictedPages,
         ]);
     }
 
@@ -120,7 +117,7 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
             $htmlmail->setJumperURLPrefix(
                 $urls['baseUrl'] . $glue .
                 'mid=###SYS_MAIL_ID###' .
-                (intval($params['jumpurl_tracking_privacy']) ? '' : '&rid=###SYS_TABLE_NAME###_###USER_uid###') .
+                ((int)($params['jumpurl_tracking_privacy']) ? '' : '&rid=###SYS_TABLE_NAME###_###USER_uid###') .
                 '&aC=###SYS_AUTHCODE###' .
                 '&jumpurl='
             );
@@ -141,8 +138,7 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
             $htmlmail->addPlain($mailContent);
             if (!$mailContent || !$htmlmail->getPartPlainConfig('content')) {
                 $errorMsg[] = $lang->getLL('dmail_no_plain_content');
-            }
-            elseif (!strstr($htmlmail->getPartPlainConfig('content'), '<!--DMAILER_SECTION_BOUNDARY')) {
+            } elseif (!strstr($htmlmail->getPartPlainConfig('content'), '<!--DMAILER_SECTION_BOUNDARY')) {
                 $warningMsg[] = $lang->getLL('dmail_no_plain_boundaries');
             }
         }
@@ -162,21 +158,17 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
                 );
                 if ($res == 1) {
                     $htmlmail->setCharset($matches[1]);
-                }
-                elseif (isset($params['direct_mail_charset'])) {
+                } elseif (isset($params['direct_mail_charset'])) {
                     $htmlmail->setCharset($params['direct_mail_charset']);
-                }
-                else {
+                } else {
                     $htmlmail->setCharset('iso-8859-1');
                 }
             }
             if ($htmlmail->extractFramesInfo()) {
                 $errorMsg[] = $lang->getLL('dmail_frames_not allowed');
-            }
-            elseif (!$success || !$htmlmail->getPartHtmlConfig('content')) {
+            } elseif (!$success || !$htmlmail->getPartHtmlConfig('content')) {
                 $errorMsg[] = $lang->getLL('dmail_no_html_content');
-            }
-            elseif (!strstr($htmlmail->getPartHtmlConfig('content'), '<!--DMAILER_SECTION_BOUNDARY')) {
+            } elseif (!strstr($htmlmail->getPartHtmlConfig('content'), '<!--DMAILER_SECTION_BOUNDARY')) {
                 $warningMsg[] = $lang->getLL('dmail_no_html_boundaries');
             }
         }
@@ -191,7 +183,7 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
                 'charset'            => $htmlmail->getCharset(),
                 'mailContent'        => $mailContent,
                 'renderedSize'       => strlen($mailContent),
-                'long_link_rdct_url' => $urls['baseUrl']
+                'long_link_rdct_url' => $urls['baseUrl'],
             ];
 
             $done = GeneralUtility::makeInstance(SysDmailRepository::class)->updateSysDmailRecord((int)$row['uid'], $updateData);
@@ -202,18 +194,17 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
                     $output .= $flashMessageRendererResolver
                         ->resolve()
                         ->render([
-                            self::createFlashMessage($warning, $lang->getLL('dmail_warning'), FlashMessage::WARNING, false)
+                            self::createFlashMessage($warning, $lang->getLL('dmail_warning'), FlashMessage::WARNING, false),
                         ]);
                 }
             }
-        }
-        else {
+        } else {
             $flashMessageRendererResolver = self::getFlashMessageRendererResolver();
             foreach ($errorMsg as $error) {
                 $output .= $flashMessageRendererResolver
                     ->resolve()
                     ->render([
-                        self::createFlashMessage($error, $lang->getLL('dmail_error'), FlashMessage::ERROR, false)
+                        self::createFlashMessage($error, $lang->getLL('dmail_error'), FlashMessage::ERROR, false),
                     ]);
             }
         }
@@ -221,7 +212,7 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
         if ($returnArray) {
             return [
                 'errors' => $errorMsg,
-                'warnings' => $warningMsg
+                'warnings' => $warningMsg,
             ];
         }
 
@@ -233,9 +224,9 @@ protected static function createFlashMessage(
         string $messageHeader = '',
         int $messageType = 0,
         bool $storeInSession = false
-    ): FlashMessage
-    {
-        return GeneralUtility::makeInstance(FlashMessage::class,
+    ): FlashMessage {
+        return GeneralUtility::makeInstance(
+            FlashMessage::class,
             $messageText,
             $messageHeader,
             $messageType,
@@ -267,7 +258,7 @@ protected static function addUserPass(string $url, array $params): string
         }
         if (($params['simulate_usergroup'] ?? false) && MathUtility::canBeInterpretedAsInteger($params['simulate_usergroup'])) {
             $glue = self::getURLGlue($url);
-            $url = $url . $glue . 'dmail_fe_group=' . (int)$params['simulate_usergroup'] . '&access_token=' .  GeneralUtility::makeInstance(DmRegistryUtility::class)->createAndGetAccessToken();
+            $url = $url . $glue . 'dmail_fe_group=' . (int)$params['simulate_usergroup'] . '&access_token=' . GeneralUtility::makeInstance(DmRegistryUtility::class)->createAndGetAccessToken();
         }
         return $url;
     }
@@ -285,7 +276,7 @@ public static function getFullUrlsForDirectMailRecord(array $row): array
         $result = [
             'baseUrl' => self::getTypolinkURL((int)$row['page']),
             'htmlUrl' => '',
-            'plainTextUrl' => ''
+            'plainTextUrl' => '',
         ];
 
         // Finding the url to fetch content from
@@ -305,8 +296,7 @@ public static function getFullUrlsForDirectMailRecord(array $row): array
         if ($result['plainTextUrl']) {
             if (!($row['sendOptions'] & 1)) {
                 $result['plainTextUrl'] = '';
-            }
-            else {
+            } else {
                 $urlParts = @parse_url($result['plainTextUrl']);
                 if (!$urlParts['scheme']) {
                     $result['plainTextUrl'] = 'http://' . $result['plainTextUrl'];
@@ -318,8 +308,7 @@ public static function getFullUrlsForDirectMailRecord(array $row): array
         if ($result['htmlUrl']) {
             if (!($row['sendOptions'] & 2)) {
                 $result['htmlUrl'] = '';
-            }
-            else {
+            } else {
                 $urlParts = @parse_url($result['htmlUrl']);
                 if (!$urlParts['scheme']) {
                     $result['htmlUrl'] = 'http://' . $result['htmlUrl'];
@@ -340,8 +329,7 @@ public static function intInRangeWrapper(
         int $min,
         int $max = 2000000000,
         int $zeroValue = 0
-    ): int
-    {
+    ): int {
         return MathUtility::forceIntegerInRange($theInt, $min, $max, $zeroValue);
     }
 
@@ -374,8 +362,7 @@ public static function substUrlsInPlainText($message, $urlmode = '76', $index_sc
         if ($lengthLimit === false) {
             // No processing
             $messageSubstituted = $message;
-        }
-        else {
+        } else {
             $messageSubstituted = preg_replace_callback(
                 '/(http|https):\\/\\/.+(?=[\\]\\.\\?]*([\\! \'"()<>]+|$))/iU',
                 function (array $matches) use ($lengthLimit, $index_script_url) {
diff --git a/Classes/DmQueryGenerator.php b/Classes/DmQueryGenerator.php
index 78ef137c1..ef3fbc836 100644
--- a/Classes/DmQueryGenerator.php
+++ b/Classes/DmQueryGenerator.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail;
 
 /*
@@ -21,7 +22,6 @@
  * https://api.typo3.org/11.5/class_t_y_p_o3_1_1_c_m_s_1_1_lowlevel_1_1_database_1_1_query_generator.html
  */
 
-use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lowlevel\Database\QueryGenerator;
@@ -31,9 +31,6 @@
  *
  * @author		Kasper Skårhøj <kasper@typo3.com>
  * @author		Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
- *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
  */
 class DmQueryGenerator extends QueryGenerator
 {
diff --git a/Classes/Dmailer.php b/Classes/Dmailer.php
index 9a191d1c7..0a8fa5185 100755
--- a/Classes/Dmailer.php
+++ b/Classes/Dmailer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail;
 
 /*
@@ -14,11 +15,11 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use DirectMailTeam\DirectMail\Utility\AuthCodeUtility;
-use DirectMailTeam\DirectMail\Utility\Typo3ConfVarsUtility;
-use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
 use DirectMailTeam\DirectMail\Repository\SysDmailMaillogRepository;
+use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
 use DirectMailTeam\DirectMail\Repository\TempRepository;
+use DirectMailTeam\DirectMail\Utility\AuthCodeUtility;
+use DirectMailTeam\DirectMail\Utility\Typo3ConfVarsUtility;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\Mime\Address;
@@ -35,9 +36,6 @@
  *
  * @author		Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author      Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
- *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
  */
 class Dmailer implements LoggerAwareInterface
 {
@@ -238,8 +236,6 @@ protected function getMarkerBasedTemplateService(): MarkerBasedTemplateService
      * Preparing the Email. Headers are set in global variables
      *
      * @param array $row Record from the sys_dmail table
-     *
-     * @return void
      */
     public function prepare(array $row): void
     {
@@ -283,7 +279,7 @@ public function prepare(array $row): void
             $mediaParts = explode('cid:part', $this->dmailer['boundaryParts_html'][$bKey][1]);
             reset($mediaParts);
             next($mediaParts);
-            if(!isset($this->dmailer['boundaryParts_html'][$bKey]['mediaList'])) {
+            if (!isset($this->dmailer['boundaryParts_html'][$bKey]['mediaList'])) {
                 $this->dmailer['boundaryParts_html'][$bKey]['mediaList'] = '';
             }
             foreach ($mediaParts as $part) {
@@ -375,10 +371,10 @@ public function sendAdvanced(array $recipRow, string $tableNameChar): int
                 '###SYS_MAIL_ID###'         => $this->dmailer['sys_dmail_uid'],
                 '###SYS_AUTHCODE###'        => AuthCodeUtility::getHmac($recipRow, $this->authCodeFieldList),
                  // Put in the unique message id in HTML-code
-                $this->dmailer['messageID'] => md5(microtime()) . '_' . $midRidId
+                $this->dmailer['messageID'] => md5(microtime()) . '_' . $midRidId,
             ];
             $rowFieldsArray = Typo3ConfVarsUtility::getDMConfigMergedFields();
-            if(count($rowFieldsArray)) {
+            if (count($rowFieldsArray)) {
                 foreach ($rowFieldsArray as $substField) {
                     $additionalMarkers['###USER_' . $substField . '###'] = $this->ensureCorrectEncoding($recipRow[$substField]);
                 }
@@ -442,7 +438,7 @@ public function sendSimple(array $recipients): bool
         $this->theParts['html']['content']  = ($this->theParts['html']['content'] ?? false) ? $this->getBoundaryParts($this->dmailer['boundaryParts_html'], -1) : '';
         $this->theParts['plain']['content'] = ($this->theParts['plain']['content'] ?? false) ? $this->getBoundaryParts($this->dmailer['boundaryParts_plain'], -1) : '';
 
-        if(count($recipients)) {
+        if (count($recipients)) {
             foreach ($recipients as $recipient) {
                 $this->sendTheMail($recipient);
             }
@@ -471,14 +467,13 @@ protected function getBoundaryParts($cArray, $userCategories): string
             $key = substr($cP[0], 1);
             $isSubscribed = false;
             $cP['mediaList'] = $cP['mediaList'] ?? '';
-            if (!$key || (intval($userCategories) == -1)) {
+            if (!$key || ((int)$userCategories == -1)) {
                 $returnVal .= $cP[1];
                 //$this->mediaList .= $cP['mediaList'];
                 if ($cP[1]) {
                     $this->mailHasContent = true;
                 }
-            }
-            elseif ($key == 'END') {
+            } elseif ($key == 'END') {
                 $returnVal .= $cP[1];
                 //$this->mediaList .= $cP['mediaList'];
                 // There is content and it is not just the header and footer content,
@@ -486,8 +481,7 @@ protected function getBoundaryParts($cArray, $userCategories): string
                 if (($cP[1] && !($bKey == 0 || $bKey == $boundaryMax)) || count($cArray) == 1) {
                     $this->mailHasContent = true;
                 }
-            }
-            else {
+            } else {
                 foreach (explode(',', $key) as $group) {
                     if (GeneralUtility::inList($userCategories, $group)) {
                         $isSubscribed = true;
@@ -522,8 +516,8 @@ public function getListOfRecipentCategories(string $table, int $uid): string
         $rows = GeneralUtility::makeInstance(TempRepository::class)->getListOfRecipentCategories($table, $relationTable, $uid);
 
         $list = '';
-        if($rows && count($rows)) {
-            foreach($rows as $row) {
+        if ($rows && count($rows)) {
+            foreach ($rows as $row) {
                 $list .= $row['uid_foreign'] . ',';
             }
         }
@@ -536,7 +530,7 @@ public function getListOfRecipentCategories(string $table, int $uid): string
      *
      * @param	array $query_info List of recipients' ID in the sys_dmail table
      * @param	int $mid Directmail ID. UID of the sys_dmail table
-     * @return	boolean
+     * @return	bool
      */
     protected function masssendList(array $query_info, int $mid): bool
     {
@@ -579,13 +573,12 @@ protected function masssendList(array $query_info, int $mid): bool
                                 $c++;
                             }
                         }
-                    }
-                    else {
+                    } else {
                         $idList = implode(',', $listArr);
                         if ($idList) {
                             $rows = GeneralUtility::makeInstance(TempRepository::class)->selectForMasssendList($table, $idList, ($this->sendPerCycle + 1), $sendIds);
-                            if($rows && count($rows)) {
-                                foreach($rows as $recipRow) {
+                            if ($rows && count($rows)) {
+                                foreach ($rows as $recipRow) {
                                     $recipRow['sys_dmail_categories_list'] = $this->getListOfRecipentCategories($table, $recipRow['uid']);
 
                                     if ($c >= $this->sendPerCycle) {
@@ -617,8 +610,6 @@ protected function masssendList(array $query_info, int $mid): bool
      * @param string $tableKey Table name
      *
      * @internal param string $tKey : table of the recipient
-     *
-     * @return	void
      */
     protected function shipOfMail(int $mid, array $recipRow, string $tableKey): void
     {
@@ -647,7 +638,7 @@ protected function shipOfMail(int $mid, array $recipRow, string $tableKey): void
                     'logUid' => $logUid,
                     'html_sent' => (int)$this->sendAdvanced($recipRow, $tableKey),
                     'parsetime' => $this->getMilliseconds() - $pt,
-                    'size' => strlen($this->message)
+                    'size' => strlen($this->message),
                 ];
                 $ok = $sysDmailMaillogRepository->updateSysDmailMaillogForShipOfMail($values);
 
@@ -656,8 +647,7 @@ protected function shipOfMail(int $mid, array $recipRow, string $tableKey): void
                     $this->logger->critical($message);
                     die($message);
                 }
-            }
-            else {
+            } else {
                 // stop the script if dummy log can't be made
                 $message = 'Unable to update Log-Entry in table sys_dmail_maillog. Table full? Mass-Sending stopped. Delete each entries except the entries of active mailings (mid=' . $mid . ')';
                 $this->logger->critical($message);
@@ -697,8 +687,6 @@ public function convertFields(array $recipRow): array
      *
      * @param int $mid Sys_dmail UID
      * @param string $key Begin or end
-     *
-     * @return	void
      */
     protected function setBeginEnd(int $mid, string $key): void
     {
@@ -744,8 +732,6 @@ protected function setBeginEnd(int $mid, string $key): void
      * Called from the dmailerd script.
      * Look if there is newsletter to be sent
      * and do the sending process. Otherwise quit runtime
-     *
-     * @return	void
      */
     public function runcron(): void
     {
@@ -793,8 +779,7 @@ public function runcron(): void
             if ($finished) {
                 $this->setBeginEnd((int)$row['uid'], 'end');
             }
-        }
-        else {
+        } else {
             $this->logger->debug($this->getLanguageService()->getLL('dmailer_nothing_to_do'));
         }
 
@@ -805,8 +790,6 @@ public function runcron(): void
     /**
      * Initializing the MailMessage class and setting the first global variables.
      * Write to log file if it's a cronjob
-     *
-     * @return	void
      */
     public function start(): void
     {
@@ -836,7 +819,6 @@ public function start(): void
     /**
      * Set the content from $this->theParts['html'] or $this->theParts['plain'] to the mailbody
      *
-     * @return void
      * @var MailMessage $mailer Mailer Object
      */
     protected function setContent(&$mailer): void
@@ -855,19 +837,18 @@ protected function setContent(&$mailer): void
                         if ($applicationContext->isDevelopment()) {
                             $context = stream_context_create(
                                 [
-                                    "ssl" => [
-                                        "verify_peer" => Typo3ConfVarsUtility::getDMConfigSSLVerifyPeer(),
-                                        "verify_peer_name" => Typo3ConfVarsUtility::getDMConfigSSLVerifyPeerName(),
+                                    'ssl' => [
+                                        'verify_peer' => Typo3ConfVarsUtility::getDMConfigSSLVerifyPeer(),
+                                        'verify_peer_name' => Typo3ConfVarsUtility::getDMConfigSSLVerifyPeerName(),
                                     ],
                                 ]
                             );
                         }
 
-                        if (($fp = fopen($media['absRef'], 'r', false, $context)) !== false ) {
+                        if (($fp = fopen($media['absRef'], 'r', false, $context)) !== false) {
                             $mailer->embed($fp, basename($media['absRef']));
                         }
-                    }
-                    else {
+                    } else {
                         $mailer->embed(GeneralUtility::getUrl($media['absRef']), basename($media['absRef']));
                     }
                     $this->theParts['html']['content'] = str_replace($media['subst_str'], 'cid:' . basename($media['absRef']), $this->theParts['html']['content']);
@@ -889,12 +870,12 @@ protected function setContent(&$mailer): void
         // handle FAL attachments
         if ((int)$this->dmailer['sys_dmail_rec']['attachment'] > 0) {
             $files = DirectMailUtility::getAttachments((int)$this->dmailer['sys_dmail_rec']['uid']);
-            if(count($files)) {
+            if (count($files)) {
                 $publicPath = Environment::getPublicPath();
                 /** @var FileReference $file */
                 foreach ($files as $file) {
                     // https://docs.typo3.org/m/typo3/reference-coreapi/11.5/en-us/ApiOverview/Environment/Index.html#getpublicpath
-                    $mailer->attachFromPath($publicPath.$file->getPublicUrl());
+                    $mailer->attachFromPath($publicPath . $file->getPublicUrl());
                 }
             }
         }
@@ -905,8 +886,6 @@ protected function setContent(&$mailer): void
      *
      * @param Address|string   $recipient The recipient to send the mail to
      * @param array     $recipRow  Recipient's data array
-     *
-     * @return	void
      */
     protected function sendTheMail($recipient, $recipRow = null): void
     {
@@ -920,8 +899,7 @@ protected function sendTheMail($recipient, $recipRow = null): void
 
         if ($this->replyToEmail) {
             $mailer->replyTo($this->createRecipient($this->replyToEmail, $this->replyToName));
-        }
-        else {
+        } else {
             $mailer->replyTo($this->createRecipient($this->fromEmail, $this->fromName));
         }
 
@@ -974,7 +952,6 @@ protected function sendTheMail($recipient, $recipRow = null): void
         */
     }
 
-
     /**
      * Add HTML to an email
      *
@@ -1036,8 +1013,6 @@ protected function fetchHTML(string $url): bool
      * Rewrite core function, since it has bug.
      * See Bug Tracker 8265. It will be removed if it's fixed.
      * This function substitutes the hrefs in $this->theParts["html"]["content"]
-     *
-     * @return	void
      */
     protected function substHREFsInHTML(): void
     {
@@ -1048,17 +1023,14 @@ protected function substHREFsInHTML(): void
             if ($val['no_jumpurl']) {
                 // A tag attribute "no_jumpurl=1" allows to disable jumpurl for custom links
                 $substVal = $val['absRef'];
-            }
-            elseif ($this->jumperURLPrefix && ($val['tag'] != 'form') && (!strstr($val['ref'], 'mailto:'))) {
+            } elseif ($this->jumperURLPrefix && ($val['tag'] != 'form') && (!strstr($val['ref'], 'mailto:'))) {
                 // Form elements cannot use jumpurl!
                 $substVal = $this->jumperURLPrefix;
                 $substVal .= $this->jumperURLUseId ? $urlId : str_replace('%2F', '/', rawurlencode($val['absRef']));
-            }
-            elseif (strstr($val['ref'], 'mailto:') && $this->jumperURLUseMailto) {
+            } elseif (strstr($val['ref'], 'mailto:') && $this->jumperURLUseMailto) {
                 $substVal = $this->jumperURLPrefix;
                 $substVal .= $this->jumperURLUseId ? $urlId : str_replace('%2F', '/', rawurlencode($val['absRef']));
-            }
-            else {
+            } else {
                 $substVal = $val['absRef'];
             }
 
@@ -1086,8 +1058,6 @@ protected function dmailerLog(string $logMsg): void
      * Adds plain-text, replaces the HTTP urls in the plain text and then encodes it
      *
      * @param string $content The plain text content
-     *
-     * @return void
      */
     public function addPlain(string $content): void
     {
@@ -1118,13 +1088,11 @@ function ($urlMatches) use (&$jumpUrlCounter) {
                 if (strpos($url, '&no_jumpurl=1') !== false) {
                     // A link parameter "&no_jumpurl=1" allows to disable jumpurl for plain text links
                     $url = str_replace('&no_jumpurl=1', '', $url);
-                }
-                elseif ($this->jumperURLUseId) {
+                } elseif ($this->jumperURLUseId) {
                     $this->theParts['plain']['link_ids'][$jumpUrlCounter] = $url;
                     $url = $this->jumperURLPrefix . '-' . $jumpUrlCounter;
                     $jumpUrlCounter++;
-                }
-                else {
+                } else {
                     $url = $this->jumperURLPrefix . str_replace('%2F', '/', rawurlencode($url));
                 }
                 return $url;
@@ -1137,8 +1105,6 @@ function ($urlMatches) use (&$jumpUrlCounter) {
      * Sets the plain-text part. No processing done.
      *
      * @param string $content The plain content
-     *
-     * @return	void
      */
     protected function setPlain(string $content): void
     {
@@ -1149,8 +1115,6 @@ protected function setPlain(string $content): void
      * Sets the HTML-part. No processing done.
      *
      * @param string $content The HTML content
-     *
-     * @return void
      */
     protected function setHtml(string $content): void
     {
@@ -1159,8 +1123,6 @@ protected function setHtml(string $content): void
 
     /**
      * Extracts all media-links from $this->theParts['html']['content']
-     *
-     * @return	void
      */
     public function extractMediaLinks(): void
     {
@@ -1241,7 +1203,7 @@ public function extractMediaLinks(): void
             $imageData['subst_str'] = $imageData['quotes'] . $imageData['ref'] . $imageData['quotes'];
             $theInfo = GeneralUtility::split_fileref($imageData['ref']);
 
-            if(in_array($theInfo['fileext'], ['gif', 'jpeg', 'jpg'])) {
+            if (in_array($theInfo['fileext'], ['gif', 'jpeg', 'jpg'])) {
                 if ($imageData['ref'] && !strstr($imageList, '|' . $imageData['subst_str'] . '|')) {
                     $imageList .= '|' . $imageData['subst_str'] . '|';
                     $imageData['absRef'] = $this->absRef($imageData['ref']);
@@ -1253,8 +1215,6 @@ public function extractMediaLinks(): void
 
     /**
      * Extracts all hyper-links from $this->theParts["html"]["content"]
-     *
-     * @return	void
      */
     public function extractHyperLinks(): void
     {
@@ -1287,7 +1247,7 @@ public function extractHyperLinks(): void
                     $linkList .= '|' . $hrefData['subst_str'] . '|';
                     $hrefData['absRef'] = $this->absRef($hrefData['ref']);
                     $hrefData['tag'] = $tag;
-                    $hrefData['no_jumpurl'] = intval(trim(($attributes['no_jumpurl'] ?? ''), '"')) ? 1 : 0;
+                    $hrefData['no_jumpurl'] = (int)(trim(($attributes['no_jumpurl'] ?? ''), '"')) ? 1 : 0;
                     $this->theParts['html']['hrefs'][] = $hrefData;
                 }
             }
@@ -1341,11 +1301,11 @@ public function extractFramesInfo(): bool
                 $info[] = [
                     'src' => $attributes['src'],
                     'name' => $attributes['name'],
-                    'absRef' => $this->absRef($frame['src'])
+                    'absRef' => $this->absRef($frame['src']),
                 ];
             }
 
-            if(count($info)) {
+            if (count($info)) {
                 return false;
             }
         }
@@ -1380,7 +1340,7 @@ protected function tag_regex(array $tags): string
      *
      * @param string $tag Tag is either like this "<TAG OPTION ATTRIB=VALUE>" or
      *				 this " OPTION ATTRIB=VALUE>" which means you can omit the tag-name
-     * @param boolean $removeQuotes When TRUE (default) quotes around a value will get removed
+     * @param bool $removeQuotes When TRUE (default) quotes around a value will get removed
      *
      * @return array array with attributes as keys in lower-case
      */
@@ -1404,8 +1364,7 @@ protected function get_tag_attributes(string $tag, bool $removeQuotes = true): a
                     $reg = explode('"', substr($tag, 1, $tagLen), 2);
                     $tag = ltrim($reg[1]);
                     $value = $reg[0];
-                }
-                else {
+                } else {
                     // No quotes around value
                     preg_match('/^([^[:space:]>]*)(.*)/', $tag, $reg);
                     $value = trim($reg[1]);
@@ -1439,20 +1398,17 @@ protected function absRef(string $ref)
         if ($info['scheme'] ?? false) {
             // if ref is an url
             // do nothing
-        }
-        elseif (preg_match('/^\//', $ref)) {
+        } elseif (preg_match('/^\//', $ref)) {
             // if ref is an absolute link
             $addr = parse_url($this->theParts['html']['path']);
             $ref = $addr['scheme'] . '://' . $addr['host'] . (($addr['port'] ?? false) ? ':' . $addr['port'] : '') . $ref;
-        }
-        else {
+        } else {
             // If the reference is relative, the path is added,
             // in order for us to fetch the content
             if (substr($this->theParts['html']['path'], -1) == '/') {
                 // if the last char is a /, then prepend the ref
                 $ref = $this->theParts['html']['path'] . $ref;
-            }
-            else {
+            } else {
                 // if the last char not a /, then assume it's an absolute
                 $addr = parse_url($this->theParts['html']['path']);
                 $ref = $addr['scheme'] . '://' . $addr['host'] . ($addr['port'] ? ':' . $addr['port'] : '') . '/' . $ref;
@@ -1515,15 +1471,14 @@ protected function getLanguageService(): LanguageService
      * Creates an address object ready to be used with the symonfy mailer
      *
      * @param string $email
-     * @param string|NULL $name
+     * @param string|null $name
      * @return Address
      */
-    protected function createRecipient(string $email, $name = NULL): Address
+    protected function createRecipient(string $email, $name = null): Address
     {
         if (!empty($name)) {
             $recipient = new Address($email, $name);
-        }
-        else {
+        } else {
             $recipient = new Address($email);
         }
 
@@ -1536,7 +1491,7 @@ protected function createRecipient(string $email, $name = NULL): Address
      */
     protected function ensureCorrectEncoding(string $inputString): string
     {
-        if($inputString) {
+        if ($inputString) {
             return $this
                 ->getCharsetConverter()
                 ->conv(
diff --git a/Classes/Hooks/TypoScriptFrontendController.php b/Classes/Hooks/TypoScriptFrontendController.php
index 2043d8baa..54b365a43 100644
--- a/Classes/Hooks/TypoScriptFrontendController.php
+++ b/Classes/Hooks/TypoScriptFrontendController.php
@@ -23,7 +23,6 @@
  * Hooks which is called while FE rendering
  *
  * Class TypoScriptFrontendController
- * @package DirectMailTeam\DirectMail\Hooks
  */
 class TypoScriptFrontendController
 {
@@ -37,13 +36,11 @@ public function simulateUsergroup($parameters, \TYPO3\CMS\Frontend\Controller\Ty
         $directMailFeGroup = (int)GeneralUtility::_GET('dmail_fe_group');
         $accessToken = (string)GeneralUtility::_GET('access_token');
         if ($directMailFeGroup > 0 && GeneralUtility::makeInstance(DmRegistryUtility::class)->validateAndRemoveAccessToken($accessToken)) {
-
             /** @var UserAspect $userAspect */
             $userAspect = $typoScriptFrontendController->getContext()->getAspect('frontend.user');
 
             // we reset the content if required
             if (!in_array($directMailFeGroup, $userAspect->getGroupIds(), true)) {
-
                 // code was refactor, using a different hook!
                 $typoScriptFrontendController->getContext()->setAspect(
                     'frontend.user',
diff --git a/Classes/Importer.php b/Classes/Importer.php
index 8675648d6..9ea95e777 100644
--- a/Classes/Importer.php
+++ b/Classes/Importer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail;
 
 /*
@@ -37,9 +38,6 @@
  * Recipient list module for tx_directmail extension
  *
  * @author		Ivan-Dharma Kartolo	<ivan.kartolo@dkd.de>
- *
- * @package 	TYPO3
- * @subpackage	tx_directmail
  */
 class Importer
 {
@@ -63,8 +61,6 @@ class Importer
      * Init the class
      *
      * @param $pObj $pObj The parent object
-     *
-     * @return void
      */
     public function init(&$pObj)
     {
@@ -93,7 +89,7 @@ public function displayImport()
                 'target' => '',
                 'target_disabled' => '',
                 'newFile' => '',
-                'newFileUid' => 0
+                'newFileUid' => 0,
             ],
             'conf' => [
                 'show' => false,
@@ -108,7 +104,7 @@ public function displayImport()
                 'record_unique' => '',
                 'newFile' => '',
                 'newFileUid' => 0,
-                'disableInput' => false
+                'disableInput' => false,
             ],
             'mapping' => [
                 'show' => false,
@@ -131,7 +127,7 @@ public function displayImport()
                 'add_cat' => false,
                 'error' => [],
                 'table' => [],
-                'fields' => []
+                'fields' => [],
             ],
             'startImport' => [
                 'show' => false,
@@ -152,8 +148,8 @@ public function displayImport()
                 'hiddenMap' => [],
                 'hiddenCat' => [],
                 'add_cat' => false,
-                'tables' => []
-            ]
+                'tables' => [],
+            ],
         ];
 
         $beUser = $this->getBeUser();
@@ -163,7 +159,7 @@ public function displayImport()
             'first_fieldname' => 0,
             'valid_email' => 0,
             'remove_dublette' => 0,
-            'update_unique' => 0
+            'update_unique' => 0,
         ];
 
         if (GeneralUtility::_GP('CSV_IMPORT')) {
@@ -188,19 +184,16 @@ public function displayImport()
             $tempFile = $this->checkUpload();
             $this->indata['newFile'] = $tempFile['newFile'];
             $this->indata['newFileUid'] = $tempFile['newFileUid'];
-        }
-        elseif (!empty($this->indata['csv']) && empty($_FILES['upload_1']['name'])) {
+        } elseif (!empty($this->indata['csv']) && empty($_FILES['upload_1']['name'])) {
             unset($this->indata['newFile']);
             unset($this->indata['newFileUid']);
         }
         $stepCurrent = '';
         if ($this->indata['back'] ?? false) {
             $stepCurrent = $step['back'];
-        }
-        elseif ($this->indata['next'] ?? false) {
+        } elseif ($this->indata['next'] ?? false) {
             $stepCurrent = $step['next'];
-        }
-        elseif ($this->indata['update'] ?? false) {
+        } elseif ($this->indata['update'] ?? false) {
             $stepCurrent = 'mapping';
         }
 
@@ -209,11 +202,9 @@ public function displayImport()
             $tempFile = $this->writeTempFile($this->indata['csv'] ?? '', $this->indata['newFile'] ?? '', $this->indata['newFileUid'] ?? 0);
             $this->indata['newFile'] = $tempFile['newFile'];
             $this->indata['newFileUid'] = $tempFile['newFileUid'];
-        }
-        elseif (!empty($this->indata['newFile'])) {
+        } elseif (!empty($this->indata['newFile'])) {
             $this->indata['mode'] = 'file';
-        }
-        else {
+        } else {
             unset($stepCurrent);
         }
 
@@ -225,8 +216,7 @@ public function displayImport()
             $newMap = ArrayUtility::removeArrayEntryByValue(array_unique($map), 'noMap');
             if (empty($newMap)) {
                 $error[] = 'noMap';
-            }
-            elseif (!in_array('email', $map)) {
+            } elseif (!in_array('email', $map)) {
                 $error[] = 'email';
             }
             if (count($error)) {
@@ -248,12 +238,12 @@ public function displayImport()
 
                 $optStorage = [];
                 $subfolders = GeneralUtility::makeInstance(PagesRepository::class)->selectSubfolders($pagePermsClause3);
-                if($subfolders && count($subfolders)) {
-                    foreach($subfolders as $subfolder) {
+                if ($subfolders && count($subfolders)) {
+                    foreach ($subfolders as $subfolder) {
                         if (BackendUtility::readPageAccess($subfolder['uid'], $pagePermsClause1)) {
                             $optStorage[] = [
                                 'val' => $subfolder['uid'],
-                                'text' => $subfolder['title'] . ' [uid:' . $subfolder['uid'] . ']'
+                                'text' => $subfolder['title'] . ' [uid:' . $subfolder['uid'] . ']',
                             ];
                         }
                     }
@@ -263,7 +253,7 @@ public function displayImport()
                     ['val' => 'comma', 'text' => $this->getLanguageService()->getLL('mailgroup_import_separator_comma')],
                     ['val' => 'semicolon', 'text' => $this->getLanguageService()->getLL('mailgroup_import_separator_semicolon')],
                     ['val' => 'colon', 'text' => $this->getLanguageService()->getLL('mailgroup_import_separator_colon')],
-                    ['val' => 'tab', 'text' => $this->getLanguageService()->getLL('mailgroup_import_separator_tab')]
+                    ['val' => 'tab', 'text' => $this->getLanguageService()->getLL('mailgroup_import_separator_tab')],
                 ];
 
                 $optEncap = [
@@ -274,7 +264,7 @@ public function displayImport()
                 // TODO: make it variable?
                 $optUnique = [
                     ['val' => 'email', 'text' => 'email'],
-                    ['val' =>'name', 'text' => 'name']
+                    ['val' =>'name', 'text' => 'name'],
                 ];
 
                 $output['conf']['disableInput'] = $this->params['inputDisable'] == 1 ? true : false;
@@ -353,8 +343,7 @@ public function displayImport()
                     $csvData = $this->readExampleCSV(4);
                     $csv_firstRow = $csvData[0];
                     $csvData = array_slice($csvData, 1);
-                }
-                else {
+                } else {
                     // read csv
                     $csvData = $this->readExampleCSV(3);
                     $fieldsAmount = count($csvData[0] ?? []);
@@ -373,14 +362,14 @@ public function displayImport()
                 foreach ($ttAddressFields as $map) {
                     $mapFields[] = [
                         $map,
-                        str_replace(':', '', $this->getLanguageService()->sL($GLOBALS['TCA']['tt_address']['columns'][$map]['label']))
+                        str_replace(':', '', $this->getLanguageService()->sL($GLOBALS['TCA']['tt_address']['columns'][$map]['label'])),
                     ];
                 }
                 // add 'no value'
                 array_unshift($mapFields, ['noMap', $this->getLanguageService()->getLL('mailgroup_import_mapping_mapTo')]);
                 $mapFields[] = [
                     'cats',
-                    $this->getLanguageService()->getLL('mailgroup_import_mapping_categories')
+                    $this->getLanguageService()->getLL('mailgroup_import_mapping_categories'),
                 ];
                 reset($csv_firstRow);
                 reset($csvData);
@@ -396,7 +385,7 @@ public function displayImport()
                         'mapping_description' => $csv_firstRow[$i],
                         'mapping_i' => $i,
                         'mapping_mappingSelected' => $this->indata['map'][$i],
-                        'mapping_value' => $exampleLines
+                        'mapping_value' => $exampleLines,
                     ];
                 }
 
@@ -415,7 +404,7 @@ public function displayImport()
                                 'cat' => htmlspecialchars($v['category']),
                                 'k' => $k,
                                 'vUid' => $v['uid'],
-                                'checked' => $this->indata['cat'][$k] != $v['uid'] ? false : true
+                                'checked' => $this->indata['cat'][$k] != $v['uid'] ? false : true,
                             ];
                         }
                     }
@@ -468,14 +457,14 @@ public function displayImport()
                             $mapKeys = array_keys($v);
                             $rowsTable[] = [
                                 'val' => $v[$mapKeys[0]],
-                                'email' => $v['email']
+                                'email' => $v['email'],
                             ];
                         }
                     }
 
                     $output['startImport']['tables'][] = [
                         'header' => $this->getLanguageService()->getLL('mailgroup_import_report_' . $order),
-                        'rows' => $rowsTable
+                        'rows' => $rowsTable,
                     ];
                 }
 
@@ -500,11 +489,11 @@ public function displayImport()
                 if (($this->indata['mode'] === 'file') && !(((strpos($currentFileInfo['file'], 'import') === false) ? 0 : 1) && ($currentFileInfo['realFileext'] === 'txt'))) {
                     $output['upload']['current'] = true;
                     $file = $this->getFileById((int)$this->indata['newFileUid']);
-                    if(is_object($file)) {
+                    if (is_object($file)) {
                         $output['upload']['fileInfo'] = [
                             'name' => $file->getName(),
                             'extension' => $file->getProperty('extension'),
-                            'size' => GeneralUtility::formatSize($file->getProperty('size'))
+                            'size' => GeneralUtility::formatSize($file->getProperty('size')),
                         ];
                     }
                 }
@@ -619,12 +608,10 @@ public function doImport(array $csvData)
                     if (($this->indata['valid_email']) && ($this->indata['map'][$kk] === 'email')) {
                         $invalidEmail = GeneralUtility::validEmail(trim($fieldData)) ? 0 : 1;
                         $tempData[$this->indata['map'][$kk]] = trim($fieldData);
-                    }
-                    else {
+                    } else {
                         if ($this->indata['map'][$kk] !== 'cats') {
                             $tempData[$this->indata['map'][$kk]] = $fieldData;
-                        }
-                        else {
+                        } else {
                             $tempCats = explode(',', $fieldData);
                             foreach ($tempCats as $catC => $tempCat) {
                                 $tempData['module_sys_dmail_category'][$catC] = $tempCat;
@@ -635,8 +622,7 @@ public function doImport(array $csvData)
             }
             if ($invalidEmail) {
                 $invalidEmailCSV[] = $tempData;
-            }
-            else {
+            } else {
                 $mappedCSV[] = $tempData;
             }
         }
@@ -656,7 +642,7 @@ public function doImport(array $csvData)
 
             $rows = GeneralUtility::makeInstance(TtAddressRepository::class)->selectTtAddressByPid((int)$this->indata['storage'], $this->indata['record_unique']);
 
-            if(is_array($rows)) {
+            if (is_array($rows)) {
                 foreach ($rows as $row) {
                     $user[] = $row['email'];
                     $userID[] = $row['uid'];
@@ -677,8 +663,8 @@ public function doImport(array $csvData)
                         if (is_array($this->indata['cat']) && !in_array('cats', $this->indata['map'])) {
                             if ($this->indata['add_cat']) {
                                 $rows = GeneralUtility::makeInstance(SysDmailTtAddressCategoryMmRepository::class)->selectUidsByUidLocal((int)$userID[$foundUser[0]]);
-                                if(is_array($rows)) {
-                                    foreach($rows as $row) {
+                                if (is_array($rows)) {
+                                    foreach ($rows as $row) {
                                         $data['tt_address'][$userID[$foundUser[0]]]['module_sys_dmail_category'][] = $row['uid_foreign'];
                                     }
                                 }
@@ -689,8 +675,7 @@ public function doImport(array $csvData)
                             }
                         }
                         $resultImport['update'][] = $dataArray;
-                    }
-                    else {
+                    } else {
                         // which one to update? all?
                         foreach ($foundUser as $kk => $_) {
                             $data['tt_address'][$userID[$foundUser[$kk]]] = $dataArray;
@@ -698,8 +683,7 @@ public function doImport(array $csvData)
                         }
                         $resultImport['update'][] = $dataArray;
                     }
-                }
-                else {
+                } else {
                     // write new user
                     $this->addDataArray($data, 'NEW' . $c, $dataArray);
                     $resultImport['new'][] = $dataArray;
@@ -707,8 +691,7 @@ public function doImport(array $csvData)
                     $c++;
                 }
             }
-        }
-        else {
+        } else {
             // no update, import all
             $c = 1;
             foreach ($mappedCSV as $dataArray) {
@@ -763,8 +746,6 @@ public function doImport(array $csvData)
      * @param array $data Array for the TCE
      * @param string $id Record ID
      * @param array $dataArray The data to be imported
-     *
-     * @return void
      */
     public function addDataArray(array &$data, $id, array $dataArray)
     {
@@ -790,7 +771,7 @@ public function readCSV()
     {
         $mydata = [];
 
-        if((int)$this->indata['newFileUid'] < 1) {
+        if ((int)$this->indata['newFileUid'] < 1) {
             return $mydata;
         }
 
@@ -807,7 +788,7 @@ public function readCSV()
 
         ini_set('auto_detect_line_endings', true);
         $handle = fopen($fileAbsolutePath, 'r');
-        if($handle === false) {
+        if ($handle === false) {
             return $mydata;
         }
 
@@ -836,7 +817,7 @@ public function readExampleCSV($records = 3)
     {
         $mydata = [];
 
-        if((int)$this->indata['newFileUid'] < 1) {
+        if ((int)$this->indata['newFileUid'] < 1) {
             return $mydata;
         }
 
@@ -854,7 +835,7 @@ public function readExampleCSV($records = 3)
 
         ini_set('auto_detect_line_endings', true);
         $handle = fopen($fileAbsolutePath, 'r');
-        if($handle === false) {
+        if ($handle === false) {
             return $mydata;
         }
 
@@ -919,8 +900,7 @@ public function writeTempFile(string $csv, string $newFile, int $newFileUid)
 
             if ($httpHost != $refInfo['host'] && !$GLOBALS['TYPO3_CONF_VARS']['SYS']['doNotCheckReferer']) {
                 $extendedFileUtility->writeLog(0, 2, 1, 'Referer host "%s" and server host "%s" did not match!', [$refInfo['host'], $httpHost]);
-            }
-            else {
+            } else {
                 // new file
                 $file['newfile']['target'] = $this->userTempFolder();
                 $file['newfile']['data'] = 'import_' . $this->getTimestampFromAspect() . '.txt';
@@ -932,15 +912,14 @@ public function writeTempFile(string $csv, string $newFile, int $newFileUid)
                     $newfile['newFileUid'] = $newfileObj->getUid();
                 }
             }
-        }
-        else {
+        } else {
             $newfile = ['newFile' => $newFile, 'newFileUid' => $newFileUid];
         }
 
         if ($newfile['newFile']) {
             $csvFile = [
                 'data' => $csv,
-                'target' => $newfile['newFile']
+                'target' => $newfile['newFile'],
             ];
             $write = $extendedFileUtility->func_edit($csvFile);
         }
@@ -969,8 +948,7 @@ public function checkUpload()
 
         if ($httpHost != $refInfo['host'] && !$GLOBALS['TYPO3_CONF_VARS']['SYS']['doNotCheckReferer']) {
             $extendedFileUtility->writeLog(0, 2, 1, 'Referer host "%s" and server host "%s" did not match!', [$refInfo['host'], $httpHost]);
-        }
-        else {
+        } else {
             $file = GeneralUtility::_GP('file');
             $extendedFileUtility->start($file);
             $extendedFileUtility->setExistingFilesConflictMode(DuplicationBehavior::cast(DuplicationBehavior::REPLACE));
@@ -980,7 +958,7 @@ public function checkUpload()
                 $storageConfig = $tempFile[0]->getStorage()->getConfiguration();
                 $newfile = [
                     'newFile' => rtrim($storageConfig['basePath'], '/') . '/' . ltrim($tempFile[0]->getIdentifier(), '/'),
-                    'newFileUid' => $tempFile[0]->getUid()
+                    'newFileUid' => $tempFile[0]->getUid(),
                 ];
             }
         }
@@ -989,7 +967,6 @@ public function checkUpload()
     }
 
     /**
-     *
      * @param int $fileUid
      * @return \TYPO3\CMS\Core\Resource\File|bool
      */
@@ -998,22 +975,19 @@ private function getFileById(int $fileUid) //: \TYPO3\CMS\Core\Resource\File|boo
         $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
         try {
             return $resourceFactory->getFileObject($fileUid);
-        }
-        catch(\TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException $e) {
-
+        } catch(\TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException $e) {
         }
         return false;
     }
 
     /**
-     *
      * @param int $fileUid
      * @return string
      */
     private function getFileAbsolutePath(int $fileUid): string
     {
         $file = $this->getFileById($fileUid);
-        if(!is_object($file)) {
+        if (!is_object($file)) {
             return '';
         }
         return Environment::getPublicPath() . '/' . str_replace('//', '/', $file->getStorage()->getConfiguration()['basePath'] . $file->getProperty('identifier'));
@@ -1032,10 +1006,10 @@ public function userTempFolder()
     }
 
     /**
-     *
      * @return int
      */
-    private function getTimestampFromAspect(): int {
+    private function getTimestampFromAspect(): int
+    {
         $context = GeneralUtility::makeInstance(Context::class);
         return $context->getPropertyFromAspect('date', 'timestamp');
     }
@@ -1051,7 +1025,6 @@ protected function getLanguageService()
     }
 
     /**
-     *
      * @return BackendUserAuthentication
      */
     protected function getBeUser()
@@ -1066,7 +1039,6 @@ protected function getMessageQueue()
     }
 
     /**
-     *
         https://api.typo3.org/11.5/class_t_y_p_o3_1_1_c_m_s_1_1_core_1_1_messaging_1_1_abstract_message.html
         const 	NOTICE = -2
         const 	INFO = -1
@@ -1080,7 +1052,8 @@ protected function getMessageQueue()
      */
     protected function createFlashMessage(string $messageText, string $messageHeader = '', int $messageType = 0, bool $storeInSession = false)
     {
-        return GeneralUtility::makeInstance(FlashMessage::class,
+        return GeneralUtility::makeInstance(
+            FlashMessage::class,
             $messageText,
             $messageHeader, // [optional] the header
             $messageType, // [optional] the severity defaults to \TYPO3\CMS\Core\Messaging\FlashMessage::OK
diff --git a/Classes/Middleware/JumpurlController.php b/Classes/Middleware/JumpurlController.php
index 845de9aa2..b23d410de 100644
--- a/Classes/Middleware/JumpurlController.php
+++ b/Classes/Middleware/JumpurlController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Middleware;
@@ -22,7 +23,6 @@
 use DirectMailTeam\DirectMail\Repository\TtAddressRepository;
 use DirectMailTeam\DirectMail\Utility\AuthCodeUtility;
 use DirectMailTeam\DirectMail\Utility\Typo3ConfVarsUtility;
-use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -35,13 +35,9 @@
  * JumpUrl processing hook on TYPO3\CMS\Frontend\Http\RequestHandler
  *
  * @author		Ivan Kartolo <ivan.kartolo@gmail.com>
- *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
  */
 class JumpurlController implements MiddlewareInterface
 {
-
     public const RECIPIENT_TABLE_TTADDRESS = 'tt_address';
     public const RECIPIENT_TABLE_FEUSER = 'fe_users';
 
@@ -103,7 +99,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 // try to build the ready-to-use target url
                 if (!empty($this->recipientRecord)) {
                     $valid = AuthCodeUtility::validateAuthCode($submittedAuthCode, $this->recipientRecord, ($this->directMailRecord['authcode_fieldList'] ?: 'uid'));
-                    if(!$valid) {
+                    if (!$valid) {
                         throw new \Exception(
                             'authCode verification failed.',
                             1376899631
@@ -118,8 +114,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 if (empty($jumpurl)) {
                     die('Error: No further link. Please report error to the mail sender.');
                 }
-            }
-            else {
+            } else {
                 // jumpUrl is not an integer -- then this is a URL, that means that the "dmailerping"
                 // functionality was used to count the number of "opened mails" received (url, dmailerping)
 
@@ -139,7 +134,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     'response_type' => $this->responseType,
                     'url_id'        => (int)$urlId,
                     'rtbl'          => mb_substr($this->recipientTable, 0, 1),
-                    'rid'           => (int)($recipientUid ?? $this->recipientRecord['uid'])
+                    'rid'           => (int)($recipientUid ?? $this->recipientRecord['uid']),
                 ];
                 $sysDmailMaillogRepository = GeneralUtility::makeInstance(SysDmailMaillogRepository::class);
                 if ($sysDmailMaillogRepository->hasRecentLog($mailLogParams) === false) {
@@ -165,7 +160,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     protected function shouldProcess(): bool
     {
         $mid = $this->request->getQueryParams()['mid'] ?? null;
-        return ($mid && MathUtility::canBeInterpretedAsInteger($mid));
+        return $mid && MathUtility::canBeInterpretedAsInteger($mid);
     }
 
     /**
@@ -197,8 +192,7 @@ protected function getTargetUrl(int $targetIndex): ?string
                 // Link (number)
                 $this->responseType = self::RESPONSE_TYPE_HREF;
                 $targetUrl = $mailContent['html']['hrefs'][$targetIndex]['absRef'];
-            }
-            else {
+            } else {
                 // Link (number, plaintext)
                 $this->responseType = self::RESPONSE_TYPE_PLAIN;
                 $targetUrl = $mailContent['plain']['link_ids'][abs($targetIndex)];
@@ -264,7 +258,7 @@ protected function substituteUserMarkersFromTargetUrl(string $targetUrl): string
         reset($rowFieldsArray);
         $processedTargetUrl = $targetUrl;
         foreach ($rowFieldsArray as $substField) {
-            if(isset($this->recipientRecord[$substField] )) {
+            if (isset($this->recipientRecord[$substField])) {
                 $processedTargetUrl = str_replace(
                     '###USER_' . $substField . '###',
                     $this->recipientRecord[$substField],
@@ -289,7 +283,7 @@ protected function substituteSystemMarkersFromTargetUrl(string $targetUrl): stri
         $substitutions = [
             mb_substr($this->recipientTable, 0, 1),
             $mailId,
-            $submittedAuthCode
+            $submittedAuthCode,
         ];
         $targetUrl = str_replace($markers, $substitutions, $targetUrl);
 
@@ -349,13 +343,11 @@ protected function isAllowedJumpUrlTarget(string $target): bool
         if (preg_match('#/dmailerping\\.(gif|png)$#', $checkPath) && (GeneralUtility::isAllowedAbsPath($checkPath) || GeneralUtility::isValidUrl($target))) {
             // set juHash as done for external_url in core: http://forge.typo3.org/issues/46071
             $allowed = true;
-        }
-        elseif (GeneralUtility::isValidUrl($target)) {
+        } elseif (GeneralUtility::isValidUrl($target)) {
             // if it's a valid URL, throw exception
             throw new \Exception('direct_mail: Invalid target.', 1578347190);
         }
 
         return $allowed;
     }
-
 }
diff --git a/Classes/Module/ConfigurationController.php b/Classes/Module/ConfigurationController.php
index eabc02a2f..906ac37f0 100644
--- a/Classes/Module/ConfigurationController.php
+++ b/Classes/Module/ConfigurationController.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
 
-use DirectMailTeam\DirectMail\DirectMailUtility;
 use DirectMailTeam\DirectMail\Utility\TsUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -25,7 +25,7 @@ class ConfigurationController extends MainController
 
     protected $requestUri = '';
 
-    public function indexAction(ServerRequestInterface $request) : ResponseInterface
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
         $currentModule = 'Configuration';
         $this->view = $this->configureTemplatePaths($currentModule);
@@ -44,25 +44,22 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
                 if (($this->pageinfo['doktype'] ?? 0) == 254) {
                     $this->setDefaultValues();
                     $this->view->assignMultiple([
-                        'implodedParams' => $this->implodedParams
+                        'implodedParams' => $this->implodedParams,
                     ]);
-                }
-                elseif ($this->id != 0) {
+                } elseif ($this->id != 0) {
                     $message = $this->createFlashMessage($this->getLanguageService()->getLL('dmail_noRegular'), $this->getLanguageService()->getLL('dmail_newsletters'), 1, false);
                     $this->messageQueue->addMessage($message);
                 }
-            }
-            else {
+            } else {
                 $message = $this->createFlashMessage($this->getLanguageService()->getLL('select_folder'), $this->getLanguageService()->getLL('header_conf'), 1, false);
                 $this->messageQueue->addMessage($message);
                 $this->view->assignMultiple(
                     [
-                        'dmLinks' => $this->getDMPages($this->moduleName)
+                        'dmLinks' => $this->getDMPages($this->moduleName),
                     ]
                 );
             }
-        }
-        else {
+        } else {
             // If no access or if ID == zero
             $this->view = $this->configureTemplatePaths('NoAccess');
             $message = $this->createFlashMessage('If no access or if ID == zero', 'No Access', 1, false);
@@ -103,8 +100,6 @@ protected function setDefaultValues(): void
    /**
      * Update the pageTS
      * No return value: sent header to the same page
-     *
-     * @return void
      */
     protected function updatePageTS(): void
     {
diff --git a/Classes/Module/DmailController.php b/Classes/Module/DmailController.php
index 7290b94a8..0663593c8 100644
--- a/Classes/Module/DmailController.php
+++ b/Classes/Module/DmailController.php
@@ -1,12 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
 
+use DirectMailTeam\DirectMail\DirectMailUtility;
 use DirectMailTeam\DirectMail\Dmailer;
 use DirectMailTeam\DirectMail\DmQueryGenerator;
-use DirectMailTeam\DirectMail\DirectMailUtility;
-use DirectMailTeam\DirectMail\Utility\DmCsvUtility;
 use DirectMailTeam\DirectMail\Repository\PagesRepository;
 use DirectMailTeam\DirectMail\Repository\SysDmailGroupRepository;
 use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
@@ -14,13 +14,12 @@
 use DirectMailTeam\DirectMail\Repository\TtAddressRepository;
 use DirectMailTeam\DirectMail\Repository\TtContentCategoryMmRepository;
 use DirectMailTeam\DirectMail\Repository\TtContentRepository;
+use DirectMailTeam\DirectMail\Utility\DmCsvUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Configuration\TranslationConfigurationProvider;
-use TYPO3\CMS\Backend\Routing\PreviewUriBuilder;
 use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Error\Http\ServiceUnavailableException;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Http\HtmlResponse;
@@ -43,7 +42,7 @@ class DmailController extends MainController
 
     /**
      * for cmd == 'delete'
-     * @var integer
+     * @var int
      */
     protected int $uid = 0;
 
@@ -71,7 +70,8 @@ class DmailController extends MainController
      */
     protected string $moduleName = 'DirectMailNavFrame_DirectMail';
 
-    protected function initDmail(ServerRequestInterface $request): void {
+    protected function initDmail(ServerRequestInterface $request): void
+    {
         $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/DateTimePicker');
 
         $queryParams = $request->getQueryParams();
@@ -108,7 +108,7 @@ protected function initDmail(ServerRequestInterface $request): void {
         $this->tt_address_uid = (int)($parsedBody['tt_address_uid'] ?? $queryParams['tt_address_uid'] ?? 0);
     }
 
-    public function indexAction(ServerRequestInterface $request) : ResponseInterface
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
         $currentModule = 'Dmail';
         $this->view = $this->configureTemplatePaths($currentModule);
@@ -117,7 +117,7 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
         $this->initDmail($request);
 
         // get the config from pageTS
-        $this->params['pid'] = intval($this->id);
+        $this->params['pid'] = (int)($this->id);
         $this->cshTable = '_MOD_' . $this->moduleName;
 
         if (($this->id && $this->access) || ($this->isAdmin() && !$this->id)) {
@@ -131,26 +131,23 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
                     $this->view->assignMultiple(
                         [
                             'flashmessages' => $markers['FLASHMESSAGES'],
-                            'data' => $markers['data']
+                            'data' => $markers['data'],
                         ]
                     );
-                }
-                elseif ($this->id != 0) {
+                } elseif ($this->id != 0) {
                     $message = $this->createFlashMessage($this->getLanguageService()->getLL('dmail_noRegular'), $this->getLanguageService()->getLL('dmail_newsletters'), 1, false);
                     $this->messageQueue->addMessage($message);
                 }
-            }
-            else {
+            } else {
                 $message = $this->createFlashMessage($this->getLanguageService()->getLL('select_folder'), $this->getLanguageService()->getLL('header_directmail'), 1, false);
                 $this->messageQueue->addMessage($message);
                 $this->view->assignMultiple(
                     [
-                        'dmLinks' => $this->getDMPages($this->moduleName)
+                        'dmLinks' => $this->getDMPages($this->moduleName),
                     ]
                 );
             }
-        }
-        else {
+        } else {
             // If no access or if ID == zero
             $this->view = $this->configureTemplatePaths('NoAccess');
             $message = $this->createFlashMessage('If no access or if ID == zero', 'No Access', 1, false);
@@ -170,7 +167,7 @@ protected function moduleContent()
 
         $markers = [
             'FLASHMESSAGES' => '',
-            'data' => []
+            'data' => [],
         ];
 
         if ($this->cmd == 'delete') {
@@ -178,7 +175,7 @@ protected function moduleContent()
         }
 
         $row = [];
-        if (intval($this->sys_dmail_uid)) {
+        if ((int)($this->sys_dmail_uid)) {
             $row = BackendUtility::getRecord('sys_dmail', $this->sys_dmail_uid);
             $isExternalDirectMailRecord = (is_array($row) && $row['type'] == 1);
         }
@@ -188,7 +185,7 @@ protected function moduleContent()
 
         if ((isset($tsconfig['tx_directmail.']['hideSteps']) &&
             $tsconfig['tx_directmail.']['hideSteps'] === 'cat') || $isExternalDirectMailRecord) {
-                $hideCategoryStep = true;
+            $hideCategoryStep = true;
         }
 
         if ($this->backButtonPressed) {
@@ -239,8 +236,8 @@ protected function moduleContent()
                 'next_error' => false,
                 'totalSteps' => $totalSteps,
                 'currentStep' => 1,
-                'steps' => array_fill(1, $totalSteps, '')
-            ]
+                'steps' => array_fill(1, $totalSteps, ''),
+            ],
         ];
 
         switch ($this->cmd) {
@@ -249,7 +246,7 @@ protected function moduleContent()
                 $this->currentStep = 2;
                 $data['navigation']['currentStep'] = $this->currentStep;
                 $data['info'] = [
-                    'currentStep' => $this->currentStep
+                    'currentStep' => $this->currentStep,
                 ];
 
                 $fetchMessage = '';
@@ -274,9 +271,8 @@ protected function moduleContent()
                         }
 
                         $data['info']['internal']['cmd'] = $nextCmd ? $nextCmd : 'cats';
-                    } else {
-                        // TODO: Error message - Error while adding the DB set
                     }
+                // TODO: Error message - Error while adding the DB set
                 }
                 // external URL
                 // $this->createMailFrom_URL is the External URL subject
@@ -306,13 +302,13 @@ protected function moduleContent()
                 // Quickmail
                 elseif ($quickmail['send']) {
                     $temp = $this->createDMailQuick($quickmail);
-                    if(!$temp['errorTitle']) {
+                    if (!$temp['errorTitle']) {
                         $fetchError = false;
                     }
-                    if($temp['errorTitle']) {
+                    if ($temp['errorTitle']) {
                         $this->messageQueue->addMessage($this->createFlashMessage($temp['errorText'], $temp['errorTitle'], 2, false));
                     }
-                    if($temp['warningTitle']) {
+                    if ($temp['warningTitle']) {
                         $this->messageQueue->addMessage($this->createFlashMessage($temp['warningText'], $temp['warningTitle'], 1, false));
                     }
 
@@ -336,14 +332,13 @@ protected function moduleContent()
                         // add attachment here, since attachment added in 2nd step
                         $unserializedMailContent = unserialize(base64_decode($row['mailContent']));
                         $temp = $this->compileQuickMail($row, $unserializedMailContent['plain']['content'] ?? '', false);
-                        if($temp['errorTitle']) {
+                        if ($temp['errorTitle']) {
                             $this->messageQueue->addMessage($this->createFlashMessage($temp['errorText'], $temp['errorTitle'], 2, false));
                         }
-                        if($temp['warningTitle']) {
+                        if ($temp['warningTitle']) {
                             $this->messageQueue->addMessage($this->createFlashMessage($temp['warningText'], $temp['warningTitle'], 1, false));
                         }
-                    }
-                    else {
+                    } else {
                         if ($this->fetchAtOnce) {
                             $fetchMessage = DirectMailUtility::fetchUrlContentsForDirectMailRecord($row, $this->params);
                             $fetchError = ((strstr($fetchMessage, $this->getLanguageService()->getLL('dmail_error')) === false) ? false : true);
@@ -359,8 +354,7 @@ protected function moduleContent()
 
                 if ($fetchMessage) {
                     $markers['FLASHMESSAGES'] = $fetchMessage;
-                }
-                elseif (!$fetchError && $this->fetchAtOnce) {
+                } elseif (!$fetchError && $this->fetchAtOnce) {
                     $message = $this->createFlashMessage(
                         '',
                         $this->getLanguageService()->getLL('dmail_wiz2_fetch_success'),
@@ -380,7 +374,7 @@ protected function moduleContent()
                 $this->currentStep = 3;
                 $data['navigation']['currentStep'] = $this->currentStep;
                 $data['cats'] = [
-                    'currentStep' => $this->currentStep
+                    'currentStep' => $this->currentStep,
                 ];
 
                 $data['navigation']['back'] = true;
@@ -388,7 +382,7 @@ protected function moduleContent()
 
                 $indata = GeneralUtility::_GP('indata');
                 $temp = $this->makeCategoriesForm($row, $indata);
-                $data['cats']['output'] = $temp['output'];;
+                $data['cats']['output'] = $temp['output'];
                 $data['cats']['catsForm'] = $temp['theOutput'];
 
                 $data['cats']['cmd'] = 'send_test';
@@ -404,7 +398,7 @@ protected function moduleContent()
                 $this->currentStep = (4 - (5 - $totalSteps));
                 $data['navigation']['currentStep'] = $this->currentStep;
                 $data['test'] = [
-                    'currentStep' => $this->currentStep
+                    'currentStep' => $this->currentStep,
                 ];
 
                 $data['navigation']['back'] = true;
@@ -426,7 +420,7 @@ protected function moduleContent()
                 $this->currentStep = (5 - (5 - $totalSteps));
                 $data['navigation']['currentStep'] = $this->currentStep;
                 $data['final'] = [
-                    'currentStep' => $this->currentStep
+                    'currentStep' => $this->currentStep,
                 ];
 
                 if ($this->cmd == 'send_mass') {
@@ -438,15 +432,14 @@ protected function moduleContent()
                         $this->sendMail($row);
                         break;
                     }
-                    else {
-                        $message = $this->createFlashMessage(
-                            $this->getLanguageService()->getLL('mod.no_recipients'),
-                            '',
-                            1,
-                            false
-                        );
-                        $this->messageQueue->addMessage($message);
-                    }
+
+                    $message = $this->createFlashMessage(
+                        $this->getLanguageService()->getLL('mod.no_recipients'),
+                        '',
+                        1,
+                        false
+                    );
+                    $this->messageQueue->addMessage($message);
                 }
                 // send mass, show calendar
                 $data['final']['finalForm'] = $this->cmd_finalmail($row);
@@ -461,7 +454,7 @@ protected function moduleContent()
                 $this->currentStep = 1;
 
                 $showTabs = ['int', 'ext', 'quick', 'dmail'];
-                if(isset($tsconfig['tx_directmail.']['hideTabs'])) {
+                if (isset($tsconfig['tx_directmail.']['hideTabs'])) {
                     $hideTabs = GeneralUtility::trimExplode(',', $tsconfig['tx_directmail.']['hideTabs']);
                     foreach ($hideTabs as $hideTab) {
                         $showTabs = ArrayUtility::removeArrayEntryByValue($showTabs, $hideTab);
@@ -544,8 +537,7 @@ protected function getNews(): array
         $empty = false;
         if (empty($rows)) {
             $empty = true;
-        }
-        else {
+        } else {
             $iconActionsOpen = $this->getIconActionsOpen();
             foreach ($rows as $row) {
                 $languages = $this->getAvailablePageLanguages($row['uid']);
@@ -555,7 +547,7 @@ protected function getNews(): array
                         'id' => $this->id,
                         'createMailFrom_UID' => $row['uid'],
                         'fetchAtOnce' => 1,
-                        'cmd' => 'info'
+                        'cmd' => 'info',
                     ]
                 );
 
@@ -581,7 +573,7 @@ protected function getNews(): array
                         'href' => '#',
                         'data-dispatch-action' => $attributes['dispatch-action'],
                         'data-dispatch-args' => $attributes['dispatch-args'],
-                        'title' => htmlentities($this->getLanguageService()->getLL('nl_viewPage_HTML') . $langTitle)
+                        'title' => htmlentities($this->getLanguageService()->getLL('nl_viewPage_HTML') . $langTitle),
                     ], true);
 
                     $previewHTMLLink .= '<a ' . $serializedAttributes . '>' . $htmlIcon . '</a>';
@@ -596,7 +588,7 @@ protected function getNews(): array
                             'href' => '#',
                             'data-dispatch-action' => $attributes['dispatch-action'],
                             'data-dispatch-args' => $attributes['dispatch-args'],
-                            'title' => htmlentities($this->getLanguageService()->getLL('nl_viewPage_TXT') . $langTitle)
+                            'title' => htmlentities($this->getLanguageService()->getLL('nl_viewPage_TXT') . $langTitle),
                         ], true);
 
                     $previewTextLink .= '<a href="#" ' . $serializedAttributes . '>' . $plainIcon . '</a>';
@@ -620,7 +612,7 @@ protected function getNews(): array
                     'edit' => [
                         'pages' => [
                             $row['uid'] => 'edit',
-                        ]
+                        ],
                     ],
                     'returnUrl' => $this->requestUri,
                 ];
@@ -632,7 +624,7 @@ protected function getNews(): array
                     'createLink' => $createLink,
                     'editOnClickLink' => $this->getEditOnClickLink($params),
                     'iconActionsOpen' => $iconActionsOpen,
-                    'previewLink' => $previewLink
+                    'previewLink' => $previewLink,
                 ];
             }
         }
@@ -687,7 +679,7 @@ protected function getConfigFormExternal()
         return [
             'title' => 'dmail_dovsk_crFromUrl',
             'cshItem' => BackendUtility::cshItem($this->cshTable, 'create_directmail_from_url'),
-            'no_valid_url' => (bool)($this->error == 'no_valid_url')
+            'no_valid_url' => (bool)($this->error == 'no_valid_url'),
         ];
     }
 
@@ -704,7 +696,7 @@ protected function getConfigFormQuickMail()
             'senderMail' => htmlspecialchars($this->quickmail['senderEmail'] ?? $this->getBackendUser()->user['email']),
             'subject' => htmlspecialchars($this->quickmail['subject'] ?? ''),
             'message' => htmlspecialchars($this->quickmail['message'] ?? ''),
-            'breakLines' => (bool)($this->quickmail['breakLines'] ?? false)
+            'breakLines' => (bool)($this->quickmail['breakLines'] ?? false),
         ];
     }
 
@@ -716,16 +708,16 @@ protected function getConfigFormQuickMail()
     protected function getConfigFormDMail()
     {
         $sOrder = preg_replace(
-            '/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i', '',
+            '/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i',
+            '',
             trim($GLOBALS['TCA']['sys_dmail']['ctrl']['default_sortby'])
         );
-        if (!empty($sOrder)){
-            if (substr_count($sOrder, 'ASC') > 0 ){
-                $sOrder = trim(str_replace('ASC','',$sOrder));
+        if (!empty($sOrder)) {
+            if (substr_count($sOrder, 'ASC') > 0) {
+                $sOrder = trim(str_replace('ASC', '', $sOrder));
                 $ascDesc = 'ASC';
-            }
-            else{
-                $sOrder = trim(str_replace('DESC','',$sOrder));
+            } else {
+                $sOrder = trim(str_replace('DESC', '', $sOrder));
                 $ascDesc = 'DESC';
             }
         }
@@ -742,7 +734,7 @@ protected function getConfigFormDMail()
                 'renderedsize' => ($row['renderedsize'] ? GeneralUtility::formatSize($row['renderedsize']) : ''),
                 'attachment' => ($row['attachment'] ? $this->iconFactory->getIcon('directmail-attachment', Icon::SIZE_SMALL) : ''),
                 'type' => ($row['type'] & 0x1 ? $this->getLanguageService()->getLL('nl_l_tUrl') : $this->getLanguageService()->getLL('nl_l_tPage')) . ($row['type']  & 0x2 ? ' (' . $this->getLanguageService()->getLL('nl_l_tDraft') . ')' : ''),
-                'deleteLink' => $this->deleteLink($row['uid'])
+                'deleteLink' => $this->deleteLink($row['uid']),
             ];
         }
 
@@ -768,12 +760,12 @@ protected function createDMailQuick(array $indata)
             'replyto_email'      => $this->params['replyto_email'] ?? '',
             'replyto_name'       => $this->params['replyto_name'] ?? '',
             'return_path'        => $this->params['return_path'] ?? '',
-            'priority'           => (int) $this->params['priority'],
-            'use_rdct'           => (int) $this->params['use_rdct'],
-            'long_link_mode'     => (int) $this->params['long_link_mode'],
+            'priority'           => (int)$this->params['priority'],
+            'use_rdct'           => (int)$this->params['use_rdct'],
+            'long_link_mode'     => (int)$this->params['long_link_mode'],
             'organisation'       => $this->params['organisation'] ?? '',
             'authcode_fieldList' => $this->params['authcode_fieldList'] ?? '',
-            'plainParams'        => ''
+            'plainParams'        => '',
         ];
 
         // always plaintext
@@ -803,7 +795,7 @@ protected function createDMailQuick(array $indata)
             $dataHandler->process_datamap();
             $this->sys_dmail_uid = $dataHandler->substNEWwithIDs['NEW'];
 
-            $row = BackendUtility::getRecord('sys_dmail', intval($this->sys_dmail_uid));
+            $row = BackendUtility::getRecord('sys_dmail', (int)($this->sys_dmail_uid));
             // link in the mail
             $message = '<!--DMAILER_SECTION_BOUNDARY_-->' . $indata['message'] . '<!--DMAILER_SECTION_BOUNDARY_END-->';
             if (trim($this->params['use_rdct'])) {
@@ -818,9 +810,8 @@ protected function createDMailQuick(array $indata)
             }
             // fetch functions
             $theOutput = $this->compileQuickMail($row, $message);
-            // end fetch function
-        }
-        else {
+        // end fetch function
+        } else {
             if (!$dmail['sys_dmail']['NEW']['sendOptions']) {
                 $this->error = 'no_valid_url';
             }
@@ -845,7 +836,7 @@ protected function linkDMailRecord($uid)
                 'id' => $this->id,
                 'sys_dmail_uid' => $uid,
                 'fetchAtOnce' => 1,
-                'cmd' => 'info'
+                'cmd' => 'info',
             ]
         );
     }
@@ -868,7 +859,7 @@ protected function deleteLink($uid)
                 [
                     'id' => $this->id,
                     'uid' => $uid,
-                    'cmd' => 'delete'
+                    'cmd' => 'delete',
                 ]
             );
         }
@@ -880,8 +871,6 @@ protected function deleteLink($uid)
      * Delete existing dmail record
      *
      * @param int $uid record uid to be deleted
-     *
-     * @return void
      */
     protected function deleteDMail(int $uid)
     {
@@ -917,8 +906,7 @@ protected function compileQuickMail(array $row, $message)
         if (!$message || !$htmlmail->getPartPlainConfig('content')) {
             $erg['errorTitle'] = $this->getLanguageService()->getLL('dmail_error');
             $erg['errorText'] = $this->getLanguageService()->getLL('dmail_no_plain_content');
-        }
-        elseif (!strstr(base64_decode($htmlmail->getPartPlainConfig('content')), '<!--DMAILER_SECTION_BOUNDARY')) {
+        } elseif (!strstr(base64_decode($htmlmail->getPartPlainConfig('content')), '<!--DMAILER_SECTION_BOUNDARY')) {
             $erg['warningTitle'] = $this->getLanguageService()->getLL('dmail_warning');
             $erg['warningText'] = $this->getLanguageService()->getLL('dmail_no_plain_boundaries');
         }
@@ -931,8 +919,9 @@ protected function compileQuickMail(array $row, $message)
             $mailContent = base64_encode(serialize($htmlmail->getParts()));
 
             GeneralUtility::makeInstance(SysDmailRepository::class)->updateSysDmail(
-                intval($this->sys_dmail_uid),
-                $htmlmail->getCharset(), $mailContent
+                (int)($this->sys_dmail_uid),
+                $htmlmail->getCharset(),
+                $mailContent
             );
         }
 
@@ -962,7 +951,7 @@ protected function renderRecordDetailsTable(array $row): array
                         'id' => $this->id,
                         'sys_dmail_uid' => $row['uid'],
                         'fetchAtOnce' => 1,
-                        'cmd' => 'info'
+                        'cmd' => 'info',
                     ]
                 );
 
@@ -974,22 +963,20 @@ protected function renderRecordDetailsTable(array $row): array
                     ],
                     'returnUrl' => $requestUri->__toString(),
                 ]);
-            }
-            else {
+            } else {
                 $label = $this->getLanguageService()->getLL('dmail_noEdit_noPerms');
             }
-        }
-        else {
+        } else {
             $label = $this->getLanguageService()->getLL('dmail_noEdit_isSent');
         }
 
         $trs = [];
-        $nameArr = ['from_name','from_email','replyto_name','replyto_email','organisation','return_path','priority','type','page',
-            'sendOptions','includeMedia','flowedFormat','sys_language_uid','plainParams','HTMLParams','encoding','charset','issent','renderedsize'];
+        $nameArr = ['from_name', 'from_email', 'replyto_name', 'replyto_email', 'organisation', 'return_path', 'priority', 'type', 'page',
+            'sendOptions', 'includeMedia', 'flowedFormat', 'sys_language_uid', 'plainParams', 'HTMLParams', 'encoding', 'charset', 'issent', 'renderedsize'];
         foreach ($nameArr as $name) {
             $trs[] = [
                 'title' => DirectMailUtility::fName($name),
-                'value' => htmlspecialchars((string)BackendUtility::getProcessedValue('sys_dmail', $name, ($row[$name] ?? false)))
+                'value' => htmlspecialchars((string)BackendUtility::getProcessedValue('sys_dmail', $name, ($row[$name] ?? false))),
             ];
         }
 
@@ -997,7 +984,7 @@ protected function renderRecordDetailsTable(array $row): array
         $fileNames = [];
         $attachments = DirectMailUtility::getAttachments((int)($row['uid'] ?? 0));
         /** @var FileReference $attachment */
-        if(count($attachments)) {
+        if (count($attachments)) {
             foreach ($attachments as $attachment) {
                 $fileNames[] = $attachment->getName();
             }
@@ -1005,7 +992,7 @@ protected function renderRecordDetailsTable(array $row): array
 
         $trs[] = [
             'title' => DirectMailUtility::fName('attachment'),
-            'value' => implode(', ', $fileNames)
+            'value' => implode(', ', $fileNames),
         ];
 
         return [
@@ -1016,7 +1003,7 @@ protected function renderRecordDetailsTable(array $row): array
             'trs' => $trs,
             'label' => $label,
             'edit' => $edit,
-            'editParams' => $editParams
+            'editParams' => $editParams,
         ];
     }
 
@@ -1030,7 +1017,7 @@ protected function getTestMailConfig(): array
     {
         $data = [
             'test_tt_address'  => '',
-            'test_dmail_group_table' => []
+            'test_dmail_group_table' => [],
         ];
 
         if ($this->params['test_tt_address_uids'] ?? false) {
@@ -1056,7 +1043,7 @@ protected function getTestMailConfig(): array
                         'id' => $this->id,
                         'sys_dmail_uid' => $this->sys_dmail_uid,
                         'cmd' => 'send_mail_test',
-                        'sys_dmail_group_uid[]' => $row['uid']
+                        'sys_dmail_group_uid[]' => $row['uid'],
                     ]
                 );
 
@@ -1068,7 +1055,7 @@ protected function getTestMailConfig(): array
                     'iconFactory' => $this->iconFactory->getIconForRecord('sys_dmail_group', $row, Icon::SIZE_SMALL),
                     'title' => htmlspecialchars($row['title']),
                     'uid' => $row['uid'],
-                    'tds' => $this->displayMailGroupTest($result)
+                    'tds' => $this->displayMailGroupTest($result),
                 ];
             }
         }
@@ -1164,8 +1151,7 @@ protected function sendMail($row)
                 );
                 $this->messageQueue->addMessage($message);
             }
-        }
-        elseif ($this->cmd == 'send_mail_test') {
+        } elseif ($this->cmd == 'send_mail_test') {
             // step 4, sending test personalized test emails
             // setting Testmail flag
             $htmlmail->setTestmail((bool)$this->params['testmail']);
@@ -1189,8 +1175,7 @@ protected function sendMail($row)
                         );
                         $this->messageQueue->addMessage($message);
                     }
-                }
-                else {
+                } else {
                     $message = $this->createFlashMessage(
                         'Error: No valid recipient found to send test mail to. #1579209279',
                         $this->getLanguageService()->getLL('send_sending'),
@@ -1199,8 +1184,7 @@ protected function sendMail($row)
                     );
                     $this->messageQueue->addMessage($message);
                 }
-            }
-            elseif (is_array(GeneralUtility::_GP('sys_dmail_group_uid'))) {
+            } elseif (is_array(GeneralUtility::_GP('sys_dmail_group_uid'))) {
                 // personalized to group
                 $result = $this->cmd_compileMailGroup(GeneralUtility::_GP('sys_dmail_group_uid'));
 
@@ -1218,8 +1202,7 @@ protected function sendMail($row)
                 );
                 $this->messageQueue->addMessage($message);
             }
-        }
-        else {
+        } else {
             // step 5, sending personalized emails to the mailqueue
 
             // prepare the email for sending with the mailqueue
@@ -1237,7 +1220,7 @@ protected function sendMail($row)
                 $updateFields = [
                     'recipientGroups' => implode(',', $recipientGroups),
                     'scheduled'  => $distributionTime,
-                    'query_info' => serialize($queryInfo)
+                    'query_info' => serialize($queryInfo),
                 ];
 
                 if (GeneralUtility::_GP('testmail')) {
@@ -1250,8 +1233,7 @@ protected function sendMail($row)
                     $updateFields['scheduled'] = 0;
                     $content = $this->getLanguageService()->getLL('send_draft_scheduler');
                     $sectionTitle = $this->getLanguageService()->getLL('send_draft_saved');
-                }
-                else {
+                } else {
                     $content = $this->getLanguageService()->getLL('send_was_scheduled_for') . ' ' . BackendUtility::datetime($distributionTime);
                     $sectionTitle = $this->getLanguageService()->getLL('send_was_scheduled');
                 }
@@ -1341,9 +1323,9 @@ public function getRecordList(array $listArr, $table, $editLinkFlag = 1, $testMa
                             'edit' => [
                                 $table => [
                                     $row['uid'] => 'edit',
-                                ]
+                                ],
                             ],
-                            'returnUrl' => $this->requestUri . '&cmd=send_test&sys_dmail_uid=' . $this->sys_dmail_uid . '&pages_uid=' . $this->pages_uid
+                            'returnUrl' => $this->requestUri . '&cmd=send_test&sys_dmail_uid=' . $this->sys_dmail_uid . '&pages_uid=' . $this->pages_uid,
                         ];
 
                         $editOnClick = $this->getEditOnClickLink($params);
@@ -1356,7 +1338,7 @@ public function getRecordList(array $listArr, $table, $editLinkFlag = 1, $testMa
                                 'id' => $this->id,
                                 'sys_dmail_uid' => $this->sys_dmail_uid,
                                 'cmd' => 'send_mail_test',
-                                'tt_address_uid' => $row['uid']
+                                'tt_address_uid' => $row['uid'],
                             ]
                         );
                     }
@@ -1367,7 +1349,7 @@ public function getRecordList(array $listArr, $table, $editLinkFlag = 1, $testMa
                     'editOnClick' => $editOnClick,
                     'testLink' => $moduleUrl,
                     'name' => $row['name'],
-                    'email' => $row['email']
+                    'email' => $row['email'],
                 ];
             }
         }
@@ -1415,8 +1397,8 @@ protected function cmd_finalmail($direct_mail_row)
 
         $opt = [];
         $lastGroup = null;
-        if($groups) {
-            foreach($groups as $group)  {
+        if ($groups) {
+            foreach ($groups as $group) {
                 $result = $this->cmd_compileMailGroup([$group['uid']]);
                 $count = 0;
                 $idLists = $result['queryInfo']['id_lists'];
@@ -1436,7 +1418,7 @@ protected function cmd_finalmail($direct_mail_row)
                 $opt[] = [
                     'uid' => $group['uid'],
                     'title' => $group['title'],
-                    'count' => $count
+                    'count' => $count,
                 ];
                 $lastGroup = $group;
             }
@@ -1462,7 +1444,7 @@ protected function cmd_finalmail($direct_mail_row)
             'lastGroup' => $lastGroup,
             'opt' => $opt,
             'send_mail_datetime_hr' => strftime('%H:%M %d-%m-%Y', time()),
-            'send_mail_datetime' => strftime('%H:%M %d-%m-%Y', time())
+            'send_mail_datetime' => strftime('%H:%M %d-%m-%Y', time()),
         ];
     }
 
@@ -1537,7 +1519,7 @@ public function cmd_compileMailGroup(array $groups)
         }
 
         return [
-            'queryInfo' => ['id_lists' => $idLists]
+            'queryInfo' => ['id_lists' => $idLists],
         ];
     }
 
@@ -1584,7 +1566,7 @@ protected function getSingleMailGroup($groupUid)
 
                         // Make queries
                         if ($pidList) {
-                            $whichTables = intval($mailGroup['whichtables']);
+                            $whichTables = (int)($mailGroup['whichtables']);
                             if ($whichTables&1) {
                                 // tt_address
                                 $idLists['tt_address'] = GeneralUtility::makeInstance(TempRepository::class)->getIdList('tt_address', $pidList, $groupUid, $mailGroup['select_categories']);
@@ -1612,8 +1594,7 @@ protected function getSingleMailGroup($groupUid)
                         if ($mailGroup['csv'] == 1) {
                             $dmCsvUtility = GeneralUtility::makeInstance(DmCsvUtility::class);
                             $recipients = $dmCsvUtility->rearrangeCsvValues($dmCsvUtility->getCsvValues($mailGroup['list']), $this->fieldList);
-                        }
-                        else {
+                        } else {
                             $mailGroupList = $mailGroup['list'];
                             $recipients = $mailGroupList ? $this->rearrangePlainMails(array_unique(preg_split('|[[:space:],;]+|', $mailGroupList))) : [];
                         }
@@ -1632,15 +1613,13 @@ protected function getSingleMailGroup($groupUid)
                     case 3:
                         // Special query list
                         $mailGroup = $this->updateSpecialQuery($mailGroup);
-                        $whichTables = intval($mailGroup['whichtables']);
+                        $whichTables = (int)($mailGroup['whichtables']);
                         $table = '';
                         if ($whichTables&1) {
                             $table = 'tt_address';
-                        }
-                        elseif ($whichTables&2) {
+                        } elseif ($whichTables&2) {
                             $table = 'fe_users';
-                        }
-                        elseif ($this->userTable && ($whichTables&4)) {
+                        } elseif ($this->userTable && ($whichTables&4)) {
                             $table = $this->userTable;
                         }
 
@@ -1678,15 +1657,13 @@ public function updateSpecialQuery(array $mailGroup)
         $queryTable = $set['queryTable'];
         $queryConfig = GeneralUtility::_GP('queryConfig');
 
-        $whichTables = intval($mailGroup['whichtables']);
+        $whichTables = (int)($mailGroup['whichtables']);
         $table = '';
         if ($whichTables&1) {
             $table = 'tt_address';
-        }
-        elseif ($whichTables&2) {
+        } elseif ($whichTables&2) {
             $table = 'fe_users';
-        }
-        elseif ($this->userTable && ($whichTables&4)) {
+        } elseif ($this->userTable && ($whichTables&4)) {
             $table = $this->userTable;
         }
 
@@ -1705,16 +1682,14 @@ public function updateSpecialQuery(array $mailGroup)
             $whichTables = 0;
             if ($this->MOD_SETTINGS['queryTable'] == 'tt_address') {
                 $whichTables = 1;
-            }
-            elseif ($this->MOD_SETTINGS['queryTable'] == 'fe_users') {
+            } elseif ($this->MOD_SETTINGS['queryTable'] == 'fe_users') {
                 $whichTables = 2;
-            }
-            elseif ($this->MOD_SETTINGS['queryTable'] == $this->userTable) {
+            } elseif ($this->MOD_SETTINGS['queryTable'] == $this->userTable) {
                 $whichTables = 4;
             }
             $updateFields = [
                 'whichtables' => (int)$whichTables,
-                'query' => $this->MOD_SETTINGS['queryConfig']
+                'query' => $this->MOD_SETTINGS['queryConfig'],
             ];
 
             $done = GeneralUtility::makeInstance(SysDmailGroupRepository::class)->updateSysDmailGroupRecord((int)$mailGroup['uid'], $updateFields);
@@ -1742,7 +1717,7 @@ public function makeCategoriesForm(array $row, $indata)
             'pages_uid' => $this->pages_uid,
             'cmd' => $this->CMD,
             'update_cats' => $this->getLanguageService()->getLL('nl_l_update'),
-            'output' => ''
+            'output' => '',
         ];
         $theOutput = '';
 
@@ -1776,8 +1751,7 @@ public function makeCategoriesForm(array $row, $indata)
         );
         if (empty($rows)) {
             $output['subtitle'] = $this->getLanguageService()->getLL('nl_cat_msg1');
-        }
-        else {
+        } else {
             //https://api.typo3.org/master/class_t_y_p_o3_1_1_c_m_s_1_1_backend_1_1_utility_1_1_backend_utility.html#a5522e461e5ce3b1b5c87ee7546af449d
             $output['subtitle'] = BackendUtility::cshItem($this->cshTable, 'assign_categories');
             $output['rowsFound'] = true;
@@ -1796,7 +1770,7 @@ public function makeCategoriesForm(array $row, $indata)
                     $output['rows'][] = [
                         'separator' => true,
                         'title' => $this->getLanguageService()->getLL('nl_l_column'),
-                        'value' => BackendUtility::getProcessedValue('tt_content', 'colPos', $row['colPos'])
+                        'value' => BackendUtility::getProcessedValue('tt_content', 'colPos', $row['colPos']),
                     ];
                     $colPosVal = $row['colPos'];
                 }
@@ -1808,7 +1782,7 @@ public function makeCategoriesForm(array $row, $indata)
                     $cboxes[] = [
                         'pKey' => $pKey,
                         'checked' => GeneralUtility::inList($categoriesRow, $pKey) ? true : false,
-                        'pVal' => htmlspecialchars($pVal)
+                        'pVal' => htmlspecialchars($pVal),
                     ];
                 }
 
@@ -1821,7 +1795,7 @@ public function makeCategoriesForm(array $row, $indata)
                     'bodytext' => empty($row['bodytext']) ? '' : GeneralUtility::fixed_lgd_cs(strip_tags($row['bodytext']), 200),
                     'color' => $row['module_sys_dmail_category'] ? 'red' : 'green',
                     'labelOnlyAll' => $row['module_sys_dmail_category'] ? $this->getLanguageService()->getLL('nl_l_ONLY') : $this->getLanguageService()->getLL('nl_l_ALL'),
-                    'checkboxes' => $cboxes
+                    'checkboxes' => $cboxes,
                 ];
             }
         }
@@ -1840,9 +1814,8 @@ public function getLanguageParam($sysLanguageUid, array $params)
         if (isset($params['langParams.'][$sysLanguageUid])) {
             $param = $params['langParams.'][$sysLanguageUid];
 
-            // fallback: L == sys_language_uid
-        }
-        else {
+        // fallback: L == sys_language_uid
+        } else {
             $param = '&L=' . $sysLanguageUid;
         }
 
@@ -1873,14 +1846,14 @@ public function createDirectMailRecordFromPage(int $pageUid, array $parameters,
             'return_path'           => $parameters['return_path'] ?? '',
             'priority'              => $parameters['priority'] ?? 0,
             'use_rdct'              => (!empty($parameters['use_rdct']) ? $parameters['use_rdct']:0), /*$parameters['use_rdct'],*/
-            'long_link_mode'        => (!empty($parameters['long_link_mode']) ? $parameters['long_link_mode']:0),//$parameters['long_link_mode'],
+            'long_link_mode'        => (!empty($parameters['long_link_mode']) ? $parameters['long_link_mode']:0), //$parameters['long_link_mode'],
             'organisation'          => $parameters['organisation'] ?? '',
             'authcode_fieldList'    => $parameters['authcode_fieldList'] ?? '',
             'sendOptions'           => $GLOBALS['TCA']['sys_dmail']['columns']['sendOptions']['config']['default'],
             'long_link_rdct_url'    => $this->getUrlBase((int)$pageUid),
             'sys_language_uid'      => (int)$sysLanguageUid,
             'attachment'            => '',
-            'mailContent'           => ''
+            'mailContent'           => '',
         ];
 
         if ($newRecord['sys_language_uid'] > 0) {
@@ -1919,8 +1892,8 @@ public function createDirectMailRecordFromPage(int $pageUid, array $parameters,
         if ($newRecord['page'] && $newRecord['sendOptions']) {
             $tcemainData = [
                 'sys_dmail' => [
-                    'NEW' => $newRecord
-                ]
+                    'NEW' => $newRecord,
+                ],
             ];
 
             /* @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
@@ -1929,8 +1902,7 @@ public function createDirectMailRecordFromPage(int $pageUid, array $parameters,
             $dataHandler->start($tcemainData, []);
             $dataHandler->process_datamap();
             $result = $dataHandler->substNEWwithIDs['NEW'];
-        }
-        elseif (!$newRecord['sendOptions']) {
+        } elseif (!$newRecord['sendOptions']) {
             $result = false;
         }
         return $result;
@@ -1966,7 +1938,7 @@ public function createDirectMailRecordFromExternalURL($subject, $externalUrlHtml
             'organisation'          => $parameters['organisation'] ?? '',
             'authcode_fieldList'    => $parameters['authcode_fieldList'] ?? '',
             'sendOptions'           => $GLOBALS['TCA']['sys_dmail']['columns']['sendOptions']['config']['default'],
-            'long_link_rdct_url'    => $this->getUrlBase((int)($parameters['page'] ?? 0))
+            'long_link_rdct_url'    => $this->getUrlBase((int)($parameters['page'] ?? 0)),
         ];
 
         // If params set, set default values:
@@ -1985,8 +1957,7 @@ public function createDirectMailRecordFromExternalURL($subject, $externalUrlHtml
         if (!$externalUrlPlain || $urlParts === false || !$urlParts['host']) {
             $newRecord['plainParams'] = '';
             $newRecord['sendOptions'] &= 254;
-        }
-        else {
+        } else {
             $newRecord['plainParams'] = $externalUrlPlain;
         }
 
@@ -1994,8 +1965,7 @@ public function createDirectMailRecordFromExternalURL($subject, $externalUrlHtml
         $urlParts = @parse_url($externalUrlHtml);
         if (!$externalUrlHtml || $urlParts === false || !$urlParts['host']) {
             $newRecord['sendOptions'] &= 253;
-        }
-        else {
+        } else {
             $newRecord['HTMLParams'] = $externalUrlHtml;
         }
 
@@ -2003,8 +1973,8 @@ public function createDirectMailRecordFromExternalURL($subject, $externalUrlHtml
         if ($newRecord['pid'] && $newRecord['sendOptions']) {
             $tcemainData = [
                 'sys_dmail' => [
-                    'NEW' => $newRecord
-                ]
+                    'NEW' => $newRecord,
+                ],
             ];
 
             /* @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
@@ -2013,8 +1983,7 @@ public function createDirectMailRecordFromExternalURL($subject, $externalUrlHtml
             $dataHandler->start($tcemainData, []);
             $dataHandler->process_datamap();
             $result = $dataHandler->substNEWwithIDs['NEW'];
-        }
-        elseif (!$newRecord['sendOptions']) {
+        } elseif (!$newRecord['sendOptions']) {
             $result = false;
         }
         return $result;
@@ -2039,9 +2008,8 @@ protected function getUrlBase(int $pageId): string
 
                 return sprintf('%s://%s', $base->getScheme(), $base->getHost());
             }
-            else {
-                return ''; // No site found in root line of pageId
-            }
+
+            return ''; // No site found in root line of pageId
         }
 
         return ''; // No valid pageId
@@ -2069,8 +2037,7 @@ protected function getCharacterSet(): string
 
         if (!empty($settings['config.']['metaCharset'])) {
             $characterSet = $settings['config.']['metaCharset'];
-        }
-        elseif (!empty($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'])) {
+        } elseif (!empty($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'])) {
             $characterSet = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'];
         }
 
diff --git a/Classes/Module/MailerEngineController.php b/Classes/Module/MailerEngineController.php
index 6a22b5a1f..deeec324f 100644
--- a/Classes/Module/MailerEngineController.php
+++ b/Classes/Module/MailerEngineController.php
@@ -1,16 +1,16 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
 
 use DirectMailTeam\DirectMail\Dmailer;
-use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
 use DirectMailTeam\DirectMail\Repository\SysDmailMaillogRepository;
+use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
 use DirectMailTeam\DirectMail\Utility\Typo3ConfVarsUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Http\HtmlResponse;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -19,7 +19,7 @@ class MailerEngineController extends MainController
 {
     /**
      * for cmd == 'delete'
-     * @var integer
+     * @var int
      */
     protected int $uid = 0;
 
@@ -32,7 +32,8 @@ class MailerEngineController extends MainController
      */
     protected $moduleName = 'DirectMailNavFrame_MailerEngine';
 
-    protected function initMailerEngine(ServerRequestInterface $request): void {
+    protected function initMailerEngine(ServerRequestInterface $request): void
+    {
         $queryParams = $request->getQueryParams();
         $parsedBody = $request->getParsedBody();
 
@@ -40,7 +41,7 @@ protected function initMailerEngine(ServerRequestInterface $request): void {
         $this->invokeMailerEngine = (bool)($queryParams['invokeMailerEngine'] ?? false);
     }
 
-    public function indexAction(ServerRequestInterface $request) : ResponseInterface
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
         $this->view = $this->configureTemplatePaths('MailerEngine');
 
@@ -68,26 +69,23 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
                             'invoke' => $mailerEngine['invoke'],
                             'moduleName' => $this->moduleName,
                             'moduleUrl' => $mailerEngine['moduleUrl'],
-                            'show' => true
+                            'show' => true,
                         ]
                     );
-                }
-                elseif ($this->id != 0) {
+                } elseif ($this->id != 0) {
                     $message = $this->createFlashMessage($this->getLanguageService()->getLL('dmail_noRegular'), $this->getLanguageService()->getLL('dmail_newsletters'), 1, false);
                     $this->messageQueue->addMessage($message);
                 }
-            }
-            else {
+            } else {
                 $message = $this->createFlashMessage($this->getLanguageService()->getLL('select_folder'), $this->getLanguageService()->getLL('header_mailer'), 1, false);
                 $this->messageQueue->addMessage($message);
                 $this->view->assignMultiple(
                     [
-                        'dmLinks' => $this->getDMPages($this->moduleName)
+                        'dmLinks' => $this->getDMPages($this->moduleName),
                     ]
                 );
             }
-        }
-        else {
+        } else {
             // If no access or if ID == zero
             $this->view = $this->configureTemplatePaths('NoAccess');
             $message = $this->createFlashMessage('If no access or if ID == zero', 'No Access', 1, false);
@@ -132,8 +130,8 @@ public function cronMonitor()
          */
         if (file_exists($this->getDmailerLockFilePath())) {
             $res = GeneralUtility::makeInstance(SysDmailMaillogRepository::class)->selectByResponseType(0);
-            if(is_array($res)) {
-                foreach($res as $lastSend) {
+            if (is_array($res)) {
+                foreach ($res as $lastSend) {
                     if (($lastSend['tstamp'] < time()) && ($lastSend['tstamp'] > $lastCronjobShouldBeNewThan)) {
                         // cron is sending
                         $mailerStatus = 1;
@@ -143,7 +141,7 @@ public function cronMonitor()
                     }
                 }
             }
-            // cron is idle or no cron
+        // cron is idle or no cron
         } elseif (strpos($logContent, 'error')) {
             // error in log file
             $mailerStatus = -1;
@@ -217,7 +215,7 @@ public function mailerengine()
                 'DirectMailNavFrame_MailerEngine',
                 [
                     'id' => $this->id,
-                    'invokeMailerEngine' => 1
+                    'invokeMailerEngine' => 1,
                 ]
             );
 
@@ -226,8 +224,8 @@ public function mailerengine()
 
         $data = [];
         $rows = GeneralUtility::makeInstance(SysDmailRepository::class)->selectSysDmailsByPid($this->id);
-        if(is_array($rows)) {
-            foreach($rows as $row) {
+        if (is_array($rows)) {
+            foreach ($rows as $row) {
                 $data[] = [
                     'uid'             => $row['uid'],
                     'icon'            => $this->iconFactory->getIconForRecord('sys_dmail', $row, Icon::SIZE_SMALL)->render(),
@@ -236,7 +234,7 @@ public function mailerengine()
                     'scheduled_begin' => $row['scheduled_begin'] ? BackendUtility::datetime($row['scheduled_begin']) : '',
                     'scheduled_end'   => $row['scheduled_end'] ? BackendUtility::datetime($row['scheduled_end']) : '',
                     'sent'            => $this->getSysDmailMaillogsCountres($row['uid']),
-                    'delete'          => $this->canDelete($row['uid'])
+                    'delete'          => $this->canDelete($row['uid']),
                 ];
             }
         }
@@ -250,8 +248,8 @@ private function getSysDmailMaillogsCountres(int $uid): int
         $countres = GeneralUtility::makeInstance(SysDmailMaillogRepository::class)->countSysDmailMaillogs($uid);
         $count = 0;
         //@TODO
-        if(is_array($countres)) {
-            foreach($countres as $cRow) {
+        if (is_array($countres)) {
+            foreach ($countres as $cRow) {
                 $count = (int)$cRow['COUNT(*)'];
             }
         }
@@ -270,15 +268,13 @@ public function canDelete($uid)
         $dmail = BackendUtility::getRecord('sys_dmail', $uid);
 
         // show delete icon if newsletter hasn't been sent, or not yet finished sending
-        return ($dmail['scheduled_begin'] === 0 || $dmail['scheduled_end'] === 0);
+        return $dmail['scheduled_begin'] === 0 || $dmail['scheduled_end'] === 0;
     }
 
     /**
      * Delete existing dmail record
      *
      * @param int $uid Record uid to be deleted
-     *
-     * @return void
      */
     public function deleteDMail(int $uid)
     {
@@ -319,6 +315,6 @@ public function linkDMail_record($str, $uid)
     {
         return $str;
         //TODO: Link to detail page for the new queue
-        #return '<a href="index.php?id='.$this->id.'&sys_dmail_uid='.$uid.'&SET[dmail_mode]=direct">'.$str.'</a>';
+        //return '<a href="index.php?id='.$this->id.'&sys_dmail_uid='.$uid.'&SET[dmail_mode]=direct">'.$str.'</a>';
     }
 }
diff --git a/Classes/Module/MainController.php b/Classes/Module/MainController.php
index 6546d2b94..708f19675 100644
--- a/Classes/Module/MainController.php
+++ b/Classes/Module/MainController.php
@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
 
-use DirectMailTeam\DirectMail\DirectMailUtility;
 use DirectMailTeam\DirectMail\Repository\PagesRepository;
 use DirectMailTeam\DirectMail\Utility\TsUtility;
 use Psr\Http\Message\ServerRequestInterface;
@@ -13,7 +13,6 @@
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
@@ -28,8 +27,8 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 
-class MainController {
-
+class MainController
+{
     /**
      * ModuleTemplate Container
      *
@@ -77,7 +76,8 @@ class MainController {
     public function __construct(
         ModuleTemplate $moduleTemplate = null,
         IconFactory $iconFactory = null,
-        PageRenderer $pageRenderer = null)
+        PageRenderer $pageRenderer = null
+    )
     {
         $this->moduleTemplate = $moduleTemplate ?? GeneralUtility::makeInstance(ModuleTemplate::class);
         $this->iconFactory = $iconFactory ?? GeneralUtility::makeInstance(IconFactory::class);
@@ -115,7 +115,7 @@ protected function init(ServerRequestInterface $request): void
 
         $this->messageQueue = $this->getMessageQueue();
 
-        if($this->updatePageTree) {
+        if ($this->updatePageTree) {
             \TYPO3\CMS\Backend\Utility\BackendUtility::setUpdateSignal('updatePageTree');
         }
     }
@@ -124,7 +124,7 @@ protected function init(ServerRequestInterface $request): void
      * Configure template paths for your backend module
      * @return StandaloneView
      */
-    protected function configureTemplatePaths (string $templateName): StandaloneView
+    protected function configureTemplatePaths(string $templateName): StandaloneView
     {
         $view = GeneralUtility::makeInstance(StandaloneView::class);
         $view->setTemplateRootPaths(['EXT:direct_mail/Resources/Private/Templates/']);
@@ -135,7 +135,6 @@ protected function configureTemplatePaths (string $templateName): StandaloneView
     }
 
     /**
-     *
         https://api.typo3.org/11.5/class_t_y_p_o3_1_1_c_m_s_1_1_core_1_1_messaging_1_1_abstract_message.html
         const 	NOTICE = -2
         const 	INFO = -1
@@ -149,7 +148,8 @@ protected function configureTemplatePaths (string $templateName): StandaloneView
      */
     protected function createFlashMessage(string $messageText, string $messageHeader = '', int $messageType = 0, bool $storeInSession = false)
     {
-        return GeneralUtility::makeInstance(FlashMessage::class,
+        return GeneralUtility::makeInstance(
+            FlashMessage::class,
             $messageText,
             $messageHeader, // [optional] the header
             $messageType, // [optional] the severity defaults to \TYPO3\CMS\Core\Messaging\FlashMessage::OK
@@ -168,7 +168,7 @@ protected function getModulName()
         $module = $this->pageinfo['module'] ?? false;
 
         if (!$module && isset($this->pageinfo['pid'])) {
-            $pidrec = BackendUtility::getRecord('pages', intval($this->pageinfo['pid']));
+            $pidrec = BackendUtility::getRecord('pages', (int)($this->pageinfo['pid']));
             $module = $pidrec['module'] ?? false;
         }
 
@@ -232,13 +232,13 @@ protected function getDMPages(string $moduleName): array
         $dmLinks = [];
         $rows = GeneralUtility::makeInstance(PagesRepository::class)->getDMPages();
 
-        if(count($rows)) {
-            foreach($rows as $row) {
-                if($this->getBackendUser()->doesUserHaveAccess(BackendUtility::getRecord('pages', (int)$row['uid']), 2)) {
+        if (count($rows)) {
+            foreach ($rows as $row) {
+                if ($this->getBackendUser()->doesUserHaveAccess(BackendUtility::getRecord('pages', (int)$row['uid']), 2)) {
                     $dmLinks[] = [
                         'id' => $row['uid'],
                         'url' => $this->buildUriFromRoute($this->moduleName, ['id' => $row['uid'], 'updatePageTree' => '1']),
-                        'title' => $row['title']
+                        'title' => $row['title'],
                     ];
                 }
             }
@@ -282,7 +282,7 @@ protected function getRecordList(array $listArr, string $table)
             'editLinkTitle' => $lang->getLL('dmail_edit'),
             'actionsOpen' => $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL),
             'counter' => is_array($listArr) ? count($listArr) : 0,
-            'rows' => []
+            'rows' => [],
         ];
 
         $isAllowedDisplayTable = $this->getBackendUser()->check('tables_select', $table);
@@ -297,22 +297,22 @@ protected function getRecordList(array $listArr, string $table)
                     $urlParameters = [
                         'edit' => [
                             $table => [
-                                $row['uid'] => 'edit'
-                            ]
+                                $row['uid'] => 'edit',
+                            ],
                         ],
-                        'returnUrl' => $this->requestUri
+                        'returnUrl' => $this->requestUri,
                     ];
 
                     $editLink = $this->buildUriFromRoute('record_edit', $urlParameters);
                 }
 
                 $name = $row['name'] ?? '';
-                if($name == '') {
-                    if($row['first_name'] ?? '') {
-                        $name = $row['first_name'].' ';
+                if ($name == '') {
+                    if ($row['first_name'] ?? '') {
+                        $name = $row['first_name'] . ' ';
                     }
-                    if($row['middle_name'] ?? '') {
-                        $name .= $row['middle_name'].' ';
+                    if ($row['middle_name'] ?? '') {
+                        $name .= $row['middle_name'] . ' ';
                     }
                     $name .= $row['last_name'] ?? '';
                 }
@@ -321,7 +321,7 @@ protected function getRecordList(array $listArr, string $table)
                     'icon' => $tableIcon,
                     'editLink' => $editLink,
                     'email' => $isAllowedDisplayTable ? htmlspecialchars($row['email']) : $notAllowedPlaceholder,
-                    'name' => $isAllowedDisplayTable ? htmlspecialchars($name) : ''
+                    'name' => $isAllowedDisplayTable ? htmlspecialchars($name) : '',
                 ];
             }
         }
@@ -341,7 +341,7 @@ protected function getEditOnClickLink(array $params): string
         /** @var UriBuilder $uriBuilder */
         $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
 
-        return 'window.location.href=' . GeneralUtility::quoteJSvalue((string) $uriBuilder->buildUriFromRoute('record_edit', $params)) . '; return false;';
+        return 'window.location.href=' . GeneralUtility::quoteJSvalue((string)$uriBuilder->buildUriFromRoute('record_edit', $params)) . '; return false;';
     }
 
     /**
diff --git a/Classes/Module/NavFrameController.php b/Classes/Module/NavFrameController.php
index 9b955dded..0dd09f86e 100644
--- a/Classes/Module/NavFrameController.php
+++ b/Classes/Module/NavFrameController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
@@ -18,7 +19,6 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException;
 use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
@@ -36,7 +36,7 @@ class NavFrameController extends MainController
      */
     protected $doHighlight;
 
-    public function indexAction(ServerRequestInterface $request) : ResponseInterface
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
         $currentModule = (string)($request->getQueryParams()['currentModule'] ?? $request->getParsedBody()['currentModule'] ?? 'DirectMailNavFrame_Configuration');
         /** @var UriBuilder $uriBuilder */
@@ -77,7 +77,8 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
         return new HtmlResponse($this->moduleTemplate->renderContent());
     }
 
-    protected function getJSNavFrame($currentModule, $currentSubScript) {
+    protected function getJSNavFrame($currentModule, $currentSubScript)
+    {
         // @TODO Uncaught Error: Writing to fsMod is not possible anymore, use ModuleStateStorage instead.
         // https://docs.typo3.org/c/typo3/cms-core/master/en-us/Changelog/11.4/Deprecation-94762-DeprecateJavaScriptTopfsModState.html
         // https://github.com/typo3/typo3/commit/ca4afee813
@@ -123,7 +124,8 @@ function hilight_row(frameSetModule,highLightID) {
         ;
     }
 
-    protected function getPages() {
+    protected function getPages()
+    {
         $queryBuilder = $this->getQueryBuilder('pages');
         $queryBuilder
             ->getRestrictions()
@@ -134,9 +136,9 @@ protected function getPages() {
             ->select('uid', 'title', 'module')
             ->from('pages')
             ->where(
-            $queryBuilder->expr()->eq(
-                'doktype',
-                '254'
+                $queryBuilder->expr()->eq(
+                    'doktype',
+                    '254'
                 )
             )
             ->andWhere(
@@ -162,14 +164,14 @@ protected function getPages() {
         return $statement;
     }
 
-    private function setDocHeader(string $active) {
+    private function setDocHeader(string $active)
+    {
         /**
         $docHeaderButtons = [
             'CSH' => BackendUtility::cshItem('_MOD_DirectMailNavFrame', 'folders', $GLOBALS['BACK_PATH'], true),
             'REFRESH' => '<a class="btn btn-default btn-sm " href="' . htmlspecialchars(GeneralUtility::linkThisScript(['unique' => uniqid('directmail_navframe')])) . '"></a>'
         ];
         */
-
         $buttonBar = $this->moduleTemplate->getDocHeaderComponent()->getButtonBar();
         $list = $buttonBar->makeLinkButton()
         ->setHref(GeneralUtility::linkThisScript(['unique' => uniqid('directmail_navframe')]))
diff --git a/Classes/Module/RecipientListController.php b/Classes/Module/RecipientListController.php
index 3f924032f..659907c44 100644
--- a/Classes/Module/RecipientListController.php
+++ b/Classes/Module/RecipientListController.php
@@ -1,10 +1,15 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
 
-use DirectMailTeam\DirectMail\Importer;
 use DirectMailTeam\DirectMail\DmQueryGenerator;
+use DirectMailTeam\DirectMail\Importer;
+use DirectMailTeam\DirectMail\Repository\FeUsersRepository;
+use DirectMailTeam\DirectMail\Repository\SysDmailGroupRepository;
+use DirectMailTeam\DirectMail\Repository\TempRepository;
+use DirectMailTeam\DirectMail\Repository\TtAddressRepository;
 use DirectMailTeam\DirectMail\Utility\DmCsvUtility;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -12,11 +17,6 @@
 use TYPO3\CMS\Core\Http\HtmlResponse;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use DirectMailTeam\DirectMail\DirectMailUtility;
-use DirectMailTeam\DirectMail\Repository\SysDmailGroupRepository;
-use DirectMailTeam\DirectMail\Repository\FeUsersRepository;
-use DirectMailTeam\DirectMail\Repository\TempRepository;
-use DirectMailTeam\DirectMail\Repository\TtAddressRepository;
 
 class RecipientListController extends MainController
 {
@@ -46,7 +46,8 @@ class RecipientListController extends MainController
 
     private bool $submit = false;
 
-    protected function initRecipientList(ServerRequestInterface $request): void {
+    protected function initRecipientList(ServerRequestInterface $request): void
+    {
         $queryParams = $request->getQueryParams();
         $parsedBody = $request->getParsedBody();
 
@@ -66,7 +67,7 @@ protected function initRecipientList(ServerRequestInterface $request): void {
         $this->submit = (bool)($parsedBody['submit'] ?? $queryParams['submit'] ?? false);
     }
 
-    public function indexAction(ServerRequestInterface $request) : ResponseInterface
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
         $this->view = $this->configureTemplatePaths('RecipientList');
 
@@ -87,26 +88,23 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
                             'data' => $data['data'],
                             'type' => $data['type'],
                             'formcontent' => $data['content'],
-                            'show' => true
+                            'show' => true,
                         ]
                     );
-                }
-                elseif ($this->id != 0) {
+                } elseif ($this->id != 0) {
                     $message = $this->createFlashMessage($this->getLanguageService()->getLL('dmail_noRegular'), $this->getLanguageService()->getLL('dmail_newsletters'), 1, false);
                     $this->messageQueue->addMessage($message);
                 }
-            }
-            else {
+            } else {
                 $message = $this->createFlashMessage($this->getLanguageService()->getLL('select_folder'), $this->getLanguageService()->getLL('header_recip'), 1, false);
                 $this->messageQueue->addMessage($message);
                 $this->view->assignMultiple(
                     [
-                        'dmLinks' => $this->getDMPages($this->moduleName)
+                        'dmLinks' => $this->getDMPages($this->moduleName),
                     ]
                 );
             }
-        }
-        else {
+        } else {
             // If no access or if ID == zero
             $this->view = $this->configureTemplatePaths('NoAccess');
             $message = $this->createFlashMessage('If no access or if ID == zero', 'No Access', 1, false);
@@ -165,13 +163,13 @@ protected function moduleContent()
     protected function showExistingRecipientLists()
     {
         $data = [
-            'rows' => []
+            'rows' => [],
         ];
 
         $rows = GeneralUtility::makeInstance(SysDmailGroupRepository::class)->selectSysDmailGroupByPid($this->id, trim($GLOBALS['TCA']['sys_dmail_group']['ctrl']['default_sortby']));
 
-        foreach($rows as $row) {
-            $result = $this->cmd_compileMailGroup(intval($row['uid']));
+        foreach ($rows as $row) {
+            $result = $this->cmd_compileMailGroup((int)($row['uid']));
             $count = 0;
             $idLists = $result['queryInfo']['id_lists'];
 
@@ -193,15 +191,15 @@ protected function showExistingRecipientLists()
                 'reciplink'   => $this->linkRecip_record('<strong>' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($row['title'], 30)) . '</strong>&nbsp;&nbsp;', $row['uid']),
                 'type'        => htmlspecialchars(BackendUtility::getProcessedValue('sys_dmail_group', 'type', $row['type'])),
                 'description' => BackendUtility::getProcessedValue('sys_dmail_group', 'description', htmlspecialchars($row['description'] ?? '')),
-                'count'       => $count
+                'count'       => $count,
             ];
         }
 
         $data['editOnClickLink'] = $this->getEditOnClickLink([
             'edit' => [
                 'sys_dmail_group' => [
-                    $this->id => 'new'
-                ]
+                    $this->id => 'new',
+                ],
             ],
             'returnUrl' => $this->requestUri,
         ]);
@@ -213,7 +211,7 @@ protected function showExistingRecipientLists()
             $this->moduleName,
             [
                 'id' => $this->id,
-                'cmd' => 'displayImport'
+                'cmd' => 'displayImport',
             ]
         );
         return $data;
@@ -260,7 +258,7 @@ protected function cmd_compileMailGroup(int $groupUid)
 
                         // Make queries
                         if ($pidList) {
-                            $whichTables = intval($mailGroup['whichtables']);
+                            $whichTables = (int)($mailGroup['whichtables']);
                             // tt_address
                             if ($whichTables&1) {
                                 $idLists['tt_address'] = GeneralUtility::makeInstance(TempRepository::class)->getIdList('tt_address', $pidList, $groupUid, $mailGroup['select_categories']);
@@ -288,8 +286,7 @@ protected function cmd_compileMailGroup(int $groupUid)
                         if ($mailGroup['csv'] == 1) {
                             $dmCsvUtility = GeneralUtility::makeInstance(DmCsvUtility::class);
                             $recipients = $dmCsvUtility->rearrangeCsvValues($dmCsvUtility->getCsvValues($mailGroup['list']), $this->fieldList);
-                        }
-                        else {
+                        } else {
                             $mailGroupList = $mailGroup['list'];
                             $recipients = $mailGroupList ? $this->rearrangePlainMails(array_unique(preg_split('|[[:space:],;]+|', $mailGroupList))) : [];
                         }
@@ -308,15 +305,13 @@ protected function cmd_compileMailGroup(int $groupUid)
                     case 3:
                         // Special query list
                         $mailGroup = $this->updateSpecialQuery($mailGroup);
-                        $whichTables = intval($mailGroup['whichtables']);
+                        $whichTables = (int)($mailGroup['whichtables']);
                         $table = '';
                         if ($whichTables&1) {
                             $table = 'tt_address';
-                        }
-                        elseif ($whichTables&2) {
+                        } elseif ($whichTables&2) {
                             $table = 'fe_users';
-                        }
-                        elseif ($this->userTable && ($whichTables&4)) {
+                        } elseif ($this->userTable && ($whichTables&4)) {
                             $table = $this->userTable;
                         }
 
@@ -374,7 +369,7 @@ protected function cmd_compileMailGroup(int $groupUid)
         }
 
         return [
-            'queryInfo' => ['id_lists' => $idLists]
+            'queryInfo' => ['id_lists' => $idLists],
         ];
     }
 
@@ -421,7 +416,7 @@ protected function linkRecip_record($str, $uid)
                 'id' => $this->id,
                 'group_uid' => $uid,
                 'cmd' => 'displayMailGroup',
-                'SET[dmail_mode]' => 'recip'
+                'SET[dmail_mode]' => 'recip',
             ]
         );
         return '<a href="' . $moduleUrl . '">' . $str . '</a>';
@@ -462,7 +457,7 @@ protected function displayMailGroup($result)
             'group_totalRecipients' => $totalRecipients,
             'group_link_listall' => ($this->lCmd == '') ? GeneralUtility::linkThisScript(['lCmd'=>'listall']) : '',
             'tables' => [],
-            'special' => []
+            'special' => [],
         ];
 
         // do the CSV export
@@ -471,16 +466,14 @@ protected function displayMailGroup($result)
             $dmCsvUtility = GeneralUtility::makeInstance(DmCsvUtility::class);
             if ($csvValue == 'PLAINLIST') {
                 $dmCsvUtility->downloadCSV($idLists['PLAINLIST']);
-            }
-            elseif (GeneralUtility::inList('tt_address,fe_users,' . $this->userTable, $csvValue)) {
-                if($this->getBackendUser()->check('tables_select', $csvValue)) {
+            } elseif (GeneralUtility::inList('tt_address,fe_users,' . $this->userTable, $csvValue)) {
+                if ($this->getBackendUser()->check('tables_select', $csvValue)) {
                     $fields = $csvValue == 'fe_users' ? str_replace('phone', 'telephone', $this->fieldList) : $this->fieldList;
                     $fields .= ',tstamp';
 
                     $rows = GeneralUtility::makeInstance(TempRepository::class)->fetchRecordsListValues($idLists[$csvValue], $csvValue, $fields);
                     $dmCsvUtility->downloadCSV($rows);
-                }
-                else {
+                } else {
                     $message = $this->createFlashMessage(
                         '',
                         $this->getLanguageService()->getLL('mailgroup_table_disallowed_csv'),
@@ -500,7 +493,7 @@ protected function displayMailGroup($result)
                     $data['tables'][] = [
                         'title_table' => 'mailgroup_table_address',
                         'recipListConfig' => $this->getRecordList($rows, 'tt_address'),
-                        'table_custom' => ''
+                        'table_custom' => '',
                     ];
                 }
                 if (is_array($idLists['fe_users'] ?? false)) {
@@ -508,14 +501,14 @@ protected function displayMailGroup($result)
                     $data['tables'][] = [
                         'title_table' => 'mailgroup_table_fe_users',
                         'recipListConfig' => $this->getRecordList($rows, 'fe_users'),
-                        'table_custom' => ''
+                        'table_custom' => '',
                     ];
                 }
                 if (is_array($idLists['PLAINLIST'] ?? false)) {
                     $data['tables'][] = [
                         'title_table' => 'mailgroup_plain_list',
                         'recipListConfig' => $this->getRecordList($idLists['PLAINLIST'], 'sys_dmail_group'),
-                        'table_custom' => ''
+                        'table_custom' => '',
                     ];
                 }
                 if (!in_array($this->userTable, ['tt_address', 'fe_users', 'PLAINLIST']) && is_array($idLists[$this->userTable] ?? false)) {
@@ -523,7 +516,7 @@ protected function displayMailGroup($result)
                     $data['tables'][] = [
                         'title_table' => 'mailgroup_table_custom',
                         'recipListConfig' => $this->getRecordList($rows, $this->userTable),
-                        'table_custom' => ' '.$this->userTable
+                        'table_custom' => ' ' . $this->userTable,
                     ];
                 }
                 break;
@@ -533,7 +526,7 @@ protected function displayMailGroup($result)
                         'title_table' => 'mailgroup_table_address',
                         'title_recip' => 'mailgroup_recip_number',
                         'recip_counter' => ' ' . count($idLists['tt_address']),
-                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv'=>'tt_address'])
+                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv'=>'tt_address']),
                     ];
                 }
 
@@ -542,7 +535,7 @@ protected function displayMailGroup($result)
                         'title_table' => 'mailgroup_table_fe_users',
                         'title_recip' => 'mailgroup_recip_number',
                         'recip_counter' => ' ' . count($idLists['fe_users']),
-                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv'=>'fe_users'])
+                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv'=>'fe_users']),
                     ];
                 }
 
@@ -551,7 +544,7 @@ protected function displayMailGroup($result)
                         'title_table' => 'mailgroup_plain_list',
                         'title_recip' => 'mailgroup_recip_number',
                         'recip_counter' => ' ' . count($idLists['PLAINLIST']),
-                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv'=>'PLAINLIST'])
+                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv'=>'PLAINLIST']),
                     ];
                 }
 
@@ -560,7 +553,7 @@ protected function displayMailGroup($result)
                         'title_table' => 'mailgroup_table_custom',
                         'title_recip' => 'mailgroup_recip_number',
                         'recip_counter' => ' ' . count($idLists[$this->userTable]),
-                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv' => $this->userTable])
+                        'mailgroup_download_link' => GeneralUtility::linkThisScript(['csv' => $this->userTable]),
                     ];
                 }
 
@@ -587,15 +580,13 @@ protected function updateSpecialQuery($mailGroup)
         $queryTable = $set['queryTable'] ?? '';
         $queryConfig = GeneralUtility::_GP('queryConfig');
 
-        $whichTables = intval($mailGroup['whichtables']);
+        $whichTables = (int)($mailGroup['whichtables']);
         $table = '';
         if ($whichTables&1) {
             $table = 'tt_address';
-        }
-        elseif ($whichTables&2) {
+        } elseif ($whichTables&2) {
             $table = 'fe_users';
-        }
-        elseif ($this->userTable && ($whichTables&4)) {
+        } elseif ($this->userTable && ($whichTables&4)) {
             $table = $this->userTable;
         }
 
@@ -614,16 +605,14 @@ protected function updateSpecialQuery($mailGroup)
             $whichTables = 0;
             if ($this->MOD_SETTINGS['queryTable'] == 'tt_address') {
                 $whichTables = 1;
-            }
-            elseif ($this->MOD_SETTINGS['queryTable'] == 'fe_users') {
+            } elseif ($this->MOD_SETTINGS['queryTable'] == 'fe_users') {
                 $whichTables = 2;
-            }
-            elseif ($this->MOD_SETTINGS['queryTable'] == $this->userTable) {
+            } elseif ($this->MOD_SETTINGS['queryTable'] == $this->userTable) {
                 $whichTables = 4;
             }
             $updateFields = [
-                'whichtables' => intval($whichTables),
-                'query' => $this->MOD_SETTINGS['queryConfig']
+                'whichtables' => (int)$whichTables,
+                'query' => $this->MOD_SETTINGS['queryConfig'],
             ];
 
             $done = GeneralUtility::makeInstance(SysDmailGroupRepository::class)->updateSysDmailGroupRecord((int)$mailGroup['uid'], $updateFields);
@@ -662,7 +651,7 @@ protected function specialQuery()
      */
     protected function displayUserInfo()
     {
-        if(!in_array($this->table, ['tt_address', 'fe_users'])) {
+        if (!in_array($this->table, ['tt_address', 'fe_users'])) {
             return [];
         }
         if ($this->submit) {
@@ -723,7 +712,7 @@ protected function displayUserInfo()
             $mmTable = $GLOBALS['TCA'][$this->table]['columns']['module_sys_dmail_category']['config']['MM'];
             $resCat = GeneralUtility::makeInstance(TempRepository::class)->getDisplayUserInfo((string)$mmTable, (int)$row['uid']);
             $categoriesArray = [];
-            if($resCat && count($resCat)) {
+            if ($resCat && count($resCat)) {
                 foreach ($resCat as $rowCat) {
                     $categoriesArray[] = $rowCat['uid_foreign'];
                 }
@@ -734,8 +723,8 @@ protected function displayUserInfo()
             $editOnClickLink = $this->getEditOnClickLink([
                 'edit' => [
                     $this->table => [
-                        $row['uid'] => 'edit'
-                    ]
+                        $row['uid'] => 'edit',
+                    ],
                 ],
                 'returnUrl' => $this->requestUri,
             ]);
@@ -751,7 +740,7 @@ protected function displayUserInfo()
                 'table' => $this->table,
                 'thisID' => $this->uid,
                 'cmd' => $this->cmd,
-                'html' => $row['module_sys_dmail_html'] ? true : false
+                'html' => $row['module_sys_dmail_html'] ? true : false,
             ];
             $this->categories = GeneralUtility::makeInstance(TempRepository::class)->makeCategories($this->table, $row, $this->sys_language_uid);
 
@@ -760,7 +749,7 @@ protected function displayUserInfo()
                 $dataout['categories'][] = [
                     'pkey'    => $pKey,
                     'pVal'    => htmlspecialchars($pVal),
-                    'checked' => GeneralUtility::inList($categories, $pKey) ? true : false
+                    'checked' => GeneralUtility::inList($categories, $pKey) ? true : false,
                 ];
             }
         }
diff --git a/Classes/Module/StatisticsController.php b/Classes/Module/StatisticsController.php
index 140a326b4..cfaead665 100644
--- a/Classes/Module/StatisticsController.php
+++ b/Classes/Module/StatisticsController.php
@@ -1,12 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Module;
 
 use DirectMailTeam\DirectMail\DirectMailUtility;
-use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
-use DirectMailTeam\DirectMail\Repository\SysDmailMaillogRepository;
 use DirectMailTeam\DirectMail\Repository\FeUsersRepository;
+use DirectMailTeam\DirectMail\Repository\SysDmailMaillogRepository;
+use DirectMailTeam\DirectMail\Repository\SysDmailRepository;
 use DirectMailTeam\DirectMail\Repository\TempRepository;
 use DirectMailTeam\DirectMail\Repository\TtAddressRepository;
 use DirectMailTeam\DirectMail\Utility\Typo3ConfVarsUtility;
@@ -18,7 +19,6 @@
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 
 class StatisticsController extends MainController
 {
@@ -64,7 +64,8 @@ class StatisticsController extends MainController
 
     private string $siteUrl = '';
 
-    protected function initStatistics(ServerRequestInterface $request): void {
+    protected function initStatistics(ServerRequestInterface $request): void
+    {
         $this->siteUrl = $request->getAttribute('normalizedParams')->getSiteUrl();
 
         $queryParams = $request->getQueryParams();
@@ -76,7 +77,7 @@ protected function initStatistics(ServerRequestInterface $request): void {
         $this->uid = (int)($parsedBody['uid'] ?? $queryParams['uid'] ?? 0);
 
         $table = (string)($parsedBody['table'] ?? $queryParams['table'] ?? '');
-        if(in_array($table, $this->tables)) {
+        if (in_array($table, $this->tables)) {
             $this->table = (string)($table);
         }
 
@@ -110,7 +111,7 @@ protected function initStatistics(ServerRequestInterface $request): void {
         $this->reasonUnknownCSV     = (bool)($parsedBody['reasonUnknownCSV'] ?? $queryParams['reasonUnknownCSV'] ?? false);
     }
 
-    public function indexAction(ServerRequestInterface $request) : ResponseInterface
+    public function indexAction(ServerRequestInterface $request): ResponseInterface
     {
         $this->view = $this->configureTemplatePaths('Statistics');
 
@@ -127,26 +128,23 @@ public function indexAction(ServerRequestInterface $request) : ResponseInterface
                     $this->view->assignMultiple(
                         [
                             'data' => $data,
-                            'show' => true
+                            'show' => true,
                         ]
                     );
-                }
-                elseif ($this->id != 0) {
+                } elseif ($this->id != 0) {
                     $message = $this->createFlashMessage($this->getLanguageService()->getLL('dmail_noRegular'), $this->getLanguageService()->getLL('dmail_newsletters'), 1, false);
                     $this->messageQueue->addMessage($message);
                 }
-            }
-            else {
+            } else {
                 $message = $this->createFlashMessage($this->getLanguageService()->getLL('select_folder'), $this->getLanguageService()->getLL('header_stat'), 1, false);
                 $this->messageQueue->addMessage($message);
                 $this->view->assignMultiple(
                     [
-                        'dmLinks' => $this->getDMPages($this->moduleName)
+                        'dmLinks' => $this->getDMPages($this->moduleName),
                     ]
                 );
             }
-        }
-        else {
+        } else {
             // If no access or if ID == zero
             $this->view = $this->configureTemplatePaths('NoAccess');
             $message = $this->createFlashMessage('If no access or if ID == zero', 'No Access', 1, false);
@@ -166,8 +164,7 @@ protected function moduleContent(): array
 
         if (!$this->sys_dmail_uid) {
             $theOutput['dataPageInfo'] = $this->displayPageInfo();
-        }
-        else {
+        } else {
             $row = GeneralUtility::makeInstance(SysDmailRepository::class)->selectSysDmailById($this->sys_dmail_uid, $this->id);
             if (is_array($row)) {
                 // COMMAND:
@@ -203,7 +200,7 @@ protected function displayPageInfo()
         $rows = GeneralUtility::makeInstance(SysDmailRepository::class)->selectForPageInfo($this->id);
         $data = [];
         if (is_array($rows)) {
-            foreach ($rows as $row)  {
+            foreach ($rows as $row) {
                 $data[] = [
                     'icon'            => $this->iconFactory->getIconForRecord('sys_dmail', $row, Icon::SIZE_SMALL)->render(),
                     'subject'         => $this->linkDMail_record(GeneralUtility::fixed_lgd_cs($row['subject'], 30) . '  ', $row['uid'], $row['subject']),
@@ -211,7 +208,7 @@ protected function displayPageInfo()
                     'scheduled_begin' => $row['scheduled_begin'] ? BackendUtility::datetime($row['scheduled_begin']) : '',
                     'scheduled_end'   => $row['scheduled_end'] ? BackendUtility::datetime($row['scheduled_end']) : '',
                     'sent'            => $row['count'] ? $row['count'] : '',
-                    'status'          => $this->getSentStatus($row)
+                    'status'          => $this->getSentStatus($row),
                 ];
             }
         }
@@ -219,7 +216,8 @@ protected function displayPageInfo()
         return $data;
     }
 
-    protected function getSentStatus(array $row): string {
+    protected function getSentStatus(array $row): string
+    {
         if (!empty($row['scheduled_begin'])) {
             if (!empty($row['scheduled_end'])) {
                 $sent = $this->getLanguageService()->getLL('stats_overview_sent');
@@ -292,11 +290,11 @@ protected function displayUserInfo()
         if (is_array($row) && count($row)) {
             $categories = '';
 
-            if($GLOBALS['TCA'][$this->table] ?? false) {
+            if ($GLOBALS['TCA'][$this->table] ?? false) {
                 $mmTable = $GLOBALS['TCA'][$this->table]['columns']['module_sys_dmail_category']['config']['MM'];
                 $resCat = GeneralUtility::makeInstance(TempRepository::class)->getDisplayUserInfo((string)$mmTable, (int)$row['uid']);
-                if($resCat && count($resCat)) {
-                    foreach($resCat as $rowCat) {
+                if ($resCat && count($resCat)) {
+                    foreach ($resCat as $rowCat) {
                         $categories .= $rowCat['uid_foreign'] . ',';
                     }
                     $categories = rtrim($categories, ',');
@@ -325,14 +323,14 @@ protected function displayUserInfo()
                 'table'           => $this->table,
                 'thisID'          => $this->uid,
                 'cmd'             => $this->cmd,
-                'html'            => $row['module_sys_dmail_html'] ? true : false
+                'html'            => $row['module_sys_dmail_html'] ? true : false,
             ];
 
             foreach ($this->categories as $pKey => $pVal) {
                 $data['categories'][] = [
                     'pkey'    => $pKey,
                     'pVal'    => htmlspecialchars($pVal),
-                    'checked' => GeneralUtility::inList($categories, $pKey) ? true : false
+                    'checked' => GeneralUtility::inList($categories, $pKey) ? true : false,
                 ];
             }
         }
@@ -341,22 +339,22 @@ protected function displayUserInfo()
     }
 
     /**
-     *
      * @param int $mailingId
      * @return array
      */
-    protected function mailResponsesGeneral(int $mailingId): array {
+    protected function mailResponsesGeneral(int $mailingId): array
+    {
         $table = GeneralUtility::makeInstance(SysDmailMaillogRepository::class)->countSysDmailMaillogsResponseTypeByMid($mailingId);
-        $table = $this->changekeyname($table,'counter','COUNT(*)');
+        $table = $this->changekeyname($table, 'counter', 'COUNT(*)');
 
         // Plaintext/HTML
         $res = GeneralUtility::makeInstance(SysDmailMaillogRepository::class)->countSysDmailMaillogAllByMid($mailingId);
 
         /* this function is called to change the key from 'COUNT(*)' to 'counter' */
-        $res = $this->changekeyname($res,'counter','COUNT(*)');
+        $res = $this->changekeyname($res, 'counter', 'COUNT(*)');
 
         $textHtml = [];
-        foreach($res as $row2){
+        foreach ($res as $row2) {
             // 0:No mail; 1:HTML; 2:TEXT; 3:HTML+TEXT
             $textHtml[$row2['html_sent']] = $row2['counter'];
         }
@@ -373,48 +371,48 @@ protected function mailResponsesGeneral(int $mailingId): array {
         $res = GeneralUtility::makeInstance(SysDmailMaillogRepository::class)->countSysDmailMaillogPingByMid($mailingId);
         $uniquePingResponses = count($res); //sql_num_rows($res);
 
-        $totalSent = intval(($textHtml['1'] ?? 0) + ($textHtml['2'] ?? 0) + ($textHtml['3'] ?? 0));
-        $htmlSent  = intval(($textHtml['1'] ?? 0) + ($textHtml['3'] ?? 0));
-        $plainSent = intval(($textHtml['2'] ?? 0));
+        $totalSent = (int)(($textHtml['1'] ?? 0) + ($textHtml['2'] ?? 0) + ($textHtml['3'] ?? 0));
+        $htmlSent  = (int)(($textHtml['1'] ?? 0) + ($textHtml['3'] ?? 0));
+        $plainSent = (int)(($textHtml['2'] ?? 0));
 
         return [
             'table' => [
                 'head' => [
-                    '', 'stats_total', 'stats_HTML', 'stats_plaintext'
+                    '', 'stats_total', 'stats_HTML', 'stats_plaintext',
                 ],
                 'body' => [
                     [
                         'stats_mails_sent',
                         $totalSent,
                         $htmlSent,
-                        $plainSent
+                        $plainSent,
                     ],
                     [
                         'stats_mails_returned',
                         $this->showWithPercent($table['-127']['counter'] ?? 0, $totalSent),
                         '',
-                        ''
+                        '',
                     ],
                     [
                         'stats_HTML_mails_viewed',
                         '',
                         $this->showWithPercent($uniquePingResponses, $htmlSent),
-                        ''
+                        '',
                     ],
                     [
                         'stats_unique_responses',
                         $this->showWithPercent($uniqueHtmlResponses + $uniquePlainResponses, $totalSent),
                         $this->showWithPercent($uniqueHtmlResponses, $htmlSent),
-                        $this->showWithPercent($uniquePlainResponses, $plainSent ? $plainSent : $htmlSent)
-                    ]
-                ]
+                        $this->showWithPercent($uniquePlainResponses, $plainSent ? $plainSent : $htmlSent),
+                    ],
+                ],
             ],
             'uniqueHtmlResponses' => $uniqueHtmlResponses,
             'uniquePlainResponses' => $uniquePlainResponses,
             'totalSent' => $totalSent,
             'htmlSent' => $htmlSent,
             'plainSent' => $plainSent,
-            'db' => $table
+            'db' => $table,
         ];
     }
 
@@ -480,14 +478,14 @@ protected function stats($row)
         }
         if (is_array($unpackedMail['plain']['link_ids'] ?? false)) {
             foreach ($unpackedMail['plain']['link_ids'] as $k => $v) {
-                $urlArr[intval(-$k)] = $v;
+                $urlArr[(int)(-$k)] = $v;
             }
         }
 
         // Traverse plain urls:
         $mappedPlainUrlsTable = [];
         foreach ($plainUrlsTable as $id => $c) {
-            $url = $urlArr[intval($id)];
+            $url = $urlArr[(int)$id];
             if (isset($urlMd5Map[md5($url)])) {
                 $mappedPlainUrlsTable[$urlMd5Map[md5($url)]] = $c;
             } else {
@@ -526,28 +524,28 @@ protected function stats($row)
 
         $tables[2] = [
             'head' => [
-                '', 'stats_total', 'stats_HTML', 'stats_plaintext'
+                '', 'stats_total', 'stats_HTML', 'stats_plaintext',
             ],
             'body' => [
                 [
                     'stats_total_responses',
                     ($table['1']['counter'] ?? 0) + ($table['2']['counter'] ?? 0),
                     $table['1']['counter'] ?? '0',
-                    $table['2']['counter'] ?? '0'
+                    $table['2']['counter'] ?? '0',
                 ],
                 [
                     'stats_unique_responses',
                     $this->showWithPercent($uniqueHtmlResponses + $uniquePlainResponses, $totalSent),
                     $this->showWithPercent($uniqueHtmlResponses, $htmlSent),
-                    $this->showWithPercent($uniquePlainResponses, $plainSent ? $plainSent : $htmlSent)
+                    $this->showWithPercent($uniquePlainResponses, $plainSent ? $plainSent : $htmlSent),
                 ],
                 [
                     'stats_links_clicked_per_respondent',
                     ($uniqueHtmlResponses+$uniquePlainResponses ? number_format(($table['1']['counter'] + $table['2']['counter']) / ($uniqueHtmlResponses+$uniquePlainResponses), 2) : '-'),
                     ($uniqueHtmlResponses  ? number_format(($table['1']['counter']) / ($uniqueHtmlResponses), 2)  : '-'),
-                    ($uniquePlainResponses ? number_format(($table['2']['counter']) / ($uniquePlainResponses), 2) : '-')
-                ]
-            ]
+                    ($uniquePlainResponses ? number_format(($table['2']['counter']) / ($uniquePlainResponses), 2) : '-'),
+                ],
+            ],
         ];
         arsort($urlCounter['total']);
         arsort($urlCounter['html']);
@@ -555,7 +553,7 @@ protected function stats($row)
         reset($urlCounter['total']);
 
         // HTML mails
-        if (intval($row['sendOptions']) & 0x2) {
+        if ((int)($row['sendOptions']) & 0x2) {
             $htmlContent = $unpackedMail['html']['content'];
 
             $htmlLinks = [];
@@ -563,13 +561,13 @@ protected function stats($row)
                 foreach ($unpackedMail['html']['hrefs'] as $jumpurlId => $data) {
                     $htmlLinks[$jumpurlId] = [
                         'url'   => $data['ref'],
-                        'label' => ''
+                        'label' => '',
                     ];
                 }
             }
 
             // Parse mail body
-            $dom = new \DOMDocument;
+            $dom = new \DOMDocument();
             @$dom->loadHTML($htmlContent);
             $links = [];
             // Get all links
@@ -587,7 +585,7 @@ protected function stats($row)
                     continue;
                 }
 
-                if(str_starts_with($url, 'mailto:')) {
+                if (str_starts_with($url, 'mailto:')) {
                     // Drop mail links
                     continue;
                 }
@@ -607,8 +605,7 @@ protected function stats($row)
                 if (!empty($title)) {
                     // no title attribute
                     $label = '<span title="' . $title . '">' . GeneralUtility::fixed_lgd_cs(substr($targetUrl, -40), 40) . '</span>';
-                }
-                else {
+                } else {
                     $label = '<span title="' . $targetUrl . '">' . GeneralUtility::fixed_lgd_cs(substr($targetUrl, -40), 40) . '</span>';
                 }
 
@@ -622,7 +619,7 @@ protected function stats($row)
         foreach ($urlCounter['total'] as $id => $_) {
             // $id is the jumpurl ID
             $origId = $id;
-            $id     = abs(intval($id));
+            $id     = abs((int)$id);
             $url    = $htmlLinks[$id]['url'] ? $htmlLinks[$id]['url'] : $urlArr[$origId];
             // a link to this host?
             $uParts = @parse_url($url);
@@ -630,7 +627,7 @@ protected function stats($row)
 
             $label = $this->getLinkLabel($url, $urlstr, false, $htmlLinks[$id]['label']);
 
-            $img = '<a href="' . $urlstr . '" target="_blank">' .  $iconAppsToolbarMenuSearch . '</a>';
+            $img = '<a href="' . $urlstr . '" target="_blank">' . $iconAppsToolbarMenuSearch . '</a>';
 
             if (isset($urlCounter['html'][$id]['plainId'])) {
                 $tblLines[] = [
@@ -640,10 +637,9 @@ protected function stats($row)
                     $urlCounter['total'][$origId]['counter'],
                     $urlCounter['html'][$id]['counter'],
                     $urlCounter['html'][$id]['plainCounter'],
-                    $img
+                    $img,
                 ];
-            }
-            else {
+            } else {
                 $html = (empty($urlCounter['html'][$id]['counter']) ? 0 : 1);
                 $tblLines[] = [
                     $label,
@@ -652,7 +648,7 @@ protected function stats($row)
                     ($html ? $urlCounter['html'][$id]['counter'] : $urlCounter['plain'][$origId]['counter']),
                     $urlCounter['html'][$id]['counter'],
                     $urlCounter['plain'][$origId]['counter'],
-                    $img
+                    $img,
                 ];
             }
         }
@@ -666,7 +662,7 @@ protected function stats($row)
                 $urlstr = $this->getUrlStr($uParts);
 
                 $label = $htmlLinks[$id]['label'] . ' (' . ($urlstr ? $urlstr : '/') . ')';
-                $img = '<a href="' . htmlspecialchars($link) . '" target="_blank">' .  $iconAppsToolbarMenuSearch . '</a>';
+                $img = '<a href="' . htmlspecialchars($link) . '" target="_blank">' . $iconAppsToolbarMenuSearch . '</a>';
                 $tblLines[] = [
                     $label,
                     ($html ? $id : '-'),
@@ -674,7 +670,7 @@ protected function stats($row)
                     ($html ? $urlCounter['html'][$id]['counter'] : $urlCounter['plain'][$id]['counter']),
                     $urlCounter['html'][$id]['counter'],
                     $urlCounter['plain'][$id]['counter'],
-                    $img
+                    $img,
                 ];
             }
         }
@@ -687,9 +683,9 @@ protected function stats($row)
                 'stats_total',
                 'stats_HTML',
                 'stats_plaintext',
-                ''
+                '',
             ],
-            'body' => $tblLines
+            'body' => $tblLines,
         ];
 
         if ($urlCounter['total']) {
@@ -719,7 +715,7 @@ protected function stats($row)
                 'id' => $this->id,
                 'sys_dmail_uid' => $row['uid'],
                 'cmd' => $this->cmd,
-                'recalcCache' => 1
+                'recalcCache' => 1,
             ]
         );
 
@@ -734,17 +730,17 @@ protected function stats($row)
 
         $tables[4] = [
             'head' => [
-                '', 'stats_count', ''
+                '', 'stats_count', '',
             ],
             'body' => [
                 [
                     'title' => 'stats_total_mails_returned',
-                    'counter' => number_format(intval($table['-127']['counter'] ?? 0)),
+                    'counter' => number_format((int)($table['-127']['counter'] ?? 0)),
                     'icons' => [// Icons mails returned
                         ['getAttr' => 'returnList', 'lang' => 'stats_list_returned', 'icon' => $listIcons],
                         ['getAttr' => 'returnDisable', 'lang' => 'stats_disable_returned', 'icon' => $hideIcons],
-                        ['getAttr' => 'returnCSV', 'lang' => 'stats_CSV_returned', 'icon' => $csvIcons]
-                    ]
+                        ['getAttr' => 'returnCSV', 'lang' => 'stats_CSV_returned', 'icon' => $csvIcons],
+                    ],
                 ],
                 [
                     'title' => 'stats_recipient_unknown',
@@ -752,8 +748,8 @@ protected function stats($row)
                     'icons' => [// Icons unknown recip
                         ['getAttr' => 'unknownList', 'lang' => 'stats_list_returned_unknown_recipient', 'icon' => $listIcons],
                         ['getAttr' => 'unknownDisable', 'lang' => 'stats_disable_returned_unknown_recipient', 'icon' => $hideIcons],
-                        ['getAttr' => 'unknownCSV', 'lang' => 'stats_CSV_returned_unknown_recipient', 'icon' => $csvIcons]
-                    ]
+                        ['getAttr' => 'unknownCSV', 'lang' => 'stats_CSV_returned_unknown_recipient', 'icon' => $csvIcons],
+                    ],
                 ],
                 [
                     'title' => 'stats_mailbox_full',
@@ -761,8 +757,8 @@ protected function stats($row)
                     'icons' => [// Icons mailbox full
                         ['getAttr' => 'fullList', 'lang' => 'stats_list_returned_mailbox_full', 'icon' => $listIcons],
                         ['getAttr' => 'fullDisable', 'lang' => 'stats_disable_returned_mailbox_full', 'icon' => $hideIcons],
-                        ['getAttr' => 'fullCSV', 'lang' => 'stats_CSV_returned_mailbox_full', 'icon' => $csvIcons]
-                    ]
+                        ['getAttr' => 'fullCSV', 'lang' => 'stats_CSV_returned_mailbox_full', 'icon' => $csvIcons],
+                    ],
                 ],
                 [
                     'title' => 'stats_bad_host',
@@ -770,8 +766,8 @@ protected function stats($row)
                     'icons' => [// Icons bad host
                         ['getAttr' => 'badHostList', 'lang' => 'stats_list_returned_bad_host', 'icon' => $listIcons],
                         ['getAttr' => 'badHostDisable', 'lang' => 'stats_disable_returned_bad_host', 'icon' => $hideIcons],
-                        ['getAttr' => 'badHostCSV', 'lang' => 'stats_CSV_returned_bad_host', 'icon' => $csvIcons]
-                    ]
+                        ['getAttr' => 'badHostCSV', 'lang' => 'stats_CSV_returned_bad_host', 'icon' => $csvIcons],
+                    ],
                 ],
                 [
                     'title' => 'stats_error_in_header',
@@ -779,8 +775,8 @@ protected function stats($row)
                     'icons' => [//Icons bad header
                         ['getAttr' => 'badHeaderList', 'lang' => 'stats_list_returned_bad_header', 'icon' => $listIcons],
                         ['getAttr' => 'badHeaderDisable', 'lang' => 'stats_disable_returned_bad_header', 'icon' => $hideIcons],
-                        ['getAttr' => 'badHeaderCSV', 'lang' => 'stats_CSV_returned_bad_header', 'icon' => $csvIcons]
-                    ]
+                        ['getAttr' => 'badHeaderCSV', 'lang' => 'stats_CSV_returned_bad_header', 'icon' => $csvIcons],
+                    ],
                 ],
                 [
                     'title' => 'stats_reason_unkown',
@@ -788,11 +784,11 @@ protected function stats($row)
                     'icons' => [//Icons unknown reasons @TODO: link to show all reason
                         ['getAttr' => 'reasonUnknownList', 'lang' => 'stats_list_returned_reason_unknown', 'icon' => $listIcons],
                         ['getAttr' => 'reasonUnknownDisable', 'lang' => 'stats_disable_returned_reason_unknown', 'icon' => $hideIcons],
-                        ['getAttr' => 'reasonUnknownCSV', 'lang' => 'stats_CSV_returned_reason_unknown', 'icon' => $csvIcons]
-                    ]
-                ]
+                        ['getAttr' => 'reasonUnknownCSV', 'lang' => 'stats_CSV_returned_reason_unknown', 'icon' => $csvIcons],
+                    ],
+                ],
             ],
-            'url' => $thisurl
+            'url' => $thisurl,
         ];
 
         $tempRepository = GeneralUtility::makeInstance(TempRepository::class);
@@ -805,18 +801,18 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['returnList']['tt_address'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address')
+                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['returnList']['fe_users'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users')
+                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users'),
                     ];
                 }
                 if (count($idLists['PLAINLIST'])) {
                     $tables[6]['returnList']['PLAINLIST'] = [
-                        'PLAINLIST' => join('</li><li>', $idLists['PLAINLIST'])
+                        'PLAINLIST' => implode('</li><li>', $idLists['PLAINLIST']),
                     ];
                 }
             }
@@ -825,13 +821,13 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['returnDisable']['tt_address'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'tt_address')
+                        'counter' => $this->disableRecipients($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['returnDisable']['fe_users'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'fe_users')
+                        'counter' => $this->disableRecipients($tempRows, 'fe_users'),
                     ];
                 }
             }
@@ -855,7 +851,7 @@ protected function stats($row)
                 }
 
                 $tables[6]['returnCSV'] = [
-                    'text' => htmlspecialchars(implode(LF, $emails))
+                    'text' => htmlspecialchars(implode(LF, $emails)),
                 ];
             }
         }
@@ -869,18 +865,18 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['unknownList']['tt_address'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address')
+                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['unknownList']['fe_users'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users')
+                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users'),
                     ];
                 }
                 if (count($idLists['PLAINLIST'])) {
                     $tables[6]['unknownList']['PLAINLIST'] = [
-                        'PLAINLIST' => join('</li><li>', $idLists['PLAINLIST'])
+                        'PLAINLIST' => implode('</li><li>', $idLists['PLAINLIST']),
                     ];
                 }
             }
@@ -889,13 +885,13 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['unknownDisable']['tt_address'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'tt_address')
+                        'counter' => $this->disableRecipients($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['unknownDisable']['fe_users'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'fe_users')
+                        'counter' => $this->disableRecipients($tempRows, 'fe_users'),
                     ];
                 }
             }
@@ -919,7 +915,7 @@ protected function stats($row)
                 }
 
                 $tables[6]['unknownCSV'] = [
-                    'text' => htmlspecialchars(implode(LF, $emails))
+                    'text' => htmlspecialchars(implode(LF, $emails)),
                 ];
             }
         }
@@ -933,18 +929,18 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['fullList']['tt_address'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address')
+                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['fullList']['fe_users'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users')
+                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users'),
                     ];
                 }
                 if (count($idLists['PLAINLIST'])) {
                     $tables[6]['fullList']['PLAINLIST'] = [
-                        'PLAINLIST' => join('</li><li>', $idLists['PLAINLIST'])
+                        'PLAINLIST' => implode('</li><li>', $idLists['PLAINLIST']),
                     ];
                 }
             }
@@ -953,13 +949,13 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['fullDisable']['tt_address'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'tt_address')
+                        'counter' => $this->disableRecipients($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['fullDisable']['fe_users'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'fe_users')
+                        'counter' => $this->disableRecipients($tempRows, 'fe_users'),
                     ];
                 }
             }
@@ -983,7 +979,7 @@ protected function stats($row)
                 }
 
                 $tables[6]['fullCSV'] = [
-                    'text' => htmlspecialchars(implode(LF, $emails))
+                    'text' => htmlspecialchars(implode(LF, $emails)),
                 ];
             }
         }
@@ -997,18 +993,18 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['badHostList']['tt_address'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address')
+                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['badHostList']['fe_users'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users')
+                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users'),
                     ];
                 }
                 if (count($idLists['PLAINLIST'])) {
                     $tables[6]['badHostList']['PLAINLIST'] = [
-                        'PLAINLIST' => join('</li><li>', $idLists['PLAINLIST'])
+                        'PLAINLIST' => implode('</li><li>', $idLists['PLAINLIST']),
                     ];
                 }
             }
@@ -1017,13 +1013,13 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['badHostDisable']['tt_address'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'tt_address')
+                        'counter' => $this->disableRecipients($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['badHostDisable']['fe_users'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'fe_users')
+                        'counter' => $this->disableRecipients($tempRows, 'fe_users'),
                     ];
                 }
             }
@@ -1049,7 +1045,7 @@ protected function stats($row)
                 }
 
                 $tables[6]['badHostCSV'] = [
-                    'text' => htmlspecialchars(implode(LF, $emails))
+                    'text' => htmlspecialchars(implode(LF, $emails)),
                 ];
             }
         }
@@ -1063,18 +1059,18 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['badHeaderList']['tt_address'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address')
+                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['badHeaderList']['fe_users'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users')
+                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users'),
                     ];
                 }
                 if (count($idLists['PLAINLIST'])) {
                     $tables[6]['badHeaderList']['PLAINLIST'] = [
-                        'PLAINLIST' => join('</li><li>', $idLists['PLAINLIST'])
+                        'PLAINLIST' => implode('</li><li>', $idLists['PLAINLIST']),
                     ];
                 }
             }
@@ -1083,13 +1079,13 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['badHeaderDisable']['tt_address'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'tt_address')
+                        'counter' => $this->disableRecipients($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['badHeaderDisable']['fe_users'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'fe_users')
+                        'counter' => $this->disableRecipients($tempRows, 'fe_users'),
                     ];
                 }
             }
@@ -1113,7 +1109,7 @@ protected function stats($row)
                 }
 
                 $tables[6]['badHeaderCSV'] = [
-                    'text' => htmlspecialchars(implode(LF, $emails))
+                    'text' => htmlspecialchars(implode(LF, $emails)),
                 ];
             }
         }
@@ -1128,18 +1124,18 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['reasonUnknownList']['tt_address'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address')
+                        'returnConfig' => $this->getRecordList($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['reasonUnknownList']['fe_users'] = [
-                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users')
+                        'returnConfig' => $this->getRecordList($tempRows, 'fe_users'),
                     ];
                 }
                 if (count($idLists['PLAINLIST'])) {
                     $tables[6]['reasonUnknownList']['PLAINLIST'] = [
-                        'PLAINLIST' => join('</li><li>', $idLists['PLAINLIST'])
+                        'PLAINLIST' => implode('</li><li>', $idLists['PLAINLIST']),
                     ];
                 }
             }
@@ -1148,13 +1144,13 @@ protected function stats($row)
                 if (count($idLists['tt_address'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['tt_address'], 'tt_address');
                     $tables[6]['reasonUnknownDisable']['tt_address'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'tt_address')
+                        'counter' => $this->disableRecipients($tempRows, 'tt_address'),
                     ];
                 }
                 if (count($idLists['fe_users'])) {
                     $tempRows = $tempRepository->fetchRecordsListValues($idLists['fe_users'], 'fe_users');
                     $tables[6]['reasonUnknownDisable']['fe_users'] = [
-                        'counter' => $this->disableRecipients($tempRows, 'fe_users')
+                        'counter' => $this->disableRecipients($tempRows, 'fe_users'),
                     ];
                 }
             }
@@ -1178,7 +1174,7 @@ protected function stats($row)
                 }
 
                 $tables[6]['reasonUnknownCSV'] = [
-                    'text' => htmlspecialchars(implode(LF, $emails))
+                    'text' => htmlspecialchars(implode(LF, $emails)),
                 ];
             }
         }
@@ -1215,11 +1211,11 @@ private function getIdLists($rrows): array
         $idLists = [
             'tt_address' => [],
             'fe_users' => [],
-            'PLAINLIST' => []
+            'PLAINLIST' => [],
         ];
 
-        if(is_array($rrows)) {
-            foreach($rrows as $rrow) {
+        if (is_array($rrows)) {
+            foreach ($rrows as $rrow) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][] = $rrow['rid'];
@@ -1257,7 +1253,7 @@ protected function linkDMail_record($str, $uid, $aTitle='')
                 'id' => $this->id,
                 'sys_dmail_uid' => $uid,
                 'cmd' => 'stats',
-                'SET[dmail_mode]' => 'direct'
+                'SET[dmail_mode]' => 'direct',
             ]
         );
         return '<a title="' . htmlspecialchars($aTitle) . '" href="' . $moduleUrl . '">' . htmlspecialchars($str) . '</a>';
@@ -1270,7 +1266,7 @@ protected function countTotalRecipientFromQueryInfo(string $queryInfo): int
     {
         $totalRecip = 0;
         $idLists = unserialize($queryInfo);
-        if(is_array($idLists)) {
+        if (is_array($idLists)) {
             foreach ($idLists['id_lists'] as $idArray) {
                 $totalRecip += count($idArray);
             }
@@ -1322,7 +1318,7 @@ protected function directMail_compactView($row)
             'totalRecip'    => $this->countTotalRecipientFromQueryInfo($row['query_info']),
             'sentRecip'     => count($res),
             'organisation'  => htmlspecialchars($row['organisation']),
-            'return_path'   => htmlspecialchars($row['return_path'])
+            'return_path'   => htmlspecialchars($row['return_path']),
         ];
         return $data;
     }
@@ -1334,12 +1330,10 @@ protected function directMail_compactView($row)
      */
     private function changekeyname($array, $newkey, $oldkey)
     {
-        foreach ($array as $key => $value)
-        {
+        foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $array[$key] = $this->changekeyname($value,$newkey,$oldkey);
-            }
-            else {
+                $array[$key] = $this->changekeyname($value, $newkey, $oldkey);
+            } else {
                 $array[$newkey] =  $array[$oldkey];
             }
         }
@@ -1357,8 +1351,8 @@ private function changekeyname($array, $newkey, $oldkey)
      */
     protected function showWithPercent($pieces, $total)
     {
-        $total = intval($total);
-        $str = $pieces ? number_format(intval($pieces)) : '0';
+        $total = (int)$total;
+        $str = $pieces ? number_format((int)$pieces) : '0';
         if ($total) {
             $str .= ' / ' . number_format(($pieces/$total*100), 2) . '%';
         }
@@ -1369,8 +1363,6 @@ protected function showWithPercent($pieces, $total)
      * Write the statistic to a temporary table
      *
      * @param array $mrow DB mail records
-     *
-     * @return void
      */
     protected function makeStatTempTableContent(array $mrow)
     {
@@ -1380,20 +1372,20 @@ protected function makeStatTempTableContent(array $mrow)
         $currentRec = '';
         $recRec = [];
 
-        if(is_array($rows)) {
-            foreach($rows as $row) {
+        if (is_array($rows)) {
+            foreach ($rows as $row) {
                 $thisRecPointer = $row['rtbl'] . $row['rid'];
 
                 if ($thisRecPointer != $currentRec) {
                     $recRec = [
-                        'mid'         => intval($mrow['uid']),
+                        'mid'         => (int)($mrow['uid']),
                         'rid'         => $row['rid'],
                         'rtbl'        => $row['rtbl'],
                         'pings'       => [],
                         'plain_links' => [],
                         'html_links'  => [],
                         'response'    => [],
-                        'links'       => []
+                        'links'       => [],
                     ];
                     $currentRec = $thisRecPointer;
                 }
@@ -1416,15 +1408,15 @@ protected function makeStatTempTableContent(array $mrow)
                         $recRec['links'][] = $row['tstamp'];
                         if (!$recRec['firstlink']) {
                             $recRec['firstlink'] = $row['url_id'];
-                            $recRec['firstlink_time'] = intval(@max($recRec['pings']));
+                            $recRec['firstlink_time'] = (int)(@max($recRec['pings']));
                             $recRec['firstlink_time'] = $recRec['firstlink_time'] ? $row['tstamp'] - $recRec['firstlink_time'] : 0;
                         } elseif (!$recRec['secondlink']) {
                             $recRec['secondlink'] = $row['url_id'];
-                            $recRec['secondlink_time'] = intval(@max($recRec['pings']));
+                            $recRec['secondlink_time'] = (int)(@max($recRec['pings']));
                             $recRec['secondlink_time'] = $recRec['secondlink_time'] ? $row['tstamp'] - $recRec['secondlink_time'] : 0;
                         } elseif (!$recRec['thirdlink']) {
                             $recRec['thirdlink'] = $row['url_id'];
-                            $recRec['thirdlink_time'] = intval(@max($recRec['pings']));
+                            $recRec['thirdlink_time'] = (int)(@max($recRec['pings']));
                             $recRec['thirdlink_time'] = $recRec['thirdlink_time'] ? $row['tstamp'] - $recRec['thirdlink_time'] : 0;
                         }
                         $recRec['response'][] = $row['tstamp'];
@@ -1445,26 +1437,24 @@ protected function makeStatTempTableContent(array $mrow)
      * Insert statistic to a temporary table
      *
      * @param array $recRec Statistic array
-     *
-     * @return void
      */
     protected function storeRecRec(array $recRec)
     {
         if (is_array($recRec)) {
-            $recRec['pings_first'] = empty($recRec['pings']) ? 0 : intval(@min($recRec['pings']));
-            $recRec['pings_last']  = empty($recRec['pings']) ? 0 : intval(@max($recRec['pings']));
+            $recRec['pings_first'] = empty($recRec['pings']) ? 0 : (int)(@min($recRec['pings']));
+            $recRec['pings_last']  = empty($recRec['pings']) ? 0 : (int)(@max($recRec['pings']));
             $recRec['pings'] = count($recRec['pings']);
 
-            $recRec['html_links_first'] = empty($recRec['html_links']) ? 0 : intval(@min($recRec['html_links']));
-            $recRec['html_links_last']  = empty($recRec['html_links']) ? 0 : intval(@max($recRec['html_links']));
+            $recRec['html_links_first'] = empty($recRec['html_links']) ? 0 : (int)(@min($recRec['html_links']));
+            $recRec['html_links_last']  = empty($recRec['html_links']) ? 0 : (int)(@max($recRec['html_links']));
             $recRec['html_links'] = count($recRec['html_links']);
 
-            $recRec['plain_links_first'] = empty($recRec['plain_links']) ? 0 : intval(@min($recRec['plain_links']));
-            $recRec['plain_links_last']  = empty($recRec['plain_links']) ? 0 : intval(@max($recRec['plain_links']));
+            $recRec['plain_links_first'] = empty($recRec['plain_links']) ? 0 : (int)(@min($recRec['plain_links']));
+            $recRec['plain_links_last']  = empty($recRec['plain_links']) ? 0 : (int)(@max($recRec['plain_links']));
             $recRec['plain_links'] = count($recRec['plain_links']);
 
-            $recRec['links_first'] = empty($recRec['links']) ? 0 : intval(@min($recRec['links']));
-            $recRec['links_last']  = empty($recRec['links']) ? 0 : intval(@max($recRec['links']));
+            $recRec['links_first'] = empty($recRec['links']) ? 0 : (int)(@min($recRec['links']));
+            $recRec['links_last']  = empty($recRec['links']) ? 0 : (int)(@max($recRec['links']));
             $recRec['links'] = count($recRec['links']);
 
             $recRec['response_first'] = DirectMailUtility::intInRangeWrapper((int)((int)(empty($recRec['response']) ? 0 : @min($recRec['response'])) - $recRec['tstamp']), 0);
@@ -1498,7 +1488,7 @@ public function getUrlStr(array $urlParts): string
             if (preg_match('/(?:^|&)id=([0-9a-z_]+)/', $urlParts['query'], $m)) {
                 $isInt = MathUtility::canBeInterpretedAsInteger($m[1]);
                 if ($isInt) {
-                    $uid = intval($m[1]);
+                    $uid = (int)($m[1]);
                 }
 //                @TODO
 //                 else {
@@ -1568,7 +1558,7 @@ public function getLinkLabel($url, $urlStr, $forceFetch = false, $linkedWord = '
         if (!$forceFetch && (substr($url, 0, strlen($pathSite)) === $pathSite)) {
             if ($urlParts['fragment'] && (substr($urlParts['fragment'], 0, 1) == 'c')) {
                 // linking directly to a content
-                $elementUid = intval(substr($urlParts['fragment'], 1));
+                $elementUid = (int)(substr($urlParts['fragment'], 1));
                 $row = BackendUtility::getRecord('tt_content', $elementUid);
                 if ($row) {
                     $contentTitle = BackendUtility::getRecordTitle('tt_content', $row, false, true);
diff --git a/Classes/Plugin/DirectMail.php b/Classes/Plugin/DirectMail.php
index c86a54180..8f2998c5f 100644
--- a/Classes/Plugin/DirectMail.php
+++ b/Classes/Plugin/DirectMail.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Plugin;
 
 /***************************************************************
@@ -31,17 +32,13 @@
 /**
  * @author		Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author		Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
- *
- * @package 	TYPO3
- * @subpackage 	direct_mail
- *
  */
 
+use DirectMailTeam\DirectMail\DirectMailUtility;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Core\Service\MarkerBasedTemplateService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MailUtility;
-use DirectMailTeam\DirectMail\DirectMailUtility;
 use TYPO3\CMS\Frontend\DataProcessing\FilesProcessor;
 use TYPO3\CMS\Frontend\Plugin\AbstractPlugin;
 
@@ -55,7 +52,6 @@
  */
 class DirectMail extends AbstractPlugin
 {
-
     /**
      * ObjectRenderer
      *
@@ -144,12 +140,12 @@ public function main($content, array $conf)
             case 'html':
                 $lines[] = $this->getHtml();
                 break;
-            case (!!preg_match('/menu_.*/', $cType)):
+            case (bool)preg_match('/menu_.*/', $cType):
                 $lines[] = $this->getHeader();
                 $lines[] = $this->getMenuContent($cType);
                 break;
             default:
-                    // Hook for processing other content types
+                // Hook for processing other content types
                 if (is_array($TYPO3_CONF_VARS['EXTCONF']['direct_mail']['renderCType'])) {
                     foreach ($TYPO3_CONF_VARS['EXTCONF']['direct_mail']['renderCType'] as $classRef) {
                         $procObj = GeneralUtility::makeInstance($classRef);
@@ -183,8 +179,6 @@ public function main($content, array $conf)
      * Initializing the parent class
      *
      * @param	array		$conf TS conf
-     *
-     * @return	void
      */
     public function init(array $conf)
     {
@@ -265,15 +259,15 @@ public function getImages($fieldname)
             '10' => 'TYPO3\CMS\Frontend\DataProcessing\FilesProcessor',
             '10.' => [
                 'references.' => [
-                    'fieldName' => $fieldname
+                    'fieldName' => $fieldname,
                 ],
                 'folders.' => [
-                    'field' => 'file_folder'
+                    'field' => 'file_folder',
                 ],
                 'sorting.' => [
-                    'field' => 'filelink_sorting'
-                ]
-            ]
+                    'field' => 'filelink_sorting',
+                ],
+            ],
         ];
 
         $images = GeneralUtility::makeInstance(FilesProcessor::class)->process(
@@ -289,13 +283,12 @@ public function getImages($fieldname)
                 $imagesArray[] = [
                     'image' => $this->getLink($image->getPublicUrl()),
                     'link' => $this->getLink($image->getLink()),
-                    'caption' => $image->getDescription()
+                    'caption' => $image->getDescription(),
                 ];
             }
 
             $images = $this->renderImages($imagesArray, $fieldname);
-        }
-        else {
+        } else {
             $images = '';
         }
 
@@ -362,7 +355,7 @@ public function renderUploads($str, $uploadPath = 'uploads/media/')
      * Renders a content element header, observing the layout type giving different header formattings
      *
      * @param	string		$str The header string
-     * @param	integer		$type The layout type of the header (in the content element)
+     * @param	int		$type The layout type of the header (in the content element)
      *
      * @return	string		Content
      */
@@ -441,7 +434,7 @@ public function renderHeader($str, $type = 0)
      *
      * @param	array		$lines Array of existing lines to which the new char-pattern should be added
      * @param	string		$preLineChar The character pattern to repeat. Default is "-"
-     * @param	integer		$len The length of the line. $preLineChar will be repeated to fill in this length.
+     * @param	int		$len The length of the line. $preLineChar will be repeated to fill in this length.
      *
      * @return	array		The input array with a new line added.
      * @see renderHeader()
@@ -574,7 +567,6 @@ public function breakTable($str)
      * @param	int			$cols Number of table columns
      *
      * @return	string		Divider line for the table
-     * @access private
      * @see breakTable()
      */
     public function addDiv(array $messure, $content, $divChar, $joinChar, $cols)
@@ -592,7 +584,6 @@ public function addDiv(array $messure, $content, $divChar, $joinChar, $cols)
      * @param	array		$tableLines Array with [table rows] [table cells] [lines in cell]
      *
      * @return	array		Statistics (max lines/lengths)
-     * @access private
      * @see breakTable()
      */
     public function traverseTable(array $tableLines)
@@ -612,7 +603,7 @@ public function traverseTable(array $tableLines)
                 }
             }
         }
-        return array($maxLen,$maxLines);
+        return [$maxLen, $maxLines];
     }
 
     /**
@@ -638,20 +629,20 @@ public function renderImages(array $imagesArray, $fieldname)
                 if ($image['link']) {
                     $theLink = $this->getLink($image['link']);
                     if ($theLink) {
-                        $lines[] = $this->getString($this->conf[$fieldname.'.']['linkPrefix']) . $theLink;
+                        $lines[] = $this->getString($this->conf[$fieldname . '.']['linkPrefix']) . $theLink;
                     }
                 }
                 if ($image['caption']) {
-                    $cHeader = trim($this->getString($this->conf[$fieldname.'.']['captionHeader']));
-                    $lines[] = $cHeader . ' ' .$this->breakContent($image['caption']);
+                    $cHeader = trim($this->getString($this->conf[$fieldname . '.']['captionHeader']));
+                    $lines[] = $cHeader . ' ' . $this->breakContent($image['caption']);
                 }
                 // add newline
                 $lines[] = '';
                 $imageExists = true;
             }
         }
-        if ($this->conf[$fieldname.'.']['header'] && $imageExists) {
-            array_unshift($lines, $this->getString($this->conf[$fieldname.'.']['header']));
+        if ($this->conf[$fieldname . '.']['header'] && $imageExists) {
+            array_unshift($lines, $this->getString($this->conf[$fieldname . '.']['header']));
         }
 
         return LF . implode(LF, $lines);
@@ -670,8 +661,8 @@ public function getLink($link)
             'parameter' => $link,
             'forceAbsoluteUrl' => '1',
             'forceAbsoluteUrl.' => [
-                'scheme' => GeneralUtility::getIndpEnv('TYPO3_SSL')?'https':'http'
-            ]
+                'scheme' => GeneralUtility::getIndpEnv('TYPO3_SSL')?'https':'http',
+            ],
         ]);
     }
 
@@ -701,7 +692,6 @@ public function breakLines($str, $implChar, $charWidth=0)
      * @param	string		$str Input string
      *
      * @return	string		Output string
-     * @access private
      */
     public function getString($str)
     {
diff --git a/Classes/Repository/FeUsersRepository.php b/Classes/Repository/FeUsersRepository.php
index add23dc71..e2f8e1d9f 100644
--- a/Classes/Repository/FeUsersRepository.php
+++ b/Classes/Repository/FeUsersRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class FeUsersRepository extends MainRepository {
+class FeUsersRepository extends MainRepository
+{
     protected string $table = 'fe_users';
 
     /**
@@ -14,7 +16,7 @@ public function selectFeUsersByUid(int $uid, string $permsClause) //: array|bool
         $queryBuilder = $this->getQueryBuilder($this->table);
 
         return $queryBuilder
-        ->select($this->table.'.*')
+        ->select($this->table . '.*')
         ->from($this->table, $this->table)
         ->leftjoin(
             $this->table,
@@ -22,10 +24,10 @@ public function selectFeUsersByUid(int $uid, string $permsClause) //: array|bool
             'pages',
             $queryBuilder->expr()->eq(
                 'pages.uid',
-                $queryBuilder->quoteIdentifier($this->table.'.pid')
+                $queryBuilder->quoteIdentifier($this->table . '.pid')
             )
         )
-        ->add('where', $this->table.'.uid = ' . intval($uid) .
+        ->add('where', $this->table . '.uid = ' . (int)$uid .
             ' AND ' . $permsClause . ' AND pages.deleted = 0')
 
 //         debug($queryBuilder->getSQL());
diff --git a/Classes/Repository/MainRepository.php b/Classes/Repository/MainRepository.php
index 480f82b9d..8a70f747d 100644
--- a/Classes/Repository/MainRepository.php
+++ b/Classes/Repository/MainRepository.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
@@ -8,7 +9,8 @@
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class MainRepository {
+class MainRepository
+{
     public function getConnectionPool(): ConnectionPool
     {
         return GeneralUtility::makeInstance(ConnectionPool::class);
diff --git a/Classes/Repository/PagesRepository.php b/Classes/Repository/PagesRepository.php
index 676410c3b..f3b27c3d9 100644
--- a/Classes/Repository/PagesRepository.php
+++ b/Classes/Repository/PagesRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class PagesRepository extends MainRepository {
+class PagesRepository extends MainRepository
+{
     protected string $table = 'pages';
 
     /**
@@ -40,7 +42,7 @@ public function selectPagesForDmail(int $pid, string $permsClause) //: array|boo
         ->andWhere(
             $queryBuilder->expr()->notIn(
                 'doktype',
-                [199,254,255]
+                [199, 254, 255]
             )
         )
         ->orderBy('sorting')
@@ -112,22 +114,23 @@ public function selectTitleTranslatedPage(int $pageUid, int $langUid) //: array|
                 $queryBuilder->createNamedParameter($pageUid, \PDO::PARAM_INT)
             )
         )
-        ->andWhere($queryBuilder->expr()->eq(
-                'sys_language_uid',
-                $queryBuilder->createNamedParameter($langUid, \PDO::PARAM_INT)
-            )
+        ->andWhere(
+            $queryBuilder->expr()->eq(
+            'sys_language_uid',
+            $queryBuilder->createNamedParameter($langUid, \PDO::PARAM_INT)
+        )
         )
         ->execute()
         ->fetch();
     }
 
     /**
-     *
      * @param int $pageUid
      * @param string $tsConf
      * @return int
      */
-    public function updatePageTSconfig(int $pageUid, string $tsConf) {
+    public function updatePageTSconfig(int $pageUid, string $tsConf)
+    {
         $connection = $this->getConnection($this->table);
         return $connection->update(
             $this->table,
@@ -145,7 +148,7 @@ public function getDMPages() //: array|bool
         $queryBuilder = $this->getQueryBuilder($this->table);
 
         return $queryBuilder
-        ->select('uid','title')
+        ->select('uid', 'title')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
diff --git a/Classes/Repository/SysDmailCategoryRepository.php b/Classes/Repository/SysDmailCategoryRepository.php
index 13bb60e5f..9e628573c 100644
--- a/Classes/Repository/SysDmailCategoryRepository.php
+++ b/Classes/Repository/SysDmailCategoryRepository.php
@@ -1,11 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-class SysDmailCategoryRepository extends MainRepository {
+class SysDmailCategoryRepository extends MainRepository
+{
     protected string $table = 'sys_dmail_category';
 
     /**
@@ -31,7 +31,7 @@ public function selectSysDmailCategoryByPid(int $pid) //: array|bool
 
     public function selectSysDmailCategoryForContainer(int $uid) //: array|bool
     {
-        $select = $this->table.".uid";
+        $select = $this->table . '.uid';
         $mmTable = 'sys_dmail_ttcontent_category_mm';
         $orderBy = $this->table . '.uid';
 
diff --git a/Classes/Repository/SysDmailGroupRepository.php b/Classes/Repository/SysDmailGroupRepository.php
index 4186e4cc0..888379068 100644
--- a/Classes/Repository/SysDmailGroupRepository.php
+++ b/Classes/Repository/SysDmailGroupRepository.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
@@ -7,7 +8,8 @@
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class SysDmailGroupRepository extends MainRepository {
+class SysDmailGroupRepository extends MainRepository
+{
     protected string $table = 'sys_dmail_group';
 
     /**
@@ -21,7 +23,7 @@ public function selectSysDmailGroupByPid(int $pid, string $defaultSortBy) //: ar
         ->removeAll()
         ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
 
-        return $queryBuilder->select('uid','pid','title','description','type')
+        return $queryBuilder->select('uid', 'pid', 'title', 'description', 'type')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -31,7 +33,8 @@ public function selectSysDmailGroupByPid(int $pid, string $defaultSortBy) //: ar
         )
         ->orderBy(
             preg_replace(
-                '/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i', '',
+                '/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i',
+                '',
                 $defaultSortBy
             )
         )
@@ -46,7 +49,7 @@ public function selectSysDmailGroupForFinalMail(int $pid, int $sysLanguageUid, s
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('uid','pid','title')
+        return $queryBuilder->select('uid', 'pid', 'title')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -62,10 +65,11 @@ public function selectSysDmailGroupForFinalMail(int $pid, int $sysLanguageUid, s
         )
         ->orderBy(
             preg_replace(
-                    '/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i', '',
-                    $defaultSortBy
-                )
+                '/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i',
+                '',
+                $defaultSortBy
             )
+        )
         ->execute()
         ->fetchAll();
     }
@@ -82,20 +86,20 @@ public function selectSysDmailGroupForTestmail(array $intList, string $permsClau
         ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
 
         return $queryBuilder
-        ->select($this->table.'.*')
+        ->select($this->table . '.*')
         ->from($this->table)
         ->leftJoin(
             $this->table,
             'pages',
             'pages',
             $queryBuilder->expr()->eq(
-                $this->table.'.pid',
+                $this->table . '.pid',
                 $queryBuilder->quoteIdentifier('pages.uid')
             )
         )
         ->where(
             $queryBuilder->expr()->in(
-                $this->table.'.uid',
+                $this->table . '.uid',
                 $queryBuilder->createNamedParameter($intList, Connection::PARAM_INT_ARRAY)
             )
         )
@@ -107,7 +111,6 @@ public function selectSysDmailGroupForTestmail(array $intList, string $permsClau
     }
 
         /**
-     *
      * @param int $uid
      * @param array $updateData
      * @return int
@@ -120,6 +123,5 @@ public function updateSysDmailGroupRecord(int $uid, array $updateData)
             $updateData, // value array
             [ 'uid' => $uid ] // where
         );
-
     }
 }
diff --git a/Classes/Repository/SysDmailMaillogRepository.php b/Classes/Repository/SysDmailMaillogRepository.php
index 58b20a47b..93f5eb5e1 100644
--- a/Classes/Repository/SysDmailMaillogRepository.php
+++ b/Classes/Repository/SysDmailMaillogRepository.php
@@ -1,11 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-class SysDmailMaillogRepository extends MainRepository {
+class SysDmailMaillogRepository extends MainRepository
+{
     protected string $table = 'sys_dmail_maillog';
 
     /**
@@ -139,7 +139,7 @@ public function selectByResponseType(int $responseType) //: array|bool
                 $queryBuilder->createNamedParameter($responseType, \PDO::PARAM_INT)
             )
         )
-        ->orderBy('tstamp','DESC')
+        ->orderBy('tstamp', 'DESC')
         ->execute()
         ->fetchAll();
     }
@@ -223,13 +223,12 @@ public function selectSysDmailMaillogsCompactView(int $uid) //: array|bool
                 $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
             )
         )
-        ->orderBy('rid','ASC')
+        ->orderBy('rid', 'ASC')
         ->execute()
         ->fetchAll();
     }
 
     /**
-     *
      * @param int $uid
      * @param int $responseType: 1 for html, 2 for plain
      * @return array
@@ -306,7 +305,7 @@ public function selectStatTempTableContent(int $uid) //: array|bool
         $queryBuilder = $this->getQueryBuilder($this->table);
 
         return $queryBuilder
-        ->select('rid','rtbl','tstamp','response_type','url_id','html_sent','size')
+        ->select('rid', 'rtbl', 'tstamp', 'response_type', 'url_id', 'html_sent', 'size')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -328,7 +327,7 @@ public function findAllReturnedMail(int $uid) //: array|bool
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('rid','rtbl','email')
+        return $queryBuilder->select('rid', 'rtbl', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -353,7 +352,7 @@ public function findUnknownRecipient(int $uid) //: array|bool
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('rid','rtbl','email')
+        return $queryBuilder->select('rid', 'rtbl', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -388,7 +387,7 @@ public function findMailboxFull(int $uid) //: array|bool
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('rid','rtbl','email')
+        return $queryBuilder->select('rid', 'rtbl', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -419,7 +418,7 @@ public function findBadHost(int $uid) //: array|bool
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('rid','rtbl','email')
+        return $queryBuilder->select('rid', 'rtbl', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -450,7 +449,7 @@ public function findBadHeader(int $uid) //: array|bool
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('rid','rtbl','email')
+        return $queryBuilder->select('rid', 'rtbl', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -481,7 +480,7 @@ public function findUnknownReasons(int $uid) //: array|bool
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
 
-        return $queryBuilder->select('rid','rtbl','email')
+        return $queryBuilder->select('rid', 'rtbl', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -513,7 +512,7 @@ public function selectForAnalyzeBounceMail(int $rid, string $rtbl, int $mid) //:
         $queryBuilder = $this->getQueryBuilder($this->table);
 
         return $queryBuilder
-        ->select('uid','email')
+        ->select('uid', 'email')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->andX(
@@ -702,7 +701,8 @@ public function analyzeBounceMailAddToMailLog(
         int $tstamp,
         array $midArray,
         int $returnCode,
-        string $returnContent)
+        string $returnContent
+    )
     {
         $queryBuilder = $this->getQueryBuilder($this->table);
         $queryBuilder
@@ -715,11 +715,11 @@ public function analyzeBounceMailAddToMailLog(
                 'email' => $midArray['email'],
                 'rtbl' => $midArray['rtbl'],
                 'return_content' => $returnContent,
-                'return_code' => $returnCode
+                'return_code' => $returnCode,
             ])
             ->execute();
 
-            return (int)$queryBuilder->getConnection()->lastInsertId($this->table);
+        return (int)$queryBuilder->getConnection()->lastInsertId($this->table);
     }
 
     /**
diff --git a/Classes/Repository/SysDmailRepository.php b/Classes/Repository/SysDmailRepository.php
index b19845b0d..e3da2c2fc 100644
--- a/Classes/Repository/SysDmailRepository.php
+++ b/Classes/Repository/SysDmailRepository.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
@@ -7,7 +8,8 @@
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class SysDmailRepository extends MainRepository {
+class SysDmailRepository extends MainRepository
+{
     protected string $table = 'sys_dmail';
 
     /**
@@ -62,7 +64,7 @@ public function selectSysDmailsByPid(int $pid) //: array|bool
                 $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
             )
         )
-        ->orderBy('scheduled','DESC')
+        ->orderBy('scheduled', 'DESC')
         ->execute()
         ->fetchAllAssociative();
     }
@@ -113,8 +115,8 @@ public function selectForPageInfo(int $id) //: array|bool
             )
         )
         ->groupBy('sys_dmail_maillog.mid')
-        ->orderBy('sys_dmail.scheduled','DESC')
-        ->addOrderBy('sys_dmail.scheduled_begin','DESC')
+        ->orderBy('sys_dmail.scheduled', 'DESC')
+        ->addOrderBy('sys_dmail.scheduled_begin', 'DESC')
         ->execute()
         ->fetchAll();
     }
@@ -132,7 +134,7 @@ public function selectForMkeListDMail(int $id, string $sOrder, string $ascDesc)
         ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
 
         return $queryBuilder
-        ->select('uid','pid','subject','tstamp','issent','renderedsize','attachment','type')
+        ->select('uid', 'pid', 'subject', 'tstamp', 'issent', 'renderedsize', 'attachment', 'type')
         ->from($this->table)
         ->where(
             $queryBuilder->expr()->eq(
@@ -148,7 +150,7 @@ public function selectForMkeListDMail(int $id, string $sOrder, string $ascDesc)
                 $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
             )
         )
-        ->orderBy($sOrder,$ascDesc)
+        ->orderBy($sOrder, $ascDesc)
         ->execute()
         ->fetchAll();
     }
@@ -176,7 +178,6 @@ public function updateSysDmail(int $uid, string $charset, string $mailContent):
     }
 
     /**
-     *
      * @param int $uid
      * @param array $updateData
      * @return int
@@ -210,7 +211,7 @@ public function selectForJumpurl(int $mailId)
 
     public function dmailerSetBeginEnd(int $mid, string $key)
     {
-        if(in_array($key, ['begin', 'end'])) {
+        if (in_array($key, ['begin', 'end'])) {
             $queryBuilder = $this->getQueryBuilder($this->table);
 
             $queryBuilder
diff --git a/Classes/Repository/SysDmailTtAddressCategoryMmRepository.php b/Classes/Repository/SysDmailTtAddressCategoryMmRepository.php
index e25628e05..20b1db655 100644
--- a/Classes/Repository/SysDmailTtAddressCategoryMmRepository.php
+++ b/Classes/Repository/SysDmailTtAddressCategoryMmRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class SysDmailTtAddressCategoryMmRepository extends MainRepository {
+class SysDmailTtAddressCategoryMmRepository extends MainRepository
+{
     protected string $table = 'sys_dmail_ttaddress_category_mm';
 
     /**
diff --git a/Classes/Repository/SysDmailTtContentCategoryMmRepository.php b/Classes/Repository/SysDmailTtContentCategoryMmRepository.php
index e145da446..4c20ede4b 100644
--- a/Classes/Repository/SysDmailTtContentCategoryMmRepository.php
+++ b/Classes/Repository/SysDmailTtContentCategoryMmRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class SysDmailTtContentCategoryMmRepository extends MainRepository {
+class SysDmailTtContentCategoryMmRepository extends MainRepository
+{
     protected string $table = 'sys_dmail_ttcontent_category_mm';
 
     /**
diff --git a/Classes/Repository/SysLanguageRepository.php b/Classes/Repository/SysLanguageRepository.php
index 1379cdc73..8efca5611 100644
--- a/Classes/Repository/SysLanguageRepository.php
+++ b/Classes/Repository/SysLanguageRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class SysLanguageRepository extends MainRepository {
+class SysLanguageRepository extends MainRepository
+{
     protected string $table = 'sys_language';
 
     /**
diff --git a/Classes/Repository/TempRepository.php b/Classes/Repository/TempRepository.php
index fc87f1f1a..c3f9ef4b3 100644
--- a/Classes/Repository/TempRepository.php
+++ b/Classes/Repository/TempRepository.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
@@ -9,8 +10,8 @@
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class TempRepository extends MainRepository {
-
+class TempRepository extends MainRepository
+{
     /**
      * Get recipient DB record given on the ID
      *
@@ -38,8 +39,7 @@ public function fetchRecordsListValues(array $listArr, $table, $fields = 'uid,na
             foreach ($fieldArray as $i => $field) {
                 if ($i) {
                     $queryBuilder->addSelect($field);
-                }
-                else {
+                } else {
                     $queryBuilder->select($field);
                 }
             }
@@ -102,7 +102,7 @@ public function getIdList($table, $pidList, $groupUid, $cat)
         // The following will work but INSTR and CONCAT are available only in mySQL
 
         $mmTable = $GLOBALS['TCA'][$switchTable]['columns']['module_sys_dmail_category']['config']['MM'];
-        $cat = intval($cat);
+        $cat = (int)$cat;
         if ($cat < 1) {
             if ($table == 'fe_groups') {
                 $res = $queryBuilder
@@ -111,10 +111,11 @@ public function getIdList($table, $pidList, $groupUid, $cat)
                 ->from($table, $table)
                 ->andWhere(
                     $queryBuilder->expr()->andX()
-                    ->add($queryBuilder->expr()->in(
-                            'fe_groups.pid',
-                            $queryBuilder->createNamedParameter($pidArray, Connection::PARAM_INT_ARRAY)
-                        )
+                    ->add(
+                        $queryBuilder->expr()->in(
+                        'fe_groups.pid',
+                        $queryBuilder->createNamedParameter($pidArray, Connection::PARAM_INT_ARRAY)
+                    )
                     )
                     ->add('INSTR( CONCAT(\',\',fe_users.usergroup,\',\'),CONCAT(\',\',fe_groups.uid ,\',\') )')
                     ->add(
@@ -128,8 +129,7 @@ public function getIdList($table, $pidList, $groupUid, $cat)
                 ->orderBy($switchTable . '.uid')
                 ->addOrderBy($switchTable . '.email')
                 ->execute();
-            }
-            else {
+            } else {
                 $res = $queryBuilder
                 ->selectLiteral('DISTINCT ' . $switchTable . '.uid', $switchTable . '.email')
                 ->from($switchTable)
@@ -153,8 +153,7 @@ public function getIdList($table, $pidList, $groupUid, $cat)
                 ->addOrderBy($switchTable . '.email')
                 ->execute();
             }
-        }
-        else {
+        } else {
             if ($table == 'fe_groups') {
                 $res = $queryBuilder
                 ->selectLiteral('DISTINCT ' . $switchTable . '.uid', $switchTable . '.email')
@@ -166,7 +165,7 @@ public function getIdList($table, $pidList, $groupUid, $cat)
                     'mm_1',
                     $switchTable,
                     $switchTable,
-                    $queryBuilder->expr()->eq($switchTable .'.uid', $queryBuilder->quoteIdentifier('mm_1.uid_local'))
+                    $queryBuilder->expr()->eq($switchTable . '.uid', $queryBuilder->quoteIdentifier('mm_1.uid_local'))
                 )
                 ->andWhere(
                     $queryBuilder->expr()->andX()
@@ -206,8 +205,7 @@ public function getIdList($table, $pidList, $groupUid, $cat)
                 ->orderBy($switchTable . '.uid')
                 ->addOrderBy($switchTable . '.email')
                 ->execute();
-            }
-            else {
+            } else {
                 $res = $queryBuilder
                 ->selectLiteral('DISTINCT ' . $switchTable . '.uid', $switchTable . '.email')
                 ->from('sys_dmail_group', 'sys_dmail_group')
@@ -218,7 +216,7 @@ public function getIdList($table, $pidList, $groupUid, $cat)
                     $table,
                     $table,
                     $queryBuilder->expr()->eq(
-                        $table .'.uid',
+                        $table . '.uid',
                         $queryBuilder->quoteIdentifier('mm_1.uid_local')
                     )
                 )
@@ -322,8 +320,8 @@ public function getStaticIdList($table, $uid)
                 $switchTable,
                 $switchTable,
                 $queryBuilder->expr()->inSet(
-                    $switchTable.'.usergroup',
-                    $queryBuilder->quoteIdentifier($table.'.uid')
+                    $switchTable . '.usergroup',
+                    $queryBuilder->quoteIdentifier($table . '.uid')
                 )
             )
             ->andWhere(
@@ -357,8 +355,7 @@ public function getStaticIdList($table, $uid)
             ->orderBy($switchTable . '.uid')
             ->addOrderBy($switchTable . '.email')
             ->execute();
-        }
-        else {
+        } else {
             $res = $queryBuilder
             ->selectLiteral('DISTINCT ' . $switchTable . '.uid', $switchTable . '.email')
             ->from('sys_dmail_group_mm', 'sys_dmail_group_mm')
@@ -440,8 +437,9 @@ public function getStaticIdList($table, $uid)
                 ->add(
                     $queryBuilder->expr()->eq(
                         'sys_dmail_group.uid',
-                        $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT))
+                        $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)
                     )
+                )
                 ->add(
                     $queryBuilder->expr()->eq(
                         'fe_groups.uid',
@@ -465,7 +463,7 @@ public function getStaticIdList($table, $uid)
             if (!empty($subgroups)) {
                 $usergroupInList = null;
                 foreach ($subgroups as $subgroup) {
-                    $usergroupInList .= (($usergroupInList == null) ? null : ' OR') . ' INSTR( CONCAT(\',\',fe_users.usergroup,\',\'),CONCAT(\',' . intval($subgroup) . ',\') )';
+                    $usergroupInList .= (($usergroupInList == null) ? null : ' OR') . ' INSTR( CONCAT(\',\',fe_users.usergroup,\',\'),CONCAT(\',' . (int)$subgroup . ',\') )';
                 }
                 $usergroupInList = '(' . $usergroupInList . ')';
 
@@ -549,7 +547,7 @@ public function getFEgroupSubgroups($groupId)
                 $queryBuilder->quoteIdentifier($groupTable . '.uid')
             )
         )
-        ->andWhere('INSTR( CONCAT(\',\',fe_groups.subgroup,\',\'),\',' . intval($groupId) . ',\' )')
+        ->andWhere('INSTR( CONCAT(\',\',fe_groups.subgroup,\',\'),\',' . (int)$groupId . ',\' )')
         ->execute();
         $groupArr = [];
 
@@ -578,7 +576,7 @@ public function getSpecialQueryIdList(DmQueryGenerator $queryGenerator, string $
         if ($group['query']) {
             $select = $queryGenerator->getQueryDM();
             //$queryGenerator->extFieldLists['queryFields'] = 'uid';
-            if($select) {
+            if ($select) {
                 $connection = $this->getConnection($table);
                 $recipients = $connection->executeQuery($select)->fetchAll();
 
@@ -631,8 +629,7 @@ public function getMailGroups($list, array $parsedGroups, $permsClause)
                     $parsedGroups[] = $row['uid'];
                     $groups = array_merge($groups, $this->getMailGroups($row['mail_groups'], $parsedGroups, $permsClause));
                 }
-            }
-            else {
+            } else {
                 // Normal mail group, just add to list
                 $groups[] = $row['uid'];
             }
@@ -700,9 +697,9 @@ public function getRecordOverlay(string $table, array $row, int $sys_language_co
                             $queryBuilder = $this->getQueryBuilder($table);
                             $olrow = $queryBuilder->select('*')
                             ->from($table)
-                            ->add('where', 'pid=' . intval($row['pid']) .
-                                ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['languageField'] . '=' . intval($sys_language_content) .
-                                ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . '=' . intval($row['uid']))
+                            ->add('where', 'pid=' . (int)($row['pid']) .
+                                ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['languageField'] . '=' . (int)$sys_language_content .
+                                ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . '=' . (int)($row['uid']))
                             ->setMaxResults(1)/* LIMIT 1*/
                             ->execute()
                             ->fetch();
@@ -718,14 +715,12 @@ public function getRecordOverlay(string $table, array $row, int $sys_language_co
                                 }
                             }
 
-                            // Otherwise, check if sys_language_content is different from the value of the record
-                            // that means a japanese site might try to display french content.
-                        }
-                        elseif ($sys_language_content != $row[$GLOBALS['TCA'][$table]['ctrl']['languageField']]) {
+                        // Otherwise, check if sys_language_content is different from the value of the record
+                        // that means a japanese site might try to display french content.
+                        } elseif ($sys_language_content != $row[$GLOBALS['TCA'][$table]['ctrl']['languageField']]) {
                             unset($row);
                         }
-                    }
-                    else {
+                    } else {
                         // When default language is displayed,
                         // we never want to return a record carrying another language!:
                         if ($row[$GLOBALS['TCA'][$table]['ctrl']['languageField']] > 0) {
@@ -740,7 +735,6 @@ public function getRecordOverlay(string $table, array $row, int $sys_language_co
     }
 
     /**
-     *
      * @param string $table
      * @param int $uid
      * @return array|bool
@@ -785,7 +779,7 @@ public function getListOfRecipentCategories(string $table, string $relationTable
             ->removeAll()
             ->add(
                 GeneralUtility::makeInstance(DeletedRestriction::class)
-        );
+            );
         return $queryBuilder
             ->select($relationTable . '.uid_foreign')
             ->from($relationTable, $relationTable)
diff --git a/Classes/Repository/TtAddressRepository.php b/Classes/Repository/TtAddressRepository.php
index 6599a9e7a..ec3dd5e89 100644
--- a/Classes/Repository/TtAddressRepository.php
+++ b/Classes/Repository/TtAddressRepository.php
@@ -1,15 +1,17 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
-class TtAddressRepository extends MainRepository {
+class TtAddressRepository extends MainRepository
+{
     protected string $table = 'tt_address';
 
     /**
@@ -20,7 +22,7 @@ public function selectTtAddressByUid(int $uid, string $permsClause) //: array|bo
         $queryBuilder = $this->getQueryBuilder($this->table);
 
         return $queryBuilder
-        ->select($this->table.'.*')
+        ->select($this->table . '.*')
         ->from($this->table, $this->table)
         ->leftjoin(
             $this->table,
@@ -28,12 +30,12 @@ public function selectTtAddressByUid(int $uid, string $permsClause) //: array|bo
             'pages',
             $queryBuilder->expr()->eq(
                 'pages.uid',
-                $queryBuilder->quoteIdentifier($this->table.'.pid')
+                $queryBuilder->quoteIdentifier($this->table . '.pid')
             )
         )
         ->where(
             $queryBuilder->expr()->eq(
-                $this->table.'.uid',
+                $this->table . '.uid',
                 $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)
             ),
             $queryBuilder->expr()->eq(
@@ -85,7 +87,7 @@ public function selectTtAddressForTestmail(array $intList, string $permsClause)
         $queryBuilder = $this->getQueryBuilder($this->table);
 
         return $queryBuilder
-        ->select($this->table.'.*')
+        ->select($this->table . '.*')
         ->from($this->table)
         ->leftJoin(
             $this->table,
@@ -93,12 +95,12 @@ public function selectTtAddressForTestmail(array $intList, string $permsClause)
             'pages',
             $queryBuilder->expr()->eq(
                 'pages.uid',
-                $queryBuilder->quoteIdentifier($this->table.'.pid')
+                $queryBuilder->quoteIdentifier($this->table . '.pid')
             )
         )
         ->where(
             $queryBuilder->expr()->in(
-                $this->table.'.uid',
+                $this->table . '.uid',
                 $queryBuilder->createNamedParameter($intList, Connection::PARAM_INT_ARRAY)
             )
         )
@@ -184,8 +186,7 @@ public function getRawRecord(int $uid)
                         $queryBuilder->createNamedParameter(0)
                     )
                 );
-            }
-            else {
+            } else {
                 $queryBuilder->where(
                     $queryBuilder->expr()->eq(
                         'uid',
diff --git a/Classes/Repository/TtContentCategoryMmRepository.php b/Classes/Repository/TtContentCategoryMmRepository.php
index 1cce4db77..f08b55bc3 100644
--- a/Classes/Repository/TtContentCategoryMmRepository.php
+++ b/Classes/Repository/TtContentCategoryMmRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class TtContentCategoryMmRepository extends MainRepository {
+class TtContentCategoryMmRepository extends MainRepository
+{
     protected string $table = 'sys_dmail_ttcontent_category_mm';
 
     /**
diff --git a/Classes/Repository/TtContentRepository.php b/Classes/Repository/TtContentRepository.php
index 31ff25746..7c0b377a5 100644
--- a/Classes/Repository/TtContentRepository.php
+++ b/Classes/Repository/TtContentRepository.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Repository;
 
-class TtContentRepository extends MainRepository {
+class TtContentRepository extends MainRepository
+{
     protected string $table = 'tt_content';
 
     /**
diff --git a/Classes/Scheduler/AnalyzeBounceMail.php b/Classes/Scheduler/AnalyzeBounceMail.php
index 4d214525d..70b9a338c 100644
--- a/Classes/Scheduler/AnalyzeBounceMail.php
+++ b/Classes/Scheduler/AnalyzeBounceMail.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Scheduler;
 
 /*
@@ -25,7 +26,6 @@
 
 /**
  * Class AnalyzeBounceMail
- * @package DirectMailTeam\DirectMail\Scheduler
  * @author Ivan Kartolo <ivan.kartolo@gmail.com>
  * @deprecated will be removed in TYPO3 v12.0. Use AnalyzeBounceMailCommand instead.
  */
@@ -160,7 +160,7 @@ public function getMaxProcessed()
      */
     public function setMaxProcessed($maxProcessed)
     {
-        $this->maxProcessed = (int) $maxProcessed;
+        $this->maxProcessed = (int)$maxProcessed;
     }
 
     /**
@@ -195,9 +195,8 @@ public function execute()
             $mailServer->expunge();
             imap_close($mailServer->getImapStream());
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**
@@ -219,7 +218,7 @@ private function processBounceMail($message)
                 $bouncedMail = $attachment->getData();
                 // Find mail id
                 $midArray = $readMail->find_XTypo3MID($bouncedMail);
-                if (false === empty($midArray)) {
+                if (empty($midArray) === false) {
                     // if mid, rid and rtbl are found, then stop looping
                     break;
                 }
@@ -253,7 +252,7 @@ private function processBounceMail($message)
                     'email' => $midArray['email'],
                     'rtbl' => $midArray['rtbl'],
                     'return_content' => serialize($cp),
-                    'return_code' => (int)$cp['reason']
+                    'return_code' => (int)$cp['reason'],
                 ];
                 $connection->insert('sys_dmail_maillog', $insertFields);
                 $sql_insert_id = $connection->lastInsertId('sys_dmail_maillog');
@@ -280,7 +279,7 @@ private function connectMailServer()
         $mailServer = GeneralUtility::makeInstance(
             Server::class,
             $this->server,
-            (int) $this->port,
+            (int)$this->port,
             $this->service
         );
 
@@ -299,7 +298,8 @@ private function connectMailServer()
      * https://docs.typo3.org/m/typo3/reference-coreapi/main/en-us/ApiOverview/Context/Index.html#example
      * @TODO
      */
-    private function getEXEC_TIME() {
+    private function getEXEC_TIME()
+    {
         return $GLOBALS['EXEC_TIME'];
     }
 }
diff --git a/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php b/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php
index 672abbd86..50a8c71b2 100644
--- a/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php
+++ b/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Scheduler;
 
 /*
@@ -26,7 +27,6 @@
  * Class AnalyzeBounceMailAdditionalFields
  * This provides additional fields for the AnalyzeBounceMail task.
  *
- * @package DirectMailTeam\DirectMail\Scheduler
  * @author Ivan Kartolo <ivan.kartolo@gmail.com>
  */
 class AnalyzeBounceMailAdditionalFields extends AbstractAdditionalFieldProvider
@@ -61,12 +61,11 @@ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleCont
         $passwordHTML = '<input type="password" name="tx_scheduler[bouncePassword]" value="' . ($task ? $task->getPassword() : '') . '"/>';
         $maxProcessedHTML = '<input type="text" name="tx_scheduler[bounceProcessed]" value="' . ($task ? $task->getMaxProcessed() : '') . '"/>';
 
-        if($task){
+        if ($task) {
             $serviceHTML = '<select name="tx_scheduler[bounceService]" id="bounceService">' .
                 '<option value="imap" ' . ($task->getService() === 'imap'? 'selected="selected"' : '') . '>IMAP</option>' .
                 '<option value="pop3" ' . ($task->getService() === 'pop3'? 'selected="selected"' : '') . '>POP3</option>' .
                 '</select>';
-
         } else {
             $serviceHTML = '<select name="tx_scheduler[bounceService]" id="bounceService">' .
                 '<option value="imap" >IMAP</option>' .
@@ -90,7 +89,6 @@ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleCont
      *
      * @param array $submittedData An array containing the data submitted by the add/edit task form
      * @param AnalyzeBounceMail $task Reference to the scheduler backend module
-     * @return void
      */
     public function saveAdditionalFields(array $submittedData, AbstractTask $task)
     {
@@ -153,7 +151,7 @@ protected function createAdditionalFields($fieldName, $fieldHTML)
             'code'     => $fieldHTML,
             'label'    => $this->getLanguangeService()->getLL('scheduler.bounceMail.' . $fieldName),
             'cshKey'   => $fieldName,
-            'cshLabel' => $this->getLanguangeService()->getLL('scheduler.bounceMail.csh.' . $fieldName)
+            'cshLabel' => $this->getLanguangeService()->getLL('scheduler.bounceMail.csh.' . $fieldName),
         ];
     }
 
diff --git a/Classes/Scheduler/DirectmailScheduler.php b/Classes/Scheduler/DirectmailScheduler.php
index b2f935d30..1cc87081b 100644
--- a/Classes/Scheduler/DirectmailScheduler.php
+++ b/Classes/Scheduler/DirectmailScheduler.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Scheduler;
 
 /*
@@ -21,8 +22,6 @@
 * Class tx_directmail_scheduler
 *
 * @author	Ivan Kartolo <ivan.kartolo@dkd.de>
-* @package TYPO3
-* @subpackage	tx_directmail
 * @deprecated will be removed in TYPO3 v12.0. Use DirectmailCommand instead.
 */
 class DirectmailScheduler extends \TYPO3\CMS\Scheduler\Task\AbstractTask
@@ -38,7 +37,7 @@ public function execute()
         trigger_error(
             'will be removed in TYPO3 v12.0. Use DirectmailCommand instead.',
             E_USER_DEPRECATED
-         );
+        );
         /* @var $htmlmail \DirectMailTeam\DirectMail\Dmailer */
         $htmlmail = GeneralUtility::makeInstance(Dmailer::class);
         $htmlmail->start();
diff --git a/Classes/Scheduler/MailFromDraft.php b/Classes/Scheduler/MailFromDraft.php
index 63181ec78..257d52f50 100644
--- a/Classes/Scheduler/MailFromDraft.php
+++ b/Classes/Scheduler/MailFromDraft.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Scheduler;
 
 /*
@@ -30,12 +31,10 @@
  * directmail record that is ready for sending right away
  *
  * @author	Benjamin Mack <benni@typo3.org>
- * @package TYPO3
- * @subpackage	tx_directmail
  */
 class MailFromDraft extends AbstractTask
 {
-    public $draftUid = null;
+    public $draftUid;
 
     protected $hookObjects = [];
 
@@ -43,8 +42,6 @@ class MailFromDraft extends AbstractTask
      * Setter function to set the draft ID that the task should use
      *
      * @param int $draftUid The UID of the sys_dmail record (needs to be of type=3 or type=4)
-     *
-     * @return void
      */
     public function setDraft($draftUid)
     {
@@ -66,8 +63,8 @@ public function execute()
             $draftRecord = BackendUtility::getRecord('sys_dmail', $this->draftUid);
 
             // update recipients
-            $recipientGroups = explode(",", $draftRecord['recipientGroups']);
-            $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \DirectMailTeam\DirectMail\Module\Dmail::class );
+            $recipientGroups = explode(',', $draftRecord['recipientGroups']);
+            $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\DirectMailTeam\DirectMail\Module\Dmail::class);
             $SOBE->init();
 
             $newRecipients = $SOBE->cmd_compileMailGroup($recipientGroups);
@@ -123,7 +120,7 @@ public function execute()
             if ($mailRecord['mailContent'] && $mailRecord['renderedsize'] > 0) {
                 $updateData = [
                     'scheduled' => time(),
-                    'issent'    => 1
+                    'issent'    => 1,
                 ];
                 // Call a hook before enqueuing the cloned dmail record into
                 // the direct mail delivery queue
@@ -137,7 +134,7 @@ public function execute()
                 $connection->update(
                     'sys_dmail', // table
                     $updateData, // value array
-                    [ 'uid' => intval($this->dmailUid) ] // where
+                    [ 'uid' => (int)($this->dmailUid) ] // where
                 );
             }
         }
@@ -160,11 +157,10 @@ protected function checkUrlBase(int $pageId): bool
             if (!empty($siteFinder->getAllSites())) {
                 $site = $siteFinder->getSiteByPageId($pageId);
                 $base = $site->getBase();
-                if($base->getHost()) {
+                if ($base->getHost()) {
                     return true;
                 }
-            }
-            else {
+            } else {
                 return false; // No site found in root line of pageId
             }
         }
@@ -177,8 +173,6 @@ protected function checkUrlBase(int $pageId): bool
      *
      * @param string $hookMethod The hook method name
      * @param array $hookParams The hook params
-     *
-     * @return    void
      */
     public function callHooks($hookMethod, array $hookParams)
     {
@@ -190,7 +184,6 @@ public function callHooks($hookMethod, array $hookParams)
     /**
      * Initializes hook objects for this class
      *
-     * @return void
      * @throws \Exception
      */
     public function initializeHookObjects()
diff --git a/Classes/Scheduler/MailFromDraftAdditionalFields.php b/Classes/Scheduler/MailFromDraftAdditionalFields.php
index 6cb520808..83b77dbc3 100644
--- a/Classes/Scheduler/MailFromDraftAdditionalFields.php
+++ b/Classes/Scheduler/MailFromDraftAdditionalFields.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Scheduler;
 
 /*
@@ -26,12 +27,9 @@
  * Aditional fields provider class for usage with the Scheduler's MailFromDraft task
  *
  * @author		Benjamin Mack <benni@typo3.org>
- * @package		TYPO3
- * @subpackage	direct_mail
  */
 class MailFromDraftAdditionalFields extends AbstractAdditionalFieldProvider
 {
-
     /**
      * This method is used to define new fields for adding or editing a task
      * In this case, it adds an email field
@@ -114,7 +112,7 @@ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleCont
             'label'    => 'Choose Draft to create DirectMail from',
             // TODO! add CSH
             'cshKey'   => '',
-            'cshLabel' => $fieldID
+            'cshLabel' => $fieldID,
         ];
 
         return $additionalFields;
@@ -131,7 +129,7 @@ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleCont
      */
     public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModuleController)
     {
-        $draftUid = $submittedData['selecteddraft'] = (int) $submittedData['selecteddraft'];
+        $draftUid = $submittedData['selecteddraft'] = (int)$submittedData['selecteddraft'];
         if ($draftUid > 0) {
             $draftRecord = BackendUtility::getRecord('sys_dmail', $draftUid);
 
@@ -168,8 +166,6 @@ public function validateAdditionalFields(array &$submittedData, SchedulerModuleC
      *
      * @param	array				$submittedData Array containing the data submitted by the user
      * @param	AbstractTask	$task Reference to the current task object
-     *
-     * @return	void
      */
     public function saveAdditionalFields(array $submittedData, AbstractTask $task)
     {
diff --git a/Classes/Scheduler/MailFromDraftHookInterface.php b/Classes/Scheduler/MailFromDraftHookInterface.php
index 569508ee4..41ff6ab8a 100644
--- a/Classes/Scheduler/MailFromDraftHookInterface.php
+++ b/Classes/Scheduler/MailFromDraftHookInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Scheduler;
 
 /*
@@ -21,13 +22,9 @@
  * newsletters via a scheduler task.
  *
  * @author		Bernhard Kraft <kraft@webconsulting.at>
- *
- * @package		TYPO3
- * @subpackage		tx_directmail
  */
 interface MailFromDraftHookInterface
 {
-
     /**
      * Gets called before a copy of the direct mail draft record gets inserted into the database.
      *
@@ -35,8 +32,6 @@ interface MailFromDraftHookInterface
      *
      * @param	array $hookParams Parameters to the hook. All passed by reference
      * @param	object $parentObject A reference to the calling object instance
-     *
-     * @return	void
      */
     public function postInsertClone(array $hookParams, &$parentObject);
 
@@ -48,8 +43,6 @@ public function postInsertClone(array $hookParams, &$parentObject);
      *
      * @param	array		$hookParams Parameters to the hook. All passed by reference
      * @param	object		$parentObject A reference to the calling object instance
-     *
-     * @return	void
      */
     public function enqueueClonedDmail(array $hookParams, &$parentObject);
 }
diff --git a/Classes/SelectCategories.php b/Classes/SelectCategories.php
index a748ceed0..42103d680 100644
--- a/Classes/SelectCategories.php
+++ b/Classes/SelectCategories.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail;
 
 /*
@@ -25,9 +26,6 @@
  * Localize categories for backend forms
  *
  * @author		Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
- *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
  */
 class SelectCategories
 {
@@ -36,8 +34,6 @@ class SelectCategories
      * Referenced by TCA
      *
      * @param	array $params Array of searched translation
-     *
-     * @return	void
      */
     public function get_localized_categories(array $params)
     {
@@ -65,7 +61,7 @@ public function get_localized_categories(array $params)
             $tempRepository = GeneralUtility::makeInstance(TempRepository::class);
 
             foreach ($params['items'] as $k => $item) {
-                $rows = $tempRepository->selectRowsByUid($table, intval($item[1]));
+                $rows = $tempRepository->selectRowsByUid($table, (int)($item[1]));
                 if (is_array($rows)) {
                     foreach ($rows as $rowCat) {
                         if ($localizedRowCat = $tempRepository->getRecordOverlay($table, $rowCat, $sys_language_uid)) {
diff --git a/Classes/Utility/AuthCodeUtility.php b/Classes/Utility/AuthCodeUtility.php
index 49f0e4306..57ce74d75 100644
--- a/Classes/Utility/AuthCodeUtility.php
+++ b/Classes/Utility/AuthCodeUtility.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Utility;
@@ -19,7 +20,7 @@ public static function validateAuthCode(string $submittedAuthCode, array $recipi
     {
         if (!empty($submittedAuthCode)) {
             $hmac = self::getHmac($recipientRecord, $authcodeFieldList);
-            if($submittedAuthCode === $hmac) {
+            if ($submittedAuthCode === $hmac) {
                 return true;
             }
             /**
@@ -27,7 +28,7 @@ public static function validateAuthCode(string $submittedAuthCode, array $recipi
              * for old e-mails
              */
             $authCodeToMatch = self::getAuthCode($recipientRecord, $authcodeFieldList);
-            if($submittedAuthCode === $authCodeToMatch) {
+            if ($submittedAuthCode === $authCodeToMatch) {
                 return true;
             }
         }
@@ -51,8 +52,7 @@ public static function getHmac(array $recipientRecord, string $authcodeFieldList
             foreach ($fieldArr as $k => $v) {
                 $recCopy_temp[$k] = $recipientRecord[$v];
             }
-        }
-        else {
+        } else {
             $recCopy_temp = $recipientRecord;
         }
         $preKey = implode('|', $recCopy_temp);
diff --git a/Classes/Utility/DmCsvUtility.php b/Classes/Utility/DmCsvUtility.php
index decb851a1..d2c06b4b3 100644
--- a/Classes/Utility/DmCsvUtility.php
+++ b/Classes/Utility/DmCsvUtility.php
@@ -1,13 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Utility;
 
-use DirectMailTeam\DirectMail\Repository\PagesRepository;
-use DirectMailTeam\DirectMail\Utility\Typo3ConfVarsUtility;
-use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\CsvUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class DmCsvUtility
 {
@@ -79,7 +76,7 @@ public function rearrangeCsvValues(array $lines, $fieldList): array
             if (!$fieldName) {
                 $fieldOrder = [
                     ['name'],
-                    ['email']
+                    ['email'],
                 ];
             }
             // Re-map values
@@ -102,13 +99,11 @@ public function rearrangeCsvValues(array $lines, $fieldList): array
                                 if (trim($data[$kk])) {
                                     if (substr($fN[1], 0, 1) == '=') {
                                         $out[$c][$fN[0]] = trim(substr($fN[1], 1));
-                                    }
-                                    elseif (substr($fN[1], 0, 1) == '+') {
+                                    } elseif (substr($fN[1], 0, 1) == '+') {
                                         $out[$c][$fN[0]] += substr($fN[1], 1);
                                     }
                                 }
-                            }
-                            else {
+                            } else {
                                 $out[$c][$fN[0]] = trim($data[$kk]);
                             }
                         }
@@ -124,8 +119,6 @@ public function rearrangeCsvValues(array $lines, $fieldList): array
      * Send csv values as download by sending appropriate HTML header
      *
      * @param array $idArr Values to be put into csv
-     *
-     * @return void Sent HML header for a file download
      */
     public function downloadCSV(array $idArr)
     {
diff --git a/Classes/Utility/DmRegistryUtility.php b/Classes/Utility/DmRegistryUtility.php
index 0ac5c2a3b..a1835aa0b 100644
--- a/Classes/Utility/DmRegistryUtility.php
+++ b/Classes/Utility/DmRegistryUtility.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Utility;
diff --git a/Classes/Utility/ReadmailUtility.php b/Classes/Utility/ReadmailUtility.php
index d78fa83a5..229fe1bd7 100644
--- a/Classes/Utility/ReadmailUtility.php
+++ b/Classes/Utility/ReadmailUtility.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Utility;
@@ -26,8 +27,6 @@
  * @author  Kasper Skårhøj <kasper@typo3.com>
  * @author  Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
  *
- * @package  TYPO3
- * @subpackage  tx_directmail
  * @version  $Id: class.readmail.php 6012 2007-07-23 12:54:25Z ivankartolo $
  */
 class ReadmailUtility
@@ -36,7 +35,7 @@ class ReadmailUtility
         '550' => 'no mailbox|account does not exist|user unknown|Recipient unknown|recipient unknown|account that you tried to reach is disabled|User Unknown|User unknown|unknown in relay recipient table|user is unknown|unknown user|unknown local part|unrouteable address|does not have an account here|no such user|user not listed|account has been disabled or discontinued|user disabled|unknown recipient|invalid recipient|recipient problem|recipient name is not recognized|mailbox unavailable|550 5\.1\.1 recipient|status: 5\.1\.1|delivery failed 550|550 requested action not taken|receiver not found|unknown or illegal alias|is unknown at host|is not a valid mailbox|no mailbox here by that name|we do not relay|5\.7\.1 unable to relay|cuenta no activa|inactive user|user is inactive|mailaddress is administratively disabled|not found in directory|not listed in public name & address book|destination addresses were unknown|recipient address rejected|Recipient address rejected|Address rejected|rejected address|not listed in domino directory|domino directory entry does not|550-5\.1.1 The email account that you tried to reach does not exist|The email address you entered couldn',
         '551' => 'over quota|quota exceeded|mailbox full|mailbox is full|not enough space on the disk|mailfolder is over the allowed quota|recipient reached disk quota|temporalmente sobre utilizada|recipient storage full|mailbox lleno|user mailbox exceeds allowed size',
         '552' => 'connection refused|Connection refused|connection timed out|Connection timed out|timed out while|Host not found|host not found|Unable to connect to DNS|t find any host named|unrouteable mail domain|not reached for any host after a long failure period|domain invalid|host lookup did not complete: retry timeout exceeded|no es posible conectar correctamente',
-        '554' => 'error in header|header error|invalid message|invalid structure|header line format error'
+        '554' => 'error in header|header error|invalid message|invalid structure|header line format error',
     ];
 
     public $dateAbbrevs = [
@@ -51,7 +50,7 @@ class ReadmailUtility
         'SEP' => 9,
         'OCT' => 10,
         'NOV' => 11,
-        'DEC' => 12
+        'DEC' => 12,
     ];
 
     public $serverGMToffsetMinutes = 60;
@@ -71,13 +70,13 @@ public function find_MIDfromReturnPath($to)
         $out = [
             'mid' => $moreParts[0],
             'rtbl' => substr($moreParts[1], 0, 1),
-            'rid' => intval(substr($moreParts[1], 1))
+            'rid' => (int)(substr($moreParts[1], 1)),
         ];
         if ($out['rtbl'] == 'p') {
             $out['rtbl'] = 'P';
         }
 
-        return($out);
+        return $out;
     }
 
     /**
@@ -99,9 +98,9 @@ public function find_XTypo3MID($content)
                 $out = [
                     'mid' => $moreParts[0],
                     'rtbl' => substr($moreParts[1], 0, 1),
-                    'rid' => substr($moreParts[1], 1)
+                    'rid' => substr($moreParts[1], 1),
                 ];
-                return($out);
+                return $out;
             }
         }
         return '';
@@ -121,21 +120,18 @@ public function getMessage(array $mailParts)
         if (preg_match('/^Content-Type: message\/delivery-status/', substr($mailParts['CONTENT'], 0, 5000))) {
             // Don't break it, we're only looking for a reason
             $c = $mailParts['CONTENT'];
-        }
-        elseif ($mailParts['content-type']) {
+        } elseif ($mailParts['content-type']) {
             $cType = $this->getCType($mailParts['content-type']);
             if ($cType['boundary']) {
                 $parts = $this->getMailBoundaryParts($cType['boundary'], $mailParts['CONTENT']);
                 $c = $this->getTextContent($parts[0]);
-            }
-            else {
+            } else {
                 $c = $this->getTextContent(
                     'Content-Type: ' . $mailParts['content-type'] . '
      ' . $mailParts['CONTENT']
                 );
             }
-        }
-        else {
+        } else {
             $c = $mailParts['CONTENT'];
         }
         return $c;
@@ -199,8 +195,7 @@ public function getCType($str)
             $mparts = explode('=', $ppstr, 2);
             if (count($mparts) > 1) {
                 $cTypes[strtolower(trim($mparts[0]))] = preg_replace('/^"/', '', trim(preg_replace('/"$/', '', trim($mparts[1]))));
-            }
-            else {
+            } else {
                 $cTypes[] = $ppstr;
             }
         }
@@ -293,7 +288,7 @@ public function extractReason($text)
         $reason = -1;
         foreach ($this->reason_text as $case => $value) {
             if (preg_match('/' . $value . '/i', $text)) {
-                return intval($case);
+                return (int)$case;
             }
         }
         return $reason;
@@ -347,8 +342,7 @@ public function extractNameEmail($str)
         preg_match('/<([^>]*)>/', $str, $reg);
         if (GeneralUtility::validEmail($str)) {
             $outArr['email'] = $str;
-        }
-        elseif ($reg[1] && GeneralUtility::validEmail($reg[1])) {
+        } elseif ($reg[1] && GeneralUtility::validEmail($reg[1])) {
             $outArr['email'] = $reg[1];
             // Find name:
             list($namePart) = explode($reg[0], $str);
@@ -382,7 +376,7 @@ public function getContentTypeData($contentTypeStr)
         $outValue['_MIME_TYPE'] = $cTypeParts[0];
         reset($cTypeParts);
         next($cTypeParts);
-        while (list(, $v) = Each($cTypeParts)) {
+        while (list(, $v) = each($cTypeParts)) {
             $reg = '';
             preg_match('/([^=]*)="(.*)"/i', $v, $reg);
             if (trim($reg[1]) && trim($reg[2])) {
@@ -419,11 +413,10 @@ public function makeUnixDate($dateStr)
      * @param string $GMT A string like "+0100" or so.
      *
      * @return int Minutes to offset the timestamp
-     * @access private
      */
     public function getGMToffset($GMT)
     {
-        $GMToffset = intval(substr($GMT, 1, 2)) * 60 + intval(substr($GMT, 3, 2));
+        $GMToffset = (int)(substr($GMT, 1, 2)) * 60 + (int)(substr($GMT, 3, 2));
         $GMToffset *= substr($GMT, 0, 1) == '+' ? 1 : -1;
         $GMToffset -= $this->serverGMToffsetMinutes;
         return $GMToffset;
diff --git a/Classes/Utility/TsUtility.php b/Classes/Utility/TsUtility.php
index 3ded5b773..dacafea1d 100644
--- a/Classes/Utility/TsUtility.php
+++ b/Classes/Utility/TsUtility.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Utility;
@@ -25,8 +26,7 @@ public function implodeTSParams(array $p, string $k = ''): array
             foreach ($p as $kb => $val) {
                 if (is_array($val)) {
                     $implodeParams = array_merge($implodeParams, $this->implodeTSParams($val, $k . $kb));
-                }
-                else {
+                } else {
                     $implodeParams[$k . $kb] = $val;
                 }
             }
@@ -49,14 +49,13 @@ public function implodeTSParams(array $p, string $k = ''): array
      * @param string $tsConfPrefix Prefix for object paths
      * @param array|string $impParams [Description needed.]
      *
-     * @return	void
      *
      * @see implodeTSParams(), getPagesTSconfig()
      */
     public function updatePagesTSconfig(int $id, array $pageTs, string $tsConfPrefix, $impParams = '')
     {
         $done = false;
-        $id = intval($id);
+        $id = (int)$id;
         if (is_array($pageTs) && $id > 0) {
             if (!is_array($impParams)) {
                 $impParams = $this->implodeTSParams(BackendUtility::getPagesTSconfig($id));
diff --git a/Classes/Utility/Typo3ConfVarsUtility.php b/Classes/Utility/Typo3ConfVarsUtility.php
index dfdcfd5b1..8f15eaffb 100644
--- a/Classes/Utility/Typo3ConfVarsUtility.php
+++ b/Classes/Utility/Typo3ConfVarsUtility.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DirectMailTeam\DirectMail\Utility;
@@ -42,8 +43,8 @@ public static function getDMConfigMergedFields(): array
     public static function getDMConfigSendPerCycle(): int
     {
         $dmConfig = self::getDMConfig();
-        if(trim($dmConfig['sendPerCycle'])) {
-            return intval(trim($dmConfig['sendPerCycle']));
+        if (trim($dmConfig['sendPerCycle'])) {
+            return (int)(trim($dmConfig['sendPerCycle']));
         }
 
         return 50;
diff --git a/Configuration/Icons.php b/Configuration/Icons.php
index a66f9c7ef..c707140f9 100644
--- a/Configuration/Icons.php
+++ b/Configuration/Icons.php
@@ -1,4 +1,5 @@
 <?php
+
 //https://docs.typo3.org/m/typo3/reference-coreapi/11.5/en-us/ApiOverview/Icon/Index.html
 return [
     // icon identifier
@@ -6,51 +7,51 @@
         // icon provider class
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
         // the source bitmap file
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/attach.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/attach.png',
     ],
     'directmail-dmail' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/dmail.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/dmail.png',
     ],
     'directmail-dmail-list' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/dmail_list.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/dmail_list.png',
     ],
     'directmail-folder' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/ext_icon_dmail_folder.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/ext_icon_dmail_folder.png',
     ],
     'directmail-category' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/icon_tx_directmail_category.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/icon_tx_directmail_category.png',
     ],
     'directmail-mail' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/mail.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/mail.png',
     ],
     'directmail-mailgroup' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/mailgroup.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/mailgroup.png',
     ],
     'directmail-page-modules-dmail' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/modules_dmail.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/modules_dmail.png',
     ],
     'directmail-page-modules-dmail-inactive' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/modules_dmail__h.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/modules_dmail__h.png',
     ],
     'directmail-dmail-new' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/newmail.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/newmail.png',
     ],
     'directmail-dmail-preview-html' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/preview_html.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/preview_html.png',
     ],
     'directmail-dmail-preview-text' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        'source' => 'EXT:direct_mail/Resources/Public/Icons/preview_txt.png'
+        'source' => 'EXT:direct_mail/Resources/Public/Icons/preview_txt.png',
     ],
 /**
     'mysvgicon' => [
diff --git a/Configuration/RequestMiddlewares.php b/Configuration/RequestMiddlewares.php
index 6b14528b0..3d19efa27 100644
--- a/Configuration/RequestMiddlewares.php
+++ b/Configuration/RequestMiddlewares.php
@@ -5,7 +5,7 @@
         'direct-mail/jumpurl-controller' => [
             'target' => \DirectMailTeam\DirectMail\Middleware\JumpurlController::class,
             'before' => [
-                'friends-of-typo3/jumpurl'
+                'friends-of-typo3/jumpurl',
             ],
         ],
     ],
diff --git a/Configuration/TCA/Overrides/fe_users.php b/Configuration/TCA/Overrides/fe_users.php
index 42ec73313..4bcd3e86d 100644
--- a/Configuration/TCA/Overrides/fe_users.php
+++ b/Configuration/TCA/Overrides/fe_users.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('TYPO3') || die();
 
 // fe_users modified
@@ -7,8 +8,8 @@
         'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:module_sys_dmail_group.newsletter',
         'exclude' => '1',
         'config' => [
-            'type' => 'check'
-        ]
+            'type' => 'check',
+        ],
     ],
     'module_sys_dmail_category' => [
         'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:module_sys_dmail_group.category',
@@ -19,7 +20,7 @@
             'renderMode' => 'checkbox',
             'foreign_table' => 'sys_dmail_category',
             'foreign_table_where' => 'AND sys_dmail_category.l18n_parent=0 AND sys_dmail_category.pid IN (###PAGE_TSCONFIG_IDLIST###) ORDER BY sys_dmail_category.sorting',
-            'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::Class.'->get_localized_categories',
+            'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::class . '->get_localized_categories',
             'itemsProcFunc_config' => [
                 'table' => 'sys_dmail_category',
                 'indexField' => 'uid',
@@ -28,15 +29,15 @@
             'minitems' => 0,
             'maxitems' => 60,
             'MM' => 'sys_dmail_feuser_category_mm',
-        ]
+        ],
     ],
     'module_sys_dmail_html' => [
         'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:module_sys_dmail_group.htmlemail',
         'exclude' => '1',
         'config' => [
-            'type' => 'check'
-        ]
-    ]
+            'type' => 'check',
+        ],
+    ],
 ];
 
 TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_users', $feUsersCols);
diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
index ecfec5b08..631c6158d 100644
--- a/Configuration/TCA/Overrides/pages.php
+++ b/Configuration/TCA/Overrides/pages.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('TYPO3') || die();
 
 // pages modified
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
index 6c3e852e4..14e4cdf4e 100644
--- a/Configuration/TCA/Overrides/sys_template.php
+++ b/Configuration/TCA/Overrides/sys_template.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('TYPO3') || die();
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('direct_mail', 'Configuration/TypoScript/boundaries/', 'Direct Mail Content Boundaries');
diff --git a/Configuration/TCA/Overrides/tt_address.php b/Configuration/TCA/Overrides/tt_address.php
index e757464c6..182e23197 100644
--- a/Configuration/TCA/Overrides/tt_address.php
+++ b/Configuration/TCA/Overrides/tt_address.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('TYPO3') || die();
 
 // tt_address modified
@@ -12,7 +13,7 @@
             'renderMode' => 'checkbox',
             'foreign_table' => 'sys_dmail_category',
             'foreign_table_where' => 'AND sys_dmail_category.l18n_parent=0 AND sys_dmail_category.pid IN (###PAGE_TSCONFIG_IDLIST###) ORDER BY sys_dmail_category.sorting',
-            'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::class.'->get_localized_categories',
+            'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::class . '->get_localized_categories',
             'itemsProcFunc_config' => [
                 'table' => 'sys_dmail_category',
                 'indexField' => 'uid',
@@ -21,15 +22,15 @@
             'minitems' => 0,
             'maxitems' => 60,
             'MM' => 'sys_dmail_ttaddress_category_mm',
-        ]
+        ],
     ],
     'module_sys_dmail_html' => [
         'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:module_sys_dmail_group.htmlemail',
         'exclude' => '1',
         'config' => [
-            'type' => 'check'
-        ]
-    ]
+            'type' => 'check',
+        ],
+    ],
 ];
 
 TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_address', $ttAddressCols);
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index ea82bfd95..97046b1f4 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('TYPO3') || die();
 
 // tt_content modified
@@ -13,7 +14,7 @@
             'renderMode' => 'checkbox',
             'foreign_table' => 'sys_dmail_category',
             'foreign_table_where' => 'AND sys_dmail_category.l18n_parent=0 AND sys_dmail_category.pid IN (###PAGE_TSCONFIG_IDLIST###) ORDER BY sys_dmail_category.sorting',
-            'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::Class.'->get_localized_categories',
+            'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::class . '->get_localized_categories',
             'itemsProcFunc_config' => [
                 'table' => 'sys_dmail_category',
                 'indexField' => 'uid',
@@ -22,7 +23,7 @@
             'minitems' => 0,
             'maxitems' => 60,
             'MM' => 'sys_dmail_ttcontent_category_mm',
-        ]
+        ],
     ],
 ];
 TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', $ttContentCols);
diff --git a/Configuration/TCA/sys_dmail.php b/Configuration/TCA/sys_dmail.php
index 1e94f4bcd..47b2ec7ff 100644
--- a/Configuration/TCA/sys_dmail.php
+++ b/Configuration/TCA/sys_dmail.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'ctrl' => [
         'label' => 'subject',
@@ -10,14 +11,14 @@
         'iconfile' => 'EXT:direct_mail/Resources/Public/Icons/mail.png',
         'type' => 'type',
         'useColumnsForDefaultValues' => 'from_email,from_name,replyto_email,replyto_name,organisation,priority,encoding,charset,sendOptions,type',
-        'languageField' => 'sys_language_uid'
+        'languageField' => 'sys_language_uid',
     ],
     'columns' => [
         'sys_language_uid' => [
             'exclude' => 1,
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
-                'type' => 'language'
+                'type' => 'language',
             ],
         ],
         'subject' => [
@@ -26,8 +27,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'max' => '120',
-                'eval' => 'trim,required'
-            ]
+                'eval' => 'trim,required',
+            ],
         ],
         'page' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.page',
@@ -38,7 +39,7 @@
                 'size' => '1',
                 'maxitems' => 1,
                 'minitems' => 0,
-            ]
+            ],
         ],
         'from_email' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.from_email',
@@ -46,8 +47,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'max' => '80',
-                'eval' => 'trim,required'
-            ]
+                'eval' => 'trim,required',
+            ],
         ],
         'from_name' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.from_name',
@@ -55,8 +56,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'eval' => 'trim',
-                'max' => '80'
-            ]
+                'max' => '80',
+            ],
         ],
         'replyto_email' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.replyto_email',
@@ -64,8 +65,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'eval' => 'trim',
-                'max' => '80'
-            ]
+                'max' => '80',
+            ],
         ],
         'replyto_name' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.replyto_name',
@@ -73,8 +74,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'eval' => 'trim',
-                'max' => '80'
-            ]
+                'max' => '80',
+            ],
         ],
         'return_path' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.return_path',
@@ -82,8 +83,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'eval' => 'trim',
-                'max' => '80'
-            ]
+                'max' => '80',
+            ],
         ],
         'organisation' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.organisation',
@@ -91,8 +92,8 @@
                 'type' => 'input',
                 'size' => '30',
                 'eval' => 'trim',
-                'max' => '80'
-            ]
+                'max' => '80',
+            ],
         ],
         'encoding' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.transfer_encoding',
@@ -104,8 +105,8 @@
                     ['base64', 'base64'],
                     ['8bit', '8bit'],
                 ],
-                'default' => 'quoted-printable'
-            ]
+                'default' => 'quoted-printable',
+            ],
         ],
         'charset' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.charset',
@@ -114,8 +115,8 @@
                 'size' => '15',
                 'max' => '20',
                 'eval' => 'trim',
-                'default' => 'iso-8859-1'
-            ]
+                'default' => 'iso-8859-1',
+            ],
         ],
         'priority' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.priority',
@@ -125,10 +126,10 @@
                 'items' => [
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.priority.I.0', '5'],
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.priority.I.1', '3'],
-                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.priority.I.2', '1']
+                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.priority.I.2', '1'],
                 ],
-                'default' => '3'
-            ]
+                'default' => '3',
+            ],
         ],
         'sendOptions' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.sendOptions',
@@ -136,25 +137,25 @@
                 'type' => 'check',
                 'items' => [
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.sendOptions.I.0', ''],
-                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.sendOptions.I.1', '']
+                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.sendOptions.I.1', ''],
                 ],
                 'cols' => '2',
-                'default' => '3'
-            ]
+                'default' => '3',
+            ],
         ],
         'includeMedia' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.includeMedia',
             'config' => [
                 'type' => 'check',
-                'default' => '0'
-            ]
+                'default' => '0',
+            ],
         ],
         'flowedFormat' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.flowedFormat',
             'config' => [
                 'type' => 'check',
-                'default' => '0'
-            ]
+                'default' => '0',
+            ],
         ],
         'HTMLParams' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.HTMLParams',
@@ -163,8 +164,8 @@
                 'size' => '15',
                 'max' => '80',
                 'eval' => 'trim',
-                'default' => ''
-            ]
+                'default' => '',
+            ],
         ],
         'plainParams' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.plainParams',
@@ -173,8 +174,8 @@
                 'size' => '15',
                 'max' => '80',
                 'eval' => 'trim',
-                'default' => '&type=99'
-            ]
+                'default' => '&type=99',
+            ],
         ],
         'issent' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.issent',
@@ -182,7 +183,7 @@
             'config' => [
                 'type' => 'none',
                 'size' => 2,
-            ]
+            ],
         ],
         'scheduled' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.scheduled',
@@ -191,8 +192,8 @@
                 'type' => 'none',
                 'cols' => '30',
                 'format' => 'datetime',
-                'default' => 0
-            ]
+                'default' => 0,
+            ],
         ],
         'scheduled_begin' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.scheduled_begin',
@@ -200,8 +201,8 @@
                 'type' => 'none',
                 'cols' => '15',
                 'format' => 'datetime',
-                'default' => 0
-            ]
+                'default' => 0,
+            ],
         ],
         'scheduled_end' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.scheduled_end',
@@ -209,15 +210,15 @@
                 'type' => 'none',
                 'cols' => '15',
                 'format' => 'datetime',
-                'default' => 0
-            ]
+                'default' => 0,
+            ],
         ],
         'use_rdct' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.use_rdct',
             'config' => [
                 'type' => 'check',
-                'default' => '0'
-            ]
+                'default' => '0',
+            ],
         ],
         'long_link_rdct_url' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.long_link_rdct_url',
@@ -226,14 +227,14 @@
                 'size' => '15',
                 'max' => '80',
                 'eval' => 'trim',
-                'default' => ''
-            ]
+                'default' => '',
+            ],
         ],
         'long_link_mode' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.long_link_mode',
             'config' => [
-                'type' => 'check'
-            ]
+                'type' => 'check',
+            ],
         ],
         'authcode_fieldList' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.authcode_fieldList',
@@ -242,15 +243,15 @@
                 'size' => '30',
                 'eval' => 'trim',
                 'max' => '80',
-                'default' => 'uid,name,email,password'
-            ]
+                'default' => 'uid,name,email,password',
+            ],
         ],
         'renderedsize' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.renderedsize',
             'exclude' => '1',
             'config' => [
-                'type' => 'none'
-            ]
+                'type' => 'none',
+            ],
         ],
         'attachment' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.attachment',
@@ -259,7 +260,7 @@
                 [
                     'maxitems' => 5,
                     'appearance' => [
-                        'createNewRelationLinkTitle' => 'LLL:EXT:frontend/locallang_ttc.xlf:images.addFileReference'
+                        'createNewRelationLinkTitle' => 'LLL:EXT:frontend/locallang_ttc.xlf:images.addFileReference',
                     ],
                     // custom configuration for displaying fields in the overlay/reference table
                     // to use the image overlay palette instead of the basic overlay palette
@@ -268,12 +269,12 @@
                             '0' => [
                                 'showitem' => '
                                     --palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-                                    --palette--;;filePalette'
+                                    --palette--;;filePalette',
                             ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_TEXT => [
                                 'showitem' => '
                                     --palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-                                    --palette--;;filePalette'
+                                    --palette--;;filePalette',
                             ],
                         ],
                     ],
@@ -290,11 +291,11 @@
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.type.I.0', '0'],
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.type.I.1', '1'],
                     ['Draft of internal page', '2'],
-                    ['Draft of external URL', '3']
+                    ['Draft of external URL', '3'],
                 ],
-                'default' => '0'
-            ]
-        ]
+                'default' => '0',
+            ],
+        ],
     ],
     'types' => [
         '0' => ['showitem' => '
@@ -316,11 +317,11 @@
             --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.tab1, type, page, plainParams;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.plainParams.ALT.1, HTMLParams;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.HTMLParams.ALT.1, attachment,
             --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.tab2, subject, --palette--;;from, --palette--;Reply-to;reply, return_path, organisation, priority, encoding,
             --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail.tab3, sendOptions, includeMedia, flowedFormat, use_rdct, long_link_mode, authcode_fieldList, scheduled
-		']
+		'],
     ],
     'palettes' => [
         '1' => ['showitem' => 'scheduled_begin, scheduled_end, issent'],
         'from' => ['showitem' => 'from_email, from_name'],
         'reply' => ['showitem' => 'replyto_email, replyto_name'],
-    ]
+    ],
 ];
diff --git a/Configuration/TCA/sys_dmail_category.php b/Configuration/TCA/sys_dmail_category.php
index 70b899bcc..52df3feae 100644
--- a/Configuration/TCA/sys_dmail_category.php
+++ b/Configuration/TCA/sys_dmail_category.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'ctrl' => [
         'title' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_category',
@@ -20,8 +21,8 @@
         'sys_language_uid' => [
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
-                'type' => 'language'
-            ]
+                'type' => 'language',
+            ],
         ],
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
@@ -34,7 +35,7 @@
                 ],
                 'foreign_table' => 'sys_dmail_category',
                 'foreign_table_where' => 'AND sys_dmail_category.pid=###CURRENT_PID### AND sys_dmail_category.sys_language_uid IN (-1,0)',
-                'default' => 0
+                'default' => 0,
             ],
         ],
         'l18n_diffsource' => [
@@ -46,15 +47,15 @@
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
-                'default' => '0'
-            ]
+                'default' => '0',
+            ],
         ],
         'category' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_category.category',
             'config' => [
                 'type' => 'input',
                 'size' => '30',
-            ]
+            ],
         ],
         'old_cat_number' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_category.old_cat_number',
@@ -64,13 +65,13 @@
                 'size' => '2',
                 'eval' => 'trim',
                 'max' => '2',
-            ]
+            ],
         ],
     ],
     'types' => [
-        '0' => ['showitem' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, category']
+        '0' => ['showitem' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, category'],
     ],
     'palettes' => [
-        '1' => ['showitem' => '']
-    ]
+        '1' => ['showitem' => ''],
+    ],
 ];
diff --git a/Configuration/TCA/sys_dmail_group.php b/Configuration/TCA/sys_dmail_group.php
index 12d5b12bb..65918be50 100644
--- a/Configuration/TCA/sys_dmail_group.php
+++ b/Configuration/TCA/sys_dmail_group.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'ctrl' => [
         'label' => 'title',
@@ -21,7 +22,7 @@
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
                     ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0],
                 ],
             ],
         ],
@@ -31,16 +32,16 @@
                 'type' => 'input',
                 'size' => '30',
                 'max' => '120',
-                'eval' => 'trim,required'
-            ]
+                'eval' => 'trim,required',
+            ],
         ],
         'description' => [
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'cols' => '40',
-                'rows' => '3'
-            ]
+                'rows' => '3',
+            ],
         ],
         'type' => [
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.type',
@@ -52,10 +53,10 @@
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.type.I.1', '1'],
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.type.I.2', '2'],
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.type.I.3', '3'],
-                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.type.I.4', '4']
+                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.type.I.4', '4'],
                 ],
-                'default' => '0'
-            ]
+                'default' => '0',
+            ],
         ],
         'static_list' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.static_list',
@@ -66,8 +67,8 @@
                 'MM' => 'sys_dmail_group_mm',
                 'size' => '20',
                 'maxitems' => '100000',
-                'minitems' => '0'
-            ]
+                'minitems' => '0',
+            ],
         ],
         'pages' => [
             'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.startingpoint',
@@ -77,8 +78,8 @@
                 'allowed' => 'pages',
                 'size' => '3',
                 'maxitems' => '22',
-                'minitems' => '0'
-            ]
+                'minitems' => '0',
+            ],
         ],
         'mail_groups' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.mail_groups',
@@ -88,14 +89,14 @@
                 'allowed' => 'sys_dmail_group',
                 'size' => '3',
                 'maxitems' => '22',
-                'minitems' => '0'
-            ]
+                'minitems' => '0',
+            ],
         ],
         'recursive' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.recursive',
             'config' => [
-                'type' => 'check'
-            ]
+                'type' => 'check',
+            ],
         ],
         'whichtables' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.whichtables',
@@ -108,16 +109,16 @@
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.whichtables.I.3', ''],
                 ],
                 'cols' => 2,
-                'default' => 1
-            ]
+                'default' => 1,
+            ],
         ],
         'list' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.list',
             'config' => [
                 'type' => 'text',
                 'cols' => '48',
-                'rows' => '10'
-            ]
+                'rows' => '10',
+            ],
         ],
         'csv' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.csv',
@@ -126,10 +127,10 @@
                 'renderType' => 'selectSingle',
                 'items' => [
                     ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.csv.I.0', '0'],
-                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.csv.I.1', '1']
+                    ['LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.csv.I.1', '1'],
                 ],
-                'default' => '0'
-            ]
+                'default' => '0',
+            ],
         ],
         'select_categories' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.select_categories',
@@ -139,7 +140,7 @@
                 'renderMode' => 'checkbox',
                 'foreign_table' => 'sys_dmail_category',
                 'foreign_table_where' => 'AND sys_dmail_category.l18n_parent=0 AND sys_dmail_category.pid IN (###PAGE_TSCONFIG_IDLIST###) ORDER BY sys_dmail_category.sorting',
-                'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::Class.'->get_localized_categories',
+                'itemsProcFunc' => DirectMailTeam\DirectMail\SelectCategories::class . '->get_localized_categories',
                 'itemsProcFunc_config' => [
                     'table' => 'sys_dmail_category',
                     'indexField' => 'uid',
@@ -148,22 +149,22 @@
                 'minitems' => 0,
                 'maxitems' => 60,
                 'MM' => 'sys_dmail_group_category_mm',
-            ]
+            ],
         ],
         'query' => [
             'label' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.query',
             'config' => [
                 'type' => 'text',
                 'cols' => '48',
-                'rows' => '10'
-            ]
-        ]
+                'rows' => '10',
+            ],
+        ],
     ],
     'types' => [
         '0' => ['showitem' => 'type, sys_language_uid, title, description, --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.advanced,pages,recursive,whichtables,select_categories'],
         '1' => ['showitem' => 'type, sys_language_uid, title, description, --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.advanced,list,csv'],
         '2' => ['showitem' => 'type, sys_language_uid, title, description, --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.advanced,static_list'],
         '3' => ['showitem' => 'type, sys_language_uid, title, description'],
-        '4' => ['showitem' => 'type, sys_language_uid, title, description, --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.advanced,mail_groups']
-    ]
+        '4' => ['showitem' => 'type, sys_language_uid, title, description, --div--;LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group.advanced,mail_groups'],
+    ],
 ];
diff --git a/Tests/Unit/Dmailer/DirectMailEngineTest.php b/Tests/Unit/Dmailer/DirectMailEngineTest.php
index 167eb7158..a896d096e 100644
--- a/Tests/Unit/Dmailer/DirectMailEngineTest.php
+++ b/Tests/Unit/Dmailer/DirectMailEngineTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace DirectMailTeam\DirectMail\Tests\Unit\Mailer;
 
 /*
@@ -18,13 +19,9 @@
  * Testcase for class "DirectMailTeam\DirectMail\Dmailer"
  *
  * @author Bernhard Kraft <kraft@webconsulting.at>
- *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
  */
 class DirectMailEngineTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
-
     /**
      * @test
      * @dataProvider extractHyperLinksDataProvider
@@ -40,13 +37,13 @@ public function test_extractHyperLinks($content, $path, $expected)
 
         // Create an instance of "dmailer" with only the "extractMediaLinks" being mocked.
         $dmailer = $this->getMock('dmailer', ['extractMediaLinks']);
-        $dmailer->expects($this->once())->method('extractMediaLinks');
+        $dmailer->expects(self::once())->method('extractMediaLinks');
         $dmailer->setPartHtmlConfig('content', $content);
         $dmailer->setPartHtmlConfig('path', $path);
         $dmailer->setPartHtmlConfig('media', []);
         $dmailer->extractHyperLinks();
 
-        $this->assertEquals($expected, $dmailer->getPartHtmlConfig('hrefs'));
+        self::assertEquals($expected, $dmailer->getPartHtmlConfig('hrefs'));
     }
 
     /**
@@ -71,7 +68,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'absolute url (fails currently, #54459)' => ['
 				This is a <a title="Browse to http://google.com for more information" href="http://google.com">simple</a> test',
@@ -85,7 +82,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'relative link #1' => ['
 				This is a <a name="link" href="fileadmin/simple.pdf">simple</a> test',
@@ -99,7 +96,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'relative link #2' => ['
 				This is a <a name="link" href="fileadmin/simple.pdf">simple</a> test',
@@ -113,7 +110,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'relative link #3' => ['
 				This is a <a name="link" href="fileadmin/simple.pdf">simple</a> test',
@@ -127,7 +124,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'relative link #4' => ['
 				This is a <a name="link" href="fileadmin/simple.pdf">simple</a> test',
@@ -141,7 +138,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'absolute link #1' => ['
 				This is a <a name="link" href="/fileadmin/simple.pdf">simple</a> test',
@@ -155,7 +152,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'absolute link #2' => ['
 				This is a <a name="link" href="/fileadmin/simple.pdf">simple</a> test',
@@ -169,7 +166,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 0,
                     ],
-                ]
+                ],
             ],
             'absolute link #3 (no_jumpurl)' => ['
 				This is a <a name="link" href="image.png" no_jumpurl="1">simple</a> test',
@@ -183,7 +180,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'a',
                         'no_jumpurl' => 1,
                     ],
-                ]
+                ],
             ],
             'form action #1' => ['
 				Hello.<br />
@@ -202,7 +199,7 @@ public function extractHyperLinksDataProvider()
                         'tag' => 'form',
                         'no_jumpurl' => 1,
                     ],
-                ]
+                ],
             ],
         ];
     }
diff --git a/ext_emconf.php b/ext_emconf.php
index b6d0b50c5..186a2007e 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -17,7 +17,7 @@
             'tt_address' => '5.3.0-7.0.99',
             'php' => '7.4.0-8.0.99',
             'jumpurl' => '8.0.3-',
-            'rdct' => '2.1.0'
+            'rdct' => '2.1.0',
         ],
         'conflicts' => [
         ],
@@ -28,7 +28,7 @@
     ],
     'autoload' => [
         'psr-4' => [
-            'DirectMailTeam\\DirectMail\\' => 'Classes/'
-        ]
+            'DirectMailTeam\\DirectMail\\' => 'Classes/',
+        ],
     ],
 ];
diff --git a/ext_localconf.php b/ext_localconf.php
index d7a80471c..5050d8dd3 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 defined('TYPO3') || die();
@@ -74,7 +75,7 @@
         'extension'            => 'direct_mail',
         'title'                => 'Direct Mail: Create Mail from Draft',
         'description'        => 'This task allows you to select a DirectMail draft that gets copied and then sent to the. This allows automatic (periodic) sending of the same TYPO3 page.',
-        'additionalFields'    => 'DirectMailTeam\\DirectMail\\Scheduler\\MailFromDraftAdditionalFields'
+        'additionalFields'    => 'DirectMailTeam\\DirectMail\\Scheduler\\MailFromDraftAdditionalFields',
     ];
 
     // bounce mail per scheduler
@@ -82,6 +83,6 @@
         'extension' => 'direct_mail',
         'title' => 'Direct Mail: Analyze bounce mail',
         'description' => 'This task will get bounce mail from the configured mailbox',
-        'additionalFields' => 'DirectMailTeam\\DirectMail\\Scheduler\\AnalyzeBounceMailAdditionalFields'
+        'additionalFields' => 'DirectMailTeam\\DirectMail\\Scheduler\\AnalyzeBounceMailAdditionalFields',
     ];
 })();
diff --git a/ext_tables.php b/ext_tables.php
index 20e63e29e..fd1182fa1 100755
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 defined('TYPO3') || die();
@@ -137,7 +138,7 @@
     );
 
     if (TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExtensionVersion('tt_address')) <= TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger('2.3.5')) {
-        include_once(TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('direct_mail').'Configuration/TCA/Overrides/tt_address.php');
+        include_once(TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('direct_mail') . 'Configuration/TCA/Overrides/tt_address.php');
     }
 
     $GLOBALS['TBE_STYLES']['skins']['direct_mail']['stylesheetDirectories'][] = 'EXT:direct_mail/Resources/Public/StyleSheets/';