fix: use utf8mb4 for the database connection and new tables

PHP workers with a stale realpath cache still resolve the current symlink
to the previous release and returned 404 for the script placed in the new
one.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

deploy.php

@@ -70,7 +70,10 @@ host('prod')
     ->set('writable_mode', 'chmod')
     ->set('rsync_src', __DIR__)
     ->set('rsync', $rsyncOptions)
-    ->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{current_path}}/{{typo3_webroot}}/ --web-url=https://www.ep-reisen.de')
+    // The temp script goes into the shared typo3temp, which resolves to the same directory from every
+    // release: PHP workers with a stale realpath cache still map "current" to the previous release and
+    // would 404 on a script placed inside the new one.
+    ->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{deploy_path}}/shared/{{typo3_webroot}}/typo3temp/ --web-url=https://www.ep-reisen.de/typo3temp')
 ;
 
 task('deploy', [

public/.htaccess

@@ -285,9 +285,6 @@ AddDefaultCharset utf-8
 	<FilesMatch "\.(eot|otf|tt[cf]|woff2?)$">
 		Header set Access-Control-Allow-Origin "*"
 	</FilesMatch>
-    <FilesMatch "\.(png|gif|jpe?g)$">
-        Header append Vary Accept
-    </FilesMatch>
 </IfModule>
 
 ### End: Cross Origin ###
@@ -395,12 +392,6 @@ AddDefaultCharset utf-8
 	# NOTE: Add your additional local storages here
 	RewriteRule ^(?:typo3/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
 
-    RewriteCond %{HTTP_ACCEPT} image/webp
-    RewriteCond %{REQUEST_FILENAME} (.*)\.(png|gif|jpe?g)$
-    RewriteCond %{REQUEST_FILENAME}\.webp -f
-    RewriteRule ^ %{REQUEST_FILENAME}\.webp [L,T=image/webp]
-
-
     ### Begin: StaticFileCache (preparation) ####
 
     # Document root configuration

public/typo3conf/AdditionalConfiguration.php

@@ -90,6 +90,14 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['rootline']
 // by the CDN, so stop generating them. mod_deflate still compresses direct origin hits.
 $GLOBALS['TYPO3_CONF_VARS']['FE']['compressionLevel'] = 0;
 
+// utf8 in MySQL/MariaDB is utf8mb3 (max. 3 bytes) and rejects 4-byte characters like emoji.
+// Set here because LocalConfiguration.php is a Deployer shared file and not deployed from the repo.
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['charset'] = 'utf8mb4';
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['tableoptions'] = [
+    'charset' => 'utf8mb4',
+    'collate' => 'utf8mb4_unicode_ci',
+];
+
 // suppress php deprecation warnings flooding typo3 logs
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] =
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] & ~E_DEPRECATED & ~E_USER_DEPRECATED;

public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php

@@ -59,6 +59,7 @@ call_user_func(function() {
             'label' => 'Reiseart',
             'config' => [
                 'type' => 'select',
+                'default' => 0,
                 'renderType' => 'selectSingle',
                 'items' => [
                     ['Keine Zuordnung', 0],
@@ -74,6 +75,7 @@ call_user_func(function() {
             'label' => 'Angebot/Beispielangebot',
             'config' => [
                 'type' => 'select',
+                'default' => 0,
                 'renderType' => 'selectSingle',
                 'items' => [
                     ['Keine Zuordnung', 0],

public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php

@@ -73,6 +73,13 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     const SELECTION_CUSTOMER_GROUP = 1418;
     const SELECTION_CUSTOMER_END = 1419;
 
+    /**
+     * Fallback for dates the office has not tagged with either selection: these
+     * trip type markers in front of the travel code's trailing date mean
+     * end-customer travel.
+     */
+    const END_CUSTOMER_CODE_PATTERN = '/(?:MP|WE|KT|PM|MW|FA)\d{6}$/';
+
     /**
      * 'Leistungen Personal' occurs in no export so far, so its id is unknown and
      * it is still matched by label. Register its id once the warning fires.
@@ -422,8 +429,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         $skiPassIncluded = (int) (count($includedSkiPass) > 0);
         $date['skipass_included'] = $skiPassIncluded;
 
-        $customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
+        $date['group_travel'] = (int) $this->isGroupTravel($row);
-        $date['group_travel'] = (int) isset($customer[static::SELECTION_CUSTOMER_GROUP]);
 
         $servicesTransportation = $this->parseService($row['transportServices']);
         $discount = $this->determineDiscount($servicesTransportation);
@@ -787,8 +793,27 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     }
 
     /**
-     * A date without 'Gruppenkunde' imports as end-customer travel, which is
+     * 'Gruppenkunde' and 'Endkunde' decide. A date carrying neither is judged by
-     * only right when BusPro says 'Endkunde'.
+     * its travel code.
+     *
+     * @param array $row
+     * @return bool
+     */
+    protected function isGroupTravel(array $row): bool
+    {
+        $customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
+        $isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
+        $isEnd = isset($customer[static::SELECTION_CUSTOMER_END]);
+        if ($isGroup || $isEnd) {
+            return $isGroup;
+        }
+
+        return !preg_match(static::END_CUSTOMER_CODE_PATTERN, (string) $row['date']['code']);
+    }
+
+    /**
+     * Reports dates whose customer selection is missing or contradictory, along
+     * with what they import as.
      *
      * @param array $row
      */
@@ -804,7 +829,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         $this->logger->warning(
             $isGroup
                 ? 'date has both Gruppenkunde and Endkunde selected, importing as group travel'
-                : 'date has neither Gruppenkunde nor Endkunde selected, importing as end-customer travel',
+                : 'date has neither Gruppenkunde nor Endkunde selected, falling back to travel code, importing as '
+                    . ($this->isGroupTravel($row) ? 'group travel' : 'end-customer travel'),
             ['product' => $row['product']['code'], 'date' => $row['date']['code']]
         );
     }

public/typo3conf/ext/ep_products/Classes/Service/PickupOverviewService.php

@@ -5,7 +5,6 @@ namespace EP\EpProducts\Service;
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\Domain\Model\Product;
 use EP\EpProducts\Domain\Repository\DateRepository;
-use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 
 /**
  * Lists the pickup points of a product's latest upcoming end-customer date that
@@ -17,11 +16,6 @@ use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
  *
  * The returned shape is meant to be served by MyE&P later on, so that only the
  * data source has to change once the local date table goes away.
- *
- * Switched by pickupsOverviewEnabled in the extension configuration. A missing
- * key means off: a key added to ext_conf_template.txt is absent until the
- * extension configuration is saved in the backend, and the overview must not
- * go live before it is approved.
  */
 class PickupOverviewService
 {
@@ -30,16 +24,9 @@ class PickupOverviewService
      */
     private $dateRepository;
 
-    /**
+    public function __construct(DateRepository $dateRepository)
-     * @var bool
-     */
-    private $enabled;
-
-    public function __construct(DateRepository $dateRepository, ExtensionConfiguration $extensionConfiguration)
     {
         $this->dateRepository = $dateRepository;
-        $configuration = (array) $extensionConfiguration->get('ep_products');
-        $this->enabled = (bool) ($configuration['pickupsOverviewEnabled'] ?? false);
     }
 
     /**
@@ -48,7 +35,7 @@ class PickupOverviewService
     public function getOverview(Product $product, ?Hotel $hotel): array
     {
         $overview = ['pickups' => []];
-        if (!$this->enabled || $hotel === null || $product->isDaytrip()) {
+        if ($hotel === null || $product->isDaytrip()) {
             return $overview;
         }
 

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php

@@ -403,6 +403,7 @@ return [
 			'label' => 'Produkte',
 			'config' => [
 				'type' => 'select',
+				'default' => 0,
 				'renderType' => 'selectMultipleSideBySide',
 				'foreign_table' => 'tx_epproducts_domain_model_product',
 				'size' => 10,

public/typo3conf/ext/ep_products/ext_conf_template.txt

@@ -1,9 +1,6 @@
 # cat=General; type=int; label=Searchresult PID
 searchPageUid = 0
 
-# cat=General; type=boolean; label=Show the bus pickups table on product detail pages
-pickupsOverviewEnabled = 0
-
 # cat=MyEp; type=string; label=MyE&P URL
 myEpUrl = https://my.ep-reisen.de
 

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/pages.php

@@ -24,6 +24,7 @@ call_user_func(function() {
             'label' => 'Land',
             'config' => [
                 'type' => 'select',
+                'default' => 0,
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_epproducts_domain_model_country',
                 'foreign_table_where' => 'ORDER BY name',
@@ -39,6 +40,7 @@ call_user_func(function() {
             'label' => 'Gebiet',
             'config' => [
                 'type' => 'select',
+                'default' => 0,
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_epproducts_domain_model_region',
                 'foreign_table_where' => 'ORDER BY name',
@@ -106,6 +108,7 @@ call_user_func(function() {
             'label' => 'Badge',
             'config' => [
                 'type' => 'select',
+                'default' => 0,
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_epproducts_domain_model_badge',
                 'foreign_table_where' => 'ORDER BY title',

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_contact.php

@@ -22,6 +22,7 @@ call_user_func(function() {
         'label' => 'Mitarbeiter',
         'config' => [
             'type' => 'select',
+            'default' => 0,
             'renderType' => 'selectSingle',
             'foreign_table' => 'tx_epproducts_domain_model_teammember',
             'foreign_table_where' => 'ORDER BY name',

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html

@@ -8,7 +8,7 @@
             <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: '-translate-y-2 text-white'}"/>
         </f:if>
         <div class="py-4 relative">
-            <div class="container grid grid-cols-2 lg:grid-cols-4 gap-8 pb-4">
+            <div class="container grid md:grid-cols-2 lg:grid-cols-4 gap-8 pb-4 text-center md:text-left">
                 <f:if condition="{settings.footerNavPid}">
                     <f:for each="{footernav}" as="menuheader">
                         <div>
@@ -32,7 +32,7 @@
                 </f:if>
             </div>
 
-            <div class="container py-4 text-white text-xl border-t border-white">
+            <div class="container py-4 text-white text-xl border-t border-white text-center md:text-left">
                 {totalRatings.totalAverage -> f:format.number(decimalSeparator: ',')} Sterne bei {totalRatings.totalCount} Bewertungen
             </div>
 
@@ -184,10 +184,8 @@
         <f:format.raw>{totalRatings.jsonData->f:format.json()}</f:format.raw>
     </script>
 
-    <f:comment><!--
+    <f:if condition="{site.identifier} == 'ep-reisen'">
-        <f:if condition="{site.identifier} == 'ep-reisen'">
+        <f:render partial="Chatbot" arguments="{_all}"/>
-            <f:render partial="Chatbot" arguments="{_all}"/>
+    </f:if>
-        </f:if>
-    --></f:comment>
 
 </html>

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Journey/Details.html

@@ -2,7 +2,7 @@
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-    <div class="odd:bg-zinc-50 p-4" data-rte-content>
+    <div class="group odd:bg-zinc-50 p-4" data-rte-content>
         <f:if condition="{journey.byBus}">
             <h3>
                 Busanreise
@@ -11,6 +11,9 @@
                 {journey.byBus -> f:format.html()}
             </div>
         </f:if>
+        <f:if condition="{pickupsOverview.pickups}">
+            <f:render partial="Product/Pickups" arguments="{pickupsOverview: pickupsOverview}"/>
+        </f:if>
         <f:if condition="{journey.byCar}">
             <h3>
                 Eigenanreise

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Pickups.html

@@ -2,7 +2,7 @@
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-    <div class="group odd:bg-zinc-50 p-4" data-rte-content>
+    <div class="pb-8">
         <h3>
             Bus-Zustiege
         </h3>

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html

@@ -162,12 +162,7 @@
             <div class="mb-4 hidden"
                  data-tabs-target="tab"
                  data-tab="journey">
-                <f:if condition="{product.journey}">
+                <f:render partial="Journey/Details" arguments="{journey: product.journey, pickupsOverview: pickupsOverview, bars: 1}"/>
-                    <f:render partial="Journey/Details" arguments="{journey: product.journey, bars: 1}"/>
-                </f:if>
-                <f:if condition="{pickupsOverview.pickups}">
-                    <f:render partial="Product/Pickups" arguments="{pickupsOverview: pickupsOverview}"/>
-                </f:if>
             </div>
         </f:if>
     </f:section>