Update TYPO3 v13.0
This commit is contained in:
parent
547a992ae4
commit
02493e9540
10 changed files with 12 additions and 27 deletions
|
@ -91,7 +91,7 @@ class PageLayoutHeader
|
||||||
|
|
||||||
private function resolvePageMedia(int $pageUid): array
|
private function resolvePageMedia(int $pageUid): array
|
||||||
{
|
{
|
||||||
$files = new FileCollector();
|
$files = GeneralUtility::makeInstance(FileCollector::class);
|
||||||
$files->addFilesFromRelation('pages', 'media', ['uid' => $pageUid]);
|
$files->addFilesFromRelation('pages', 'media', ['uid' => $pageUid]);
|
||||||
|
|
||||||
return $files->getFiles();
|
return $files->getFiles();
|
||||||
|
|
|
@ -95,10 +95,10 @@ class CategoriesCounts implements DataProcessorInterface
|
||||||
$queryBuilder->addOrderBy($orderBy[0], $orderBy[1]);
|
$queryBuilder->addOrderBy($orderBy[0], $orderBy[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$statement = $queryBuilder->execute();
|
$statement = $queryBuilder->executeQuery();
|
||||||
|
|
||||||
$categories = [];
|
$categories = [];
|
||||||
while ($category = $statement->fetch()) {
|
while ($category = $statement->fetchAssociative()) {
|
||||||
$categories[] = [
|
$categories[] = [
|
||||||
'data' => $category,
|
'data' => $category,
|
||||||
];
|
];
|
||||||
|
|
|
@ -64,8 +64,8 @@ class NaturalSortingProcessor implements DataProcessorInterface
|
||||||
throw new \Exception('Variable at "' . $variablePath . '" was not of type array.', 1667911071);
|
throw new \Exception('Variable at "' . $variablePath . '" was not of type array.', 1667911071);
|
||||||
}
|
}
|
||||||
|
|
||||||
$valuesToSort = array_filter($valuesToSort, function (array $value) use ($variableSubPath) {
|
$valuesToSort = array_filter($valuesToSort, function (array $value) use ($variableSubPath): bool {
|
||||||
return ArrayUtility::getValueByPath($value, $variableSubPath);
|
return ArrayUtility::getValueByPath($value, $variableSubPath) == true;
|
||||||
});
|
});
|
||||||
|
|
||||||
usort($valuesToSort, function (array $variable1, array $variable2) use ($variableSubPath) {
|
usort($valuesToSort, function (array $variable1, array $variable2) use ($variableSubPath) {
|
||||||
|
|
|
@ -95,7 +95,7 @@ class SitemapDataProvider extends RecordsXmlSitemapDataProvider
|
||||||
|
|
||||||
return array_map(function (array $row) {
|
return array_map(function (array $row) {
|
||||||
return (int) $row['uid'];
|
return (int) $row['uid'];
|
||||||
}, $queryBuilder->execute()->fetchAll());
|
}, $queryBuilder->executeQuery()->fetchAllAssociative());
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createAdditionalWhereForPageUids(array $pageUids): string
|
private function createAdditionalWhereForPageUids(array $pageUids): string
|
||||||
|
|
|
@ -73,7 +73,7 @@ class XmlSitemapRenderer
|
||||||
$this->typoScriptConfiguration = $typoScriptConfiguration;
|
$this->typoScriptConfiguration = $typoScriptConfiguration;
|
||||||
|
|
||||||
$this->initialize($GLOBALS['TSFE']->tmpl->setup);
|
$this->initialize($GLOBALS['TSFE']->tmpl->setup);
|
||||||
$this->view->assign('type', $GLOBALS['TSFE']->type);
|
$this->view->assign('type', $request->getAttribute('routing')?->getPageType() ?? 0);
|
||||||
$sitemapType = $typoScriptConfiguration['sitemapType'] ?? 'xmlSitemap';
|
$sitemapType = $typoScriptConfiguration['sitemapType'] ?? 'xmlSitemap';
|
||||||
if (!empty($sitemap = ($request->getQueryParams()['sitemap'] ?? null))) {
|
if (!empty($sitemap = ($request->getQueryParams()['sitemap'] ?? null))) {
|
||||||
return $this->renderSitemap($request, $sitemap, $sitemapType);
|
return $this->renderSitemap($request, $sitemap, $sitemapType);
|
||||||
|
|
|
@ -33,7 +33,6 @@ services:
|
||||||
dashboard.widget.site_ownrss:
|
dashboard.widget.site_ownrss:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\RssWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\RssWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$cache: '@cache.dashboard.rss'
|
$cache: '@cache.dashboard.rss'
|
||||||
$options:
|
$options:
|
||||||
feedUrl: 'https://daniel-siepmann.de/rss-feed/blog-posts.xml'
|
feedUrl: 'https://daniel-siepmann.de/rss-feed/blog-posts.xml'
|
||||||
|
@ -52,7 +51,6 @@ services:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\BarChartWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\BarChartWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$dataProvider: '@TYPO3\CMS\Dashboard\Widgets\Provider\SysLogErrorsDataProvider'
|
$dataProvider: '@TYPO3\CMS\Dashboard\Widgets\Provider\SysLogErrorsDataProvider'
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$buttonProvider: '@TYPO3\CMS\Dashboard\Widgets\Provider\SysLogButtonProvider'
|
$buttonProvider: '@TYPO3\CMS\Dashboard\Widgets\Provider\SysLogButtonProvider'
|
||||||
tags:
|
tags:
|
||||||
- name: dashboard.widget
|
- name: dashboard.widget
|
||||||
|
|
|
@ -28,7 +28,6 @@ services:
|
||||||
dashboard.widget.danielsiepmann.tracking.pageViewsPerPage7_days:
|
dashboard.widget.danielsiepmann.tracking.pageViewsPerPage7_days:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$dataProvider: '@DanielSiepmann\Tracking\Dashboard\Provider\PageviewsPerPage7_days'
|
$dataProvider: '@DanielSiepmann\Tracking\Dashboard\Provider\PageviewsPerPage7_days'
|
||||||
tags:
|
tags:
|
||||||
- name: 'dashboard.widget'
|
- name: 'dashboard.widget'
|
||||||
|
@ -50,7 +49,6 @@ services:
|
||||||
dashboard.widget.danielsiepmann.tracking.pageViewsPerPage365_days:
|
dashboard.widget.danielsiepmann.tracking.pageViewsPerPage365_days:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$dataProvider: '@DanielSiepmann\Tracking\Dashboard\Provider\PageviewsPerPage365_days'
|
$dataProvider: '@DanielSiepmann\Tracking\Dashboard\Provider\PageviewsPerPage365_days'
|
||||||
tags:
|
tags:
|
||||||
- name: 'dashboard.widget'
|
- name: 'dashboard.widget'
|
||||||
|
@ -71,7 +69,6 @@ services:
|
||||||
dashboard.widget.danielsiepmann.tracking.records.topics:
|
dashboard.widget.danielsiepmann.tracking.records.topics:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$dataProvider: '@dashboard.provider.danielsiepmann.tracking.records.topics'
|
$dataProvider: '@dashboard.provider.danielsiepmann.tracking.records.topics'
|
||||||
tags:
|
tags:
|
||||||
- name: 'dashboard.widget'
|
- name: 'dashboard.widget'
|
||||||
|
@ -93,7 +90,6 @@ services:
|
||||||
dashboard.widget.danielsiepmann.tracking.records.topics7_days:
|
dashboard.widget.danielsiepmann.tracking.records.topics7_days:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$dataProvider: '@dashboard.provider.danielsiepmann.tracking.records.topics7_days'
|
$dataProvider: '@dashboard.provider.danielsiepmann.tracking.records.topics7_days'
|
||||||
tags:
|
tags:
|
||||||
- name: 'dashboard.widget'
|
- name: 'dashboard.widget'
|
||||||
|
@ -115,7 +111,6 @@ services:
|
||||||
dashboard.widget.danielsiepmann.tracking.records.topics365_days:
|
dashboard.widget.danielsiepmann.tracking.records.topics365_days:
|
||||||
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
class: 'TYPO3\CMS\Dashboard\Widgets\DoughnutChartWidget'
|
||||||
arguments:
|
arguments:
|
||||||
$view: '@dashboard.views.widget'
|
|
||||||
$dataProvider: '@dashboard.provider.danielsiepmann.tracking.records.topics365_days'
|
$dataProvider: '@dashboard.provider.danielsiepmann.tracking.records.topics365_days'
|
||||||
tags:
|
tags:
|
||||||
- name: 'dashboard.widget'
|
- name: 'dashboard.widget'
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
|
|
||||||
(function (string $extKey) {
|
(function (string $extKey) {
|
||||||
\TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($GLOBALS['TYPO3_CONF_VARS'], [
|
\TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($GLOBALS['TYPO3_CONF_VARS'], [
|
||||||
|
'BE' => [
|
||||||
|
'stylesheets' => [
|
||||||
|
$extKey => 'EXT:' . $extKey . '/Resources/Public/Backend/Css/',
|
||||||
|
],
|
||||||
|
],
|
||||||
'RTE' => [
|
'RTE' => [
|
||||||
'Presets' => [
|
'Presets' => [
|
||||||
'default' => 'EXT:ds_site/Configuration/RTE/Default.yaml',
|
'default' => 'EXT:ds_site/Configuration/RTE/Default.yaml',
|
||||||
|
@ -17,7 +22,4 @@
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig(
|
|
||||||
"@import 'EXT:ds_site/Configuration/UserTSconfig/*.tsconfig'"
|
|
||||||
);
|
|
||||||
})('ds_site');
|
})('ds_site');
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
(function (string $extensionKey) {
|
|
||||||
$GLOBALS['TBE_STYLES']['skins'][$extensionKey] = [
|
|
||||||
'name' => $extensionKey,
|
|
||||||
'stylesheetDirectories' => [
|
|
||||||
'css' => 'EXT:' . $extensionKey . '/Resources/Public/Backend/Css/'
|
|
||||||
]
|
|
||||||
];
|
|
||||||
})('ds_site');
|
|
Loading…
Reference in a new issue