From 8c79e51c602cb846dfa6817f49705bb370f95729 Mon Sep 17 00:00:00 2001 From: Georgi Mateev <georgi.mateev@sgalinski.de> Date: Fri, 18 Oct 2024 19:48:30 +0300 Subject: [PATCH] [BUGFIX] Code reformat --- Classes/Event/BeforeVimeoCallEvent.php | 3 +-- Classes/Filter/DurationFilter.php | 4 ++-- Classes/Preview/PreviewService.php | 6 ++++-- Classes/Service/VimeoService.php | 12 +++++++----- Classes/Upgrades/ThumbnailsUpgradeWizard.php | 10 +++++++--- Classes/Utility/FlexFormUtility.php | 12 +++++------- Classes/ViewHelpers/PictureViewHelper.php | 10 +++++----- 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/Classes/Event/BeforeVimeoCallEvent.php b/Classes/Event/BeforeVimeoCallEvent.php index f86b450..ad1582f 100644 --- a/Classes/Event/BeforeVimeoCallEvent.php +++ b/Classes/Event/BeforeVimeoCallEvent.php @@ -34,8 +34,7 @@ use SGalinski\SgVimeo\Filter\FilterParameterBag; final class BeforeVimeoCallEvent { private FilterParameterBag $parameters; - public function __construct(FilterParameterBag $parameters) - { + public function __construct(FilterParameterBag $parameters) { $this->parameters = $parameters; } } diff --git a/Classes/Filter/DurationFilter.php b/Classes/Filter/DurationFilter.php index 99f7abf..9efe782 100644 --- a/Classes/Filter/DurationFilter.php +++ b/Classes/Filter/DurationFilter.php @@ -69,13 +69,13 @@ class DurationFilter implements FilterInterface { } if ($this->filterValues['duration'] === "1") { - if ($item['duration'] > 1*60) { + if ($item['duration'] > 1 * 60) { unset($data['items'][$key]); } } if ($this->filterValues['duration'] === "2") { - if ($item['duration'] <= 1*60) { + if ($item['duration'] <= 1 * 60) { unset($data['items'][$key]); } } diff --git a/Classes/Preview/PreviewService.php b/Classes/Preview/PreviewService.php index 5a59a59..1b1e95b 100644 --- a/Classes/Preview/PreviewService.php +++ b/Classes/Preview/PreviewService.php @@ -71,13 +71,15 @@ class PreviewService { ]; $view->assign('data', $templateData); - $view->assign('headerLabel', BackendUtility::getLabelFromItemListMerged( + $view->assign( + 'headerLabel', BackendUtility::getLabelFromItemListMerged( $row['pid'], 'tt_content', 'list_type', $row['list_type'], $row - )); + ) + ); return $view; } diff --git a/Classes/Service/VimeoService.php b/Classes/Service/VimeoService.php index 605bcd1..129854a 100644 --- a/Classes/Service/VimeoService.php +++ b/Classes/Service/VimeoService.php @@ -154,7 +154,9 @@ class VimeoService implements LoggerAwareInterface { if (str_starts_with($vimeoId, 'showcase')) { $showcaseId = explode('/', $vimeoId)[1]; - $response['items'] = $this->addVideoIdsToResponse($this->getShowcaseVideos((int) $showcaseId, $parameterBag)); + $response['items'] = $this->addVideoIdsToResponse( + $this->getShowcaseVideos((int) $showcaseId, $parameterBag) + ); $response['kind'] = 'showcase'; } elseif (str_starts_with($vimeoId, 'channel')) { $channelId = explode('/', $vimeoId)[1]; @@ -306,8 +308,8 @@ class VimeoService implements LoggerAwareInterface { $parameters = [ 'fields' => $fieldsToSelect, - 'sort' => 'default', - 'per_page' => $this->maxResultsPerPage + 'sort' => 'default', + 'per_page' => $this->maxResultsPerPage ]; foreach ($filterParameterBag->getFilterInstances() as $filter) { @@ -343,8 +345,8 @@ class VimeoService implements LoggerAwareInterface { $parameters = [ 'fields' => $fieldsToSelect, - 'sort' => 'default', - 'per_page' => $this->maxResultsPerPage + 'sort' => 'default', + 'per_page' => $this->maxResultsPerPage ]; foreach ($filterParameterBag->getFilterInstances() as $filter) { diff --git a/Classes/Upgrades/ThumbnailsUpgradeWizard.php b/Classes/Upgrades/ThumbnailsUpgradeWizard.php index 6472f4d..cc21973 100644 --- a/Classes/Upgrades/ThumbnailsUpgradeWizard.php +++ b/Classes/Upgrades/ThumbnailsUpgradeWizard.php @@ -57,7 +57,9 @@ final class ThumbnailsUpgradeWizard implements UpgradeWizardInterface { ->update('sys_file_reference') ->set('fieldname', 'settings.thumbnailImages') ->where( - $queryBuilder->expr()->eq('fieldname', $queryBuilder->createNamedParameter('tx_sgvimeo_thumbnail_image')) + $queryBuilder->expr()->eq( + 'fieldname', $queryBuilder->createNamedParameter('tx_sgvimeo_thumbnail_image') + ) ); $queryBuilder->executeStatement(); @@ -75,12 +77,14 @@ final class ThumbnailsUpgradeWizard implements UpgradeWizardInterface { ->count('uid') ->from('sys_file_reference') ->where( - $queryBuilder->expr()->eq('fieldname', $queryBuilder->createNamedParameter('tx_sgvimeo_thumbnail_image')) + $queryBuilder->expr()->eq( + 'fieldname', $queryBuilder->createNamedParameter('tx_sgvimeo_thumbnail_image') + ) ) ->executeQuery() ->fetchOne(); - return (int)$count > 0; + return (int) $count > 0; } public function getPrerequisites(): array { diff --git a/Classes/Utility/FlexFormUtility.php b/Classes/Utility/FlexFormUtility.php index 86af1f7..63da837 100644 --- a/Classes/Utility/FlexFormUtility.php +++ b/Classes/Utility/FlexFormUtility.php @@ -26,23 +26,19 @@ namespace SGalinski\SgVimeo\Utility; - - use TYPO3\CMS\Core\Site\SiteFinder; use TYPO3\CMS\Core\TypoScript\TypoScriptService; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -class FlexFormUtility -{ +class FlexFormUtility { /** * Get the dynamic options for the select field * * @param array $config * @return array */ - public function getOptions(array &$config) - { + public function getOptions(array &$config) { $configurationManager = GeneralUtility::makeInstance(ConfigurationManagerInterface::class); $fullTypoScript = $configurationManager->getConfiguration( ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT @@ -51,7 +47,9 @@ class FlexFormUtility // Get the TypoScript configuration for the site $typoScriptService = GeneralUtility::makeInstance(TypoScriptService::class); $typoScriptArray = $fullTypoScript; - $pluginSettings = $typoScriptService->convertTypoScriptArrayToPlainArray($typoScriptArray['plugin.']['tx_sgyoutube.']['settings.']); + $pluginSettings = $typoScriptService->convertTypoScriptArrayToPlainArray( + $typoScriptArray['plugin.']['tx_sgyoutube.']['settings.'] + ); // Fetch the TypoScript settings (e.g., settings.selectOptions) $selectOptions = array_keys($pluginSettings['filters']); diff --git a/Classes/ViewHelpers/PictureViewHelper.php b/Classes/ViewHelpers/PictureViewHelper.php index dc5194f..66c7bc5 100644 --- a/Classes/ViewHelpers/PictureViewHelper.php +++ b/Classes/ViewHelpers/PictureViewHelper.php @@ -248,11 +248,11 @@ class PictureViewHelper extends AbstractViewHelper { $fileExtension = $originalFile->getProperty('extension'); $convertToWebp = !$disableWebp && ( - $fileExtension === 'png' - || $fileExtension === 'jpg' - || $fileExtension === 'jpeg' - || $fileExtension === 'webp' - ); + $fileExtension === 'png' + || $fileExtension === 'jpg' + || $fileExtension === 'jpeg' + || $fileExtension === 'webp' + ); $imageUrl = self::getImage($image, $sizes, 'default', $convertToWebp); // Don't add a scaled version for SVG's. This is not necessary at all -- GitLab