[TASK] Refactoring Test Mail Generation

Classes/Controller/MailController.php

@@ -28,7 +28,9 @@ namespace SGalinski\SgMail\Controller;
 
 use SGalinski\SgMail\Service\MailTemplateService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 /**
@@ -70,7 +72,7 @@ class MailController extends ActionController {
 			$languages[] = $language->getLocale();
 		}
 
-		foreach($languages as $currentLanguage) {
+		foreach ($languages as $currentLanguage) {
 			$this->writeLanguageFile($currentLanguage, $templatePath);
 		}
 
@@ -215,24 +217,20 @@ class MailController extends ActionController {
 	 * @param string $selectedTemplateKey
 	 * @param string $selectedExtensionKey
 	 * @param string $selectedLanguageLeft
-	 * @param string $selectedLanguageRight
 	 */
 	public function sendTestMailAction(
-		$emailAddress = NULL, $selectedExtensionKey = NULL, $selectedTemplateKey = NULL, $selectedLanguageLeft = NULL,
-		$selectedLanguageRight = NULL
+		$emailAddress, $selectedExtensionKey, $selectedTemplateKey, $selectedLanguageLeft
 	) {
-
-		MailTemplateService::sendEmail(
-			$selectedLanguageLeft, $selectedTemplateKey, $selectedExtensionKey, $emailAddress,
-			$this->settings['mail']['from']['test'],
-			'This is just a Test E-Mail', [], TRUE
-		);
-
-		MailTemplateService::sendEmail(
-			$selectedLanguageRight, $selectedTemplateKey, $selectedExtensionKey, $emailAddress,
-			$this->settings['mail']['from']['test'],
-			'This is just a Test E-Mail', [], TRUE
-		);
+		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+		/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
+		$mailTemplateService = $objectManager->get(MailTemplateService::class);
+		$mailTemplateService->setLanguage($selectedLanguageLeft);
+		$mailTemplateService->setToAddresses($emailAddress);
+		$mailTemplateService->setFromAddress($this->settings['mail']['test']['from']);
+		$mailTemplateService->setSubject($this->settings['mail']['test']['subject']);
+		$mailTemplateService->setTemplateName($selectedTemplateKey);
+		$mailTemplateService->setExtensionKey($selectedExtensionKey);
+		$mailTemplateService->sendEmail();
 
 		$message = LocalizationUtility::translate('backend.success_mail', 'sg_mail');
 		$this->addFlashMessage($message, '', FlashMessage::OK);

Configuration/TypoScript/setup.ts

@@ -7,7 +7,8 @@ module.tx_sgmail {
 
 	settings {
 		mail {
-			from.test = info@test.de
+			test.from = info@test.de
+			test.subject = This is just a Test E-Mail
 		}
 
 		templateDefaultLanguage = en