diff --git a/Classes/Command/MigrateNewsCommandController.php b/Classes/Command/MigrateNewsCommandController.php index 2947e61e87e60cb7755040c7e6ceb404f2e5ecb0..d8cd27c9244b38cc6f1f09af07b70d590217def7 100644 --- a/Classes/Command/MigrateNewsCommandController.php +++ b/Classes/Command/MigrateNewsCommandController.php @@ -29,6 +29,7 @@ namespace SGalinski\SgNews\Command; use SGalinski\SgNews\Domain\Model\News; use SGalinski\SgNews\Domain\Repository\FileReferenceRepository; use SGalinski\SgNews\Domain\Repository\NewsRepository; +use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -41,7 +42,6 @@ use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileInterface; use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Utility\GeneralUtility; -use Symfony\Component\Console\Command\Command; use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException; use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException; @@ -77,12 +77,15 @@ class MigrateNewsCommandController extends Command { ->addArgument('categoryPid', InputArgument::REQUIRED, 'The page id of the category page') ->addArgument('year', InputArgument::OPTIONAL, 'Only news from that year will be migrated', 2015) ->addArgument( - 'languageMapAsJson', InputArgument::OPTIONAL, + 'languageMapAsJson', + InputArgument::OPTIONAL, 'A json, mapping language ids (old => new). this is needed if the sys_language_uids have changed', '{"3":1,"1":0,"2":2,"0":3}' ) ->addArgument( - 'categoryMapAsJson', InputArgument::OPTIONAL, 'A json, mapping sys_category ids (old => new).', + 'categoryMapAsJson', + InputArgument::OPTIONAL, + 'A json, mapping sys_category ids (old => new).', '{"2":17,"3":16,"4":15,"5":14,"6":14,"7":15,"8":16,"9":17}' ) ->addArgument('pId', InputArgument::OPTIONAL, 'Only news from that pid will be migrated', 52); @@ -167,16 +170,22 @@ class MigrateNewsCommandController extends Command { $file = $this->getMatchingFile($row); if ($file instanceof File) { $teaserImage1 = $fileReferenceRepository->addFileReferenceFromFile( - $file, $this->newsPagesMap[$row['uid']], - $this->newsPagesMap[$row['uid']], 'pages', 'tx_sgnews_teaser1_image' + $file, + $this->newsPagesMap[$row['uid']], + $this->newsPagesMap[$row['uid']], + 'pages', + 'tx_sgnews_teaser1_image' ); if ($teaserImage1) { $newsPage->addTeaser1Image($teaserImage1); $teaserImage2 = $fileReferenceRepository->addFileReferenceFromFile( - $file, $this->newsPagesMap[$row['uid']], - $this->newsPagesMap[$row['uid']], 'pages', 'tx_sgnews_teaser2_image' + $file, + $this->newsPagesMap[$row['uid']], + $this->newsPagesMap[$row['uid']], + 'pages', + 'tx_sgnews_teaser2_image' ); $newsPage->addTeaser2Image($teaserImage2); } @@ -194,12 +203,15 @@ class MigrateNewsCommandController extends Command { ->where( $queryBuilder->expr()->andX( $queryBuilder->expr()->eq( - 'pid', $queryBuilder->createNamedParameter($newPageId, Connection::PARAM_INT) + 'pid', + $queryBuilder->createNamedParameter($newPageId, Connection::PARAM_INT) ), $queryBuilder->expr()->eq( - 'sys_language_uid', $queryBuilder->createNamedParameter( - $this->languageMap[(int) $row['sys_language_uid']], \PDO::PARAM_INT - ) + 'sys_language_uid', + $queryBuilder->createNamedParameter( + $this->languageMap[(int) $row['sys_language_uid']], + \PDO::PARAM_INT + ) ) ) ) @@ -230,11 +242,13 @@ class MigrateNewsCommandController extends Command { ->where( $queryBuilder->expr()->andX( $queryBuilder->expr()->eq( - 'tablenames', $queryBuilder->createNamedParameter('tx_news_domain_model_news') + 'tablenames', + $queryBuilder->createNamedParameter('tx_news_domain_model_news') ), $queryBuilder->expr()->eq('fieldname', $queryBuilder->createNamedParameter('fal_media')), $queryBuilder->expr()->eq( - 'uid_foreign', $queryBuilder->createNamedParameter($row['uid'], Connection::PARAM_INT) + 'uid_foreign', + $queryBuilder->createNamedParameter($row['uid'], Connection::PARAM_INT) ) ) ) @@ -251,7 +265,8 @@ class MigrateNewsCommandController extends Command { ->from('sys_file_news_migration') ->where( $queryBuilder->expr()->eq( - 'uid', $queryBuilder->createNamedParameter($fileReferenceResult['uid_local'], Connection::PARAM_INT) + 'uid', + $queryBuilder->createNamedParameter($fileReferenceResult['uid_local'], Connection::PARAM_INT) ) ) ->execute()->fetch(); @@ -283,7 +298,8 @@ class MigrateNewsCommandController extends Command { ->from('sys_category_record_mm_news_migration') ->where( $queryBuilder->expr()->eq( - 'uid_foreign', $queryBuilder->createNamedParameter($row['uid'], Connection::PARAM_INT) + 'uid_foreign', + $queryBuilder->createNamedParameter($row['uid'], Connection::PARAM_INT) ) ) ->execute()->fetchAll(); @@ -322,7 +338,8 @@ class MigrateNewsCommandController extends Command { if ((int) $this->languageMap[(int) $row['sys_language_uid'] === 0]) { $queryBuilder->where( $queryBuilder->expr()->eq( - 'uid', $queryBuilder->createNamedParameter($originalContentElement[0], Connection::PARAM_INT) + 'uid', + $queryBuilder->createNamedParameter($originalContentElement[0], Connection::PARAM_INT) ) ); } else { @@ -338,9 +355,11 @@ class MigrateNewsCommandController extends Command { if (isset($this->languageMap[(int) $row['sys_language_uid']])) { $queryBuilder->andWhere( $queryBuilder->expr()->eq( - 'sys_language_uid', $queryBuilder->createNamedParameter( - $this->languageMap[(int) $row['sys_language_uid']], Connection::PARAM_INT - ) + 'sys_language_uid', + $queryBuilder->createNamedParameter( + $this->languageMap[(int) $row['sys_language_uid']], + Connection::PARAM_INT + ) ) ); } else { @@ -362,7 +381,8 @@ class MigrateNewsCommandController extends Command { ->from('pages') ->where( $queryBuilder->expr()->eq( - 'uid', $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) + 'uid', + $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) ) ) ->execute()->fetch(); @@ -390,7 +410,8 @@ class MigrateNewsCommandController extends Command { $queryBuilder->update('pages') ->where( $queryBuilder->expr()->eq( - 'uid', $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) + 'uid', + $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) ) ) ->set('title', $newTitle, TRUE) @@ -402,7 +423,8 @@ class MigrateNewsCommandController extends Command { $queryBuilder->update('pages') ->where( $queryBuilder->expr()->eq( - 'l10n_parent', $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) + 'l10n_parent', + $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) ) ); @@ -412,9 +434,11 @@ class MigrateNewsCommandController extends Command { ) { $queryBuilder->andWhere( $queryBuilder->expr()->eq( - 'sys_language_uid', $queryBuilder->createNamedParameter( - $this->languageMap[(int) $row['sys_language_uid']], Connection::PARAM_INT - ) + 'sys_language_uid', + $queryBuilder->createNamedParameter( + $this->languageMap[(int) $row['sys_language_uid']], + Connection::PARAM_INT + ) ) ); } else { diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php index 52b94144f1118471a5dcc645b89be87ad8b6be93..f4b243b4272507547f6609d2fe33b30f19962d1f 100644 --- a/Classes/Controller/AbstractController.php +++ b/Classes/Controller/AbstractController.php @@ -221,11 +221,9 @@ abstract class AbstractController extends ActionController { * @param string|NULL $html * @return \Psr\Http\Message\ResponseInterface */ - protected function htmlResponse(string $html = null): \Psr\Http\Message\ResponseInterface - { + protected function htmlResponse(string $html = NULL): \Psr\Http\Message\ResponseInterface { return $this->responseFactory->createResponse() ->withHeader('Content-Type', 'text/html; charset=utf-8') ->withBody($this->streamFactory->createStream($html ?? $this->view->render())); } - } diff --git a/Classes/Controller/Ajax/LikeController.php b/Classes/Controller/Ajax/LikeController.php index d2060167e9b959e03bcbc53d1c55a4e3920b3682..647da0d78b5e366d8a2b12e3df8f032f3f41507e 100644 --- a/Classes/Controller/Ajax/LikeController.php +++ b/Classes/Controller/Ajax/LikeController.php @@ -36,7 +36,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; * @package SGalinski\SgNews\Controller\Ajax */ class LikeController extends AbstractAjaxController { - /** * This action increases the tx_sgnews_likes field of a given page ($newsPid) by one * @@ -57,9 +56,9 @@ class LikeController extends AbstractAjaxController { ) ->execute(); } catch (\Exception $exception) { - $this->returnData(['success' => false]); + $this->returnData(['success' => FALSE]); } - $this->returnData(['success' => true]); + $this->returnData(['success' => TRUE]); } } diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php index eb027af0f4e1c781abf0f9c1268dde792043e530..e46734bf394e354357acf8bc0889538105a3c2ea 100644 --- a/Classes/Controller/BackendController.php +++ b/Classes/Controller/BackendController.php @@ -43,7 +43,6 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility; * News Controller */ class BackendController extends ActionController { - /** * The uid of the current page * @@ -114,7 +113,8 @@ class BackendController extends ActionController { } $this->language = $backendUser->getModuleData( - 'tools_beuser/index.php/web_SgNewsNews_language', 'ses' + 'tools_beuser/index.php/web_SgNewsNews_language', + 'ses' ) ?: 0; $languageOptions = BackendNewsUtility::getAvailableLanguages($this->pageUid); $currentLanguageInfo = $languageOptions[$this->language] ?? NULL; @@ -170,8 +170,7 @@ class BackendController extends ActionController { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->createBackendResponse(); } } @@ -232,7 +231,8 @@ class BackendController extends ActionController { ->setTitle($language['title']) ->setHref( $uriBuilder->buildUriFromRoute( - 'web_SgNewsNews', ['id' => $this->pageUid, 'SET' => ['language' => $key]] + 'web_SgNewsNews', + ['id' => $this->pageUid, 'SET' => ['language' => $key]] ) ); if ((int) $this->language === (int) $key) { @@ -249,8 +249,7 @@ class BackendController extends ActionController { * * @return \Psr\Http\Message\ResponseInterface */ - protected function createBackendResponse(): \Psr\Http\Message\ResponseInterface - { + protected function createBackendResponse(): \Psr\Http\Message\ResponseInterface { $moduleTemplate = $this->moduleTemplateFactory->create($this->request); $moduleTemplate->setContent($this->view->render()); return $this->htmlResponse($moduleTemplate->renderContent()); diff --git a/Classes/Controller/LatestController.php b/Classes/Controller/LatestController.php index 3984a3168043b731e4fd0a90c122271aa864e203..a1dfbe78ea57766c1f13a94383289683a56b46a0 100644 --- a/Classes/Controller/LatestController.php +++ b/Classes/Controller/LatestController.php @@ -79,7 +79,15 @@ class LatestController extends AbstractController { $startTime = (int) $this->settings['starttime']; $endTime = (int) $this->settings['endtime']; $latestNewsEntries = $this->newsRepository->findLastUpdatedOrHighlightedNewsByCategories( - $limit, FALSE, $categoryUids, $offset, TRUE, $sortBy, $tagUids, $startTime, $endTime + $limit, + FALSE, + $categoryUids, + $offset, + TRUE, + $sortBy, + $tagUids, + $startTime, + $endTime ); $categories = []; @@ -106,8 +114,7 @@ class LatestController extends AbstractController { $this->view->assign('newsMetaData', $newsMetaData); if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -115,7 +122,8 @@ class LatestController extends AbstractController { /** * @param CategoryRepository $categoryRepository */ - public function injectCategoryRepository(CategoryRepository $categoryRepository + public function injectCategoryRepository( + CategoryRepository $categoryRepository ) { $this->categoryRepository = $categoryRepository; } diff --git a/Classes/Controller/ListByCategoryController.php b/Classes/Controller/ListByCategoryController.php index 67f54c08708c2dcdd2caaad752a833e2cae73a66..4492b34a2875808ae5ab7c7f178d4dbcbd6c0bfc 100644 --- a/Classes/Controller/ListByCategoryController.php +++ b/Classes/Controller/ListByCategoryController.php @@ -32,8 +32,8 @@ use SGalinski\SgNews\Domain\Repository\NewsRepository; use SGalinski\SgNews\Domain\Repository\TagRepository; use SGalinski\SgNews\Service\ConfigurationService; use SGalinski\SgNews\Service\HeaderMetaDataService; -use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; use TYPO3\CMS\Core\Http\ImmediateResponseException; +use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Frontend\Controller\ErrorController; use TYPO3\CMS\Frontend\Page\PageAccessFailureReasons; @@ -60,7 +60,8 @@ class ListByCategoryController extends AbstractController { /** * @param CategoryRepository $categoryRepository */ - public function injectCategoryRepository(CategoryRepository $categoryRepository + public function injectCategoryRepository( + CategoryRepository $categoryRepository ) { $this->categoryRepository = $categoryRepository; } @@ -159,7 +160,14 @@ class ListByCategoryController extends AbstractController { $sortDirection = $configurationService->getConfiguration('sortDirection', $this->settings); $news = $this->newsRepository->findAllSortedNewsByCategories( - $categoryUids, $newsPerPage, $offset, $sortBy, $tagUids, $startTime, $endTime, $sortDirection + $categoryUids, + $newsPerPage, + $offset, + $sortBy, + $tagUids, + $startTime, + $endTime, + $sortDirection )->toArray(); foreach ($news as $newsEntry) { @@ -186,8 +194,7 @@ class ListByCategoryController extends AbstractController { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } diff --git a/Classes/Controller/NewsByAuthorController.php b/Classes/Controller/NewsByAuthorController.php index 970663276d0afe49ff7236c3e385c548f3e425c7..51fb2b276abfe90fb499c887717e60d81cc37ac9 100644 --- a/Classes/Controller/NewsByAuthorController.php +++ b/Classes/Controller/NewsByAuthorController.php @@ -57,8 +57,7 @@ class NewsByAuthorController extends AbstractController { if (\count($newsAuthorsIds) <= 0) { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -95,8 +94,7 @@ class NewsByAuthorController extends AbstractController { if (\count($authors) <= 0) { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -106,8 +104,7 @@ class NewsByAuthorController extends AbstractController { if (\count($news) <= 0) { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -142,8 +139,7 @@ class NewsByAuthorController extends AbstractController { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } diff --git a/Classes/Controller/NewsFeedController.php b/Classes/Controller/NewsFeedController.php index dc8395e61de28735fd9b553e6a2fae780a17d12a..6cc30b1b189618182d99cd7e7c8a22ceddf92c54 100644 --- a/Classes/Controller/NewsFeedController.php +++ b/Classes/Controller/NewsFeedController.php @@ -52,7 +52,15 @@ class NewsFeedController extends AbstractController { $startTime = (int) $this->settings['starttime']; $endTime = (int) $this->settings['endtime']; $news = $this->newsRepository->findLastUpdatedOrHighlightedNewsByCategories( - 10, FALSE, $categories, 0, FALSE, 'date', $tags, $startTime, $endTime + 10, + FALSE, + $categories, + 0, + FALSE, + 'date', + $tags, + $startTime, + $endTime ); $newsCategories = []; @@ -77,8 +85,7 @@ class NewsFeedController extends AbstractController { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php index 66d718f0d8886a5d8aa32d49b4bc4ea9c3050413..fa1d3b5f6bc5696b7113675fe816a78ec3805c5a 100644 --- a/Classes/Controller/OverviewController.php +++ b/Classes/Controller/OverviewController.php @@ -35,13 +35,13 @@ use SGalinski\SgNews\Domain\Repository\TagRepository; use SGalinski\SgNews\Service\ConfigurationService; use SGalinski\SgNews\Service\HeaderMetaDataService; use TYPO3\CMS\Core\Http\ImmediateResponseException; +use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Persistence\Generic\Query; use TYPO3\CMS\Extbase\Persistence\Generic\QueryResult; use TYPO3\CMS\Extbase\Persistence\QueryInterface; use TYPO3\CMS\Frontend\Controller\ErrorController; use TYPO3\CMS\Frontend\Page\PageAccessFailureReasons; -use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; /** * Controller that handles the overview page of categories and their news @@ -65,7 +65,8 @@ class OverviewController extends AbstractController { /** * @param CategoryRepository $categoryRepository */ - public function injectCategoryRepository(CategoryRepository $categoryRepository + public function injectCategoryRepository( + CategoryRepository $categoryRepository ) { $this->categoryRepository = $categoryRepository; } @@ -116,9 +117,8 @@ class OverviewController extends AbstractController { break; default: if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { - $this->forward('overviewWithoutCategories', NULL, NULL, $this->request->getArguments()); - } - else { + $this->forward('overviewWithoutCategories', NULL, NULL, $this->request->getArguments()); + } else { return (new \TYPO3\CMS\Extbase\Http\ForwardResponse('overviewWithoutCategories'))->withControllerName('Record') ->withExtensionName('Extension') ->withArguments($this->request->getArguments()); @@ -128,8 +128,7 @@ class OverviewController extends AbstractController { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -148,7 +147,15 @@ class OverviewController extends AbstractController { /** @var News $highlightedNews */ $highlightedNews = $this->newsRepository ->findLastUpdatedOrHighlightedNewsByCategories( - 1, FALSE, $categoryIds, 0, FALSE, $this->settings['sortBy'], $tagIds, $startTime, $endTime + 1, + FALSE, + $categoryIds, + 0, + FALSE, + $this->settings['sortBy'], + $tagIds, + $startTime, + $endTime )->getFirst(); if (!$highlightedNews) { return; @@ -185,7 +192,10 @@ class OverviewController extends AbstractController { * @throws \TYPO3\CMS\Core\Error\Http\PageNotFoundException */ protected function overviewWithCategories( - array $newsByCategory = [], array $allNews = [], array $newsFilter = [], int $currentPageBrowserPage = 0 + array $newsByCategory = [], + array $allNews = [], + array $newsFilter = [], + int $currentPageBrowserPage = 0 ) { $newsLimitPerCategory = (int) $this->settings['newsLimit']; $this->categoryRepository->setDefaultOrderings(['sorting' => Query::ORDER_ASCENDING]); @@ -260,7 +270,13 @@ class OverviewController extends AbstractController { } foreach ($categoryIdsForSelect as $categoryIdsForSelectId) { $news = $this->newsRepository->findAllSortedNewsByCategories( - [$categoryIdsForSelectId], $newsLimitPerCategory, $offset, $sortBy, $tagIds, $startTime, $endTime, + [$categoryIdsForSelectId], + $newsLimitPerCategory, + $offset, + $sortBy, + $tagIds, + $startTime, + $endTime, $sortDirection ); @@ -309,7 +325,14 @@ class OverviewController extends AbstractController { $tagIds = [(int) $newsFilter['tag']]; } $news = $this->newsRepository->findAllSortedNewsByCategories( - $categoryIds, $newsLimitPerCategory, $offset, $sortBy, $tagIds, $startTime, $endTime, $sortDirection + $categoryIds, + $newsLimitPerCategory, + $offset, + $sortBy, + $tagIds, + $startTime, + $endTime, + $sortDirection ); foreach ($news as $newsEntry) { @@ -375,7 +398,10 @@ class OverviewController extends AbstractController { * @throws \TYPO3\CMS\Core\Error\Http\PageNotFoundException */ protected function overviewWithTags( - array $newsByTag = [], array $allNews = [], array $newsFilter = [], int $currentPageBrowserPage = 0 + array $newsByTag = [], + array $allNews = [], + array $newsFilter = [], + int $currentPageBrowserPage = 0 ) { $startTime = (int) $this->settings['starttime']; $endTime = (int) $this->settings['endtime']; @@ -423,7 +449,14 @@ class OverviewController extends AbstractController { $tagsById[$tagId] = $tag; $news = $this->newsRepository->findAllSortedNewsByCategories( - $categoryIds, $newsLimitPerTag, $offset, $sortBy, [$tagId], $startTime, $endTime, $sortDirection + $categoryIds, + $newsLimitPerTag, + $offset, + $sortBy, + [$tagId], + $startTime, + $endTime, + $sortDirection ); $newsMetaData[$tagId] = []; foreach ($news as $newsEntry) { @@ -468,7 +501,14 @@ class OverviewController extends AbstractController { // Get all news by tags. $news = $this->newsRepository->findAllSortedNewsByCategories( - $categoryIds, $newsLimitPerTag, $offset, $sortBy, $tagIds, $startTime, $endTime, $sortDirection + $categoryIds, + $newsLimitPerTag, + $offset, + $sortBy, + $tagIds, + $startTime, + $endTime, + $sortDirection ); foreach ($news as $newsEntry) { /** @var News $newsEntry */ @@ -545,7 +585,9 @@ class OverviewController extends AbstractController { * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException */ protected function overviewWithoutCategoriesAction( - array $newsMetaData = [], array $newsFilter = NULL, int $currentPageBrowserPage = 0 + array $newsMetaData = [], + array $newsFilter = NULL, + int $currentPageBrowserPage = 0 ): ?\Psr\Http\Message\ResponseInterface { // remember selection of the filter values, if any $selectedTag = $this->tagRepository->findByUid((int) $newsFilter['tag']); @@ -609,8 +651,7 @@ class OverviewController extends AbstractController { if ($newsCount <= 0) { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -626,7 +667,14 @@ class OverviewController extends AbstractController { } $news = $this->newsRepository->findAllSortedNewsByCategories( - $categoryIds, $newsPerPage, $offset, $sortBy, $tagIds, $startTime, $endTime, $sortDirection + $categoryIds, + $newsPerPage, + $offset, + $sortBy, + $tagIds, + $startTime, + $endTime, + $sortDirection ); foreach ($news as $newsEntry) { /** @var News $newsEntry */ @@ -661,8 +709,7 @@ class OverviewController extends AbstractController { $this->view->assign('newsMetaData', $newsMetaData); if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } diff --git a/Classes/Controller/SingleViewController.php b/Classes/Controller/SingleViewController.php index e7e9e8eeb5bcbe0facbe2a8e8c573374b4880ec8..bfece1f869cab7f564238119d49f30d37be8b854 100644 --- a/Classes/Controller/SingleViewController.php +++ b/Classes/Controller/SingleViewController.php @@ -72,8 +72,7 @@ class SingleViewController extends AbstractController { if (!$news) { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -83,8 +82,7 @@ class SingleViewController extends AbstractController { if (!$newsCategory) { if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -114,8 +112,7 @@ class SingleViewController extends AbstractController { ); if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { return NULL; - } - else { + } else { return $this->htmlResponse(); } } @@ -123,7 +120,8 @@ class SingleViewController extends AbstractController { /** * @param CategoryRepository $categoryRepository */ - public function injectCategoryRepository(CategoryRepository $categoryRepository + public function injectCategoryRepository( + CategoryRepository $categoryRepository ) { $this->categoryRepository = $categoryRepository; } diff --git a/Classes/Domain/Model/FileReference.php b/Classes/Domain/Model/FileReference.php index 63c7c7d9ee19a751613c6db032cc727f422b54bf..9a51b3dee41ed9b0b1930b0ed036d69c8f6719ad 100644 --- a/Classes/Domain/Model/FileReference.php +++ b/Classes/Domain/Model/FileReference.php @@ -30,5 +30,4 @@ namespace SGalinski\SgNews\Domain\Model; * FileReference */ class FileReference extends \TYPO3\CMS\Extbase\Domain\Model\FileReference { - } diff --git a/Classes/Domain/Model/Tag.php b/Classes/Domain/Model/Tag.php index 1dbb808c4adb7dd2a20923b31876db220f4edea3..96a5fd8e73cb2d1ffd0983c652f3b3216ec21ae9 100644 --- a/Classes/Domain/Model/Tag.php +++ b/Classes/Domain/Model/Tag.php @@ -31,7 +31,6 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; * Tag */ class Tag extends AbstractEntity { - /** * @var string */ diff --git a/Classes/Domain/Repository/AbstractRepository.php b/Classes/Domain/Repository/AbstractRepository.php index 49ad3c22f70749cf4b18fafb57dafea4b36affca..10fc1162055b7317a06bf1b2e287bb78677be128 100644 --- a/Classes/Domain/Repository/AbstractRepository.php +++ b/Classes/Domain/Repository/AbstractRepository.php @@ -90,6 +90,6 @@ abstract class AbstractRepository extends Repository { * @return int */ public function getCount(QueryInterface $query) { - return \count($query->execute(true)); + return \count($query->execute(TRUE)); } } diff --git a/Classes/Domain/Repository/AuthorRepository.php b/Classes/Domain/Repository/AuthorRepository.php index f1ac33f72aec678de1133119d79b55c42dd8d2be..7fd9bb8285e14c7e93bc0dd6dd334ac96fd85989 100644 --- a/Classes/Domain/Repository/AuthorRepository.php +++ b/Classes/Domain/Repository/AuthorRepository.php @@ -32,5 +32,4 @@ use SGalinski\SgNews\Domain\Repository\AbstractRepository; * Repository for the Author model. */ class AuthorRepository extends AbstractRepository { - } diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php index 83d5324301f1ee784c1b026803ed1a2619b96b06..f9999d61fe3624bd5ab4852ca2631a24197d1bfb 100644 --- a/Classes/Domain/Repository/CategoryRepository.php +++ b/Classes/Domain/Repository/CategoryRepository.php @@ -37,7 +37,6 @@ use TYPO3\CMS\Extbase\Persistence\QueryInterface; * Category Repository */ class CategoryRepository extends AbstractRepository { - /** * @var array */ diff --git a/Classes/Domain/Repository/FileReferenceRepository.php b/Classes/Domain/Repository/FileReferenceRepository.php index b26ff56edfb84d559a68e8a4f1c3e06694411f37..81e83ccab5f9ccce8e5038117c6338edfd8c1af5 100644 --- a/Classes/Domain/Repository/FileReferenceRepository.php +++ b/Classes/Domain/Repository/FileReferenceRepository.php @@ -26,16 +26,15 @@ namespace SGalinski\SgNews\Domain\Repository; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use TYPO3\CMS\Core\Database\ConnectionPool; -use TYPO3\CMS\Core\Utility\GeneralUtility; use SGalinski\SgNews\Domain\Model\FileReference; +use TYPO3\CMS\Core\Database\ConnectionPool; use TYPO3\CMS\Core\Resource\File; +use TYPO3\CMS\Core\Utility\GeneralUtility; /** * FileReference Repository */ class FileReferenceRepository extends AbstractRepository { - /** * Method creates a file reference entry in the database. This step is necessary because the * extbase can not handle the default TCA for FAL records. Without this method the FAL records will miss diff --git a/Classes/Domain/Repository/NewsRepository.php b/Classes/Domain/Repository/NewsRepository.php index 7bf40bf35b5b468295d6c7b1c19d391b39681284..4e9763214bd19282364cd04a5f0216fcd84e42b8 100644 --- a/Classes/Domain/Repository/NewsRepository.php +++ b/Classes/Domain/Repository/NewsRepository.php @@ -84,8 +84,14 @@ class NewsRepository extends AbstractRepository { * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException */ public function findAllSortedNewsByCategories( - array $categoryIds = NULL, $limit = 0, $offset = 0, $sortBy = 'date', array $tagIds = NULL, - $startTime = 0, $endTime = 0, $sortDirection = 'DESC' + array $categoryIds = NULL, + $limit = 0, + $offset = 0, + $sortBy = 'date', + array $tagIds = NULL, + $startTime = 0, + $endTime = 0, + $sortDirection = 'DESC' ): QueryResultInterface { $query = $this->createQuery(); @@ -169,7 +175,10 @@ class NewsRepository extends AbstractRepository { * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException */ public function newsCountByCategories( - array $categoryIds = NULL, array $tagIds = NULL, $startTime = 0, $endTime = 0 + array $categoryIds = NULL, + array $tagIds = NULL, + $startTime = 0, + $endTime = 0 ): int { $query = $this->createQuery(); @@ -229,13 +238,26 @@ class NewsRepository extends AbstractRepository { * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException */ public function findLastUpdatedOrHighlightedNewsByCategories( - $limit = 1, $onlyHighlighted = FALSE, array $categoryIds = NULL, - $offset = 0, $hideNeverHighlightedNews = FALSE, $sortBy = 'date', array $tagIds = NULL, - $startTime = 0, $endTime = 0 + $limit = 1, + $onlyHighlighted = FALSE, + array $categoryIds = NULL, + $offset = 0, + $hideNeverHighlightedNews = FALSE, + $sortBy = 'date', + array $tagIds = NULL, + $startTime = 0, + $endTime = 0 ): QueryResultInterface { return $this->getQueryForLastUpdatedOrHighlightedNewsByCategories( - $limit, $onlyHighlighted, $categoryIds, $offset, $hideNeverHighlightedNews, $sortBy, $tagIds, - $startTime, $endTime + $limit, + $onlyHighlighted, + $categoryIds, + $offset, + $hideNeverHighlightedNews, + $sortBy, + $tagIds, + $startTime, + $endTime )->execute(); } @@ -255,9 +277,15 @@ class NewsRepository extends AbstractRepository { * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException */ protected function getQueryForLastUpdatedOrHighlightedNewsByCategories( - $limit = 1, $onlyHighlighted = FALSE, array $categoryIds = NULL, - $offset = 0, $hideNeverHighlightedNews = FALSE, $sortBy = 'date', array $tagIds = NULL, - $startTime = 0, $endTime = 0 + $limit = 1, + $onlyHighlighted = FALSE, + array $categoryIds = NULL, + $offset = 0, + $hideNeverHighlightedNews = FALSE, + $sortBy = 'date', + array $tagIds = NULL, + $startTime = 0, + $endTime = 0 ): QueryInterface { $query = $this->createQuery(); $constraints = NULL; diff --git a/Classes/Hooks/PageLayoutController.php b/Classes/Hooks/PageLayoutController.php index b960292e0ca69c32258215203d7c88e64b9ba5db..53d7fe2c2c36227e215ad2ebcbfb18bdeb003c33 100644 --- a/Classes/Hooks/PageLayoutController.php +++ b/Classes/Hooks/PageLayoutController.php @@ -37,7 +37,6 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility; * Backend edid form hook */ class PageLayoutController { - /** * Adds a Button to News-Pages which allows the user to switch to the News module * diff --git a/Classes/Hooks/PageLayoutView/PluginRenderer.php b/Classes/Hooks/PageLayoutView/PluginRenderer.php index 7e94ef789b5461f7baf86b3babbee412bd0fa254..d9b8bcbd267d8085d0663fb1eebf63b1a5aee736 100644 --- a/Classes/Hooks/PageLayoutView/PluginRenderer.php +++ b/Classes/Hooks/PageLayoutView/PluginRenderer.php @@ -34,7 +34,6 @@ use TYPO3\CMS\Fluid\View\StandaloneView; * @package SGalinski\SgNews\Hook\PagelayoutView\PluginRenderer */ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { - /** * Preprocesses the preview rendering of an sg_news content element plugin. * @@ -46,7 +45,11 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { * @noinspection ReferencingObjectsInspection */ public function preProcess( - PageLayoutView &$parentObject, &$drawItem, &$headerContent, &$itemContent, array &$row + PageLayoutView &$parentObject, + &$drawItem, + &$headerContent, + &$itemContent, + array &$row ): void { switch ($row['list_type']) { case 'sgnews_overview': @@ -59,7 +62,8 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $templateData = [ @@ -88,7 +92,8 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $categories = $pluginConfiguration['settings.categories']['vDEF']; @@ -96,10 +101,12 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { $templateData = [ 'limit' => $pluginConfiguration['settings.limit']['vDEF'], 'categories' => is_string($categories) ? $this->addFieldContentsToRecordIdList( - 'pages', $categories + 'pages', + $categories ) : '', 'tags' => is_string($tags) ? $this->addFieldContentsToRecordIdList( - 'sys_category', $tags + 'sys_category', + $tags ) : '', 'starttime' => $pluginConfiguration['settings.starttime']['vDEF'], 'endtime' => $pluginConfiguration['settings.endtime']['vDEF'], @@ -121,7 +128,8 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $categories = $pluginConfiguration['settings.categories']['vDEF']; @@ -129,7 +137,8 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { $templateData = [ 'newsLimitPerPage' => $pluginConfiguration['settings.newsLimitPerPage']['vDEF'], 'categories' => is_string($categories) ? $this->addFieldContentsToRecordIdList( - 'pages', $categories + 'pages', + $categories ) : '', 'tags' => is_string($tags) ? $this->addFieldContentsToRecordIdList('sys_category', $tags) : '', 'starttime' => $pluginConfiguration['settings.starttime']['vDEF'], @@ -153,26 +162,33 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $newsAuthors = $pluginConfiguration['settings.newsAuthors']['vDEF']; $templateData = [ 'showDetails' => $pluginConfiguration['settings.showDetails']['vDEF'], 'newsAuthors' => is_string($newsAuthors) ? $this->addFieldContentsToRecordIdList( - 'tx_sgnews_domain_model_author',$newsAuthors,'name' + 'tx_sgnews_domain_model_author', + $newsAuthors, + 'name' ) : '' ]; // Not using addFieldContentsToRecordIdList to avoid repetitive imploding and exploding. $excludedNewsIds = GeneralUtility::intExplode( - ',', $pluginConfiguration['settings.excludedNews']['vDEF'], TRUE + ',', + $pluginConfiguration['settings.excludedNews']['vDEF'], + TRUE ); $excludedNewsListWithTitles = []; foreach ($excludedNewsIds as $excludedNewsId) { $excludedNewsListWithTitles[] = BackendUtility::getRecord( - 'pages', $excludedNewsId, 'title' - )['title'] . ' [' . $excludedNewsId . ']'; + 'pages', + $excludedNewsId, + 'title' + )['title'] . ' [' . $excludedNewsId . ']'; } $templateData['excludedNews'] = $excludedNewsListWithTitles; @@ -193,8 +209,7 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { * @param string $templateName * @return StandaloneView */ - protected - function createViewWithTemplate(string $templateName): StandaloneView { + protected function createViewWithTemplate(string $templateName): StandaloneView { $view = GeneralUtility::makeInstance(StandaloneView::class); $view->setTemplateRootPaths(['EXT:sg_news/Resources/Private/Templates/Backend']); $view->setPartialRootPaths(['EXT:sg_news/Resources/Private/Partials/Backend']); @@ -212,11 +227,11 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { * @param $headerContent * @param $row */ - protected - function adaptPluginHeaderContent(&$headerContent, $row): void { + protected function adaptPluginHeaderContent(&$headerContent, $row): void { $headerContent = '<h4>' . $this->getPluginNameForHeaderContent( - (int) $row['pid'], $row['list_type'] - ) . $headerContent . '</h4>'; + (int) $row['pid'], + $row['list_type'] + ) . $headerContent . '</h4>'; } /** @@ -227,13 +242,15 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { * @param string $listType * @return string */ - protected - function getPluginNameForHeaderContent(int $pid, string $listType): string { + protected function getPluginNameForHeaderContent(int $pid, string $listType): string { $languageService = GeneralUtility::makeInstance(LanguageService::class); $pluginName = $languageService->sL( BackendUtility::getLabelFromItemListMerged( - $pid, 'tt_content', 'list_type', $listType + $pid, + 'tt_content', + 'list_type', + $listType ) ); return '<span class="label label-primary">' . $pluginName . '</span> '; @@ -250,15 +267,19 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface { * @return string */ protected function addFieldContentsToRecordIdList( - string $table, string $recordIdList, string $field = 'title' + string $table, + string $recordIdList, + string $field = 'title' ): string { $recordIdsArray = GeneralUtility::intExplode(',', $recordIdList, TRUE); $recordsWithTitlesArray = []; foreach ($recordIdsArray as $recordId) { $recordsWithTitlesArray[] = BackendUtility::getRecord( - $table, $recordId, $field - )[$field] . ' [' . $recordId . ']'; + $table, + $recordId, + $field + )[$field] . ' [' . $recordId . ']'; } return implode(', ', $recordsWithTitlesArray); } diff --git a/Classes/Hooks/RealUrlAutoConfiguration.php b/Classes/Hooks/RealUrlAutoConfiguration.php index f1b77b7960a7868f62c024416f28979a50ade53b..32ac5369318105bc2243bb1ac54642204af67380 100644 --- a/Classes/Hooks/RealUrlAutoConfiguration.php +++ b/Classes/Hooks/RealUrlAutoConfiguration.php @@ -37,7 +37,8 @@ class RealUrlAutoConfiguration { */ public function addNewsConfig($params): array { return array_merge_recursive( - $params['config'], [ + $params['config'], + [ 'postVarSets' => [ '_DEFAULT' => [ 'page' => [ diff --git a/Classes/Preview/PreviewRenderer.php b/Classes/Preview/PreviewRenderer.php index be836bfbc2d1f959112806e877b3f8a04a4f85e3..9bead43f78eb4e7a1a0b782a15395802ef404c3a 100644 --- a/Classes/Preview/PreviewRenderer.php +++ b/Classes/Preview/PreviewRenderer.php @@ -76,7 +76,8 @@ class PreviewRenderer implements PreviewRendererInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $templateData = [ @@ -101,7 +102,8 @@ class PreviewRenderer implements PreviewRendererInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $categories = $pluginConfiguration['settings.categories']['vDEF']; @@ -109,10 +111,12 @@ class PreviewRenderer implements PreviewRendererInterface { $templateData = [ 'limit' => $pluginConfiguration['settings.limit']['vDEF'], 'categories' => is_string($categories) ? $this->addFieldContentsToRecordIdList( - 'pages', $categories + 'pages', + $categories ) : '', 'tags' => is_string($tags) ? $this->addFieldContentsToRecordIdList( - 'sys_category', $tags + 'sys_category', + $tags ) : '', 'starttime' => $pluginConfiguration['settings.starttime']['vDEF'], 'endtime' => $pluginConfiguration['settings.endtime']['vDEF'], @@ -130,7 +134,8 @@ class PreviewRenderer implements PreviewRendererInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $categories = $pluginConfiguration['settings.categories']['vDEF']; @@ -138,7 +143,8 @@ class PreviewRenderer implements PreviewRendererInterface { $templateData = [ 'newsLimitPerPage' => $pluginConfiguration['settings.newsLimitPerPage']['vDEF'], 'categories' => is_string($categories) ? $this->addFieldContentsToRecordIdList( - 'pages', $categories + 'pages', + $categories ) : '', 'tags' => is_string($tags) ? $this->addFieldContentsToRecordIdList('sys_category', $tags) : '', 'starttime' => $pluginConfiguration['settings.starttime']['vDEF'], @@ -158,26 +164,33 @@ class PreviewRenderer implements PreviewRendererInterface { // Get available plugin settings and their values from flexform $pluginConfiguration = GeneralUtility::xml2array( - $row['pi_flexform'], 'T3DataStructure' + $row['pi_flexform'], + 'T3DataStructure' )['data']['main']['lDEF']; $newsAuthors = $pluginConfiguration['settings.newsAuthors']['vDEF']; $templateData = [ 'showDetails' => $pluginConfiguration['settings.showDetails']['vDEF'], 'newsAuthors' => is_string($newsAuthors) ? $this->addFieldContentsToRecordIdList( - 'tx_sgnews_domain_model_author',$newsAuthors,'name' + 'tx_sgnews_domain_model_author', + $newsAuthors, + 'name' ) : '' ]; // Not using addFieldContentsToRecordIdList to avoid repetitive imploding and exploding. $excludedNewsIds = GeneralUtility::intExplode( - ',', $pluginConfiguration['settings.excludedNews']['vDEF'], TRUE + ',', + $pluginConfiguration['settings.excludedNews']['vDEF'], + TRUE ); $excludedNewsListWithTitles = []; foreach ($excludedNewsIds as $excludedNewsId) { $excludedNewsListWithTitles[] = BackendUtility::getRecord( - 'pages', $excludedNewsId, 'title' - )['title'] . ' [' . $excludedNewsId . ']'; + 'pages', + $excludedNewsId, + 'title' + )['title'] . ' [' . $excludedNewsId . ']'; } $templateData['excludedNews'] = $excludedNewsListWithTitles; @@ -251,8 +264,10 @@ class PreviewRenderer implements PreviewRendererInterface { foreach ($recordIdsArray as $recordId) { $recordsWithTitlesArray[] = BackendUtility::getRecord( - $table, $recordId, $field - )[$field] . ' [' . $recordId . ']'; + $table, + $recordId, + $field + )[$field] . ' [' . $recordId . ']'; } return implode(', ', $recordsWithTitlesArray); } diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php index 4ee488f46b88b3388009592d9128ddf413d3125c..e2cdd4683ba7ebc560bc6f83ab5cbb2ffd9df269 100644 --- a/Classes/Service/ConfigurationService.php +++ b/Classes/Service/ConfigurationService.php @@ -36,7 +36,6 @@ use TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException; * This service provides helper function for dealing with plugin configuration */ class ConfigurationService implements SingletonInterface { - /** * @var array */ diff --git a/Classes/Service/ImageService.php b/Classes/Service/ImageService.php index 67aa6736192b1e92ee796fb9e65c29e019043ca0..0438bb314fed6558d4385ec3d1e477a5b24a9717 100644 --- a/Classes/Service/ImageService.php +++ b/Classes/Service/ImageService.php @@ -61,7 +61,10 @@ class ImageService implements SingletonInterface { * @throws \InvalidArgumentException */ public function cropFirstMediaImage( - FileReference $image, array $coordinates, $path = 'typo3temp/sg_news/', $prefix = '' + FileReference $image, + array $coordinates, + $path = 'typo3temp/sg_news/', + $prefix = '' ): string { $originalResource = $image->getOriginalResource(); $extension = strtolower($originalResource->getExtension()); diff --git a/Classes/TCA/TcaProvider.php b/Classes/TCA/TcaProvider.php index c0ace7acee23cbd3f5eccfe44d7652ab4a88a3de..5092cbbdaa50f410be0dd1edff57972160563a3b 100644 --- a/Classes/TCA/TcaProvider.php +++ b/Classes/TCA/TcaProvider.php @@ -35,7 +35,6 @@ use TYPO3\CMS\Extbase\Object\ObjectManager; * This class contains methods for usage within the TCA forms. */ class TcaProvider implements SingletonInterface { - /** * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface */ @@ -84,8 +83,8 @@ class TcaProvider implements SingletonInterface { $workspaceOriginalId = (int) $row['t3ver_oid']; if ($workspaceOriginalId > 0) { $row = $queryBuilder->where( - $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($workspaceOriginalId, \PDO::PARAM_INT)) - )->execute()->fetch(); + $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($workspaceOriginalId, \PDO::PARAM_INT)) + )->execute()->fetch(); } // only articles diff --git a/Classes/Updates/MigrateSchedulerTasks.php b/Classes/Updates/MigrateSchedulerTasks.php index d03f3be0265fde95023e1abcb266211911b76555..a8b9f852d62ac8b2e28dbe5c34157d1e79982e8c 100644 --- a/Classes/Updates/MigrateSchedulerTasks.php +++ b/Classes/Updates/MigrateSchedulerTasks.php @@ -153,7 +153,7 @@ class MigrateSchedulerTasks implements UpgradeWizardInterface { */ protected function cleanArrayKeys(array $array) { $newArray = []; - foreach($array as $key => $value) { + foreach ($array as $key => $value) { $newArray[str_replace("\0", '', $key)] = $value; } return $newArray; diff --git a/Classes/UserFunction/AddAdditionalMailRecipients.php b/Classes/UserFunction/AddAdditionalMailRecipients.php index df13585f9e3c9c8d21d81a3f264de982d47b848f..dd1d5bf8c0a58c09b75095c786365a3a4eacc114 100644 --- a/Classes/UserFunction/AddAdditionalMailRecipients.php +++ b/Classes/UserFunction/AddAdditionalMailRecipients.php @@ -70,8 +70,7 @@ class AddAdditionalMailRecipients implements SingletonInterface { return $authorEmail; } - public function setContentObjectRenderer(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj): void - { + public function setContentObjectRenderer(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj): void { $this->cObj = $cObj; } } diff --git a/Classes/Utility/BackendNewsUtility.php b/Classes/Utility/BackendNewsUtility.php index 456536c10e11877e12a7ea513392e05e8d72f916..753c7d747fcabc32bcdb51a1ea5293aedc787d85 100644 --- a/Classes/Utility/BackendNewsUtility.php +++ b/Classes/Utility/BackendNewsUtility.php @@ -50,7 +50,6 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility; * Class Utility */ class BackendNewsUtility { - /** * @var int The category page doktype */ @@ -92,7 +91,12 @@ class BackendNewsUtility { $andWhere = ' AND sys_language_uid IN (0,-1)'; /** @var array $rootOptionRows */ $rootOptionRows = self::getRecordsByField( - 'pages', 'is_siteroot', 1, $andWhere, '', 'sorting' + 'pages', + 'is_siteroot', + 1, + $andWhere, + '', + 'sorting' ); if ($rootOptionRows) { foreach ($rootOptionRows as $row) { @@ -106,7 +110,8 @@ class BackendNewsUtility { foreach ($categories as $categoryUid => $categoryTitle) { if ((int) $pageInfo['uid'] !== $categoryUid) { $categoryPageInfo = BackendUtility::readPageAccess( - $categoryUid, $GLOBALS['BE_USER']->getPagePermsClause(1) + $categoryUid, + $GLOBALS['BE_USER']->getPagePermsClause(1) ); if ($categoryPageInfo) { $options[] = self::getOptionPageInfo($categoryPageInfo); @@ -154,7 +159,10 @@ class BackendNewsUtility { // get all pageids below the given siteroot $queryGenerator = GeneralUtility::makeInstance(QueryGenerator::class); $childPids = $queryGenerator->getTreeList( - $siteRootUid, PHP_INT_MAX, 0, $GLOBALS['BE_USER']->getPagePermsClause(1) + $siteRootUid, + PHP_INT_MAX, + 0, + $GLOBALS['BE_USER']->getPagePermsClause(1) ); $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages'); @@ -171,7 +179,8 @@ class BackendNewsUtility { $categories = []; foreach ($result as $page) { $categoryPageInfo = BackendUtility::readPageAccess( - (int) $page['uid'], $GLOBALS['BE_USER']->getPagePermsClause(1) + (int) $page['uid'], + $GLOBALS['BE_USER']->getPagePermsClause(1) ); if ($categoryPageInfo) { $categories[(int) $page['uid']] = $page['title']; @@ -317,7 +326,8 @@ class BackendNewsUtility { $filterCategories = $filters['categories']; foreach ($filterCategories as $categoryUid) { $categoryPageInfo = BackendUtility::readPageAccess( - (int) $categoryUid, $GLOBALS['BE_USER']->getPagePermsClause(1) + (int) $categoryUid, + $GLOBALS['BE_USER']->getPagePermsClause(1) ); if ($categoryPageInfo) { $categories[] = (int) $categoryUid; @@ -333,9 +343,14 @@ class BackendNewsUtility { $allowedUids = []; foreach ($categories as $categoryUid) { $allowedUidsTemp = GeneralUtility::intExplode( - ',', $queryGenerator->getTreeList( - $categoryUid, 1, 0, $GLOBALS['BE_USER']->getPagePermsClause(1) - ), TRUE + ',', + $queryGenerator->getTreeList( + $categoryUid, + 1, + 0, + $GLOBALS['BE_USER']->getPagePermsClause(1) + ), + TRUE ); $allowedUids = array_unique(array_merge($allowedUids, $allowedUidsTemp)); } @@ -348,13 +363,14 @@ class BackendNewsUtility { $deletedRestriction = GeneralUtility::makeInstance(DeletedRestriction::class); $queryBuilder = $connectionPool->getQueryBuilderForTable('pages'); $queryBuilder->getRestrictions()->removeAll()->add($deletedRestriction); - $queryBuilder->select('p.uid', - 'p.pid', - 'p.hidden', - 'p.sorting', - 'p.doktype', - 'p.title' - )->from('pages', 'p') + $queryBuilder->select( + 'p.uid', + 'p.pid', + 'p.hidden', + 'p.sorting', + 'p.doktype', + 'p.title' + )->from('pages', 'p') ->where( $queryBuilder->expr()->andX( $queryBuilder->expr()->in('p.uid', $queryBuilder->createNamedParameter($allowedUids, Connection::PARAM_INT_ARRAY)), @@ -364,7 +380,10 @@ class BackendNewsUtility { ->groupBy('p.uid') ->orderBy('p.sorting'); if ($languageUid) { - $queryBuilder->leftJoin('p', 'pages', 'translation', + $queryBuilder->leftJoin( + 'p', + 'pages', + 'translation', $queryBuilder->expr()->andX( $queryBuilder->expr()->eq('translation.l10n_parent', 'p.uid'), $queryBuilder->expr()->eq('translation.sys_language_uid', $queryBuilder->createNamedParameter($languageUid, \PDO::PARAM_INT)) @@ -373,7 +392,10 @@ class BackendNewsUtility { } if (isset($filters['tags']) && is_array($filters['tags']) && count($filters['tags'])) { - $queryBuilder->innerJoin('p', 'sys_category_record_mm', 'tag', + $queryBuilder->innerJoin( + 'p', + 'sys_category_record_mm', + 'tag', $queryBuilder->expr()->andX( $queryBuilder->expr()->eq('tag.tablenames', $queryBuilder->createNamedParameter('pages')), $queryBuilder->expr()->eq('tag.fieldname', $queryBuilder->createNamedParameter('tx_sgnews_tags')), @@ -484,12 +506,19 @@ class BackendNewsUtility { * @return mixed Multidimensional array with selected records (if any is selected) */ public static function getRecordsByField( - $theTable, $theField, $theValue, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '', + $theTable, + $theField, + $theValue, + $whereClause = '', + $groupBy = '', + $orderBy = '', + $limit = '', $useDeleteClause = TRUE ) { if (is_array($GLOBALS['TCA'][$theTable])) { $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($theTable); - $queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));; + $queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class)); + ; if ($useDeleteClause) { $queryBuilder->getRestrictions() ->add(GeneralUtility::makeInstance(DeletedRestriction::class)); diff --git a/Classes/ViewHelpers/AbstractViewHelper.php b/Classes/ViewHelpers/AbstractViewHelper.php index 87cb14a7473934b6d3414e683dd487ae198d2c70..740f8f26da8241cd413f59437c516d78ca202a13 100644 --- a/Classes/ViewHelpers/AbstractViewHelper.php +++ b/Classes/ViewHelpers/AbstractViewHelper.php @@ -32,7 +32,6 @@ use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper; * Abstract view helper */ class AbstractViewHelper extends AbstractBackendViewHelper { - /** * @var boolean */ diff --git a/Classes/ViewHelpers/Backend/ControlViewHelper.php b/Classes/ViewHelpers/Backend/ControlViewHelper.php index 9ec52630991bc5cd0841d9dcf47903d301c01cc7..29079f3cebbbf483ab0576f22380b8fe99561f53 100644 --- a/Classes/ViewHelpers/Backend/ControlViewHelper.php +++ b/Classes/ViewHelpers/Backend/ControlViewHelper.php @@ -39,7 +39,6 @@ use TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList; * Class ControlViewHelper **/ class ControlViewHelper extends AbstractViewHelper { - /** * Initialize the ViewHelper arguments */ diff --git a/Classes/ViewHelpers/Backend/IconViewHelper.php b/Classes/ViewHelpers/Backend/IconViewHelper.php index 5788ca4d81acf229368e7c31b2566c411188b021..981acef8eca1db5ebbcd56aeaca3de07ed76a840 100644 --- a/Classes/ViewHelpers/Backend/IconViewHelper.php +++ b/Classes/ViewHelpers/Backend/IconViewHelper.php @@ -35,7 +35,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; * Class IconViewHelper **/ class IconViewHelper extends AbstractViewHelper { - /** * Initialize the ViewHelper arguments */ @@ -58,13 +57,13 @@ class IconViewHelper extends AbstractViewHelper { $size = trim($this->arguments['size']); $overlayId = $this->arguments['overlayId']; switch ($size) { - case 'small' : + case 'small': $size = Icon::SIZE_SMALL; break; - case 'large' : + case 'large': $size = Icon::SIZE_LARGE; break; - default : + default: $size = Icon::SIZE_DEFAULT; break; } diff --git a/Classes/ViewHelpers/Backend/Link/NewRecordViewHelper.php b/Classes/ViewHelpers/Backend/Link/NewRecordViewHelper.php index 6fce666ac733b9091d855fbfb781ee0d8ff3678e..a496db6999c9771a5fd883cfca32663b54a6388b 100644 --- a/Classes/ViewHelpers/Backend/Link/NewRecordViewHelper.php +++ b/Classes/ViewHelpers/Backend/Link/NewRecordViewHelper.php @@ -78,45 +78,42 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper; * * <be:link.newRecord table="a_table" returnUrl="{f:be.uri(route: 'web_MyextensionList')}" pid="17"> */ -class NewRecordViewHelper extends AbstractTagBasedViewHelper -{ - /** - * @var string - */ - protected $tagName = 'a'; +class NewRecordViewHelper extends AbstractTagBasedViewHelper { + /** + * @var string + */ + protected $tagName = 'a'; - public function initializeArguments() - { - parent::initializeArguments(); - $this->registerUniversalTagAttributes(); - $this->registerArgument('uid', 'int', 'uid < 0 will insert the record after the given uid', false); - $this->registerArgument('pid', 'int', 'the page id where the record will be created', false); - $this->registerArgument('table', 'string', 'target database table', true); - $this->registerArgument('type', 'string', 'The type of the news', true); - $this->registerArgument('returnUrl', 'string', 'return to this URL after closing the edit dialog', false, ''); - } + public function initializeArguments() { + parent::initializeArguments(); + $this->registerUniversalTagAttributes(); + $this->registerArgument('uid', 'int', 'uid < 0 will insert the record after the given uid', FALSE); + $this->registerArgument('pid', 'int', 'the page id where the record will be created', FALSE); + $this->registerArgument('table', 'string', 'target database table', TRUE); + $this->registerArgument('type', 'string', 'The type of the news', TRUE); + $this->registerArgument('returnUrl', 'string', 'return to this URL after closing the edit dialog', FALSE, ''); + } - /** - * @return string - * @throws \TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException - */ - public function render(): string - { - if ($this->arguments['uid'] && $this->arguments['pid']) { - throw new \InvalidArgumentException('Can\'t handle both uid and pid for new records', 1526129969); - } - if (isset($this->arguments['uid']) && $this->arguments['uid'] >= 0) { - throw new \InvalidArgumentException('Uid must be negative integer, ' . $this->arguments['uid'] . ' given', 1526134901); - } + /** + * @return string + * @throws \TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException + */ + public function render(): string { + if ($this->arguments['uid'] && $this->arguments['pid']) { + throw new \InvalidArgumentException('Can\'t handle both uid and pid for new records', 1526129969); + } + if (isset($this->arguments['uid']) && $this->arguments['uid'] >= 0) { + throw new \InvalidArgumentException('Uid must be negative integer, ' . $this->arguments['uid'] . ' given', 1526134901); + } - if (empty($this->arguments['returnUrl'])) { - $this->arguments['returnUrl'] = GeneralUtility::getIndpEnv('REQUEST_URI'); - } + if (empty($this->arguments['returnUrl'])) { + $this->arguments['returnUrl'] = GeneralUtility::getIndpEnv('REQUEST_URI'); + } - $params = [ - 'edit' => [$this->arguments['table'] => [$this->arguments['uid'] ?? $this->arguments['pid'] ?? 0 => 'new']], - 'returnUrl' => $this->arguments['returnUrl'] - ]; + $params = [ + 'edit' => [$this->arguments['table'] => [$this->arguments['uid'] ?? $this->arguments['pid'] ?? 0 => 'new']], + 'returnUrl' => $this->arguments['returnUrl'] + ]; if ($this->arguments['table'] === 'pages' && in_array($this->arguments['type'], ['news', 'category'], TRUE)) { $params['overrideVals'] = [ 'pages' => [ @@ -125,11 +122,11 @@ class NewRecordViewHelper extends AbstractTagBasedViewHelper ]; } - $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class); - $uri = (string)$uriBuilder->buildUriFromRoute('record_edit', $params); - $this->tag->addAttribute('href', $uri); - $this->tag->setContent($this->renderChildren()); - $this->tag->forceClosingTag(true); - return $this->tag->render(); - } + $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class); + $uri = (string)$uriBuilder->buildUriFromRoute('record_edit', $params); + $this->tag->addAttribute('href', $uri); + $this->tag->setContent($this->renderChildren()); + $this->tag->forceClosingTag(TRUE); + return $this->tag->render(); + } } diff --git a/Classes/ViewHelpers/Backend/NewsItemTagsViewHelper.php b/Classes/ViewHelpers/Backend/NewsItemTagsViewHelper.php index ebaa2980d917bcea4fd960c176381ac16a32fb95..d8ba9a15d3c44eeb6c551290bcc50d5874f7eaa2 100644 --- a/Classes/ViewHelpers/Backend/NewsItemTagsViewHelper.php +++ b/Classes/ViewHelpers/Backend/NewsItemTagsViewHelper.php @@ -33,7 +33,6 @@ use SGalinski\SgNews\ViewHelpers\AbstractViewHelper; * Class EditOnClickViewHelper **/ class NewsItemTagsViewHelper extends AbstractViewHelper { - /** * Initialize the ViewHelper arguments */ diff --git a/Classes/ViewHelpers/Backend/RecordIconViewHelper.php b/Classes/ViewHelpers/Backend/RecordIconViewHelper.php index 20f18b705713daa8d7002da845edd6eb01f511f3..d7d6be0a2cc21d60eb3958283a0354fc49ba4588 100644 --- a/Classes/ViewHelpers/Backend/RecordIconViewHelper.php +++ b/Classes/ViewHelpers/Backend/RecordIconViewHelper.php @@ -36,7 +36,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; * Class IconViewHelper **/ class RecordIconViewHelper extends AbstractViewHelper { - /** * Initialize the ViewHelper arguments */ diff --git a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php index 56e190c67ee06cc7e394718159f450b8792bd630..c7f08571b077d168cc9210ada42847da4dd140af 100644 --- a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php +++ b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php @@ -40,7 +40,6 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility; * Class EditOnClickViewHelper **/ class TranslationLinksViewHelper extends AbstractViewHelper { - /** * Register the ViewHelp0er arguments */ @@ -115,13 +114,14 @@ class TranslationLinksViewHelper extends AbstractViewHelper { 'returnUrl' => (string) $returnUrl ]); - $out .= ' <a href="' . $link . '" title="'. $language['title'] . ' [' . $editLabel . ']" >' + $out .= ' <a href="' . $link . '" title="' . $language['title'] . ' [' . $editLabel . ']" >' . $iconFactory->getIcon($language['flag'], Icon::SIZE_SMALL)->render() . '</a>'; } else { $out .= ' <a href="' . BackendUtility::getLinkToDataHandlerAction( - sprintf($translationParameters, $languageUid), $returnUrl + sprintf($translationParameters, $languageUid), + $returnUrl ) . '" title="' . $language['title'] . ' [' . $newLabel . ']" >' . $iconFactory->getIcon( diff --git a/Classes/ViewHelpers/Backend/Widget/Controller/PaginateController.php b/Classes/ViewHelpers/Backend/Widget/Controller/PaginateController.php index 5998ad7ce318e4afbd4079a797376a449ded25b9..295a81bac8d7df7576eb07e310481fadbb79d0e7 100644 --- a/Classes/ViewHelpers/Backend/Widget/Controller/PaginateController.php +++ b/Classes/ViewHelpers/Backend/Widget/Controller/PaginateController.php @@ -33,7 +33,6 @@ use TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\Controller\PaginateController as Fluid * Class PaginateController */ class PaginateController extends FluidPaginateController { - /** * @var mixed */ @@ -79,7 +78,8 @@ class PaginateController extends FluidPaginateController { } } $this->view->assign( - 'contentArguments', [ + 'contentArguments', + [ $this->widgetConfiguration['as'] => $modifiedObjects ] ); diff --git a/Classes/ViewHelpers/GetReadingTimeViewHelper.php b/Classes/ViewHelpers/GetReadingTimeViewHelper.php index eb601920b7563f7c97099834374ab3c6279a9cfd..bb11302bc3557ee17cbc4d8735465de03dd08411 100644 --- a/Classes/ViewHelpers/GetReadingTimeViewHelper.php +++ b/Classes/ViewHelpers/GetReadingTimeViewHelper.php @@ -36,7 +36,6 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; * <sg:getReadingTime content="" /> */ class GetReadingTimeViewHelper extends AbstractViewHelper { - /** * Register the ViewHelper arguments */ diff --git a/Classes/Xclass/PageRenderer.php b/Classes/Xclass/PageRenderer.php index 2a26a5b62c792ac2239ee778b14980b2eb76865d..84583eb353686619902f1de1ab07f5415045b5f2 100755 --- a/Classes/Xclass/PageRenderer.php +++ b/Classes/Xclass/PageRenderer.php @@ -58,7 +58,9 @@ class PageRenderer extends \TYPO3\CMS\Core\Page\PageRenderer { if (is_array($this->headerDataRegex)) { foreach ($this->headerDataRegex as $regex) { $this->headerData = preg_replace( - '/' . $regex['pattern'] . '/is', $regex['replacement'], $this->headerData + '/' . $regex['pattern'] . '/is', + $regex['replacement'], + $this->headerData ); } } @@ -72,7 +74,9 @@ class PageRenderer extends \TYPO3\CMS\Core\Page\PageRenderer { * @param string $substituteHash * @return string */ - public function renderJavaScriptAndCssForProcessingOfUncachedContentObjects($cachedPageContent, $substituteHash + public function renderJavaScriptAndCssForProcessingOfUncachedContentObjects( + $cachedPageContent, + $substituteHash ): string { $this->executeHeaderRegularExpressions(); return parent::renderJavaScriptAndCssForProcessingOfUncachedContentObjects($cachedPageContent, $substituteHash); diff --git a/Configuration/Commands.php b/Configuration/Commands.php index 813f2eed18af07382c22a5a6c20bad8a1c1a2ecd..64a89a89387a4320697f2fc17fc778833e9da317 100644 --- a/Configuration/Commands.php +++ b/Configuration/Commands.php @@ -1,4 +1,5 @@ <?php + return [ 'sg_news:migrateNews' => [ 'class' => \SGalinski\SgNews\Command\MigrateNewsCommandController::class diff --git a/Configuration/Extbase/Persistence/Classes.php b/Configuration/Extbase/Persistence/Classes.php index 1630518858a63d3e3784138bd2f1f0597cba9fe9..cadba116249d6ee6fbed375b6fbdf39900b19986 100644 --- a/Configuration/Extbase/Persistence/Classes.php +++ b/Configuration/Extbase/Persistence/Classes.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); // if you need to change this, keep in mind the changes need to be done in diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php index 066b4c372789ab5f856bd18606e3ba6d71015eb8..88e5fea40566881165575d4196ae47d358397c0c 100644 --- a/Configuration/TCA/Overrides/pages.php +++ b/Configuration/TCA/Overrides/pages.php @@ -174,11 +174,13 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten 'tx_sgnews_teaser1_image' => [ 'exclude' => TRUE, 'label' => $localLangDbPath . 'pages.tx_sgnews_teaser1_image', - 'description' => (version_compare( + 'description' => ( + version_compare( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', - '>=') - ) ? 'LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:teaser_description' : null, + '>=' + ) + ) ? 'LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:teaser_description' : NULL, 'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig( 'tx_sgnews_teaser1_image', [ @@ -228,11 +230,13 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten 'tx_sgnews_teaser2_image' => [ 'exclude' => TRUE, 'label' => $localLangDbPath . 'pages.tx_sgnews_teaser2_image', - 'description' => (version_compare( + 'description' => ( + version_compare( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExtensionVersion('sg_seo'), '5.0.0', - '>=') - ) ? 'LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:teaser_description' : null, + '>=' + ) + ) ? 'LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:teaser_description' : NULL, 'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig( 'tx_sgnews_teaser2_image', [ diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php index 866956e45ad81c53aa88d3ddb71febc934353263..dd729bc2d43b1862cb266b36853f7c41331c1592 100644 --- a/Configuration/TCA/Overrides/sys_template.php +++ b/Configuration/TCA/Overrides/sys_template.php @@ -25,5 +25,7 @@ */ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( - 'sg_news', 'Configuration/TypoScript/Frontend', 'News System' + 'sg_news', + 'Configuration/TypoScript/Frontend', + 'News System' ); diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php index 8eb853234df0ca650746edae964f5247c72551b9..74941774a7f31de15622d814591b6b8c029eac0b 100644 --- a/Configuration/TCA/Overrides/tt_content.php +++ b/Configuration/TCA/Overrides/tt_content.php @@ -58,22 +58,26 @@ $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['sgnews_n // Flex form assignment $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['sgnews_overview'] = 'pi_flexform'; \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( - 'sgnews_overview', 'FILE:EXT:sg_news/Configuration/FlexForms/Overview.xml' + 'sgnews_overview', + 'FILE:EXT:sg_news/Configuration/FlexForms/Overview.xml' ); $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['sgnews_listbycategory'] = 'pi_flexform'; \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( - 'sgnews_listbycategory', 'FILE:EXT:sg_news/Configuration/FlexForms/ListByCategory.xml' + 'sgnews_listbycategory', + 'FILE:EXT:sg_news/Configuration/FlexForms/ListByCategory.xml' ); $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['sgnews_latest'] = 'pi_flexform'; \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( - 'sgnews_latest', 'FILE:EXT:sg_news/Configuration/FlexForms/Latest.xml' + 'sgnews_latest', + 'FILE:EXT:sg_news/Configuration/FlexForms/Latest.xml' ); $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['sgnews_newsbyauthor'] = 'pi_flexform'; \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( - 'sgnews_newsbyauthor', 'FILE:EXT:sg_news/Configuration/FlexForms/NewsByAuthor.xml' + 'sgnews_newsbyauthor', + 'FILE:EXT:sg_news/Configuration/FlexForms/NewsByAuthor.xml' ); $GLOBALS['TCA']['tt_content']['types']['list']['previewRenderer']['sgnews_overview'] = \SGalinski\SgNews\Preview\PreviewRenderer::class; diff --git a/Configuration/TCA/tx_sgnews_domain_model_author.php b/Configuration/TCA/tx_sgnews_domain_model_author.php index 8cd9e07411939902567008292e00733897e9312c..8bec90ec6e5e8b2c6d4fe05a2c0532cd64faa362 100644 --- a/Configuration/TCA/tx_sgnews_domain_model_author.php +++ b/Configuration/TCA/tx_sgnews_domain_model_author.php @@ -163,7 +163,8 @@ $configuration = [ 'l10n_mode' => 'exclude', 'label' => 'LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:tx_sgnews_domain_model_author.image', 'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig( - 'files', [ + 'files', + [ 'appearance' => [ 'useSortable' => TRUE, ], diff --git a/ext_localconf.php b/ext_localconf.php index 9e5e6b79bf32dadb0dee4ae7c1147a6248bbcb9b..761c30f5dac72724b1bf9d0a7f11b69e57d6cbbb 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -35,50 +35,50 @@ call_user_func( \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'Overview', - [\SGalinski\SgNews\Controller\OverviewController::class => 'overview',], - [\SGalinski\SgNews\Controller\OverviewController::class => '',] + [\SGalinski\SgNews\Controller\OverviewController::class => 'overview', ], + [\SGalinski\SgNews\Controller\OverviewController::class => '', ] ); \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'ListByCategory', - [\SGalinski\SgNews\Controller\ListByCategoryController::class => 'index',], - [\SGalinski\SgNews\Controller\ListByCategoryController::class => '',] + [\SGalinski\SgNews\Controller\ListByCategoryController::class => 'index', ], + [\SGalinski\SgNews\Controller\ListByCategoryController::class => '', ] ); \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'SingleView', - [\SGalinski\SgNews\Controller\SingleViewController::class => 'singleView',], - [\SGalinski\SgNews\Controller\SingleViewController::class => '',] + [\SGalinski\SgNews\Controller\SingleViewController::class => 'singleView', ], + [\SGalinski\SgNews\Controller\SingleViewController::class => '', ] ); \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'NewsFeed', - [\SGalinski\SgNews\Controller\NewsFeedController::class => 'index',], - [\SGalinski\SgNews\Controller\NewsFeedController::class => '',] + [\SGalinski\SgNews\Controller\NewsFeedController::class => 'index', ], + [\SGalinski\SgNews\Controller\NewsFeedController::class => '', ] ); \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'Latest', - [\SGalinski\SgNews\Controller\LatestController::class => 'index',], - [\SGalinski\SgNews\Controller\LatestController::class => '',] + [\SGalinski\SgNews\Controller\LatestController::class => 'index', ], + [\SGalinski\SgNews\Controller\LatestController::class => '', ] ); \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'ListByCategory', - [\SGalinski\SgNews\Controller\ListByCategoryController::class => 'index',], - [\SGalinski\SgNews\Controller\ListByCategoryController::class => '',] + [\SGalinski\SgNews\Controller\ListByCategoryController::class => 'index', ], + [\SGalinski\SgNews\Controller\ListByCategoryController::class => '', ] ); \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'SgNews', 'NewsByAuthor', - [\SGalinski\SgNews\Controller\NewsByAuthorController::class => 'list',], - [\SGalinski\SgNews\Controller\NewsByAuthorController::class => '',] + [\SGalinski\SgNews\Controller\NewsByAuthorController::class => 'list', ], + [\SGalinski\SgNews\Controller\NewsByAuthorController::class => '', ] ); if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('sg_ajax')) {