[BUGFIX] Make php-cs-fixer happy

Related #717

Signed-off-by: Marcus Schwemer <marcus.schwemer@in2code.de>

Author: mschwemer

Classes/Controller/FormController.php

@@ -19,6 +19,7 @@
 use In2code\Powermail\Utility\ObjectUtility;
 use In2code\Powermail\Utility\SessionUtility;
 use In2code\Powermail\Utility\TemplateUtility;
+use function in_array;
 use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
@@ -39,9 +40,8 @@
 use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
-use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
 
-use function in_array;
+use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
 
 /**
  * Class FormController
@@ -457,10 +457,10 @@ protected function forwardIfFormParamsDoNotMatch(): void
     /**
      * Forward to formAction if no mail param given
      *
-     * @return null|ForwardResponse
+     * @return ForwardResponse|null
      * @throws StopActionException
      */
-    protected function forwardIfMailParamEmpty():?ForwardResponse
+    protected function forwardIfMailParamEmpty(): ?ForwardResponse
     {
         $arguments = $this->request->getArguments();
         if (empty($arguments['mail'])) {
@@ -477,7 +477,7 @@ protected function forwardIfMailParamEmpty():?ForwardResponse
      *        used in optinConfirmAction()
      *
      * @param Mail|null $mail
-     * @return null|ResponseInterface
+     * @return ResponseInterface|null
      * @throws StopActionException
      */
     protected function forwardIfFormParamsDoNotMatchForOptinConfirm(Mail $mail = null): ?ResponseInterface

Classes/Controller/ModuleController.php

@@ -2,8 +2,6 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Controller;
 
-use Psr\Http\Message\ResponseInterface;
-use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use In2code\Powermail\Domain\Model\Answer;
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Repository\PageRepository;
@@ -13,8 +11,10 @@
 use In2code\Powermail\Utility\MailUtility;
 use In2code\Powermail\Utility\ReportingUtility;
 use In2code\Powermail\Utility\StringUtility;
+use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
 use TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException;
 use TYPO3\CMS\Extbase\Object\Exception;
@@ -47,15 +47,14 @@ public function dispatchAction($forwardToAction = 'list'): ResponseInterface
      */
     public function listAction(): ResponseInterface
     {
-
         $formUids = $this->mailRepository->findGroupedFormUidsToGivenPageUid((int)$this->id);
         $mails = $this->mailRepository->findAllInPid((int)$this->id, $this->settings, $this->piVars);
 
         $currentPage = $this->request->hasArgument('currentPage')
             ? (int)$this->request->getArgument('currentPage')
             : 1;
 
-        $itemsPerPage = (int) $this->settings['perPage'] ? (int) $this->settings['perPage'] : 10;
+        $itemsPerPage = (int)$this->settings['perPage'] ? (int)$this->settings['perPage'] : 10;
         $maximumLinks = 15;
 
         // Pagination for Mails
@@ -333,7 +332,7 @@ public function fixWrongLocalizedPagesAction(): void
      * Check if admin is logged in
      *        If not, forward to tools overview
      *
-     * @return null|ResponseInterface
+     * @return ResponseInterface|null
      * @throws StopActionException
      */
     protected function checkAdminPermissions(): ?ResponseInterface

Classes/Controller/OutputController.php

@@ -2,20 +2,20 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Controller;
 
-use Psr\Http\Message\ResponseInterface;
-use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use Doctrine\DBAL\DBALException;
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Exception\DeprecatedException;
 use In2code\Powermail\Utility\ArrayUtility;
 use In2code\Powermail\Utility\ConfigurationUtility;
 use In2code\Powermail\Utility\FrontendUtility;
 use In2code\Powermail\Utility\LocalizationUtility;
+use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Annotation as ExtbaseAnnotation;
+use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentNameException;
 use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
 use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
@@ -275,7 +275,7 @@ protected function getFieldList(string $list = ''): array
         }
 
         if (\TYPO3\CMS\Core\Utility\ArrayUtility::isValidPath($this->settings, 'main/form')) {
-           return $this->formRepository->getFieldUidsFromForm(((int)$this->settings['main']['form']));
+            return $this->formRepository->getFieldUidsFromForm(((int)$this->settings['main']['form']));
         }
         return [];
     }

Classes/Domain/Service/GetNewMarkerNamesForFormService.php

@@ -61,7 +61,7 @@ public function getMarkersForFieldsDependingOnForm(int $formUid, bool $forceRese
         $formRepository = ObjectUtility::getObjectManager()->get(FormRepository::class);
         if ($formUid === 0) {
             $forms = $formRepository->findAll();
-        } else if ( $form = $formRepository->findByUid($formUid) ){
+        } elseif ($form = $formRepository->findByUid($formUid)) {
             $forms = [$form];
         }
         $markers = [];

Classes/Domain/Service/UploadService.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Domain\Service;
 
-use TYPO3\CMS\Core\Resource\Security\FileNameValidator;
 use In2code\Powermail\Domain\Factory\FileFactory;
 use In2code\Powermail\Domain\Model\Answer;
 use In2code\Powermail\Domain\Model\File;
@@ -15,6 +14,7 @@
 use In2code\Powermail\Utility\StringUtility;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
+use TYPO3\CMS\Core\Resource\Security\FileNameValidator;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\Exception;

Classes/Domain/Validator/AbstractValidator.php

@@ -10,7 +10,6 @@
 use TYPO3\CMS\Core\Service\FlexFormService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException;
 use TYPO3\CMS\Extbase\Validation\Validator\AbstractValidator as ExtbaseAbstractValidator;

Classes/Domain/Validator/ValidatorInterface.php

@@ -3,7 +3,6 @@
 namespace In2code\Powermail\Domain\Validator;
 
 use In2code\Powermail\Domain\Model\Field;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 
 /**
  * Interface Validator

Classes/Tca/AddOptionsToSelection.php

@@ -5,7 +5,6 @@
 use In2code\Powermail\Utility\ObjectUtility;
 use In2code\Powermail\Utility\StringUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Utility\ArrayUtility;
 
 /**
  * Class AddOptionsToSelection allows to add individual options

Classes/Utility/BackendUtility.php

@@ -2,7 +2,6 @@
 declare(strict_types = 1);
 namespace In2code\Powermail\Utility;
 
-use TYPO3\CMS\Core\Http\ApplicationType;
 use In2code\Powermail\Domain\Repository\PageRepository;
 use In2code\Powermail\Exception\DeprecatedException;
 use TYPO3\CMS\Backend\Routing\Exception\ResourceNotFoundException;
@@ -11,6 +10,7 @@
 use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Backend\Utility\BackendUtility as BackendUtilityCore;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Http\ApplicationType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\Exception;
 

Classes/Utility/SlidingWindowPagination.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /*
  * This file is part of the TYPO3 CMS project.