feat: boot TYPO3 13 with site configs and the theme build

- Site configs for the seven live sites from EP/website, Development
  base variants on *-ep13.ddev.site (DDEV additional_hostnames)
- Webpack Encore build moved to the root, output in
  packages/ep_theme/Resources/Public, public path /_assets/<hash>
- Search UI removed from the kept layouts and partials, as the static
  export already does
- Daytrip room selection and the contingent chain removed (contingent
  import is not ported; no daytrip product has current contingents)
- f:uri.action is final in v13: Uri\AjaxViewHelper invokes it
- Remaining QueryBuilder::execute() and array logicalAnd() calls,
  addRootLineFields, TSFE getData, legacy typo3conf/ext template path
- Rector skips the plugin-to-CType rules; plugins stay list_type

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
frommeandClaude Opus 5.5 committed 2026-10-21 14:25:01 +02:00
1 parent 41b9302d9b
commit a598339f67
56 files changed
+10844 -1348

No files matched your search

@@ -124,7 +124,7 @@ class ContextProcessor implements DataProcessorInterface
->setParameter('uid', $uid)
;
return $query->execute()->fetch();
return $query->executeQuery()->fetchAssociative();
}
}
@@ -75,7 +75,7 @@ class SliderProcessor implements DataProcessorInterface
->setParameter('pageUid', $pageUid)
;
$slides = $query->execute()->fetchAll();
$slides = $query->executeQuery()->fetchAllAssociative();
if ($slides) {
$fileRepository = GeneralUtility::makeInstance(FileRepository::class);
@@ -24,11 +24,11 @@ class PageRepository extends Repository
->setIncludeDeleted(false)
->setRespectSysLanguage(false)
;
$query->matching($query->logicalAnd([
$query->matching($query->logicalAnd(
$query->equals('pid', $pid),
$query->equals('doktype', CorePageRepository::DOKTYPE_DEFAULT),
$query->equals('navHide', false),
]));
));
return $query->execute();
}
@@ -27,37 +27,37 @@ namespace EP\EpTheme\ViewHelpers\Uri;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Utility\RootlineUtility;
use TYPO3\CMS\Fluid\ViewHelpers\Uri\ActionViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
class AjaxViewHelper extends ActionViewHelper
/**
* f:uri.action for the AJAX plugin: picks the page type from the format and links to the
* root page unless a page is given. The core ViewHelper is final, so it is invoked instead
* of extended.
*/
class AjaxViewHelper extends AbstractViewHelper
{
const PAGE_TYPE_JSON = 1701;
const PAGE_TYPE_HTML = 1702;
public function initializeArguments()
public function initializeArguments(): void
{
parent::initializeArguments();
$this->overrideArgument('extensionName', 'string', 'Target extension name', false, 'epproducts');
$this->overrideArgument('pluginName', 'string', 'Target plugin name', false, 'Ajax');
$this->overrideArgument('format', 'string', 'The requested format', false, 'json');
$this->registerArgument('action', 'string', 'Target action');
$this->registerArgument('arguments', 'array', 'Arguments for the controller action', false, []);
$this->registerArgument('controller', 'string', 'Target controller');
$this->registerArgument('extensionName', 'string', 'Target extension name', false, 'epproducts');
$this->registerArgument('pluginName', 'string', 'Target plugin name', false, 'Ajax');
$this->registerArgument('pageUid', 'int', 'Target page, defaults to the root page');
$this->registerArgument('format', 'string', 'The requested format, json or html', false, 'json');
}
/**
* @param array $arguments
* @param \Closure $renderChildrenClosure
* @param RenderingContextInterface $renderingContext
* @return string
*/
public static function renderStatic
(
array $arguments,
\Closure $renderChildrenClosure,
RenderingContextInterface $renderingContext
) {
public function render(): string
{
$arguments = $this->arguments;
// Determine page type from format argument
if (strtolower(trim($arguments['format'])) === 'json') {
$arguments['pageType'] = self::PAGE_TYPE_JSON;
@@ -70,7 +70,9 @@ class AjaxViewHelper extends ActionViewHelper
// Use root page uid as target unless provided
if ($arguments['pageUid'] === null) {
$rootlineUtility = new RootlineUtility($GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.page.information')->getId());
/** @var ServerRequestInterface $request */
$request = $this->renderingContext->getAttribute(ServerRequestInterface::class);
$rootlineUtility = new RootlineUtility($request->getAttribute('frontend.page.information')->getId());
$rootline = $rootlineUtility->get();
$rootPage = array_pop($rootline);
$arguments['pageUid'] = $rootPage['uid'];
@@ -79,10 +81,11 @@ class AjaxViewHelper extends ActionViewHelper
// Force absolute urls
$arguments['absolute'] = true;
return parent::renderStatic(
return (string)$this->renderingContext->getViewHelperInvoker()->invoke(
ActionViewHelper::class,
$arguments,
$renderChildrenClosure,
$renderingContext
$this->renderingContext,
$this->buildRenderChildrenClosure()
);
}
+10
View File
@@ -0,0 +1,10 @@
<?php
use TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider;
return [
'content-ep_theme-ce' => [
'provider' => SvgIconProvider::class,
'source' => 'EXT:ep_theme/Resources/Public/images/logo.svg',
],
];
@@ -3,6 +3,6 @@ tt_content.button {
templateName = Button
variables {
referrerPid = TEXT
referrerPid.data = TSFE:id
referrerPid.data = page:uid
}
}
@@ -14,7 +14,7 @@ lib.dynamicContent {
pageUid.cObject = TEXT
pageUid.cObject {
field = pageUid
ifEmpty.data = TSFE:id
ifEmpty.data = page:uid
}
contentFromPid.cObject = TEXT
contentFromPid.cObject {
@@ -1,21 +0,0 @@
lib.searchBar = USER
lib.searchBar {
userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
extensionName = EpProducts
pluginName = searchbar
vendorName = EP
controller = Searchbar
action = index
switchableControllerActions {
Searchbar {
1 = index
}
}
settings =< plugin.tx_epproducts.settings
settings.searchPageUid < plugin.tx_epproducts.settings.defaultSearchPageUid
persistence =< plugin.tx_epproducts.persistence
view =< plugin.tx_epproducts.view
}
lib.searchBarCollapsed < lib.searchBar
lib.searchBarCollapsed.settings.collapsed = 1
@@ -90,7 +90,7 @@ page {
cObject {
data = levelfield: -1, backend_layout_next_level, slide
override {
data = TSFE:page|backend_layout
data = page:backend_layout
}
ifEmpty = Default
@@ -100,7 +100,7 @@ page {
1.wrap = |
}
wrap = typo3conf/ext/ep_theme/Resources/Private/Templates/Page/|.html
wrap = EXT:ep_theme/Resources/Private/Templates/Page/|.html
case = ucfirst
}
}
@@ -2,11 +2,8 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<f:cObject typoscriptObjectPath="lib.searchBarCollapsed"/>
<f:alias map="{searchbarCollapsed: 1}">
<f:render partial="Topnav" arguments="{_all}"/>
<f:render partial="Mainnav" section="Main" arguments="{_all}"/>
</f:alias>
<f:render partial="Topnav" arguments="{_all}"/>
<f:render partial="Mainnav" section="Main" arguments="{_all}"/>
<main id="main-content">
<f:render section="Content"/>
<f:render section="Teasers"/>
@@ -17,7 +14,6 @@
<aside>
<f:render partial="ContactBar" arguments="{_all}"/>
<f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
<f:render partial="Search/MobileSearch" arguments="{_all}"/>
</aside>
<f:render partial="Config" arguments="{_all}" />
</html>
@@ -5,11 +5,6 @@
<f:render partial="Mainnav" section="Main" arguments="{_all}"/>
<header>
<f:render partial="HeaderSliderSmall" arguments="{_all}"/>
<f:if condition="{data.tx_eptheme_hide_searchbar} || {settings.hideSearchbar}">
<f:else>
<f:cObject typoscriptObjectPath="lib.searchBar"/>
</f:else>
</f:if>
</header>
<main id="main-content">
<f:cObject typoscriptObjectPath="lib.breadcrumb"/>
@@ -22,10 +17,5 @@
<f:render partial="ContactBar" arguments="{_all}"/>
<f:render partial="Topnav" arguments="{_all}"/>
<f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
<f:if condition="{data.tx_eptheme_hide_searchbar} || {settings.hideSearchbar}">
<f:else>
<f:render partial="Search/MobileSearch" arguments="{_all}"/>
</f:else>
</f:if>
<f:render partial="Config" arguments="{_all}" />
</html>
@@ -5,11 +5,6 @@
<f:render partial="Mainnav" section="Main" arguments="{_all}"/>
<header>
<f:render partial="HeaderSliderSmall" arguments="{_all}"/>
<f:if condition="{data.tx_eptheme_hide_searchbar}">
<f:else>
<f:cObject typoscriptObjectPath="lib.searchBar"/>
</f:else>
</f:if>
</header>
<main id="main-content">
<f:cObject typoscriptObjectPath="lib.breadcrumb"/>
@@ -30,6 +25,5 @@
<f:render partial="ContactBar" arguments="{_all}"/>
<f:render partial="Topnav" arguments="{_all}"/>
<f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
<f:render partial="Search/MobileSearch" arguments="{_all}"/>
<f:render partial="Config" arguments="{_all}" />
</html>
@@ -93,20 +93,6 @@
</f:else>
</f:if>
</div>
<f:if condition="{teasers -> f:count()} > 3">
<f:if condition="{settings.hideMoreLink}">
<f:else>
<div class="text-right mt-4">
<f:link.typolink class="button bg-button"
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}"
additionalAttributes="{rel: 'nofollow'}">
Alle anzeigen
</f:link.typolink>
</div>
</f:else>
</f:if>
</f:if>
</div>
</f:if>
<f:if condition="{city.descriptionExtended}">
@@ -98,19 +98,6 @@
</div>
</f:else>
</f:if>
<f:if condition="{teasers -> f:count()} > 3">
<f:if condition="{settings.hideMoreLink}">
<f:else>
<div class="text-right mt-4">
<f:link.typolink class="button bg-button"
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}">
Alle anzeigen
</f:link.typolink>
</div>
</f:else>
</f:if>
</f:if>
</div>
</f:then>
<f:else>
@@ -17,18 +17,6 @@
<f:render section="FirstLevel" arguments="{_all}"/>
</div>
<div class="flex hover-hover:lg:hidden items-center space-x-4">
<f:if condition="{settings.hideSearchbar}">
<f:else>
<button type="button"
class="focus:outline-none text-zinc-800"
aria-label="Reisen suchen"
data-controller="overlay-toggle"
data-overlay-toggle-id-value="mobile-search"
data-action="overlay-toggle#invokeToggle">
{ep:icon(icon: 'search', class: 'w-8 h-8 text-zinc-800')}
</button>
</f:else>
</f:if>
<button type="button"
class="focus:outline-none text-zinc-800"
aria-label="Navigation öffnen"
@@ -73,27 +61,6 @@
</f:if>
</li>
</f:for>
<f:if condition="{data.tx_eptheme_hide_searchbar} || {settings.hideSearchbar}">
<f:else>
<li class="pb-4" role="none">
<f:if condition="{searchbarCollapsed}">
<f:then>
<button type="button"
aria-label="Suche anzeigen/ausblenden"
data-controller="searchbar-toggle"
data-action="searchbar-toggle#toggle">
{ep:icon(icon: 'search', class: 'w-6 h-6')}
</button>
</f:then>
<f:else>
<f:link.typolink parameter="{settings.defaultSearchPageUid}" title="zur Suche" additionalAttributes="{'role': 'menuitem'}">
{ep:icon(icon: 'search', class: 'w-6 h-6')}
</f:link.typolink>
</f:else>
</f:if>
</li>
</f:else>
</f:if>
</ul>
</nav>
</f:section>
@@ -17,18 +17,6 @@
<f:image class="block h-10 lg:h-12 w-auto" src="{settings.logoImage}" alt="Bildmarke"/>
</f:link.typolink>
<div class="flex hover-hover:lg:hidden items-center space-x-4">
<f:if condition="{data.tx_eptheme_hide_searchbar}">
<f:else>
<button type="button"
class="focus:outline-none text-zinc-800"
aria-label="Reisen suchen"
data-controller="overlay-toggle"
data-overlay-toggle-id-value="search"
data-action="overlay-toggle#invokeToggle">
{ep:icon(icon: 'search', class: 'w-8 h-8 text-zinc-800')}
</button>
</f:else>
</f:if>
<button type="button"
class="focus:outline-none"
aria-label="Navigation schließen"
@@ -124,19 +124,6 @@
</div>
</f:else>
</f:if>
<f:if condition="{teasers -> f:count()} > 3">
<f:if condition="{settings.hideMoreLink}">
<f:else>
<div class="text-right mt-4">
<f:link.typolink class="button bg-button"
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}">
Alle anzeigen
</f:link.typolink>
</div>
</f:else>
</f:if>
</f:if>
</div>
</f:then>
<f:else>
@@ -1,34 +0,0 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
data-namespace-typo3-fluid="true">
<div class="fixed hover-hover:lg:hidden top-0 left-0 inset-0 w-screen h-screen pt-14 hover-none:lg:pt-20 pb-10 z-50 bg-zinc-700 hidden"
data-controller="mobile-search"
data-mobile-search-uri-value="{ep:uri.ajax(controller: 'AjaxFilterPanel', action: 'index', pageUid: settings.defaultAjaxUid, format: 'html')}"
data-mobile-search-init-uri-value="{ep:uri.ajax(controller: 'AjaxFilterPanel', action: 'index', pageUid: settings.defaultAjaxUid, arguments: '{filterSettings: filterSettings}', format: 'html')}"
data-action="overlay-toggle:toggle@window->mobile-search#open datepicker:range-select->mobile-search#selectDateRange">
<div class="fixed top-0 left-0 z-100 inset-x-0 px-4 py-2 hover-none:lg:py-4 flex justify-between bg-white shadow-md">
<a href="{f:uri.typolink(parameter: settings.defaultHomeUid)}"
class="block hover-hover:lg:pb-4"
title="zur Startseite">
<f:image class="block h-10 lg:h-12 w-auto" src="{settings.logoImage}" alt="Bildmarke"/>
</a>
<button type="button"
aria-label="Suche schließen"
class="focus:outline-none" data-action="mobile-search#close">
{ep:icon(icon: 'close', class: 'w-8 h-8')}
</button>
</div>
<div data-mobile-search-target="container"
class="h-full w-full overflow-y-scroll px-4 pt-4 pb-24 bg-ep-primary-dark text-white">
</div>
<div class="fixed top-0 left-0 z-20 w-full h-full hidden"
data-mobile-search-target="loadingIndicator">
<div class="absolute top-1/2 left-1/2 -translate-xy-1/2 flex items-center space-x-4 bg-ep-secondary text-white text-lg p-4 rounded">
{ep:icon(icon: 'spinner', class: 'w-6 h-6')}
<span>Suche wird geladen...</span>
</div>
</div>
</div>
</html>
@@ -1,126 +0,0 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
data-namespace-typo3-fluid="true">
<f:layout name="Default"/>
<f:section name="Main">
<f:if condition="{nights} < 3">
<f:then>
<p class="font-bold">
Bitte mindestens 2 Nächte auswählen.
</p>
</f:then>
<f:else>
<f:render section="Table" arguments="{_all}"/>
</f:else>
</f:if>
</f:section>>
<f:section name="Table">
<table class="w-full mb-4 bg-zinc-200 text-sm xl:text-base">
<thead>
<tr>
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-left text-sm md:text-base">
Zimmerart
</th>
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-left text-sm md:text-base">
Preis
</th>
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-left text-sm md:text-base">
inkl.
</th>
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-left text-sm md:text-base">
</th>
</tr>
</thead>
<tbody>
<f:for each="{rooms}" as="row" iteration="iteration">
<tr class="odd:bg-zinc-50 hover:bg-zinc-100 odd:hover:bg-zinc-100">
<td class="border-r border-zinc-200 px-2 py-1 md:p-2">
{row.label}
</td>
<td class="border-r border-zinc-200 px-2 py-1 md:p-2 whitespace-nowrap">
ab {row.priceForSelection} €
</td>
<td class="border-r border-zinc-200 px-2 py-1 md:p-2">
<f:if condition="{row.skiPassIncluded}">
<span data-cooltipz-dir="top"
aria-label="{f:if(condition: row.summer, then: 'Bergbahnticket inklusive', else: 'Skipass inklusive')}"
role="tooltip">
<svg class="w-4 h-4">
<use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-tag"></use>
</svg>
</span>
</f:if>
<button type="button"
data-action="daytrip#openModal"
data-daytrip-type-param="services"
data-daytrip-uid-param="{iteration.cycle}"
data-cooltipz-dir="top"
aria-label="Alle Inklusivleistungen anzeigen">
<svg class="w-4 h-4">
<use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-info-circle"></use>
</svg>
</button>
</td>
<td class="border-r border-zinc-200 px-2 py-1 md:p-2">
<a class="button button--small bg-emerald-500 border-emerald-500"
href="{row.bookingUrl}" target="_blank">
Buchen
</a>
</td>
</tr>
</f:for>
</tbody>
</table>
<div class="hidden fixed inset-0 w-full h-full z-50"
data-controller="modal"
data-action="daytrip:services-modal:open@window->modal#open">
<div class="absolute inset-0 w-full h-full bg-black/85 z-25 flex items-center justify-center"
data-action="click->modal#close"></div>
<div class="absolute top-1/2 left-1/2 transform -translate-xy-1/2 bg-white shadow w-full max-w-xl rounded">
<div class="shadow flex items-center justify-between p-4 bg-ep-primary-light text-white rounded-t">
<span class="text-xl font-bold">
Inklusivleistungen
</span>
<button type="button"
class="inline-block"
aria-label="schließen"
data-action="modal#close">
<svg class="w-8 h-8">
<use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-close"></use>
</svg>
</button>
</div>
<div class="p-4">
<f:for each="{rooms}" as="row" iteration="iteration">
<table class="hidden table table-striped"
data-modal-target="content"
data-uid="{iteration.cycle}">
<tbody>
<f:for each="{row.servicesIncluded}" as="service">
<tr>
<td>
<div class="flex items-center space-x-2">
<svg class="w-6 h-6 text-ep-primary">
<use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-check"></use>
</svg>
<span>
{service}
</span>
</div>
</td>
</tr>
</f:for>
</tbody>
</table>
</f:for>
</div>
</div>
</div>
</f:section>
</html>
@@ -89,19 +89,6 @@
</div>
</f:else>
</f:if>
<f:if condition="{teasers -> f:count()} > 3">
<f:if condition="{settings.hideMoreLink}">
<f:else>
<div class="text-right mt-4">
<f:link.typolink class="button bg-button"
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}">
Alle anzeigen
</f:link.typolink>
</div>
</f:else>
</f:if>
</f:if>
</f:then>
<f:else>
<f:if condition="{nonBookableInfo}">
-24
View File
@@ -1,24 +0,0 @@
<?php
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Imaging\IconRegistry;
use TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider;
defined('TYPO3') or die();
call_user_func(function () {
if ($GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] !== '') {
$GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] .= ',';
}
$GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] .= 'og_image';
if (TYPO3_MODE === 'BE') {
$iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
$iconRegistry->registerIcon(
'content-ep_theme-ce',
SvgIconProvider::class,
['source' => 'EXT:ep_theme/Resources/Public/images/logo.svg']
);
}
});