[TASK] Remove unused and BS function for adding attachments

Classes/Service/MailTemplateService.php

@@ -33,15 +33,12 @@ use SGalinski\SgMail\Domain\Model\Template;
 use SGalinski\SgMail\Domain\Repository\LayoutRepository;
 use SGalinski\SgMail\Domain\Repository\MailRepository;
 use SGalinski\SgMail\Domain\Repository\TemplateRepository;
-use Swift_Attachment;
-use Swift_OutputByteStream;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Mail\MailMessage;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Routing\SiteMatcher;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
@@ -90,7 +87,7 @@ class MailTemplateService {
 	 */
 	protected $objectManager;
 	/**
-	 * @var TYPO3\CMS\Core\Resource\ResourceFactory
+	 * @var \TYPO3\CMS\Core\Resource\ResourceFactory
 	 */
 	protected $resourceFactory;
 	/**
@@ -364,24 +361,6 @@ class MailTemplateService {
 		return $this;
 	}
 
-	/**
-	 * IMPORTANT: make sure to set $this->>ignoreMailQueue(TRUE), if you're using this method to add an attachment!
-	 * Otherwise the attachment is ignored when sending the mail via mail queue.
-	 *
-	 * @param Swift_OutputByteStream $data
-	 * @param string $filename
-	 * @param string $contentType
-	 * @return MailTemplateService
-	 */
-	public function addAttachment($data, $filename, $contentType): MailTemplateService {
-		$attachment = Swift_Attachment::newInstance()
-			->setFilename($filename)
-			->setContentType($contentType)
-			->setBody($data);
-		$this->mailMessage->attach($attachment);
-		return $this;
-	}
-
 	/**
 	 * Adds a file resource as attachment
 	 *
@@ -1046,31 +1025,19 @@ class MailTemplateService {
 	 */
 	private function getAvailableLanguages(): array {
 		$out = [0 => ''];
-		if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.0.0', '<')) {
-			$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(
-				'sys_language'
-			);
-			$rows = $queryBuilder->select('*')
-				->from('sys_language')->execute()->fetchAll();
-
-			foreach ($rows as $row) {
-				$out[(int) $row['uid']] = $row['language_isocode'];
-			}
-		} else {
-			try {
-				$site = GeneralUtility::makeInstance(SiteMatcher::class)->matchByPageId(0);
-			} catch (\Exception $exception) {
-				return [0 => ''];
-			}
-			$availableLanguages = $site->getLanguages();
-			$out = [];
-			foreach ($availableLanguages as $language) {
-				$languageId = $language->getLanguageId();
-				if ($languageId < 0) {
-					continue;
-				}
-				$out[$language->getLanguageId()] = strtolower($language->getTwoLetterIsoCode());
+		try {
+			$site = GeneralUtility::makeInstance(SiteMatcher::class)->matchByPageId(0);
+		} catch (\Exception $exception) {
+			return [0 => ''];
+		}
+		$availableLanguages = $site->getLanguages();
+		$out = [];
+		foreach ($availableLanguages as $language) {
+			$languageId = $language->getLanguageId();
+			if ($languageId < 0) {
+				continue;
 			}
+			$out[$language->getLanguageId()] = strtolower($language->getTwoLetterIsoCode());
 		}
 		return $out;
 	}