Skip to content

Commit

Permalink
Apply CGL
Browse files Browse the repository at this point in the history
  • Loading branch information
sfroemkenjw committed Nov 5, 2024
1 parent 0146dcd commit 6aca0a1
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 36 deletions.
11 changes: 5 additions & 6 deletions Classes/Exporter/EventsExporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,16 @@ public function __construct(
protected readonly RequestFactory $requestFactory,
protected readonly LinkService $linkService,
protected readonly DateTimeUtility $dateTimeUtility,
) {
}
) {}

public function export(ExporterConfiguration $configuration): ResponseInterface
{
$preparedEvents = $this->getPreparedEvents(
$this->eventService->getEventsForExport(
$configuration->getStoragePages(),
$this->getMaxDateForEventsExport()
$this->getMaxDateForEventsExport(),
),
$configuration->getStoragePages()
$configuration->getStoragePages(),
);

try {
Expand All @@ -59,7 +58,7 @@ public function export(ExporterConfiguration $configuration): ResponseInterface
'x-api-key' => $configuration->getSecret(),
],
'body' => json_encode($preparedEvents, JSON_THROW_ON_ERROR),
]
],
);
} catch (\JsonException|GuzzleException $e) {
}
Expand Down Expand Up @@ -251,7 +250,7 @@ protected function addImages(array &$eventRecord, Event $event, array $storagePa
$publicLink = sprintf(
'%s/%s',
$baseUrl,
$fileReference->getOriginalResource()->getOriginalFile()->getPublicUrl()
$fileReference->getOriginalResource()->getOriginalFile()->getPublicUrl(),
);
$images[] = [
'url' => $publicLink,
Expand Down
25 changes: 12 additions & 13 deletions Classes/Importer/JsonImporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public function __construct(
protected readonly LocationService $locationService,
protected readonly OrganizerService $organizerService,
protected readonly ResourceFactory $resourceFactory,
) {
}
) {}

public function import(ImportConfiguration $importConfiguration): bool
{
Expand All @@ -56,7 +55,7 @@ public function import(ImportConfiguration $importConfiguration): bool
$this->updateDataMapForEventImport(
$eventImportData,
$importConfiguration,
$dataMap
$dataMap,
);
}

Expand Down Expand Up @@ -88,7 +87,7 @@ public function import(ImportConfiguration $importConfiguration): bool
protected function updateDataMapForEventImport(
array $eventImportData,
ImportConfiguration $configuration,
array &$dataMap
array &$dataMap,
): void {
$eventRecord = $this->getEventRecordByImportId($eventImportData['uid']);

Expand Down Expand Up @@ -248,7 +247,7 @@ protected function migrateExceptionsToDataMap(array $importExceptionRecords, int
'exception_time' => $this->migrateTimeRecordToDataMap($importExceptionRecord['exception_time'], $storagePid, $dataMap),
'exception_details' => $importExceptionRecord['exception_details'],
'show_anyway' => $importExceptionRecord['show_anyway'] ? 1 : 0,
'mark_as' =>$importExceptionRecord['mark_as'],
'mark_as' => $importExceptionRecord['mark_as'],
];

$exceptionUidCollection[] = $exceptionUid;
Expand Down Expand Up @@ -352,7 +351,7 @@ protected function migrateImageRecordsToDataMap(
array $importImageRecords,
string $eventUid,
ImportConfiguration $configuration,
array &$dataMap
array &$dataMap,
): string {
if ($importImageRecords === []) {
return '0';
Expand All @@ -365,7 +364,7 @@ protected function migrateImageRecordsToDataMap(
}

$resourceStorage = $this->resourceFactory->getStorageObjectFromCombinedIdentifier(
$configuration->getStorageFolder()
$configuration->getStorageFolder(),
);
$folder = $this->resourceFactory->getFolderObjectFromCombinedIdentifier($configuration->getStorageFolder());
$filename = $resourceStorage->sanitizeFileName(pathinfo($imageRecord['url'], PATHINFO_BASENAME));
Expand All @@ -379,7 +378,7 @@ protected function migrateImageRecordsToDataMap(
$fileObject = $resourceStorage->addFile(
$tempImagePath,
$folder,
$filename
$filename,
);
} catch (ExistingTargetFileNameException $e) {
continue;
Expand Down Expand Up @@ -416,16 +415,16 @@ protected function getEventRecordByImportId(int $importId): ?array
->where(
$queryBuilder->expr()->eq(
'import_id',
$queryBuilder->createNamedParameter($importId, Connection::PARAM_INT)
$queryBuilder->createNamedParameter($importId, Connection::PARAM_INT),
),
$queryBuilder->expr()->eq(
'sys_language_uid',
$queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
$queryBuilder->createNamedParameter(0, Connection::PARAM_INT),
),
$queryBuilder->expr()->eq(
'l10n_parent',
$queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
)
$queryBuilder->createNamedParameter(0, Connection::PARAM_INT),
),
)
->executeQuery()
->fetchAssociative();
Expand Down Expand Up @@ -462,7 +461,7 @@ protected function updateSlugs(DataHandler $dataHandler): void
],
[
'uid' => (int)$eventUid,
]
],
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions Classes/Service/CategoryService.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ public function getCategoryRecordByTitle(string $title, int $language = 0): ?arr
->where(
$queryBuilder->expr()->eq(
'title',
$queryBuilder->createNamedParameter($title)
$queryBuilder->createNamedParameter($title),
),
$queryBuilder->expr()->eq(
'sys_language_uid',
$queryBuilder->createNamedParameter($language, Connection::PARAM_INT)
)
$queryBuilder->createNamedParameter($language, Connection::PARAM_INT),
),
)
->executeQuery()
->fetchAssociative();
Expand Down
12 changes: 6 additions & 6 deletions Classes/Service/EventService.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,26 +89,26 @@ public function getEventsForExport(array $storagePages, \DateTimeImmutable $endD
$queryBuilder->expr()->eq(
'e.uid',
$queryBuilder->quoteIdentifier('d.event')
)
),
)
->where(
$queryBuilder->expr()->gte(
'd.day',
$queryBuilder->createNamedParameter(time(), Connection::PARAM_INT)
$queryBuilder->createNamedParameter(time(), Connection::PARAM_INT),
),
$queryBuilder->expr()->lte(
'd.day',
$queryBuilder->createNamedParameter((int)$endDate->format('U'), Connection::PARAM_INT)
)
$queryBuilder->createNamedParameter((int)$endDate->format('U'), Connection::PARAM_INT),
),
);

if ($storagePages !== []) {
$queryBuilder
->andWhere(
$queryBuilder->expr()->in(
'e.pid',
$queryBuilder->createNamedParameter($storagePages, ArrayParameterType::INTEGER)
)
$queryBuilder->createNamedParameter($storagePages, ArrayParameterType::INTEGER),
),
);
}

Expand Down
6 changes: 3 additions & 3 deletions Classes/Service/LocationService.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ public function getLocationRecordByTitle(string $title, int $language = 0): ?arr
->where(
$queryBuilder->expr()->eq(
'location',
$queryBuilder->createNamedParameter($title)
$queryBuilder->createNamedParameter($title),
),
$queryBuilder->expr()->eq(
'sys_language_uid',
$queryBuilder->createNamedParameter($language, Connection::PARAM_INT)
)
$queryBuilder->createNamedParameter($language, Connection::PARAM_INT),
),
)
->executeQuery()
->fetchAssociative();
Expand Down
6 changes: 3 additions & 3 deletions Classes/Service/OrganizerService.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ public function getOrganizerRecordByTitle(string $title, int $language = 0): ?ar
->where(
$queryBuilder->expr()->eq(
'organizer',
$queryBuilder->createNamedParameter($title)
$queryBuilder->createNamedParameter($title),
),
$queryBuilder->expr()->eq(
'sys_language_uid',
$queryBuilder->createNamedParameter($language, Connection::PARAM_INT)
)
$queryBuilder->createNamedParameter($language, Connection::PARAM_INT),
),
)
->executeQuery()
->fetchAssociative();
Expand Down
4 changes: 2 additions & 2 deletions Configuration/TCA/Overrides/sys_reaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'label' => \JWeiland\Events2\Reaction\ImportEventsReaction::getDescription(),
'value' => \JWeiland\Events2\Reaction\ImportEventsReaction::getType(),
'icon' => \JWeiland\Events2\Reaction\ImportEventsReaction::getIconIdentifier(),
]
],
);

\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
Expand All @@ -35,7 +35,7 @@
'size' => 1,
],
],
]
],
);

$GLOBALS['TCA']['sys_reaction']['palettes']['setStorage'] = [
Expand Down

0 comments on commit 6aca0a1

Please sign in to comment.