From 0c58be43ff52b68675853d328c1be9b7febb30b3 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 7 Jan 2021 08:58:03 +0100 Subject: [PATCH] Manual CGL adjustments Not covered by PSR / phpcs Relates: #8092 --- .../Command/DestinationDataImportCommand.php | 2 +- Classes/Controller/DateController.php | 8 ++++---- Classes/Controller/EventController.php | 6 +++--- Classes/Domain/Model/Event.php | 12 ++++++------ Classes/Domain/Model/Organizer.php | 9 +++++---- Classes/Domain/Model/Region.php | 9 +++++---- Classes/Domain/Repository/DateRepository.php | 8 ++++---- .../Service/DestinationDataImportService.php | 18 +++++++++--------- 8 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Classes/Command/DestinationDataImportCommand.php b/Classes/Command/DestinationDataImportCommand.php index a26d84a..ca638ff 100644 --- a/Classes/Command/DestinationDataImportCommand.php +++ b/Classes/Command/DestinationDataImportCommand.php @@ -6,8 +6,8 @@ use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Core\Bootstrap; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Object\ObjectManager; use Wrm\Events\Service\DestinationDataImportService; diff --git a/Classes/Controller/DateController.php b/Classes/Controller/DateController.php index 1ad389e..b83e882 100644 --- a/Classes/Controller/DateController.php +++ b/Classes/Controller/DateController.php @@ -2,15 +2,15 @@ namespace Wrm\Events\Controller; -use Wrm\Events\Domain\Model\Date; +use TYPO3\CMS\Core\Database\QueryGenerator; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; +use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; +use Wrm\Events\Domain\Model\Date; use Wrm\Events\Domain\Model\Dto\DateDemand; use Wrm\Events\Domain\Repository\CategoryRepository; use Wrm\Events\Domain\Repository\DateRepository; use Wrm\Events\Domain\Repository\RegionRepository; -use TYPO3\CMS\Core\Database\QueryGenerator; -use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; /** * DateController diff --git a/Classes/Controller/EventController.php b/Classes/Controller/EventController.php index b20b430..987f466 100644 --- a/Classes/Controller/EventController.php +++ b/Classes/Controller/EventController.php @@ -2,12 +2,12 @@ namespace Wrm\Events\Controller; -use Wrm\Events\Domain\Model\Dto\EventDemand; -use Wrm\Events\Domain\Model\Event; -use Wrm\Events\Domain\Repository\EventRepository; use TYPO3\CMS\Core\Database\QueryGenerator; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; +use Wrm\Events\Domain\Model\Dto\EventDemand; +use Wrm\Events\Domain\Model\Event; +use Wrm\Events\Domain\Repository\EventRepository; /** * EventController diff --git a/Classes/Domain/Model/Event.php b/Classes/Domain/Model/Event.php index ab47e24..6df87af 100644 --- a/Classes/Domain/Model/Event.php +++ b/Classes/Domain/Model/Event.php @@ -2,14 +2,14 @@ namespace Wrm\Events\Domain\Model; -use TYPO3\CMS\Extbase\Domain\Model\FileReference; -use TYPO3\CMS\Extbase\Domain\Model\Category; -use Wrm\Events\Domain\Repository\DateRepository; -use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Annotation as Extbase; +use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; +use TYPO3\CMS\Extbase\Domain\Model\Category; +use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; +use Wrm\Events\Domain\Repository\DateRepository; /** * Event @@ -531,7 +531,7 @@ class Event extends AbstractEntity } /** - * @return \TYPO3\CMS\Extbase\Domain\Model\FileReference $images + * @return FileReference $images */ public function getImages() { @@ -539,7 +539,7 @@ class Event extends AbstractEntity } /** - * @param \TYPO3\CMS\Extbase\Domain\Model\FileReference $images + * @param FileReference $images * @return void */ public function setImages(FileReference $images) diff --git a/Classes/Domain/Model/Organizer.php b/Classes/Domain/Model/Organizer.php index 0106ed1..583b1e6 100644 --- a/Classes/Domain/Model/Organizer.php +++ b/Classes/Domain/Model/Organizer.php @@ -2,9 +2,7 @@ namespace Wrm\Events\Domain\Model; -use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; - -/*** +/* * * This file is part of the "DD Events" Extension for TYPO3 CMS. * @@ -13,7 +11,10 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; * * (c) 2019 Dirk Koritnik * - ***/ + */ + +use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; + /** * Organizer */ diff --git a/Classes/Domain/Model/Region.php b/Classes/Domain/Model/Region.php index 0198035..8c8bae2 100644 --- a/Classes/Domain/Model/Region.php +++ b/Classes/Domain/Model/Region.php @@ -2,9 +2,7 @@ namespace Wrm\Events\Domain\Model; -use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; - -/*** +/* * * This file is part of the "DD Events" Extension for TYPO3 CMS. * @@ -13,7 +11,10 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; * * (c) 2019 Dirk Koritnik * - ***/ + */ + +use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; + /** * Region */ diff --git a/Classes/Domain/Repository/DateRepository.php b/Classes/Domain/Repository/DateRepository.php index 5fb5d5c..6ac94e9 100644 --- a/Classes/Domain/Repository/DateRepository.php +++ b/Classes/Domain/Repository/DateRepository.php @@ -2,14 +2,14 @@ namespace Wrm\Events\Domain\Repository; +use TYPO3\CMS\Core\Database\ConnectionPool; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface; +use TYPO3\CMS\Extbase\Persistence\QueryInterface; +use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; use TYPO3\CMS\Extbase\Persistence\Repository; use Wrm\Events\Domain\Model\Dto\DateDemand; use Wrm\Events\Service\CategoryService; -use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\Database\ConnectionPool; -use TYPO3\CMS\Extbase\Persistence\QueryInterface; -use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; class DateRepository extends Repository { diff --git a/Classes/Service/DestinationDataImportService.php b/Classes/Service/DestinationDataImportService.php index 003b352..7c72bf4 100644 --- a/Classes/Service/DestinationDataImportService.php +++ b/Classes/Service/DestinationDataImportService.php @@ -2,25 +2,25 @@ namespace Wrm\Events\Service; -use TYPO3\CMS\Extbase\Domain\Model\Category; -use Wrm\Events\Domain\Model\Date; -use Wrm\Events\Domain\Model\Organizer; -use Wrm\Events\Domain\Model\Event; -use TYPO3\CMS\Core\DataHandling\DataHandler; use TYPO3\CMS\Core\Core\Environment; +use TYPO3\CMS\Core\DataHandling\DataHandler; +use TYPO3\CMS\Core\DataHandling\SlugHelper; +use TYPO3\CMS\Core\Database\ConnectionPool; +use TYPO3\CMS\Core\Log\LogManager; use TYPO3\CMS\Core\Resource\FileRepository; use TYPO3\CMS\Core\Resource\Index\MetaDataRepository; use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\DataHandling\SlugHelper; -use TYPO3\CMS\Core\Database\ConnectionPool; -use TYPO3\CMS\Core\Log\LogManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; +use TYPO3\CMS\Extbase\Domain\Model\Category; use TYPO3\CMS\Extbase\Domain\Repository\CategoryRepository; -use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager; use TYPO3\CMS\Extbase\Object\ObjectManager; +use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; +use Wrm\Events\Domain\Model\Date; +use Wrm\Events\Domain\Model\Event; +use Wrm\Events\Domain\Model\Organizer; use Wrm\Events\Domain\Repository\DateRepository; use Wrm\Events\Domain\Repository\EventRepository; use Wrm\Events\Domain\Repository\OrganizerRepository;