[TASK] Massive code cleanup for implementing proper language handling in Mails and their templates

262ba3b5 · Kevin Ditscheid · ae2403b5 · 262ba3b5 · 262ba3b5 · 262ba3b5
Commit 262ba3b5 authored Apr 14, 2021 by Kevin Ditscheid
--- a/Classes/Command/SendMailCommandController.php
+++ b/Classes/Command/SendMailCommandController.php
 <?php
-
-namespace SGalinski\SgMail\Command;
-
 /***************************************************************
 *  Copyright notice
 *
@@ -26,6 +23,8 @@ namespace SGalinski\SgMail\Command;
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/

+namespace SGalinski\SgMail\Command;
+
 use SGalinski\SgMail\Domain\Model\Mail;
 use SGalinski\SgMail\Domain\Repository\MailRepository;
 use SGalinski\SgMail\Service\PlaintextService;
@@ -37,7 +36,10 @@ use TYPO3\CMS\Core\Resource\FileInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use Symfony\Component\Console\Command\Command;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
+use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException;

 /**
 * Command controller for the mailing feature
@@ -57,11 +59,11 @@ class SendMailCommandController extends Command {
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 * @return int
-	 * @throws \TYPO3\CMS\Extbase\Object\Exception
-	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
-	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
+	 * @throws Exception
+	 * @throws IllegalObjectTypeException
+	 * @throws UnknownObjectException
 	 */
-	public function execute(InputInterface $input, OutputInterface $output) {
+	public function execute(InputInterface $input, OutputInterface $output): int {
 		$sendCount = $input->getArgument('sendCount');
 		if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '10.4.0', '<')) {
 			$objectManager = GeneralUtility::makeInstance(ObjectManager::class);

--- a/Classes/Controller/AbstractController.php
+++ b/Classes/Controller/AbstractController.php
+<?php
+/*******************************************************************************
+ * Copyright notice
+ *
+ * (c) sgalinski Internet Services (https://www.sgalinski.de)
+ *
+ * All rights reserved
+ *
+ * This script is part of the TYPO3 project. The TYPO3 project is
+ * free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The GNU General Public License can be found at
+ * http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This script is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * This copyright notice MUST APPEAR in all copies of the script!
+ ******************************************************************************/
+
+namespace SGalinski\SgMail\Controller;
+
+use SGalinski\SgMail\Service\BackendService;
+use SGalinski\SgMail\Service\RegisterService;
+use TYPO3\CMS\Backend\Template\Components\ButtonBar;
+use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use TYPO3\CMS\Extbase\Mvc\Request;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use function count;
+
+/**
+ * Class AbstractController
+ *
+ * @package SGalinski\SgMail\Controller
+ */
+abstract class AbstractController extends ActionController {
+	public CONST sessionKey = 'sg_mail_controller_session';
+	public CONST DEFAULT_EXTENSION_KEY = 'sg_mail';
+
+	/**
+	 * @var BackendUserAuthentication
+	 */
+	protected $backendUserAuthentication;
+
+	/**
+	 * @param BackendUserAuthentication $backendUserAuthentication
+	 */
+	public function injectBackendUserAuthentication(BackendUserAuthentication $backendUserAuthentication): void {
+		$this->backendUserAuthentication = $backendUserAuthentication;
+	}
+
+	/**
+	 * @var RegisterService
+	 */
+	protected $registerService;
+
+	/**
+	 * @param RegisterService $registerService
+	 */
+	public function injectRegisterService(RegisterService $registerService): void {
+		$this->registerService = $registerService;
+	}
+
+	/**
+	 * Get data from the session
+	 *
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getFromSession(string $key): string {
+		return $this->backendUserAuthentication->getSessionData(self::sessionKey . '_' . $key);
+	}
+
+	/**
+	 * Write data to the session
+	 *
+	 * @param string $key
+	 * @param $data
+	 */
+	protected function writeToSession(string $key, $data): void {
+		$this->backendUserAuthentication->setSessionData(self::sessionKey . '_' . $key, $data);
+	}
+
+	/**
+	 * Get the page id from get parameters
+	 *
+	 * @return int
+	 */
+	protected function getPid(): int {
+		return (int) GeneralUtility::_GP('id');
+	}
+
+	/**
+	 * Get the selected extension and template from the register
+	 *
+	 * @return array
+	 * @throws NoSuchCacheException
+	 */
+	protected function getSelectedExtensionAndTemplateFromRegister(): array {
+		$pageUid = $this->getPid();
+		$registerArray = $this->registerService->getNonBlacklistedTemplates($pageUid);
+		$selectedExtension = '';
+		$selectedTemplate = '';
+		if (!empty($registerArray)) {
+			$selectedExtension = key($registerArray);
+		}
+
+		if (!empty($registerArray[$selectedExtension])) {
+			$selectedTemplate = key($registerArray[$selectedExtension]);
+		}
+
+		return [$selectedExtension, $selectedTemplate];
+	}
+
+	/**
+	 * Get the selected extension and template from session or register if session is empty
+	 *
+	 * @return array
+	 * @throws NoSuchCacheException
+	 */
+	protected function getSelectedExtensionAndTemplate(): array {
+		if (
+			$this->getFromSession('selectedTemplate') !== NULL &&
+			$this->getFromSession('selectedExtension') !== NULL &&
+			!$this->registerService->isTemplateBlacklisted(
+				$this->getFromSession('selectedExtension'),
+				$this->getFromSession('selectedTemplate'),
+				$this->getPid()
+			)
+		) {
+			return [$this->getFromSession('selectedExtension'), $this->getFromSession('selectedTemplate')];
+		}
+
+		return $this->getSelectedExtensionAndTemplateFromRegister();
+	}
+
+	/**
+	 * This function checks an array of mail addresses on validity and returns false if one of them is invalid
+	 *
+	 * @param array $addresses
+	 * @return bool
+	 */
+	protected function checkMailAddresses(array $addresses): bool {
+		if (count($addresses) > 0) {
+			foreach ($addresses as $address) {
+				if (
+					trim($address) !== '' &&
+					!filter_var($address, FILTER_VALIDATE_EMAIL) &&
+					!(
+						strpos($address, '{') !== FALSE &&
+						strpos($address, '{') < strpos($address, '}')
+					)
+				) {
+					$message = LocalizationUtility::translate('backend.error_cc', 'sg_mail');
+					$this->addFlashMessage($message, '', FlashMessage::WARNING);
+					return FALSE;
+				}
+			}
+		}
+		return TRUE;
+	}
+
+	/**
+	 * Make the docheader component
+	 */
+	protected function makeDocheader(): void {
+		$pageUid = $this->getPid();
+		$docHeaderComponent = GeneralUtility::makeInstance(DocHeaderComponent::class);
+		$pageInfo = BackendUtility::readPageAccess($pageUid, $GLOBALS['BE_USER']->getPagePermsClause(1));
+		if ($pageInfo === FALSE) {
+			$pageInfo = ['uid' => $pageUid];
+		}
+
+		$docHeaderComponent->setMetaInformation($pageInfo);
+		$this->makeButtons($docHeaderComponent);
+		$this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
+	}
+
+	/**
+	 * create buttons for the backend module header
+	 *
+	 * @param DocHeaderComponent $docHeaderComponent
+	 */
+	protected function makeButtons(DocHeaderComponent $docHeaderComponent): void {
+		$buttonBar = $docHeaderComponent->getButtonBar();
+		/** @var IconFactory $iconFactory */
+		$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
+		$locallangPath = 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:';
+		// Refresh
+		$refreshButton = $buttonBar->makeLinkButton()
+			->setHref(GeneralUtility::getIndpEnv('REQUEST_URI'))
+			->setTitle(
+				LocalizationUtility::translate(
+					$locallangPath . 'labels.reload'
+				)
+			)
+			->setIcon($iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL));
+		$buttonBar->addButton($refreshButton, ButtonBar::BUTTON_POSITION_RIGHT);
+		// shortcut button
+		$shortcutButton = $buttonBar->makeShortcutButton()
+			->setModuleName($this->request->getPluginName())
+			->setGetVariables(
+				[
+					'id',
+					'M'
+				]
+			)
+			->setSetVariables([]);
+		$buttonBar->addButton($shortcutButton, ButtonBar::BUTTON_POSITION_RIGHT);
+	}
+}
--- a/Classes/Controller/ConfigurationController.php
+++ b/Classes/Controller/ConfigurationController.php
-<?php /** @noinspection CallableParameterUseCaseInTypeContextInspection */
-
-namespace SGalinski\SgMail\Controller;
-
+<?php
 /***************************************************************
 *  Copyright notice
 *
@@ -26,67 +23,44 @@ namespace SGalinski\SgMail\Controller;
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/

-use SGalinski\SgMail\Service\BackendService;
-use SGalinski\SgMail\Service\RegisterService;
-use SGalinski\SgMail\Session\PhpSession;
-use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
-use TYPO3\CMS\Backend\Utility\BackendUtility;
+namespace SGalinski\SgMail\Controller;
+
+use TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
 use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
-use TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException;
+use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use function explode;
+use function str_getcsv;
+use function str_replace;

 /**
 * Controller for the configuration mode of the backend module
 */
-class ConfigurationController extends ActionController {
-	const DEFAULT_EXTENSION_KEY = 'sg_mail';
-
-	/**
-	 * DocHeaderComponent
-	 *
-	 * @var DocHeaderComponent
-	 */
-	protected $docHeaderComponent;
-
-	/**
-	 * @var \SGalinski\SgMail\Session\PhpSession
-	 */
-	protected $session;
-
+class ConfigurationController extends AbstractController {
 	/**
-	 *
 	 * @param string $mode
-	 * @param string $selectedTemplate
-	 * @param string $selectedExtension
+	 * @param string|null $selectedTemplate
+	 * @param string|null $selectedExtension
 	 * @param array $filters
-	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
-	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
+	 * @throws NoSuchArgumentException
+	 * @throws NoSuchCacheException
 	 */
 	public function indexAction(
-		$mode = 'new', $selectedTemplate = NULL, $selectedExtension = NULL, array $filters = []
-	) {
+		string $mode = 'new', string $selectedTemplate = NULL, string $selectedExtension = NULL, array $filters = []
+	): void {
 		if ($this->request->hasArgument('message')) {
 			$this->addFlashMessage($this->request->getArgument('message'), '', FlashMessage::ERROR);
 		}

-		$pageUid = (int) GeneralUtility::_GP('id');
-		$registerArray = BackendService::getNonBlacklistedTemplates($pageUid);
 		if ($selectedTemplate === NULL || $selectedTemplate === '') {
-			if (!empty($registerArray)) {
-				$selectedExtension = \key($registerArray);
-			}
-			if (!empty($registerArray)) {
-				$selectedTemplate = \key($registerArray[$selectedExtension]);
-			}
+			[$selectedExtension, $selectedTemplate] = $this->getSelectedExtensionAndTemplate();
 		}

-		$this->view->assign('extensionKey', self::DEFAULT_EXTENSION_KEY);
-		$this->view->assign('mode', $mode);
 		if ($mode === 'edit') {
+			$registerArray = $this->registerService->getNonBlacklistedTemplates($this->getPid());
 			$templateToEdit = $registerArray[$selectedExtension][$selectedTemplate];
 			$editableMarkers = [];
 			foreach ($templateToEdit['marker'] as $arr) {
@@ -115,18 +89,10 @@ class ConfigurationController extends ActionController {
 			);
 		}

-		// make docheader
-		$this->docHeaderComponent = GeneralUtility::makeInstance(DocHeaderComponent::class);
-		$pageInfo = BackendUtility::readPageAccess($pageUid, $GLOBALS['BE_USER']->getPagePermsClause(1));
-		if ($pageInfo === FALSE) {
-			$pageInfo = ['uid' => $pageUid];
-		}
-		$this->docHeaderComponent->setMetaInformation($pageInfo);
-		BackendService::makeButtons($this->docHeaderComponent, $this->request);
-
+		$this->makeDocheader();
 		$this->view->assignMultiple(
 			[
-				'docHeader' => $this->docHeaderComponent->docHeaderContent(),
+				'extensionKey' => self::DEFAULT_EXTENSION_KEY,
 				'selectedTemplateFilter' => $filters['filterTemplate'],
 				'selectedExtensionFilter' => $filters['filterExtension'],
 				'selectedTemplateKey' => $selectedTemplate,
@@ -139,12 +105,12 @@ class ConfigurationController extends ActionController {
 	/**
 	 * Create the template or display errors that occured
 	 *
+	 * @throws NoSuchArgumentException
+	 * @throws NoSuchCacheException
 	 * @throws StopActionException
-	 * @throws UnsupportedRequestTypeException
-	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
-	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
+	 * @throws Exception
 	 */
-	public function createAction() {
+	public function createAction(): void {
 		if (!$this->request->hasArgument('configuration')) {
 			$this->redirect(
 				'index', 'Configuration', NULL,
@@ -154,16 +120,13 @@ class ConfigurationController extends ActionController {

 		/** @var array $configuration */
 		$configuration = $this->request->getArgument('configuration');
-
 		$templateName = $configuration['templateName'];
 		$extensionKey = $configuration['extensionKey'];
-		$csv = \str_replace("\r", '', $configuration['csv']);
+		$csv = str_replace("\r", '', $configuration['csv']);
 		$subject = $configuration['subject'];
 		$description = $configuration['description'];
-
-		$markersCsv = \explode("\n", $csv);
+		$markersCsv = explode("\n", $csv);
 		$markers = [];
-
 		foreach ($markersCsv as $markerCsv) {
 			$rowArray = str_getcsv($markerCsv, ';');
 			if (!$rowArray[0]) {
@@ -180,33 +143,13 @@ class ConfigurationController extends ActionController {
 				'markerLabel' => $markerLabel
 			];
 		}
-		if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '10.4.0', '<')) {
-			/** @var RegisterService $registerService */
-			$registerService = $this->objectManager->get(RegisterService::class);
-		} else {
-			$registerService = GeneralUtility::makeInstance(RegisterService::class);
-		}
-
-		$registerService->writeRegisterFile(
+		$this->registerService->writeRegisterFile(
 			$templateName, $extensionKey, $markers, $subject, $description
 		);
-		$registerService->clearCaches();
+		$this->registerService->clearCaches();
 		// store selected template & extension key in the session
-		if (!($this->session instanceof PhpSession)) {
-			if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '10.4.0', '<')) {
-				/** @var PhpSession session */
-				$this->session = $this->objectManager->get(PhpSession::class);
-			} else {
-				$this->session = GeneralUtility::makeInstance(PhpSession::class);
-			}
-
-			$this->session->setSessionKey('sg_mail_controller_session');
-		} else {
-			$this->session->setSessionKey('sg_mail_controller_session');
-		}
-
-		$this->session->setDataByKey('selectedTemplate', $templateName);
-		$this->session->setDataByKey('selectedExtension', self::DEFAULT_EXTENSION_KEY);
+		$this->writeToSession('selectedTemplate', $templateName);
+		$this->writeToSession('selectedExtension', self::DEFAULT_EXTENSION_KEY);
 		$this->redirect(
 			'index', 'Mail', NULL,
 			['message' => LocalizationUtility::translate('backend.create_message', 'sg_mail')]
@@ -214,14 +157,14 @@ class ConfigurationController extends ActionController {
 	}

 	/**
-	 * Edit the template or display errors that occured
+	 * Edit the template or display errors that occurred
 	 *
+	 * @throws Exception
+	 * @throws NoSuchArgumentException
+	 * @throws NoSuchCacheException
 	 * @throws StopActionException
-	 * @throws UnsupportedRequestTypeException
-	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
-	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
 	 */
-	public function editAction() {
+	public function editAction(): void {
 		if (!$this->request->hasArgument('configuration')) {
 			$this->redirect(
 				'index', 'Configuration', NULL,
@@ -231,19 +174,17 @@ class ConfigurationController extends ActionController {

 		/** @var array $configuration */
 		$configuration = $this->request->getArgument('configuration');
-
 		$templateName = $configuration['templateName'];
 		$extensionKey = $configuration['extensionKey'];
 		$oldTemplateName = $configuration['oldTemplateName'];
 		$oldExtensionKey = $configuration['oldExtensionKey'];
-		$csv = \str_replace("\r", '', $configuration['csv']);
+		$csv = str_replace("\r", '', $configuration['csv']);
 		$subject = $configuration['subject'];
 		$description = $configuration['description'];
-
-		$markersCsv = \explode("\n", $csv);
+		$markersCsv = explode("\n", $csv);
 		$markers = [];
 		foreach ($markersCsv as $markerCsv) {
-			$rowArray = \str_getcsv($markerCsv, ';');
+			$rowArray = str_getcsv($markerCsv, ';');
 			if (!$rowArray[0]) {
 				continue;
 			}
@@ -259,37 +200,15 @@ class ConfigurationController extends ActionController {
 			];
 		}

-		if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '10.4.0', '<')) {
-			/** @var RegisterService $registerService */
-			$registerService = $this->objectManager->get(RegisterService::class);
-		} else {
-			$registerService = GeneralUtility::makeInstance(RegisterService::class);
-		}
-
-		$registerService->migrateTemplateEntries($oldTemplateName, $oldExtensionKey, $templateName, $extensionKey);
-		$registerService->deleteRegisterFile($oldTemplateName);
-		$registerService->writeRegisterFile(
+		$this->registerService->migrateTemplateEntries($oldTemplateName, $oldExtensionKey, $templateName, $extensionKey);
+		$this->registerService->deleteRegisterFile($oldTemplateName);
+		$this->registerService->writeRegisterFile(
 			$templateName, $extensionKey, $markers, $subject, $description
 		);
-
-		$registerService->clearCaches();
-
+		$this->registerService->clearCaches();
 		// store selected template & extension key in the session
-		if (!($this->session instanceof PhpSession)) {
-			if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '10.4.0', '<')) {
-				/** @var PhpSession session */
-				$this->session = $this->objectManager->get(PhpSession::class);
-			} else {
-				$this->session = GeneralUtility::makeInstance(PhpSession::class);
-			}
-
-			$this->session->setSessionKey('sg_mail_controller_session');
-		} else {
-			$this->session->setSessionKey('sg_mail_controller_session');
-		}
-		$this->session->setDataByKey('selectedTemplate', $templateName);
-		$this->session->setDataByKey('selectedExtension', self::DEFAULT_EXTENSION_KEY);
-
+		$this->writeToSession('selectedTemplate', $templateName);
+		$this->writeToSession('selectedExtension', self::DEFAULT_EXTENSION_KEY);
 		$this->redirect(
 			'index', 'Mail', NULL,
 			['message' => LocalizationUtility::translate('backend.edit_message', 'sg_mail')]
@@ -301,19 +220,12 @@ class ConfigurationController extends ActionController {
 	 *
 	 * @param string $selectedTemplate
 	 * @param string $selectedExtension
+	 * @throws Exception
+	 * @throws NoSuchCacheException
 	 * @throws StopActionException
-	 * @throws UnsupportedRequestTypeException
-	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
 	 */
-	public function deleteAction(string $selectedTemplate, string $selectedExtension) {
-		if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '10.4.0', '<')) {
-			/** @var RegisterService $registerService */
-			$registerService = $this->objectManager->get(RegisterService::class);
-		} else {
-			$registerService = GeneralUtility::makeInstance(RegisterService::class);
-		}
-
-		$registerService->deleteTemplate($selectedExtension, $selectedTemplate);
+	public function deleteAction(string $selectedTemplate, string $selectedExtension): void {
+		$this->registerService->deleteTemplate($selectedExtension, $selectedTemplate);
 		$this->redirect(
 			'index', 'Mail', NULL,
 			['message' => LocalizationUtility::translate('backend.delete_message', 'sg_mail')]

--- a/Classes/Controller/LayoutController.php
+++ b/Classes/Controller/LayoutController.php
 <?php
-
-namespace SGalinski\SgMail\Controller;
-
 /***************************************************************
 *  Copyright notice
 *
@@ -26,29 +23,23 @@ namespace SGalinski\SgMail\Controller;
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/

+namespace SGalinski\SgMail\Controller;
+
+use InvalidArgumentException;
 use SGalinski\SgMail\Domain\Repository\LayoutRepository;
 use SGalinski\SgMail\Service\BackendService;
-use SGalinski\SgMail\Session\PhpSession;
 use TYPO3\CMS\Backend\Clipboard\Clipboard;
-use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
+use function count;
+use function is_array;

 /**
 * Controller for the mail templating service module
 */
-class LayoutController extends ActionController {
-	/**
-	 * DocHeaderComponent
-	 *
-	 * @var DocHeaderComponent
-	 */
-	protected $docHeaderComponent;
-
+class LayoutController extends AbstractController {
 	/**
 	 * @var LayoutRepository
 	 */
@@ -59,15 +50,10 @@ class LayoutController extends ActionController {