[TASK] Code cleanups

Classes/Controller/MailController.php

@@ -83,7 +83,7 @@ class MailController extends ActionController {
 		$siteRootId = BackendService::getSiteRoot((int) GeneralUtility::_GP('id'));
 
 		if (!($this->session instanceof PhpSession)) {
-			$this->session = $this->objectManager->get('SGalinski\SgMail\Session\PhpSession');
+			$this->session = $this->objectManager->get(PhpSession::class);
 			$this->session->setSessionKey('sg_mail_controller_session');
 		}
 

Classes/Controller/QueueController.php

@@ -26,11 +26,8 @@ namespace SGalinski\SgMail\Controller;
  ***************************************************************/
 use SGalinski\SgMail\Service\BackendService;
 use SGalinski\SgMail\Service\MailTemplateService;
-use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-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;
@@ -99,10 +96,14 @@ class QueueController extends ActionController {
 	 * send or resend a mail in the queue
 	 *
 	 * @param int $uid
-	 * @param string $selectedExtension
 	 * @param string $selectedTemplate
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
 	 */
-	public function sendMailAction($uid, $selectedExtension, $selectedTemplate) {
+	public function sendMailAction($uid, $selectedTemplate) {
 		$mailService = new MailTemplateService();
 		$mailService->sendMailFromQueue($uid);
 
@@ -111,36 +112,4 @@ class QueueController extends ActionController {
 		$arguments = $this->request->getArguments();
 		$this->redirect('index', NULL, NULL, $arguments);
 	}
-
-	/**
-	 * create buttons for the backend module header
-	 */
-	private function makeButtons() {
-		/** @var ButtonBar $buttonBar */
-		$buttonBar = $this->docHeaderComponent->getButtonBar();
-
-		/** @var IconFactory $iconFactory */
-		$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-
-		// Refresh
-		$refreshButton = $buttonBar->makeLinkButton()
-			->setHref(GeneralUtility::getIndpEnv('REQUEST_URI'))
-			->setTitle(LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf: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);
-		$this->docHeaderComponent->getButtonBar();
-	}
 }