[TASK] Code cleanup

Classes/Controller/ConfigurationController.php

@@ -43,7 +43,7 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
  * Controller for the configuration mode of the backend module
  */
 class ConfigurationController extends ActionController {
-	const DEFAULT_EXTENSION_KEY = 'sg_mail';
+	public const DEFAULT_EXTENSION_KEY = 'sg_mail';
 
 	/**
 	 * DocHeaderComponent
@@ -67,7 +67,7 @@ class ConfigurationController extends ActionController {
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
 	 */
 	public function indexAction($mode = 'new', $selectedTemplate = NULL, $selectedExtension = NULL, array $filters = []
-	) {
+	): void {
 		if ($this->request->hasArgument('message')) {
 			$this->addFlashMessage($this->request->getArgument('message'), '', FlashMessage::ERROR);
 		}
@@ -137,7 +137,7 @@ class ConfigurationController extends ActionController {
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
 	 */
-	public function createAction() {
+	public function createAction(): void {
 		if (!$this->request->hasArgument('configuration')) {
 			$this->redirect(
 				'index', 'Configuration', NULL,
@@ -200,7 +200,7 @@ class ConfigurationController extends ActionController {
 	 * @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,
@@ -267,7 +267,7 @@ class ConfigurationController extends ActionController {
 	 * @throws UnsupportedRequestTypeException
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
 	 */
-	public function deleteAction(string $selectedTemplate, string $selectedExtension) {
+	public function deleteAction(string $selectedTemplate, string $selectedExtension): void {
 		$registerService = $this->objectManager->get(RegisterService::class);
 		$registerService->deleteTemplate($selectedExtension, $selectedTemplate);
 		$this->redirect(

Classes/Controller/MailController.php

@@ -36,7 +36,6 @@ use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Page\PageRenderer;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
@@ -65,7 +64,7 @@ class MailController extends ActionController {
 	 *
 	 * @param TemplateRepository $templateRepository
 	 */
-	public function injectTemplateRepository(TemplateRepository $templateRepository) {
+	public function injectTemplateRepository(TemplateRepository $templateRepository): void {
 		$this->templateRepository = $templateRepository;
 	}
 
@@ -77,12 +76,14 @@ class MailController extends ActionController {
 	/**
 	 * @param ViewInterface $view
 	 */
-	public function initializeView(ViewInterface $view) {
+	public function initializeView(ViewInterface $view): void {
 		parent::initializeView($view);
 		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-		$pageRenderer->addJsInlineCode('typo3_version', 'TYPO3.version='
+		$pageRenderer->addJsInlineCode(
+			'typo3_version', 'TYPO3.version='
 			. VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getCurrentTypo3Version())
-			. ';');
+			. ';'
+		);
 		if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.0.0', '<')) {
 			$pageRenderer->loadExtJS();
 		}
@@ -100,7 +101,7 @@ class MailController extends ActionController {
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
 	 */
-	public function indexAction(array $parameters = []) {
+	public function indexAction(array $parameters = []): void {
 		if ($this->request->hasArgument('message')) {
 			$this->addFlashMessage($this->request->getArgument('message'), '', FlashMessage::INFO);
 		}
@@ -215,7 +216,9 @@ class MailController extends ActionController {
 		$this->view->assign('templates', $registerArray);
 
 		$registerService = $this->objectManager->get(RegisterService::class);
-		$this->view->assign('isManual', $registerService->isManuallyRegisteredTemplate($parameters['selectedTemplate']));
+		$this->view->assign(
+			'isManual', $registerService->isManuallyRegisteredTemplate($parameters['selectedTemplate'])
+		);
 
 		$templateDescription = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['description'];
 
@@ -223,7 +226,7 @@ class MailController extends ActionController {
 			if ($languages[0]['isocode']) {
 				$templateDescription = $templateDescription[$languages[0]['isocode']];
 			}
-		} elseif(\strpos($templateDescription, 'LLL:') !== FALSE) {
+		} elseif (\strpos($templateDescription, 'LLL:') !== FALSE) {
 			$templateDescription = LocalizationUtility::translate(
 				$templateDescription, $parameters['selectedExtension']
 			);
@@ -255,6 +258,7 @@ class MailController extends ActionController {
 
 		$this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
 		$this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version));
+		/** @noinspection PhpInternalEntityUsedInspection */
 		$this->view->assign('beUserMail', $GLOBALS['BE_USER']->user['email']);
 
 		// get the default language label and pass it to the view
@@ -289,7 +293,7 @@ class MailController extends ActionController {
 	 * @throws \BadFunctionCallException
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
 	 */
-	public function sendTestMailAction(array $parameters = []) {
+	public function sendTestMailAction(array $parameters = []): void {
 		$arguments = [];
 		if ($parameters['selectedExtension']) {
 			$arguments['selectedExtension'] = $parameters['selectedExtension'];
@@ -369,7 +373,7 @@ class MailController extends ActionController {
 	/**
 	 * show a notice when no extension is registered
 	 */
-	public function emptyAction() {
+	public function emptyAction(): void {
 
 	}
 
@@ -382,7 +386,7 @@ class MailController extends ActionController {
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
 	 */
-	public function resetAction($template, $extensionKey) {
+	public function resetAction($template, $extensionKey): void {
 		$pid = (int) GeneralUtility::_GP('id');
 		$this->templateRepository->deleteTemplate($extensionKey, $template, $pid);