fix: CKEditor 5 list item ids no longer end up in the content

CKEditor 5 saves a data-list-item-id attribute on every list item, which
it only needs inside the editor; it bloated the frontend HTML and the RTE
content the API and the content feed hand to MyE&P. Both RTE presets now
import ep_theme's Processing.yaml, which removes the attribute on the way
into the database (exitHTMLparser_db); everything else passes unchanged.

Content saved since the go-live is cleaned once by hand after the
deploy (.ddev/plans/sql/2026-10-26-rte-list-item-ids.sql).

Checked locally as an editor: an RTE field with list item ids is stored
without them, other attributes (class on li, data-* on links) stay;
without the change the ids are stored.

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

config/sites/ep-reisen/config.yaml

@@ -282,11 +282,7 @@ routeEnhancers:
       /: 0
       /json: 1701
       /html: 1702
-      /form: 1704
       /captcha: 3413
-      searchbar: 1706
-      searchbar-collapsed: 1707
-      /snowreport: 1705
       .json: 1803
       .ical: 1710
       sitemap.xml: 1533906435

config/sites/ser/config.yaml

@@ -85,9 +85,7 @@ routeEnhancers:
     default: ''
     index: ''
     map:
-      /form: 1704
       /captcha: 3413
-      /snowreport: 1705
 routes:
   -
     route: robots.txt

config/sites/ski-boarderweek/config.yaml

@@ -66,9 +66,7 @@ routeEnhancers:
       /: 0
       /json: 1701
       /html: 1702
-      /form: 1704
       /captcha: 3413
-      /snowreport: 1705
       sitemap.xml: 1533906435
       yoast-snippetpreview.json: 1480321830
 routes:

config/sites/ski-wochenenden/config.yaml

@@ -50,7 +50,6 @@ routeEnhancers:
       /: 0
       /json: 1701
       /html: 1702
-      /form: 1704
       /captcha: 3413
       sitemap.xml: 1533906435
       yoast-snippetpreview.json: 1480321830

config/sites/snowzone/config.yaml

@@ -50,9 +50,7 @@ routeEnhancers:
       /: 0
       /json: 1701
       /html: 1702
-      /form: 1704
       /captcha: 3413
-      /snowreport: 1705
       sitemap.xml: 1533906435
       yoast-snippetpreview.json: 1480321830
 routes:

config/sites/unichamp/config.yaml

@@ -50,9 +50,7 @@ routeEnhancers:
       /: 0
       /json: 1701
       /html: 1702
-      /form: 1704
       /captcha: 3413
-      /snowreport: 1705
       sitemap.xml: 1533906435
       yoast-snippetpreview.json: 1480321830
 routes:

deploy.php

@@ -11,10 +11,8 @@ set('cachetool_url', 'https://github.com/gordalina/cachetool/releases/download/1
 set('application', 'ep-reisen-typo3-13');
 set('keep_releases', 3);
 
-// fileadmin of the TYPO3 10 release until it is moved into shared/ (plan 4a, tidy up step 2)
-set('fileadmin_path', '/usr/home/eptypo3/public_html/ep-reisen-typo3/shared/public/fileadmin');
-
 set('shared_dirs', [
+    '{{typo3/public_dir}}/fileadmin',
     '{{typo3/public_dir}}/typo3temp/assets',
     'var/lock',
     'var/log',
@@ -91,9 +89,11 @@ task('deploy:build', function () {
     runLocally('ddev exec bash -c "cd var/deploy-build && composer install --no-dev --prefer-dist --no-progress --no-interaction --optimize-autoloader"');
 })->once();
 
-task('typo3:fileadmin', function () {
-    // Relative (-r), like Deployer's shared dirs: the vhosts answer 403 for an absolute symlink here
-    run('ln -sfnr {{fileadmin_path}} {{release_path}}/{{typo3/public_dir}}/fileadmin');
+// deploy:shared would create a missing shared dir empty, and the sites would lose every file
+task('deploy:check:fileadmin', function () {
+    if (!test('[ -d {{deploy_path}}/shared/{{typo3/public_dir}}/fileadmin ]')) {
+        throw new \RuntimeException(parse('{{deploy_path}}/shared/{{typo3/public_dir}}/fileadmin is missing'));
+    }
 });
 
 // current_path instead of the recipe's release_path, so it also works after a rollback
@@ -103,6 +103,7 @@ task('typo3:cache:flush', function () {
 
 task('deploy', [
     'deploy:info',
+    'deploy:check:fileadmin',
     // Build locally first, so a failing build aborts before the server is touched at all.
     'deploy:build',
     'deploy:setup',
@@ -110,7 +111,6 @@ task('deploy', [
     'deploy:release',
     'rsync',
     'deploy:shared',
-    'typo3:fileadmin',
     'deploy:writable',
     // The schema has to exist before the new code starts serving traffic.
     'typo3:extension:setup',

packages/ep_products/Classes/Command/DateCommandController.php

@@ -1,32 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Command;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
+use EP\EpProducts\Service\ProductImport;
 use EP\EpProducts\Service\DateImportService;
 use EP\EpProducts\Service\ProductImportSource;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -38,41 +16,22 @@ use Symfony\Component\Console\Output\OutputInterface;
 class DateCommandController extends Command
 {
 
-    /**
-     * @var DateImportService
-     */
-    protected $dateImportService;
-
-    /**
-     * @var ProductImportSource
-     */
-    protected $importSource;
-
-    /**
-     * @param DateImportService $importService
-     * @param ProductImportSource $importSource
-     */
     public function __construct
     (
-        DateImportService $importService,
-        ProductImportSource $importSource
+        private readonly DateImportService $dateImportService,
+        private readonly ProductImportSource $importSource
     )
     {
-        $this->dateImportService = $importService;
-        $this->importSource = $importSource;
-
         parent::__construct();
     }
 
     /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
      * @throws \Doctrine\DBAL\DBALException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
         $import = $this->importSource->acquire();
-        if ($import === null) {
+        if (!$import instanceof ProductImport) {
             $output->writeln('No new import available.');
             return 0;
         }

packages/ep_products/Classes/Command/SchedulerTasksCommand.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace EP\EpProducts\Command;
-
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Scheduler\Domain\Repository\SchedulerTaskRepository;
-use TYPO3\CMS\Scheduler\Task\ExecuteSchedulableCommandTask;
-
-#[AsCommand(name: 'ep:scheduler-tasks', description: 'Replaces the TYPO3 10 import tasks with scheduler tasks running the ep:* commands')]
-class SchedulerTasksCommand extends Command
-{
-    /**
-     * TYPO3 10 tasks TYPO3 13 cannot run: 5/10 ImportSnowreportTask/ImportDatesTask (classes gone), 6 ImportContingentsTask
-     * (off since 2026-08), 16-21 one ep:groups-swiss task per house (API keys in the database), 25 garbage collection of
-     * the retired tx_epevents_log. The core housekeeping tasks 13, 14, 22, 23 and 24 work unchanged.
-     */
-    private const OLD_TASKS = [5, 6, 10, 16, 17, 18, 19, 20, 21, 25];
-
-    /**
-     * Same schedules and groups as on TYPO3 10 (1 Datenimport, 2 Datenexport); ep:groups-swiss without arguments
-     * exports all houses of groupsSwissHouses in secrets.php.
-     */
-    private const NEW_TASKS = [
-        ['command' => 'ep:import-dates', 'cron' => '*/15 6-20 * * *', 'multiple' => true, 'group' => 1, 'description' => 'Reisedaten aus MyE&P importieren'],
-        ['command' => 'ep:import-snowreport', 'cron' => '0 6 * * *', 'multiple' => false, 'group' => 1, 'description' => 'Schneehöhen importieren'],
-        ['command' => 'ep:groups-swiss', 'cron' => '0 14 * * *', 'multiple' => false, 'group' => 2, 'description' => 'Belegung der Gruppenhäuser nach groups.swiss exportieren'],
-    ];
-
-    public function __construct(
-        private readonly SchedulerTaskRepository $taskRepository,
-        private readonly ConnectionPool $connectionPool,
-    ) {
-        parent::__construct();
-    }
-
-    protected function configure(): void
-    {
-        $this->addOption('dry-run', null, InputOption::VALUE_NONE, 'Only show what would change');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $dryRun = (bool)$input->getOption('dry-run');
-
-        $existing = [];
-        foreach ($this->connectionPool->getConnectionForTable('tx_scheduler_task')->select(['uid', 'serialized_task_object'], 'tx_scheduler_task', ['deleted' => 0])->fetchAllAssociative() as $row) {
-            if (in_array((int)$row['uid'], self::OLD_TASKS, true)) {
-                $output->writeln(sprintf('Delete TYPO3 10 task %d', $row['uid']));
-                if (!$dryRun) {
-                    $this->taskRepository->remove((int)$row['uid']);
-                }
-            } elseif (preg_match('/s:20:"\0\*\0commandIdentifier";s:\d+:"([^"]+)"/', (string)$row['serialized_task_object'], $matches)) {
-                $existing[$matches[1]] = (int)$row['uid'];
-            }
-        }
-
-        foreach (self::NEW_TASKS as $config) {
-            if (isset($existing[$config['command']])) {
-                $output->writeln(sprintf('Task for %s exists (%d)', $config['command'], $existing[$config['command']]));
-                continue;
-            }
-            $output->writeln(sprintf('Add task for %s (%s)', $config['command'], $config['cron']));
-            if ($dryRun) {
-                continue;
-            }
-            $task = GeneralUtility::makeInstance(ExecuteSchedulableCommandTask::class);
-            $task->setCommandIdentifier($config['command']);
-            $task->setDescription($config['description']);
-            $task->setTaskGroup($config['group']);
-            $task->registerRecurringExecution($GLOBALS['EXEC_TIME'] - 1, 0, 0, $config['multiple'], $config['cron']);
-            $this->taskRepository->add($task);
-        }
-
-        return Command::SUCCESS;
-    }
-}

packages/ep_products/Classes/ContentFeed/ContentFeedApi.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\ContentFeed;
 
 use EP\EpProducts\Http\ApiKeyAuthenticator;
@@ -19,53 +21,29 @@ class ContentFeedApi
 {
     public const PATH_PREFIX = '/api/content/';
 
-    private const MANIFEST_CACHE_IDENTIFIER = 'content_feed_manifest';
+    private const string MANIFEST_CACHE_IDENTIFIER = 'content_feed_manifest';
     // The consumer polls every 15 minutes, so this caps the build at once per poll however
     // often it retries. Edits reach the chatbot within about 25 minutes.
-    private const MANIFEST_CACHE_LIFETIME = 600;
+    private const int MANIFEST_CACHE_LIFETIME = 600;
 
-    private const MAX_RECORDS_PER_REQUEST = 100;
+    private const int MAX_RECORDS_PER_REQUEST = 100;
 
-    private const DISABLED_RETRY_AFTER = 3600;
+    private const int DISABLED_RETRY_AFTER = 3600;
 
     private const JSON_FLAGS = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
 
-    /**
-     * @var ApiKeyAuthenticator
-     */
-    private $authenticator;
-
-    /**
-     * @var ContentFeedConfiguration
-     */
-    private $configuration;
-
-    /**
-     * @var ManifestBuilder
-     */
-    private $manifestBuilder;
-
-    /**
-     * @var RecordSerializer
-     */
-    private $recordSerializer;
-
     /**
      * @var FrontendInterface
      */
     private $cache;
 
     public function __construct(
-        ApiKeyAuthenticator $authenticator,
-        ContentFeedConfiguration $configuration,
-        ManifestBuilder $manifestBuilder,
-        RecordSerializer $recordSerializer,
+        private readonly ApiKeyAuthenticator $authenticator,
+        private readonly ContentFeedConfiguration $configuration,
+        private readonly ManifestBuilder $manifestBuilder,
+        private readonly RecordSerializer $recordSerializer,
         CacheManager $cacheManager
     ) {
-        $this->authenticator = $authenticator;
-        $this->configuration = $configuration;
-        $this->manifestBuilder = $manifestBuilder;
-        $this->recordSerializer = $recordSerializer;
         $this->cache = $cacheManager->getCache('ep_products_cache');
     }
 
@@ -112,9 +90,7 @@ class ContentFeedApi
 
         $uids = array_values(array_unique(array_filter(
             GeneralUtility::intExplode(',', (string) ($request->getQueryParams()['uids'] ?? ''), true),
-            function (int $uid): bool {
-                return $uid > 0;
-            }
+            fn(int $uid): bool => $uid > 0
         )));
 
         if ([] === $uids) {

packages/ep_products/Classes/ContentFeed/ContentFeedConfiguration.php

@@ -14,10 +14,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class ContentFeedConfiguration
 {
-    /**
-     * @var array
-     */
-    private $configuration;
+    private array $configuration;
 
     public function __construct(ExtensionConfiguration $extensionConfiguration)
     {

packages/ep_products/Classes/ContentFeed/ManifestBuilder.php

@@ -16,13 +16,13 @@ class ManifestBuilder
 {
     public const CONTENT_PAGE_TYPE = 1730;
 
-    private const DOKTYPE_DEFAULT = 1;
+    private const int DOKTYPE_DEFAULT = 1;
     // Recycler and backend user section: nothing below them is public.
-    private const DOKTYPES_NOT_TRAVERSED = [6, 255];
+    private const array DOKTYPES_NOT_TRAVERSED = [6, 255];
     // l18n_cfg bit 1: "hide default translation of page".
-    private const L18N_HIDE_DEFAULT_LANGUAGE = 1;
+    private const int L18N_HIDE_DEFAULT_LANGUAGE = 1;
 
-    private const RECORD_FIELDS = [
+    private const array RECORD_FIELDS = [
         'product' => ['uid', 'tstamp', 'detail_page'],
         'hotel' => ['uid', 'tstamp', 'detail_page'],
         'region' => ['uid', 'tstamp', 'detail_page'],
@@ -32,43 +32,13 @@ class ManifestBuilder
         'news' => ['uid', 'tstamp', 'pid'],
     ];
 
-    /**
-     * @var PageTree
-     */
-    private $pageTree;
-
-    /**
-     * @var UrlResolver
-     */
-    private $urlResolver;
-
-    /**
-     * @var RecordFinder
-     */
-    private $recordFinder;
-
-    /**
-     * @var ContentFeedConfiguration
-     */
-    private $configuration;
-
-    /**
-     * @var ConnectionPool
-     */
-    private $connectionPool;
-
     public function __construct(
-        PageTree $pageTree,
-        UrlResolver $urlResolver,
-        RecordFinder $recordFinder,
-        ContentFeedConfiguration $configuration,
-        ConnectionPool $connectionPool
+        private readonly PageTree $pageTree,
+        private readonly UrlResolver $urlResolver,
+        private readonly RecordFinder $recordFinder,
+        private readonly ContentFeedConfiguration $configuration,
+        private readonly ConnectionPool $connectionPool,
     ) {
-        $this->pageTree = $pageTree;
-        $this->urlResolver = $urlResolver;
-        $this->recordFinder = $recordFinder;
-        $this->configuration = $configuration;
-        $this->connectionPool = $connectionPool;
     }
 
     public function build(): array
@@ -78,7 +48,7 @@ class ManifestBuilder
 
         return [
             'generatedAt' => date('c'),
-            'sites' => array_map([$this, 'describeSite'], $sites),
+            'sites' => array_map($this->describeSite(...), $sites),
             'items' => array_merge($this->buildPageItems($sites, $this->collectDetailPages()), $records),
         ];
     }
@@ -211,8 +181,14 @@ class ManifestBuilder
         return 0 !== $languageId || 0 === ((int) $page['l18n_cfg'] & self::L18N_HIDE_DEFAULT_LANGUAGE);
     }
 
-    private function buildPageItem(array $page, array $row, int $languageId, string $isoCode, array $breadcrumb, array $context): ?array
-    {
+    private function buildPageItem(
+        array $page,
+        array $row,
+        int $languageId,
+        string $isoCode,
+        array $breadcrumb,
+        array $context,
+    ): ?array {
         $uid = (int) $page['uid'];
         // "Show content from page": the elements live on another page, and so do their changes.
         // The site answers 404 when that page is hidden.

packages/ep_products/Classes/ContentFeed/PageTree.php

@@ -15,21 +15,13 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
  */
 class PageTree
 {
-    private const FIELDS = [
+    private const array FIELDS = [
         'uid', 'pid', 'sorting', 'doktype', 'hidden', 'starttime', 'endtime', 'fe_group',
         'extendToSubpages', 'no_index', 'title', 'nav_title', 'description', 'shortcut',
         'shortcut_mode', 'content_from_pid', 'tstamp', 'sys_language_uid', 'l10n_parent', 'l18n_cfg',
     ];
 
-    /**
-     * @var ConnectionPool
-     */
-    private $connectionPool;
-
-    /**
-     * @var int
-     */
-    private $now;
+    private readonly int $now;
 
     /**
      * @var array<int, array>|null default-language rows by uid
@@ -39,16 +31,15 @@ class PageTree
     /**
      * @var array<int, int[]> child uids by parent uid, in sorting order
      */
-    private $children = [];
+    private array $children = [];
 
     /**
      * @var array<int, array<int, array>> overlay rows by default-language uid and language id
      */
-    private $overlays = [];
+    private array $overlays = [];
 
-    public function __construct(ConnectionPool $connectionPool, Context $context)
+    public function __construct(private readonly ConnectionPool $connectionPool, Context $context)
     {
-        $this->connectionPool = $connectionPool;
         $this->now = (int) $context->getPropertyFromAspect('date', 'timestamp');
     }
 

packages/ep_products/Classes/ContentFeed/RecordFinder.php

@@ -26,14 +26,8 @@ class RecordFinder
         'news' => 'tx_news_domain_model_news',
     ];
 
-    /**
-     * @var ConnectionPool
-     */
-    private $connectionPool;
-
-    public function __construct(ConnectionPool $connectionPool)
+    public function __construct(private readonly ConnectionPool $connectionPool)
     {
-        $this->connectionPool = $connectionPool;
     }
 
     /**

packages/ep_products/Classes/ContentFeed/RecordSerializer.php

@@ -18,36 +18,12 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
  */
 class RecordSerializer
 {
-    /**
-     * @var RecordFinder
-     */
-    private $recordFinder;
-
-    /**
-     * @var UrlResolver
-     */
-    private $urlResolver;
-
-    /**
-     * @var RteLinkResolver
-     */
-    private $rteLinkResolver;
-
-    /**
-     * @var ConnectionPool
-     */
-    private $connectionPool;
-
     public function __construct(
-        RecordFinder $recordFinder,
-        UrlResolver $urlResolver,
-        RteLinkResolver $rteLinkResolver,
-        ConnectionPool $connectionPool
+        private readonly RecordFinder $recordFinder,
+        private readonly UrlResolver $urlResolver,
+        private readonly RteLinkResolver $rteLinkResolver,
+        private readonly ConnectionPool $connectionPool,
     ) {
-        $this->recordFinder = $recordFinder;
-        $this->urlResolver = $urlResolver;
-        $this->rteLinkResolver = $rteLinkResolver;
-        $this->connectionPool = $connectionPool;
     }
 
     /**
@@ -62,18 +38,12 @@ class RecordSerializer
             return [];
         }
 
-        switch ($type) {
-            case 'product':
-                return $this->serializeProducts($rows);
-            case 'hotel':
-                return $this->serializeHotels($rows);
-            case 'news':
-                return $this->serializeNews($rows);
-            default:
-                return array_values(array_map(function (array $row) use ($type): array {
-                    return $this->serializeDestination($type, $row);
-                }, $rows));
-        }
+        return match ($type) {
+            'product' => $this->serializeProducts($rows),
+            'hotel' => $this->serializeHotels($rows),
+            'news' => $this->serializeNews($rows),
+            default => array_values(array_map(fn(array $row): array => $this->serializeDestination($type, $row), $rows)),
+        };
     }
 
     private function serializeProducts(array $rows): array
@@ -137,7 +107,7 @@ class RecordSerializer
 
         foreach ($rows as $uid => $row) {
             $code = trim((string) $row['code']);
-            $codes = array_values(array_unique(array_filter(array_merge([$code], $aliases[$uid] ?? []), 'strlen')));
+            $codes = array_values(array_unique(array_filter(array_merge([$code], $aliases[$uid] ?? []), strlen(...))));
 
             $items[] = $this->withLink($row, max((int) $row['tstamp'], $matchcodeTimestamps[$uid] ?? 0)) + [
                 'code' => '' === $code ? null : $code,
@@ -152,9 +122,7 @@ class RecordSerializer
                 'countryUid' => (int) $row['country'] ?: null,
                 'regionUid' => (int) $row['region'] ?: null,
                 'cityUid' => (int) $row['city'] ?: null,
-                'productUids' => array_values(array_filter($products[$uid] ?? [], function (int $productUid) use ($eligibleProducts): bool {
-                    return isset($eligibleProducts[$productUid]);
-                })),
+                'productUids' => array_values(array_filter($products[$uid] ?? [], fn(int $productUid): bool => isset($eligibleProducts[$productUid]))),
                 'address' => $this->text($row['address']),
                 'latitude' => $this->text($row['latitude']),
                 'longitude' => $this->text($row['longitude']),
@@ -192,64 +160,61 @@ class RecordSerializer
             'headline' => $this->text($row['headline']),
         ];
 
-        switch ($type) {
-            case 'region':
-                return $item + [
-                    'season' => $this->text($row['season']),
-                    'keywords' => $this->text($row['keywords']),
-                    'countryUid' => (int) $row['country'] ?: null,
-                    'facts' => [
-                        'length' => $this->text($row['length']),
-                        'height' => $this->text($row['height']),
-                        'lifts' => $this->text($row['lifts']),
-                    ],
-                    'webcam' => $this->findWebcamUrl((int) $row['webcam']),
-                    'text' => [
-                        'teaser' => $this->html($row['teaser']),
-                        'description' => $this->html($row['description']),
-                        'feature' => $this->text($row['feature']),
-                        'skiArea' => $this->html($row['ski_area']),
-                        'skiAreaExtended' => $this->html($row['ski_area_extended']),
-                        'skiPass' => $this->html($row['ski_pass']),
-                        'news' => $this->html($row['news']),
-                    ],
-                ];
-            case 'country':
-                return $item + [
-                    'code' => $this->text($row['code']),
-                    'season' => $this->text($row['season']),
-                    'keywords' => $this->text($row['keywords']),
-                    'text' => [
-                        'teaser' => $this->html($row['teaser']),
-                        'description' => $this->html($row['description']),
-                        'descriptionExtended' => $this->html($row['description_extended']),
-                    ],
-                ];
-            case 'city':
-                return $item + [
-                    'season' => $this->text($row['season']),
-                    'keywords' => $this->text($row['keywords']),
-                    'countryUid' => (int) $row['country'] ?: null,
-                    'regionUid' => (int) $row['region'] ?: null,
-                    'text' => [
-                        'teaser' => $this->html($row['teaser']),
-                        'description' => $this->html($row['description']),
-                        'descriptionExtended' => $this->html($row['description_extended']),
-                        'party' => $this->html($row['party']),
-                        'leisure' => $this->html($row['leisure']),
-                    ],
-                ];
-            default: // concept
-                return $item + [
-                    'code' => $this->text($row['code']),
-                    'text' => [
-                        'teaser' => $this->html($row['teaser']),
-                        'description' => $this->html($row['description']),
-                        'descriptionExtended' => $this->html($row['description_extended']),
-                        'popupText' => $this->html($row['popup_text']),
-                    ],
-                ];
-        }
+        return match ($type) {
+            'region' => $item + [
+                'season' => $this->text($row['season']),
+                'keywords' => $this->text($row['keywords']),
+                'countryUid' => (int) $row['country'] ?: null,
+                'facts' => [
+                    'length' => $this->text($row['length']),
+                    'height' => $this->text($row['height']),
+                    'lifts' => $this->text($row['lifts']),
+                ],
+                'webcam' => $this->findWebcamUrl((int) $row['webcam']),
+                'text' => [
+                    'teaser' => $this->html($row['teaser']),
+                    'description' => $this->html($row['description']),
+                    'feature' => $this->text($row['feature']),
+                    'skiArea' => $this->html($row['ski_area']),
+                    'skiAreaExtended' => $this->html($row['ski_area_extended']),
+                    'skiPass' => $this->html($row['ski_pass']),
+                    'news' => $this->html($row['news']),
+                ],
+            ],
+            'country' => $item + [
+                'code' => $this->text($row['code']),
+                'season' => $this->text($row['season']),
+                'keywords' => $this->text($row['keywords']),
+                'text' => [
+                    'teaser' => $this->html($row['teaser']),
+                    'description' => $this->html($row['description']),
+                    'descriptionExtended' => $this->html($row['description_extended']),
+                ],
+            ],
+            'city' => $item + [
+                'season' => $this->text($row['season']),
+                'keywords' => $this->text($row['keywords']),
+                'countryUid' => (int) $row['country'] ?: null,
+                'regionUid' => (int) $row['region'] ?: null,
+                'text' => [
+                    'teaser' => $this->html($row['teaser']),
+                    'description' => $this->html($row['description']),
+                    'descriptionExtended' => $this->html($row['description_extended']),
+                    'party' => $this->html($row['party']),
+                    'leisure' => $this->html($row['leisure']),
+                ],
+            ],
+            // concept
+            default => $item + [
+                'code' => $this->text($row['code']),
+                'text' => [
+                    'teaser' => $this->html($row['teaser']),
+                    'description' => $this->html($row['description']),
+                    'descriptionExtended' => $this->html($row['description_extended']),
+                    'popupText' => $this->html($row['popup_text']),
+                ],
+            ],
+        };
     }
 
     private function serializeNews(array $rows): array
@@ -302,8 +267,13 @@ class RecordSerializer
      * @param int[] $uids
      * @return array<int, int[]> related uids by $keyField, in $sortField order
      */
-    private function findMmUids(string $table, string $keyField, string $valueField, array $uids, string $sortField = 'sorting'): array
-    {
+    private function findMmUids(
+        string $table,
+        string $keyField,
+        string $valueField,
+        array $uids,
+        string $sortField = 'sorting',
+    ): array {
         $queryBuilder = $this->connectionPool->getQueryBuilderForTable($table);
         $rows = $queryBuilder
             ->select($keyField, $valueField)
@@ -381,12 +351,11 @@ class RecordSerializer
     }
 
     /**
-     * @param array $infoboxUids
      * @return array<int, string|null>
      */
     private function findInfoboxTexts(array $infoboxUids): array
     {
-        $infoboxUids = array_values(array_filter(array_map('intval', $infoboxUids)));
+        $infoboxUids = array_values(array_filter(array_map(intval(...), $infoboxUids)));
 
         if ([] === $infoboxUids) {
             return [];

packages/ep_products/Classes/ContentFeed/RteLinkResolver.php

@@ -15,25 +15,13 @@ use TYPO3\CMS\Core\Resource\File;
  */
 class RteLinkResolver
 {
-    /**
-     * @var LinkService
-     */
-    private $linkService;
-
-    /**
-     * @var UrlResolver
-     */
-    private $urlResolver;
-
-    public function __construct(LinkService $linkService, UrlResolver $urlResolver)
+    public function __construct(private readonly LinkService $linkService, private readonly UrlResolver $urlResolver)
     {
-        $this->linkService = $linkService;
-        $this->urlResolver = $urlResolver;
     }
 
     public function resolve(string $html): string
     {
-        if (false === strpos($html, 't3://')) {
+        if (!str_contains($html, 't3://')) {
             return $html;
         }
 
@@ -52,7 +40,7 @@ class RteLinkResolver
     {
         try {
             $data = $this->linkService->resolve($link);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             return null;
         }
 

packages/ep_products/Classes/ContentFeed/UrlResolver.php

@@ -13,42 +13,33 @@ use TYPO3\CMS\Core\Utility\MathUtility;
  */
 class UrlResolver
 {
-    private const DOKTYPE_DEFAULT = 1;
-    private const DOKTYPE_SHORTCUT = 4;
-    private const SHORTCUT_MODE_NONE = 0;
-    private const SHORTCUT_MODE_FIRST_SUBPAGE = 1;
-    private const SHORTCUT_MODE_PARENT_PAGE = 3;
-    private const MAX_SHORTCUT_DEPTH = 5;
-
-    /**
-     * @var SiteFinder
-     */
-    private $siteFinder;
-
-    /**
-     * @var PageTree
-     */
-    private $pageTree;
+    private const int DOKTYPE_DEFAULT = 1;
+    private const int DOKTYPE_SHORTCUT = 4;
+    private const int SHORTCUT_MODE_NONE = 0;
+    private const int SHORTCUT_MODE_FIRST_SUBPAGE = 1;
+    private const int SHORTCUT_MODE_PARENT_PAGE = 3;
+    private const int MAX_SHORTCUT_DEPTH = 5;
 
     /**
      * @var string[]
      */
-    private $includedSites;
+    private readonly array $includedSites;
 
     /**
      * @var array<string, int> news detail page uid by site identifier
      */
-    private $newsDetailPages;
+    private array $newsDetailPages;
 
     /**
      * @var array<int, Site|null>
      */
-    private $sitesByPage = [];
+    private array $sitesByPage = [];
 
-    public function __construct(SiteFinder $siteFinder, PageTree $pageTree, ContentFeedConfiguration $configuration)
-    {
-        $this->siteFinder = $siteFinder;
-        $this->pageTree = $pageTree;
+    public function __construct(
+        private readonly SiteFinder $siteFinder,
+        private readonly PageTree $pageTree,
+        ContentFeedConfiguration $configuration,
+    ) {
         $this->includedSites = $configuration->getSites();
         $this->newsDetailPages = $configuration->getNewsDetailPages();
     }
@@ -63,7 +54,7 @@ class UrlResolver
         foreach ($this->includedSites as $identifier) {
             try {
                 $sites[] = $this->siteFinder->getSiteByIdentifier($identifier);
-            } catch (SiteNotFoundException $e) {
+            } catch (SiteNotFoundException) {
                 // A misspelt identifier must not take the whole feed down; it just contributes nothing.
             }
         }
@@ -80,7 +71,7 @@ class UrlResolver
             try {
                 $site = $this->siteFinder->getSiteByPageId($pageUid);
                 $this->sitesByPage[$pageUid] = in_array($site->getIdentifier(), $this->includedSites, true) ? $site : null;
-            } catch (SiteNotFoundException $e) {
+            } catch (SiteNotFoundException) {
                 $this->sitesByPage[$pageUid] = null;
             }
         }
@@ -92,7 +83,7 @@ class UrlResolver
     {
         $site = $this->getIncludedSite($pageUid);
 
-        if (null === $site) {
+        if (!$site instanceof Site) {
             return null;
         }
 
@@ -100,7 +91,7 @@ class UrlResolver
             $language = $site->getLanguageById($languageId);
 
             return (string) $site->getRouter()->generateUri($pageUid, ['_language' => $language] + $parameters);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             // Unroutable pages (missing slug, disabled language) are left out rather than failing the feed.
             return null;
         }
@@ -161,7 +152,7 @@ class UrlResolver
         $pageUid = $this->parsePageReference($detailPage);
         $target = null === $pageUid ? null : $this->resolveLinkTarget($pageUid);
         $site = null === $target ? null : $this->getIncludedSite($target);
-        $url = null === $site ? null : $this->getPageUrl($target);
+        $url = $site instanceof Site ? $this->getPageUrl($target) : null;
 
         return [
             'url' => $url,
@@ -179,7 +170,7 @@ class UrlResolver
     {
         $site = $this->getIncludedSite($storagePid);
 
-        if (null === $site) {
+        if (!$site instanceof Site) {
             return null;
         }
 

packages/ep_products/Classes/Controller/AjaxCalendarController.php

@@ -2,31 +2,7 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
+use League\Period\Period;
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\MyEP\ApiClient as MyEpClient;
 use EP\EpProducts\MyEP\ApiException;
@@ -37,11 +13,8 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 class AjaxCalendarController extends ActionController
 {
-    protected MyEpClient $myEpClient;
-
-    public function __construct(MyEpClient $myEpClient)
+    public function __construct(private readonly MyEpClient $myEpClient)
     {
-        $this->myEpClient = $myEpClient;
     }
 
     public function priceCalendarAction(Hotel $hotel, int $months = 12): ResponseInterface
@@ -116,7 +89,7 @@ class AjaxCalendarController extends ActionController
                 if (null !== $lastDataDate) {
                     $dataEnd = $lastDataDate->modify('first day of next month')->setTime(0, 0, 0);
                     if ($dataEnd > $period->getEndDate()) {
-                        $period = new \League\Period\Period($period->getStartDate(), $dataEnd);
+                        $period = new Period($period->getStartDate(), $dataEnd);
                     }
                 }
             } catch (ApiException $e) {
@@ -141,7 +114,7 @@ class AjaxCalendarController extends ActionController
 
     public function priceTableAction(Hotel $hotel, ?string $year = null): ResponseInterface
     {
-        $year = $year ?? (new \DateTimeImmutable())->format('Y');
+        $year ??= new \DateTimeImmutable()->format('Y');
         $hotelCode = trim($hotel->getCode() ?? '');
         $this->tagPageCacheForHotel($hotelCode);
 
@@ -237,7 +210,7 @@ class AjaxCalendarController extends ActionController
     /**
      * @return array<int, array<string, mixed>>
      */
-    private function buildCalendarMonths(\League\Period\Period $period): array
+    private function buildCalendarMonths(Period $period): array
     {
         $months = [];
         $current = new \DateTimeImmutable($period->getStartDate()->format('Y-m-01 00:00:00'));

packages/ep_products/Classes/Controller/AjaxFilterPanelController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2021 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Service\FilterService;
 use EP\EpProducts\Service\SearchResultService;
@@ -38,23 +14,8 @@ class AjaxFilterPanelController extends ActionController
 
     use RequestArgumentTypeConversionTrait;
 
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @var SearchResultService
-     */
-    private $searchResultService;
-
-    /**
-     * @param FilterService $filterService
-     */
-    public function __construct(FilterService $filterService, SearchResultService $searchResultService)
+    public function __construct(private FilterService $filterService, private SearchResultService $searchResultService)
     {
-        $this->filterService = $filterService;
-        $this->searchResultService = $searchResultService;
     }
 
     public function initializeAction(): void
@@ -63,9 +24,6 @@ class AjaxFilterPanelController extends ActionController
         $this->processFilterSettingsArgument($forcedConceptUids);
     }
 
-    /**
-     * @param array $filterSettings
-     */
     public function indexAction(array $filterSettings): ResponseInterface
     {
         $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'] ?? '');

packages/ep_products/Classes/Controller/AjaxSearchController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Service\FilterService;
 use EP\EpProducts\Service\SearchResultService;
@@ -39,35 +15,16 @@ class AjaxSearchController extends ActionController
 
     use RequestArgumentTypeConversionTrait;
 
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @var SearchResultService
-     */
-    protected $searchResultService;
-
-    /**
-     * @param FilterService $filterService
-     * @param SearchResultService $searchResultService
-     */
-    public function __construct(FilterService $filterService, SearchResultService $searchResultService)
+    public function __construct(private FilterService $filterService, private SearchResultService $searchResultService)
     {
-        $this->filterService = $filterService;
-        $this->searchResultService = $searchResultService;
     }
 
-    public function initializeSearchresultAction()
+    public function initializeSearchresultAction(): void
     {
         $forcedConceptUids = GeneralUtility::intExplode(',', $this->settings['forcedConceptUids'] ?? '', true);
         $this->processFilterSettingsArgument($forcedConceptUids);
     }
 
-    /**
-     * @param array $filterSettings
-     */
     public function searchresultAction(array $filterSettings): ResponseInterface
     {
         $dateSelected = false;

packages/ep_products/Classes/Controller/AjaxTableController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use EP\EpProducts\Domain\Model\Infobox;
@@ -48,61 +24,17 @@ class AjaxTableController extends ActionController
 
     use RequestArgumentTypeConversionTrait;
 
-    /**
-     * @var ProductRepository
-     */
-    protected $productRepository;
-
-    /**
-     * @var InfoboxRepository
-     */
-    protected $infoboxRepository;
-
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @var DateService
-     */
-    protected $dateService;
-
-    /**
-     * @var ResellerDataService
-     */
-    protected $resellerDataService;
-
-    /**
-     * @var MyEpUrlResolverService
-     */
-    protected $myEpUrlResolverService;
-
-    /**
-     * @param ProductRepository $productRepository
-     * @param InfoboxRepository $infoboxRepository
-     * @param DateService $dateService
-     * @param FilterService $filterService
-     * @param ResellerDataService $resellerDataService
-     * @param MyEpUrlResolverService $myEpUrlResolverService
-     */
     public function __construct(
-        ProductRepository $productRepository,
-        InfoboxRepository $infoboxRepository,
-        DateService $dateService,
-        FilterService $filterService,
-        ResellerDataService $resellerDataService,
-        MyEpUrlResolverService $myEpUrlResolverService
+        private ProductRepository $productRepository,
+        private InfoboxRepository $infoboxRepository,
+        private DateService $dateService,
+        private FilterService $filterService,
+        private ResellerDataService $resellerDataService,
+        private MyEpUrlResolverService $myEpUrlResolverService,
     ) {
-        $this->productRepository = $productRepository;
-        $this->infoboxRepository = $infoboxRepository;
-        $this->dateService = $dateService;
-        $this->filterService = $filterService;
-        $this->resellerDataService = $resellerDataService;
-        $this->myEpUrlResolverService = $myEpUrlResolverService;
     }
 
-    public function initializeDatesAction()
+    public function initializeDatesAction(): void
     {
         if ($this->request->hasArgument('dateFrom')) {
             $dateFrom = $this->request->getArgument('dateFrom');
@@ -114,12 +46,6 @@ class AjaxTableController extends ActionController
         }
     }
 
-    /**
-     * @param Product $product
-     * @param Hotel $hotel
-     * @param string|null $dateFrom
-     * @param string|null $dateTo
-     */
     public function datestableAction(
         Product $product,
         Hotel $hotel,
@@ -141,7 +67,7 @@ class AjaxTableController extends ActionController
 
         if (1 === count($dates)) {
             $date = reset($dates);
-            return (new ForwardResponse('pricetable'))->withExtensionName('ep_products')->withArguments([
+            return new ForwardResponse('pricetable')->withExtensionName('ep_products')->withArguments([
                 'product' => $product,
                 'hotel' => $hotel,
                 'date' => $date['dateUid'],
@@ -160,9 +86,7 @@ class AjaxTableController extends ActionController
             'nonBookableDateUids' => $nonBookableDateUids,
         ]);
 
-        $bookableDates = array_filter($allDates, function (array $date) {
-            return $date['available'] > 0;
-        });
+        $bookableDates = array_filter($allDates, fn(array $date): bool => $date['available'] > 0);
         $includedServices = $this->dateService->groupIncludedServices($bookableDates);
 
         $altProductLink = null;
@@ -211,12 +135,6 @@ class AjaxTableController extends ActionController
         return $this->htmlResponse();
     }
 
-    /**
-     * @param Product $product
-     * @param Hotel $hotel
-     * @param Date $date
-     * @param bool $singleDate
-     */
     public function pricetableAction(
         Product $product,
         Hotel $hotel,
@@ -265,10 +183,6 @@ class AjaxTableController extends ActionController
         return $this->htmlResponse();
     }
 
-    /**
-     * @param Product $product
-     * @param Hotel $hotel
-     */
     public function pricetableHtmlAction(Product $product, Hotel $hotel): ResponseInterface
     {
         $nonBookableInfo = $this->getNonBookableInfobox($product);
@@ -293,18 +207,13 @@ class AjaxTableController extends ActionController
         return $this->htmlResponse();
     }
 
-    /**
-     * @param Product $product
-     */
     public function eventPricetableAction(Product $product): ResponseInterface
     {
         $roomTypes = GeneralUtility::trimExplode(',', $this->settings['priceTableRoomTypes'] ?? '');
-        $roomTypesPax = array_map(function ($type) {
-            return (int) $type;
-        }, $roomTypes);
-        $roomTypesLabels = array_map(function ($type) {
+        $roomTypesPax = array_map(fn($type): int => (int) $type, $roomTypes);
+        $roomTypesLabels = array_map(function ($type): string {
             $label = (int) $type . 'er';
-            if (false !== strpos($type, '+')) {
+            if (str_contains($type, '+')) {
                 $label .= '+';
             }
             return $label;
@@ -334,10 +243,9 @@ class AjaxTableController extends ActionController
     }
 
     /**
-     * @param Product $product
      * @return Infobox
      */
-    protected function getNonBookableInfobox(Product $product)
+    private function getNonBookableInfobox(Product $product)
     {
         if (null !== $nonBookableInfo = $product->getNonBookableInfo()) {
             return $nonBookableInfo;

packages/ep_products/Classes/Controller/AjaxWatchlistController.php

@@ -2,33 +2,8 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Repository\ProductRepository;
-use EP\EpProducts\Service\FilterService;
 use EP\EpProducts\Service\SearchResultService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
@@ -36,36 +11,10 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class AjaxWatchlistController extends ActionController
 {
 
-    /**
-     * @var ProductRepository
-     */
-    protected $productRepository;
-
-    /**
-     * @var SearchResultService
-     */
-    protected $searchResultService;
-
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @param ProductRepository $productRepository
-     * @param SearchResultService $searchResultService
-     * @param FilterService $filterService
-     */
-    public function __construct
-    (
-        ProductRepository $productRepository,
-        SearchResultService $searchResultService,
-        FilterService $filterService
-    )
-    {
-        $this->productRepository = $productRepository;
-        $this->searchResultService = $searchResultService;
-        $this->filterService = $filterService;
+    public function __construct(
+        private readonly ProductRepository $productRepository,
+        private readonly SearchResultService $searchResultService,
+    ) {
     }
 
     public function initializeAction(): void
@@ -77,8 +26,6 @@ class AjaxWatchlistController extends ActionController
     }
 
     /**
-     * @param array $watchlistUids
-     * @return string
      * @throws \Doctrine\DBAL\DBALException
      */
     public function listAction(array $watchlistUids = []): ResponseInterface

packages/ep_products/Classes/Controller/CityController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\City;
 use EP\EpProducts\Domain\Repository\CityRepository;
@@ -35,24 +11,10 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class CityController extends ActionController
 {
 
-    /**
-     * @var CityRepository
-     */
-    protected $cityRepository;
-
-    /**
-     * @var ProductDataService
-     */
-    private $productDataService;
-
-    /**
-     * @param CityRepository $cityRepository
-     * @param ProductDataService $productDataService
-     */
-    public function __construct(CityRepository $cityRepository, ProductDataService $productDataService)
-    {
-        $this->cityRepository = $cityRepository;
-        $this->productDataService = $productDataService;
+    public function __construct(
+        private readonly CityRepository $cityRepository,
+        private readonly ProductDataService $productDataService,
+    ) {
     }
 
     /**
@@ -60,7 +22,7 @@ class CityController extends ActionController
      */
     public function detailAction(?City $city = null): ResponseInterface
     {
-        if (null === $city) {
+        if (!$city instanceof City) {
             $cityUid = ($this->settings['cityUid'] ?? '');
             $city = $this->cityRepository->findByIdentifier($cityUid);
         }

packages/ep_products/Classes/Controller/ConceptController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Concept;
 use EP\EpProducts\Domain\Repository\ConceptRepository;
@@ -37,31 +13,11 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class ConceptController extends ActionController
 {
 
-    /**
-     * @var ConceptRepository
-     */
-    protected $conceptRepository;
-
-    /**
-     * @var ProductDataService
-     */
-    protected $productDataService;
-
-    /**
-     * @var PageRepository
-     */
-    private $pageRepository;
-
-    /**
-     * @param ConceptRepository $conceptRepository
-     * @param ProductDataService $productDataService
-     * @param PageRepository $pageRepository
-     */
-    public function __construct(ConceptRepository $conceptRepository, ProductDataService $productDataService, PageRepository $pageRepository)
-    {
-        $this->conceptRepository = $conceptRepository;
-        $this->productDataService = $productDataService;
-        $this->pageRepository = $pageRepository;
+    public function __construct(
+        private readonly ConceptRepository $conceptRepository,
+        private readonly ProductDataService $productDataService,
+        private readonly PageRepository $pageRepository,
+    ) {
     }
 
     /**
@@ -69,7 +25,7 @@ class ConceptController extends ActionController
      */
     public function detailAction(?Concept $concept = null): ResponseInterface
     {
-        if ($concept === null) {
+        if (!$concept instanceof Concept) {
             $conceptUid = ($this->settings['conceptUid'] ?? '');
             $concept = $this->conceptRepository->findByIdentifier($conceptUid);
         }

packages/ep_products/Classes/Controller/CountryController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Country;
 use EP\EpProducts\Domain\Repository\CountryRepository;
@@ -36,24 +12,10 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class CountryController extends ActionController
 {
 
-    /**
-     * @var CountryRepository
-     */
-    protected $countryRepository;
-
-    /**
-     * @var ProductDataService
-     */
-    protected $productDataService;
-
-    /**
-     * @param CountryRepository $countryRepository
-     * @param ProductDataService $productDataService
-     */
-    public function __construct(CountryRepository $countryRepository, ProductDataService $productDataService)
-    {
-        $this->countryRepository = $countryRepository;
-        $this->productDataService = $productDataService;
+    public function __construct(
+        private readonly CountryRepository $countryRepository,
+        private readonly ProductDataService $productDataService,
+    ) {
     }
 
     /**
@@ -61,7 +23,7 @@ class CountryController extends ActionController
      */
     public function detailAction(?Country $country = null): ResponseInterface
     {
-        if ($country === null) {
+        if (!$country instanceof Country) {
             $countryUid = ($this->settings['countryUid'] ?? '');
             $country = $this->countryRepository->findByIdentifier($countryUid);
         }

packages/ep_products/Classes/Controller/FaqController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Repository\FaqRepository;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
@@ -33,17 +9,8 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class FaqController extends ActionController
 {
 
-    /**
-     * @var FaqRepository
-     */
-    protected $faqRepository;
-
-    /**
-     * @param FaqRepository $faqRepository
-     */
-    public function __construct(FaqRepository $faqRepository)
+    public function __construct(private readonly FaqRepository $faqRepository)
     {
-        $this->faqRepository = $faqRepository;
     }
 
     public function detailAction(): ResponseInterface

packages/ep_products/Classes/Controller/HotelController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Product;
 use EP\EpProducts\Domain\Model\Hotel;
@@ -39,44 +15,12 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class HotelController extends ActionController
 {
 
-    /**
-     * @var HotelRepository
-     */
-    protected $hotelRepository;
-
-    /**
-     * @var ProductRepository
-     */
-    protected $productRepository;
-
-    /**
-     * @var HotelDataService
-     */
-    protected $hotelDataService;
-
-    /**
-     * @var ProductDataService
-     */
-    protected $productDataService;
-
-    /**
-     * @param HotelDataService $hotelDataService
-     * @param HotelRepository $hotelRepository
-     * @param ProductRepository $productRepository
-     * @param ProductDataService $productDataService
-     */
-    public function __construct
-    (
-        HotelDataService $hotelDataService,
-        HotelRepository $hotelRepository,
-        ProductRepository $productRepository,
-        ProductDataService $productDataService
-    )
-    {
-        $this->hotelRepository = $hotelRepository;
-        $this->productRepository = $productRepository;
-        $this->hotelDataService = $hotelDataService;
-        $this->productDataService = $productDataService;
+    public function __construct(
+        private readonly HotelDataService $hotelDataService,
+        private readonly HotelRepository $hotelRepository,
+        private readonly ProductRepository $productRepository,
+        private readonly ProductDataService $productDataService,
+    ) {
     }
 
     /**
@@ -84,7 +28,7 @@ class HotelController extends ActionController
      */
     public function detailAction(?Hotel $hotel = null): ResponseInterface
     {
-        if ($hotel !== null) {
+        if ($hotel instanceof Hotel) {
             $hotelUid = $hotel->getUid();
         } else {
             $hotelUid = ($this->settings['hotelUid'] ?? '');

packages/ep_products/Classes/Controller/MapController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\Domain\Model\Product;
@@ -38,27 +14,10 @@ use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 class MapController extends ActionController
 {
 
-    /**
-     * @var HotelRepository
-     */
-    protected $hotelRepository;
-
-    /**
-     * @var ProductRepository
-     */
-    protected $productRepository;
-
-    /**
-     * @param HotelRepository $hotelRepository
-     * @param ProductRepository $productRepository
-     */
     public function __construct(
-        HotelRepository $hotelRepository,
-        ProductRepository $productRepository
-    )
-    {
-        $this->hotelRepository = $hotelRepository;
-        $this->productRepository = $productRepository;
+        private readonly HotelRepository $hotelRepository,
+        private readonly ProductRepository $productRepository,
+    ) {
     }
 
     public function generalAction(): ResponseInterface
@@ -113,7 +72,7 @@ class MapController extends ActionController
      * @param int $pageUid
      * @return string
      */
-    protected function getUriForPageUid($pageUid)
+    private function getUriForPageUid($pageUid)
     {
         /** @var ContentObjectRenderer $contentObject */
         $contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);

packages/ep_products/Classes/Controller/NewsletterController.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Domain\Model\Dto\NewsletterSubscriptionRequest;
 use EP\EpProducts\MyEP\ApiClient;
 use EP\EpProducts\MyEP\ApiException;
@@ -35,22 +10,18 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 class NewsletterController extends ActionController
 {
-    private ApiClient $apiClient;
-
-    public function __construct(ApiClient $apiClient)
+    public function __construct(private readonly ApiClient $apiClient)
     {
-        $this->apiClient = $apiClient;
     }
 
-    public function subscriptionFormAction(?NewsletterSubscriptionRequest $subscriptionRequest = null): ResponseInterface
-    {
-        if (null === $subscriptionRequest) {
-            $subscriptionRequest = new NewsletterSubscriptionRequest();
-        }
+    public function subscriptionFormAction(
+        ?NewsletterSubscriptionRequest $subscriptionRequest = null,
+    ): ResponseInterface {
+        $subscriptionRequest ??= new NewsletterSubscriptionRequest();
 
         try {
             $lists = $this->apiClient->getNewsletterLists();
-        } catch (ApiException $e) {
+        } catch (ApiException) {
             $lists = [];
         }
 

packages/ep_products/Classes/Controller/PricetableController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 

packages/ep_products/Classes/Controller/ProductController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Hotel;
@@ -44,74 +20,16 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class ProductController extends ActionController
 {
 
-    /**
-     * @var ProductRepository
-     */
-    protected $productRepository;
-
-    /**
-     * @var HotelRepository
-     */
-    protected $hotelRepository;
-
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @var ProductDataService
-     */
-    protected $productDataService;
-
-    /**
-     * @var DateService
-     */
-    protected $dateService;
-
-    /**
-     * @var HotelDataService
-     */
-    protected $hotelDataService;
-
-    /**
-     * @var InfoboxRepository
-     */
-    private $infoboxRepository;
-
-    /**
-     * @var PickupOverviewService
-     */
-    private $pickupOverviewService;
-
-    /**
-     * @param ProductRepository $productRepository
-     * @param ProductDataService $productDataService
-     * @param HotelRepository $hotelRepository
-     * @param HotelDataService $hotelDataService
-     * @param DateService $dateService
-     * @param FilterService $filterService
-     * @param InfoboxRepository $infoboxRepository
-     * @param PickupOverviewService $pickupOverviewService
-     */
     public function __construct(
-        ProductRepository $productRepository,
-        ProductDataService $productDataService,
-        HotelRepository $hotelRepository,
-        HotelDataService $hotelDataService,
-        DateService $dateService,
-        FilterService $filterService,
-        InfoboxRepository $infoboxRepository,
-        PickupOverviewService $pickupOverviewService
+        private readonly ProductRepository $productRepository,
+        private readonly ProductDataService $productDataService,
+        private readonly HotelRepository $hotelRepository,
+        private readonly HotelDataService $hotelDataService,
+        private readonly DateService $dateService,
+        private readonly FilterService $filterService,
+        private readonly InfoboxRepository $infoboxRepository,
+        private readonly PickupOverviewService $pickupOverviewService,
     ) {
-        $this->productRepository = $productRepository;
-        $this->productDataService = $productDataService;
-        $this->hotelRepository = $hotelRepository;
-        $this->hotelDataService = $hotelDataService;
-        $this->dateService = $dateService;
-        $this->filterService = $filterService;
-        $this->infoboxRepository = $infoboxRepository;
-        $this->pickupOverviewService = $pickupOverviewService;
     }
 
     /**
@@ -129,7 +47,7 @@ class ProductController extends ActionController
         $dateTo = null
     ): ResponseInterface {
         // Get product to display from flexform settings if not provided via url
-        if ($product === null) {
+        if (!$product instanceof Product) {
             $productUid = ($this->settings['productUid'] ?? null);
             $product = $productUid ? $this->productRepository->findByIdentifier($productUid) : null;
         }
@@ -155,7 +73,7 @@ class ProductController extends ActionController
                 $arguments = [
                     'product' => $product,
                 ];
-                return (new ForwardResponse('hotelList'))->withArguments($arguments);
+                return new ForwardResponse('hotelList')->withArguments($arguments);
             }
             // Use first hotel which should be the only one at this point
             if ($product->getHotels()->count() > 0) {
@@ -213,9 +131,6 @@ class ProductController extends ActionController
         return $this->htmlResponse();
     }
 
-    /**
-     * @param Product $product
-     */
     public function hotelListAction(Product $product): ResponseInterface
     {
         $hotels = $this->hotelDataService->getList($product);

packages/ep_products/Classes/Controller/RegionController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Region;
 use EP\EpProducts\Domain\Repository\RegionRepository;
@@ -36,24 +12,10 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 class RegionController extends ActionController
 {
 
-    /**
-     * @var RegionRepository
-     */
-    protected $regionRepository;
-
-    /**
-     * @var ProductDataService
-     */
-    protected $productDataService;
-
-    /**
-     * @param RegionRepository $regionRepository
-     * @param ProductDataService $productDataService
-     */
-    public function __construct(RegionRepository $regionRepository, ProductDataService $productDataService)
-    {
-        $this->regionRepository = $regionRepository;
-        $this->productDataService = $productDataService;
+    public function __construct(
+        private readonly RegionRepository $regionRepository,
+        private readonly ProductDataService $productDataService,
+    ) {
     }
 
     /**
@@ -61,14 +23,12 @@ class RegionController extends ActionController
      */
     public function detailAction(?Region $region = null): ResponseInterface
     {
-        if ($region === null) {
+        if (!$region instanceof Region) {
             $regionUid = ($this->settings['regionUid'] ?? '');
             $region = $this->regionRepository->findByIdentifier($regionUid);
         }
         $additionalRegionUids = GeneralUtility::trimExplode(',', ($this->settings['additionalRegionUids'] ?? ''), true);
-        $additionalRegionUids = array_map(function ($uid) {
-            return (int)$uid;
-        }, $additionalRegionUids);
+        $additionalRegionUids = array_map(fn($uid): int => (int)$uid, $additionalRegionUids);
         $teaserRegionUids = array_merge([$region->getUid()], $additionalRegionUids);
         $filterSettings = [
             'regionUids' => $teaserRegionUids,

packages/ep_products/Classes/Controller/SearchController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Service\FilterService;
 use EP\EpProducts\Service\FilterSettingsEncoder;
@@ -46,26 +22,11 @@ class SearchController extends ActionController
      */
     public const SEARCHBAR_PARAMETERS = ['dateFrom', 'dateTo', 'pax', 'destinationType', 'destinationUid', 'priceRange'];
 
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @var SearchResultService
-     */
-    private $searchResultService;
-
-    /**
-     * @param FilterService $filterService
-     */
-    public function __construct(FilterService $filterService, SearchResultService $searchResultService)
+    public function __construct(private FilterService $filterService, private SearchResultService $searchResultService)
     {
-        $this->filterService = $filterService;
-        $this->searchResultService = $searchResultService;
     }
 
-    public function initializeSearchresultAction()
+    public function initializeSearchresultAction(): void
     {
         // Process encoded filtersettings from static search result.
         // Explicit filter settings win: they carry the visitor's current selection,
@@ -81,7 +42,7 @@ class SearchController extends ActionController
         // The fields of the search bar, which sends them here by GET
         $searchbarParameters = array_filter(
             array_intersect_key($this->request->getQueryParams(), array_flip(self::SEARCHBAR_PARAMETERS)),
-            'is_string'
+            is_string(...)
         );
         // Anything but a real Y-m-d date is dropped: the URL is easy to edit, and
         // DateUtility::formatDateRange() throws on what DateTime cannot read
@@ -100,9 +61,6 @@ class SearchController extends ActionController
         $this->processFilterSettingsArgument($forcedConceptUids);
     }
 
-    /**
-     * @param array $filterSettings
-     */
     public function searchresultAction(array $filterSettings): ResponseInterface
     {
         $dateSelected = false;

packages/ep_products/Classes/Controller/SearchbarController.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Service\FilterService;
 use EP\EpProducts\Service\SearchResultService;
 use Psr\Http\Message\ResponseInterface;

packages/ep_products/Classes/Controller/TeamController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use EP\EpProducts\Domain\Model\Teammember;
 use EP\EpProducts\Domain\Repository\TeammemberRepository;
@@ -34,17 +10,8 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 class TeamController extends ActionController
 {
-    /**
-     * @var TeammemberRepository
-     */
-    protected $teammemberRepository;
-
-    /**
-     * @param TeammemberRepository $teammemberRepository
-     */
-    public function __construct(TeammemberRepository $teammemberRepository)
+    public function __construct(private readonly TeammemberRepository $teammemberRepository)
     {
-        $this->teammemberRepository = $teammemberRepository;
     }
 
     public function listAction(): ResponseInterface
@@ -66,7 +33,7 @@ class TeamController extends ActionController
      */
     public function showAction(?Teammember $member = null): ResponseInterface
     {
-        if ($member === null) {
+        if (!$member instanceof Teammember) {
             return $this->redirect('list', null, null, null, null, 0, 302);
         }
 
@@ -77,8 +44,6 @@ class TeamController extends ActionController
     }
 
     /**
-     * @param Teammember $member
-     *
      * @return string
      */
     public function coalesceHeader(Teammember $member)

packages/ep_products/Classes/Controller/TravelinfoController.php

@@ -14,22 +14,12 @@ use TYPO3\CMS\Frontend\Controller\ErrorController;
 
 class TravelinfoController extends ActionController
 {
-    private const SELECTION_ID_BOARD = 71;
+    private const int SELECTION_ID_BOARD = 71;
 
-    /**
-     * @var ApiClient
-     */
-    private $apiClient;
-
-    /**
-     * @var TravelinfoRepository
-     */
-    private $travelinfoRepository;
-
-    public function __construct(ApiClient $apiClient, TravelinfoRepository $travelinfoRepository)
-    {
-        $this->apiClient = $apiClient;
-        $this->travelinfoRepository = $travelinfoRepository;
+    public function __construct(
+        private readonly ApiClient $apiClient,
+        private readonly TravelinfoRepository $travelinfoRepository,
+    ) {
     }
 
     public function travelCodeAction(string $travelCode): ResponseInterface
@@ -55,7 +45,7 @@ class TravelinfoController extends ActionController
     public function travelInfoAction(?Travelinfo $travelInfo = null): ResponseInterface
     {
         // the page itself (/reiseinformationen/) without a travel info or code
-        if (null === $travelInfo) {
+        if (!$travelInfo instanceof Travelinfo) {
             $this->notFound();
         }
 
@@ -74,26 +64,24 @@ class TravelinfoController extends ActionController
         throw new ImmediateResponseException($response, 1731071856);
     }
 
-    private function handleRequest(string $travelCode, Travelinfo $travelInfo)
+    private function handleRequest(string $travelCode, Travelinfo $travelInfo): void
     {
 
         // fetch travel data via API call
         try {
             $travelData = $this->apiClient->getTravel($travelCode);
-        } catch (ApiException $e) {
+        } catch (ApiException) {
             $travelData = [];
         }
 
         try {
             $pickupsPlanning = $this->apiClient->getPickupsPlanning($travelCode);
-        } catch (ApiException $e) {
+        } catch (ApiException) {
             $pickupsPlanning = [];
         }
 
         // extract courses from additional services
-        $courses = array_filter($travelData['additionalServices'] ?? [], function ($service) {
-            return 'KUR' === $service['subType'];
-        });
+        $courses = array_filter($travelData['additionalServices'] ?? [], fn($service): bool => 'KUR' === $service['subType']);
 
         // extract board services from included services
         $includedServicesBoard = $travelData['selectionGroups'][self::SELECTION_ID_BOARD] ?? [];
@@ -101,9 +89,7 @@ class TravelinfoController extends ActionController
 
         // extract bus departure time if applicable
         $departureDayTime = null;
-        $service = array_filter($travelData['transportationServices'] ?? [], function ($service) {
-            return 'BUS' === $service['subType'] && 'RUECK' === $service['direction'];
-        });
+        $service = array_filter($travelData['transportationServices'] ?? [], fn($service): bool => 'BUS' === $service['subType'] && 'RUECK' === $service['direction']);
         if ($serviceDetail = reset($service)) {
             $departureDayTime = $serviceDetail['dayTime'];
         }

packages/ep_products/Classes/Controller/WatchlistController.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Controller;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 

packages/ep_products/Classes/Domain/Model/AbstractDestination.php

@@ -6,30 +6,6 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class AbstractDestination extends AbstractEntity
 {
 
@@ -139,7 +115,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $detailPage
      */
-    public function setDetailPage($detailPage)
+    public function setDetailPage($detailPage): void
     {
         $this->detailPage = $detailPage;
     }
@@ -155,7 +131,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $season
      */
-    public function setSeason($season)
+    public function setSeason($season): void
     {
         $this->season = $season;
     }
@@ -181,7 +157,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param float $latitude
      */
-    public function setLatitude($latitude)
+    public function setLatitude($latitude): void
     {
         $this->latitude = $latitude;
     }
@@ -197,7 +173,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param float $longitude
      */
-    public function setLongitude($longitude)
+    public function setLongitude($longitude): void
     {
         $this->longitude = $longitude;
     }
@@ -213,7 +189,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -229,7 +205,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $nameInternal
      */
-    public function setNameInternal($nameInternal)
+    public function setNameInternal($nameInternal): void
     {
         $this->nameInternal = $nameInternal;
     }
@@ -245,7 +221,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $keywords
      */
-    public function setKeywords($keywords)
+    public function setKeywords($keywords): void
     {
         $this->keywords = $keywords;
     }
@@ -261,7 +237,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $headline
      */
-    public function setHeadline($headline)
+    public function setHeadline($headline): void
     {
         $this->headline = $headline;
     }
@@ -277,7 +253,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $teaser
      */
-    public function setTeaser($teaser)
+    public function setTeaser($teaser): void
     {
         $this->teaser = $teaser;
     }
@@ -293,7 +269,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $headerTitle
      */
-    public function setHeaderTitle($headerTitle)
+    public function setHeaderTitle($headerTitle): void
     {
         $this->headerTitle = $headerTitle;
     }
@@ -309,7 +285,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $headerSubtitle
      */
-    public function setHeaderSubtitle($headerSubtitle)
+    public function setHeaderSubtitle($headerSubtitle): void
     {
         $this->headerSubtitle = $headerSubtitle;
     }
@@ -325,7 +301,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $description
      */
-    public function setDescription($description)
+    public function setDescription($description): void
     {
         $this->description = $description;
     }
@@ -341,7 +317,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param string $descriptionExtended
      */
-    public function setDescriptionExtended($descriptionExtended)
+    public function setDescriptionExtended($descriptionExtended): void
     {
         $this->descriptionExtended = $descriptionExtended;
     }
@@ -357,7 +333,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param ObjectStorage<FileReference> $images
      */
-    public function setImages(ObjectStorage $images)
+    public function setImages(ObjectStorage $images): void
     {
         $this->images = $images;
     }
@@ -385,7 +361,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param ObjectStorage $teaserImages
      */
-    public function setTeaserImages($teaserImages)
+    public function setTeaserImages($teaserImages): void
     {
         $this->teaserImages = $teaserImages;
     }
@@ -415,7 +391,7 @@ class AbstractDestination extends AbstractEntity
     /**
      * @param ObjectStorage $headerImages
      */
-    public function setHeaderImages($headerImages)
+    public function setHeaderImages($headerImages): void
     {
         $this->headerImages = $headerImages;
     }

packages/ep_products/Classes/Domain/Model/Badge.php

@@ -1,33 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Badge extends AbstractEntity
 {
 
@@ -57,7 +35,7 @@ class Badge extends AbstractEntity
     /**
      * @param string $title
      */
-    public function setTitle($title)
+    public function setTitle($title): void
     {
         $this->title = $title;
     }
@@ -73,7 +51,7 @@ class Badge extends AbstractEntity
     /**
      * @param string $subtitle
      */
-    public function setSubtitle($subtitle)
+    public function setSubtitle($subtitle): void
     {
         $this->subtitle = $subtitle;
     }
@@ -89,10 +67,9 @@ class Badge extends AbstractEntity
     /**
      * @param string $link
      */
-    public function setLink($link)
+    public function setLink($link): void
     {
         $this->link = $link;
     }
 
 }
-

packages/ep_products/Classes/Domain/Model/City.php

@@ -4,30 +4,6 @@ namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class City extends AbstractDestination implements TeaserInterface
 {
 
@@ -83,7 +59,7 @@ class City extends AbstractDestination implements TeaserInterface
     /**
      * @param bool $excludeFromTeasergroups
      */
-    public function setExcludeFromTeasergroups($excludeFromTeasergroups)
+    public function setExcludeFromTeasergroups($excludeFromTeasergroups): void
     {
         $this->excludeFromTeasergroups = (bool) $excludeFromTeasergroups;
     }
@@ -98,7 +74,7 @@ class City extends AbstractDestination implements TeaserInterface
     /**
      * @param string $party
      */
-    public function setParty($party) {
+    public function setParty($party): void {
         $this->party = $party;
     }
 
@@ -112,7 +88,7 @@ class City extends AbstractDestination implements TeaserInterface
     /**
      * @param string $leisure
      */
-    public function setLeisure($leisure) {
+    public function setLeisure($leisure): void {
         $this->leisure = $leisure;
     }
 
@@ -127,7 +103,7 @@ class City extends AbstractDestination implements TeaserInterface
         $headerImages = $this->headerImages;
 
         if ($headerImages->count() === 0 && null !== $this->getRegion()) {
-            $headerImages = $this->getRegion()->getHeaderImages();
+            return $this->getRegion()->getHeaderImages();
         }
 
         return $headerImages;
@@ -141,10 +117,7 @@ class City extends AbstractDestination implements TeaserInterface
         return $this->country;
     }
 
-    /**
-     * @param Country $country
-     */
-    public function setCountry(Country $country)
+    public function setCountry(Country $country): void
     {
         $this->country = $country;
     }
@@ -157,10 +130,7 @@ class City extends AbstractDestination implements TeaserInterface
         return $this->region;
     }
 
-    /**
-     * @param Region $region
-     */
-    public function setRegion(Region $region)
+    public function setRegion(Region $region): void
     {
         $this->region = $region;
     }
@@ -176,7 +146,7 @@ class City extends AbstractDestination implements TeaserInterface
     /**
      * @param ObjectStorage<Fact> $facts
      */
-    public function setFacts(ObjectStorage $facts)
+    public function setFacts(ObjectStorage $facts): void
     {
         $this->facts = $facts;
     }
@@ -192,7 +162,7 @@ class City extends AbstractDestination implements TeaserInterface
     /**
      * @param Officetip $officetip
      */
-    public function setOfficetip($officetip)
+    public function setOfficetip($officetip): void
     {
         $this->officetip = $officetip;
     }

packages/ep_products/Classes/Domain/Model/Concept.php

@@ -6,30 +6,6 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Concept extends AbstractEntity implements TeaserInterface
 {
 
@@ -146,7 +122,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param int $busProId
      */
-    public function setBusProId($busProId) {
+    public function setBusProId($busProId): void {
         $this->busProId = $busProId;
     }
 
@@ -161,7 +137,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -177,7 +153,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $code
      */
-    public function setCode($code)
+    public function setCode($code): void
     {
         $this->code = $code;
     }
@@ -193,7 +169,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $teaser
      */
-    public function setTeaser($teaser)
+    public function setTeaser($teaser): void
     {
         $this->teaser = $teaser;
     }
@@ -203,7 +179,7 @@ class Concept extends AbstractEntity implements TeaserInterface
         return $this->popupText;
     }
 
-    public function setPopupText($popupText)
+    public function setPopupText($popupText): static
     {
         $this->popupText = $popupText;
 
@@ -215,7 +191,7 @@ class Concept extends AbstractEntity implements TeaserInterface
         return $this->popupTitle;
     }
 
-    public function setPopupTitle($popupTitle)
+    public function setPopupTitle($popupTitle): static
     {
         $this->popupTitle = $popupTitle;
 
@@ -227,7 +203,7 @@ class Concept extends AbstractEntity implements TeaserInterface
         return $this->popupButtonLabel;
     }
 
-    public function setPopupButtonLabel($popupButtonLabel)
+    public function setPopupButtonLabel($popupButtonLabel): static
     {
         $this->popupButtonLabel = $popupButtonLabel;
 
@@ -245,7 +221,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headline
      */
-    public function setHeadline($headline)
+    public function setHeadline($headline): void
     {
         $this->headline = $headline;
     }
@@ -261,7 +237,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headerTitle
      */
-    public function setHeaderTitle($headerTitle)
+    public function setHeaderTitle($headerTitle): void
     {
         $this->headerTitle = $headerTitle;
     }
@@ -277,7 +253,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headerSubtitle
      */
-    public function setHeaderSubtitle($headerSubtitle)
+    public function setHeaderSubtitle($headerSubtitle): void
     {
         $this->headerSubtitle = $headerSubtitle;
     }
@@ -293,7 +269,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $description
      */
-    public function setDescription($description)
+    public function setDescription($description): void
     {
         $this->description = $description;
     }
@@ -309,7 +285,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $descriptionExtended
      */
-    public function setDescriptionExtended($descriptionExtended)
+    public function setDescriptionExtended($descriptionExtended): void
     {
         $this->descriptionExtended = $descriptionExtended;
     }
@@ -325,7 +301,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param string $detailPage
      */
-    public function setDetailPage($detailPage)
+    public function setDetailPage($detailPage): void
     {
         $this->detailPage = $detailPage;
     }
@@ -353,7 +329,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $teaserImages
      */
-    public function setTeaserImages($teaserImages)
+    public function setTeaserImages($teaserImages): void
     {
         $this->teaserImages = $teaserImages;
     }
@@ -381,7 +357,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $headerImages
      */
-    public function setHeaderImages($headerImages)
+    public function setHeaderImages($headerImages): void
     {
         $this->headerImages = $headerImages;
     }
@@ -397,23 +373,17 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $images
      */
-    public function setImages($images)
+    public function setImages($images): void
     {
         $this->images = $images;
     }
 
-    /**
-     * @param Product $product
-     */
-    public function addProduct(Product $product)
+    public function addProduct(Product $product): void
     {
         $this->products->attach($product);
     }
 
-    /**
-     * @param Product $product
-     */
-    public function removeProduct(Product $product)
+    public function removeProduct(Product $product): void
     {
         $this->products->detach($product);
     }
@@ -429,7 +399,7 @@ class Concept extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage<Product> $products
      */
-    public function setProducts(ObjectStorage $products)
+    public function setProducts(ObjectStorage $products): void
     {
         $this->products = $products;
     }

packages/ep_products/Classes/Domain/Model/Country.php

@@ -4,30 +4,6 @@ namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Country extends AbstractDestination implements TeaserInterface
 {
 
@@ -39,6 +15,7 @@ class Country extends AbstractDestination implements TeaserInterface
     /**
      * @var string
      */
+    #[\Override]
     protected $descriptionExtended = '';
 
     /**
@@ -72,7 +49,7 @@ class Country extends AbstractDestination implements TeaserInterface
     /**
      * @param string $code
      */
-    public function setCode($code) {
+    public function setCode($code): void {
         $this->code = $code;
     }
 
@@ -87,23 +64,17 @@ class Country extends AbstractDestination implements TeaserInterface
     /**
      * @param string $descriptionExtended
      */
-    public function setDescriptionExtended($descriptionExtended)
+    public function setDescriptionExtended($descriptionExtended): void
     {
         $this->descriptionExtended = $descriptionExtended;
     }
 
-    /**
-     * @param Fact $fact
-     */
-    public function addFact(Fact $fact)
+    public function addFact(Fact $fact): void
     {
         $this->facts->attach($fact);
     }
 
-    /**
-     * @param Fact $factToRemove
-     */
-    public function removeFact(Fact $factToRemove)
+    public function removeFact(Fact $factToRemove): void
     {
         $this->facts->detach($factToRemove);
     }
@@ -119,7 +90,7 @@ class Country extends AbstractDestination implements TeaserInterface
     /**
      * @param ObjectStorage<Fact> $facts
      */
-    public function setFacts(ObjectStorage $facts)
+    public function setFacts(ObjectStorage $facts): void
     {
         $this->facts = $facts;
     }
@@ -135,7 +106,7 @@ class Country extends AbstractDestination implements TeaserInterface
     /**
      * @param Officetip $officetip
      */
-    public function setOfficetip($officetip)
+    public function setOfficetip($officetip): void
     {
         $this->officetip = $officetip;
     }
@@ -151,7 +122,7 @@ class Country extends AbstractDestination implements TeaserInterface
     /**
      * @param Snowreport $snowreport
      */
-    public function setSnowreport($snowreport)
+    public function setSnowreport($snowreport): void
     {
         $this->snowreport = $snowreport;
     }

packages/ep_products/Classes/Domain/Model/Date.php

@@ -4,30 +4,6 @@ namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Date extends AbstractEntity
 {
     /**
@@ -190,7 +166,7 @@ class Date extends AbstractEntity
         return $this->product;
     }
 
-    public function setProduct($product)
+    public function setProduct($product): void
     {
         $this->product = $product;
     }
@@ -200,7 +176,7 @@ class Date extends AbstractEntity
         return $this->hotel;
     }
 
-    public function setHotel($hotel)
+    public function setHotel($hotel): void
     {
         $this->hotel = $hotel;
     }
@@ -210,7 +186,7 @@ class Date extends AbstractEntity
         return $this->country;
     }
 
-    public function setCountry($country)
+    public function setCountry($country): void
     {
         $this->country = $country;
     }
@@ -220,7 +196,7 @@ class Date extends AbstractEntity
         return $this->region;
     }
 
-    public function setRegion($region)
+    public function setRegion($region): void
     {
         $this->region = $region;
     }
@@ -230,7 +206,7 @@ class Date extends AbstractEntity
         return $this->city;
     }
 
-    public function setCity($city)
+    public function setCity($city): void
     {
         $this->city = $city;
     }
@@ -246,7 +222,7 @@ class Date extends AbstractEntity
     /**
      * @param int $busProId
      */
-    public function setBusProId($busProId)
+    public function setBusProId($busProId): void
     {
         $this->busProId = $busProId;
     }
@@ -262,7 +238,7 @@ class Date extends AbstractEntity
     /**
      * @param int $hotelBusProId
      */
-    public function setHotelBusProId($hotelBusProId)
+    public function setHotelBusProId($hotelBusProId): void
     {
         $this->hotelBusProId = $hotelBusProId;
     }
@@ -278,7 +254,7 @@ class Date extends AbstractEntity
     /**
      * @param string $code
      */
-    public function setCode($code)
+    public function setCode($code): void
     {
         $this->code = $code;
     }
@@ -294,7 +270,7 @@ class Date extends AbstractEntity
     /**
      * @param bool $daytrip
      */
-    public function setDaytrip($daytrip)
+    public function setDaytrip($daytrip): void
     {
         $this->daytrip = $daytrip;
     }
@@ -307,10 +283,7 @@ class Date extends AbstractEntity
         return $this->dateStart;
     }
 
-    /**
-     * @param \DateTime $dateStart
-     */
-    public function setDateStart(\DateTime $dateStart)
+    public function setDateStart(\DateTime $dateStart): void
     {
         $this->dateStart = $dateStart;
     }
@@ -323,10 +296,7 @@ class Date extends AbstractEntity
         return $this->dateEnd;
     }
 
-    /**
-     * @param \DateTime $dateEnd
-     */
-    public function setDateEnd(\DateTime $dateEnd)
+    public function setDateEnd(\DateTime $dateEnd): void
     {
         $this->dateEnd = $dateEnd;
     }
@@ -342,7 +312,7 @@ class Date extends AbstractEntity
     /**
      * @param int $nights
      */
-    public function setNights($nights)
+    public function setNights($nights): void
     {
         $this->nights = $nights;
     }
@@ -358,7 +328,7 @@ class Date extends AbstractEntity
     /**
      * @param string $board
      */
-    public function setBoard($board)
+    public function setBoard($board): void
     {
         $this->board = $board;
     }
@@ -371,10 +341,7 @@ class Date extends AbstractEntity
         return $this->boardCode;
     }
 
-    /**
-     * @param string $boardCode
-     */
-    public function setBoardCode(string $boardCode)
+    public function setBoardCode(string $boardCode): void
     {
         $this->boardCode = $boardCode;
     }
@@ -387,10 +354,7 @@ class Date extends AbstractEntity
         return $this->boardBusProId;
     }
 
-    /**
-     * @param int $boardBusProId
-     */
-    public function setBoardBusProId(int $boardBusProId)
+    public function setBoardBusProId(int $boardBusProId): void
     {
         $this->boardBusProId = $boardBusProId;
     }
@@ -406,7 +370,7 @@ class Date extends AbstractEntity
     /**
      * @param bool $busIncluded
      */
-    public function setBusIncluded($busIncluded)
+    public function setBusIncluded($busIncluded): void
     {
         $this->busIncluded = $busIncluded;
     }
@@ -422,7 +386,7 @@ class Date extends AbstractEntity
     /**
      * @param bool $skipassIncluded
      */
-    public function setSkipassIncluded($skipassIncluded)
+    public function setSkipassIncluded($skipassIncluded): void
     {
         $this->skipassIncluded = $skipassIncluded;
     }
@@ -438,7 +402,7 @@ class Date extends AbstractEntity
     /**
      * @param bool $groupTravel
      */
-    public function setGroupTravel($groupTravel)
+    public function setGroupTravel($groupTravel): void
     {
         $this->groupTravel = $groupTravel;
     }
@@ -454,7 +418,7 @@ class Date extends AbstractEntity
     /**
      * @param bool $busAvailable
      */
-    public function setBusAvailable($busAvailable)
+    public function setBusAvailable($busAvailable): void
     {
         $this->busAvailable = $busAvailable;
     }
@@ -470,7 +434,7 @@ class Date extends AbstractEntity
     /**
      * @param float $busPrice
      */
-    public function setBusPrice($busPrice)
+    public function setBusPrice($busPrice): void
     {
         $this->busPrice = $busPrice;
     }
@@ -478,15 +442,12 @@ class Date extends AbstractEntity
     /**
      * @return array $servicesIncluded
      */
-    public function getServicesIncluded()
+    public function getServicesIncluded(): mixed
     {
         return unserialize($this->servicesIncluded);
     }
 
-    /**
-     * @param array $servicesIncluded
-     */
-    public function setServicesIncluded(array $servicesIncluded)
+    public function setServicesIncluded(array $servicesIncluded): void
     {
         $this->servicesIncluded = serialize($servicesIncluded);
     }
@@ -505,20 +466,17 @@ class Date extends AbstractEntity
         return $services;
     }
 
-    /**
-     * @param array $servicesGeneral
-     */
-    public function setServicesGeneral(array $servicesGeneral)
+    public function setServicesGeneral(array $servicesGeneral): void
     {
         $this->servicesGeneral = serialize($servicesGeneral);
     }
 
-    public function getCoursesIncluded()
+    public function getCoursesIncluded(): mixed
     {
         return unserialize($this->coursesIncluded);
     }
 
-    public function setCoursesIncluded($coursesIncluded)
+    public function setCoursesIncluded($coursesIncluded): void
     {
         $this->coursesIncluded = $coursesIncluded;
     }
@@ -528,7 +486,7 @@ class Date extends AbstractEntity
         return $this->getServicesGeneral('KUR');
     }
 
-    public function getGuide()
+    public function getGuide(): mixed
     {
         return unserialize($this->guide);
     }
@@ -541,15 +499,12 @@ class Date extends AbstractEntity
     /**
      * @return string
      */
-    public function getPickups()
+    public function getPickups(): mixed
     {
         return unserialize($this->pickups);
     }
 
-    /**
-     * @param array $pickups
-     */
-    public function setPickups(array $pickups)
+    public function setPickups(array $pickups): void
     {
         $this->pickups = serialize($pickups);
     }
@@ -564,7 +519,7 @@ class Date extends AbstractEntity
     /**
      * @param float $discount
      */
-    public function setDiscount($discount) {
+    public function setDiscount($discount): void {
         $this->discount = $discount;
     }
 
@@ -579,7 +534,7 @@ class Date extends AbstractEntity
     /**
      * @param float $minPrice
      */
-    public function setMinPrice($minPrice)
+    public function setMinPrice($minPrice): void
     {
         $this->minPrice = $minPrice;
     }
@@ -595,7 +550,7 @@ class Date extends AbstractEntity
     /**
      * @param float $pseudoPrice
      */
-    public function setPseudoPrice($pseudoPrice)
+    public function setPseudoPrice($pseudoPrice): void
     {
         $this->pseudoPrice = $pseudoPrice;
     }
@@ -611,7 +566,7 @@ class Date extends AbstractEntity
     /**
      * @param int $available
      */
-    public function setAvailable($available)
+    public function setAvailable($available): void
     {
         $this->available = $available;
     }
@@ -621,7 +576,7 @@ class Date extends AbstractEntity
         return $this->minPax;
     }
 
-    public function setMinPax($minPax)
+    public function setMinPax($minPax): static
     {
         $this->minPax = $minPax;
 
@@ -633,7 +588,7 @@ class Date extends AbstractEntity
         return $this->new;
     }
 
-    public function setNew(bool $new)
+    public function setNew(bool $new): void
     {
         $this->new = $new;
     }

packages/ep_products/Classes/Domain/Model/Dto/FilterOptions.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Domain\Model\Dto;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class FilterOptions implements \JsonSerializable
 {
     /**
@@ -44,67 +19,55 @@ class FilterOptions implements \JsonSerializable
     /**
      * @var array
      */
-    protected $priceRanges = [];
+    private $priceRanges = [];
+
+    private array $destinations = [];
 
     /**
      * @var array
      */
-    protected $destinations = [];
+    private $concepts = [];
+
+    private array $pax;
 
     /**
      * @var array
      */
-    protected $concepts = [];
+    private $nights = [];
 
     /**
      * @var array
      */
-    protected $pax = [];
+    private $hotelTypes = [];
 
     /**
      * @var array
      */
-    protected $nights = [];
+    private $boardTypes = [];
 
     /**
      * @var array
      */
-    protected $hotelTypes = [];
-
-    /**
-     * @var array
-     */
-    protected $boardTypes = [];
-
-    /**
-     * @var array
-     */
-    protected $roomTypes = [];
+    private $roomTypes = [];
 
     /**
      * @var \DateTime
      */
-    protected $dateFrom;
+    private $dateFrom;
 
     /**
      * @var \DateTime
      */
-    protected $dateTo;
+    private $dateTo;
 
     /**
      * @var bool
      */
-    protected $busAvailable;
+    private $busAvailable;
 
-    /**
-     * @var int
-     */
-    protected $resultCount;
+    private ?int $resultCount = null;
 
-    /**
-     * @var string
-     */
-    protected $resultsUri;
+    private ?string $resultsUri = null;
 
     public function __construct()
     {
@@ -125,7 +88,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $priceRanges
      */
-    public function setPriceRanges($priceRanges)
+    public function setPriceRanges($priceRanges): void
     {
         $this->priceRanges = $priceRanges;
     }
@@ -138,10 +101,7 @@ class FilterOptions implements \JsonSerializable
         return $this->destinations;
     }
 
-    /**
-     * @param array $destinations
-     */
-    public function setDestinations(array $destinations)
+    public function setDestinations(array $destinations): void
     {
         $this->destinations = $destinations;
     }
@@ -157,7 +117,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $concepts
      */
-    public function setConcepts($concepts)
+    public function setConcepts($concepts): void
     {
         $this->concepts = $concepts;
     }
@@ -173,7 +133,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $pax
      */
-    public function setPax($pax)
+    public function setPax($pax): void
     {
         $this->pax = $pax;
     }
@@ -189,7 +149,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $nights
      */
-    public function setNights($nights)
+    public function setNights($nights): void
     {
         $this->nights = $nights;
     }
@@ -205,7 +165,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $hotelTypes
      */
-    public function setHotelTypes($hotelTypes)
+    public function setHotelTypes($hotelTypes): void
     {
         $this->hotelTypes = $hotelTypes;
     }
@@ -221,7 +181,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $boardTypes
      */
-    public function setBoardTypes($boardTypes)
+    public function setBoardTypes($boardTypes): void
     {
         $this->boardTypes = $boardTypes;
     }
@@ -237,7 +197,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param array $roomTypes
      */
-    public function setRoomTypes($roomTypes)
+    public function setRoomTypes($roomTypes): void
     {
         $this->roomTypes = $roomTypes;
     }
@@ -253,7 +213,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param \DateTime $dateFrom
      */
-    public function setDateFrom($dateFrom)
+    public function setDateFrom($dateFrom): void
     {
         $this->dateFrom = $dateFrom;
     }
@@ -269,7 +229,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param \DateTime $dateTo
      */
-    public function setDateTo($dateTo)
+    public function setDateTo($dateTo): void
     {
         $this->dateTo = $dateTo;
     }
@@ -285,7 +245,7 @@ class FilterOptions implements \JsonSerializable
     /**
      * @param bool $busAvailable
      */
-    public function setBusAvailable($busAvailable)
+    public function setBusAvailable($busAvailable): void
     {
         $this->busAvailable = $busAvailable;
     }
@@ -298,10 +258,7 @@ class FilterOptions implements \JsonSerializable
         return $this->resultCount;
     }
 
-    /**
-     * @param int $resultCount
-     */
-    public function setResultCount(int $resultCount)
+    public function setResultCount(int $resultCount): void
     {
         $this->resultCount = $resultCount;
     }
@@ -314,10 +271,7 @@ class FilterOptions implements \JsonSerializable
         return $this->resultsUri;
     }
 
-    /**
-     * @param string $resultsUri
-     */
-    public function setResultsUri(string $resultsUri)
+    public function setResultsUri(string $resultsUri): void
     {
         $this->resultsUri = $resultsUri;
     }

packages/ep_products/Classes/Domain/Model/Dto/NewsletterSubscriptionRequest.php

@@ -98,9 +98,7 @@ class NewsletterSubscriptionRequest implements JsonSerializable
             'firstName' => $this->firstName,
             'lastName' => $this->lastName,
             'email' => $this->email,
-            'listIds' => array_map(function($value) {
-                return (int) $value;
-            }, $this->listIds),
+            'listIds' => array_map(fn($value): int => (int) $value, $this->listIds),
         ];
     }
 }

packages/ep_products/Classes/Domain/Model/Fact.php

@@ -1,33 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Fact extends AbstractEntity
 {
 
@@ -57,7 +35,7 @@ class Fact extends AbstractEntity
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -73,7 +51,7 @@ class Fact extends AbstractEntity
     /**
      * @param string $keywords
      */
-    public function setKeywords($keywords)
+    public function setKeywords($keywords): void
     {
         $this->keywords = $keywords;
     }
@@ -89,7 +67,7 @@ class Fact extends AbstractEntity
     /**
      * @param string $label
      */
-    public function setLabel($label)
+    public function setLabel($label): void
     {
         $this->label = $label;
     }

packages/ep_products/Classes/Domain/Model/Faq.php

@@ -1,33 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Faq extends AbstractEntity
 {
 
@@ -52,7 +30,7 @@ class Faq extends AbstractEntity
     /**
      * @param string $question
      */
-    public function setQuestion($question)
+    public function setQuestion($question): void
     {
         $this->question = $question;
     }
@@ -68,9 +46,9 @@ class Faq extends AbstractEntity
     /**
      * @param string $answer
      */
-    public function setAnswer($answer)
+    public function setAnswer($answer): void
     {
         $this->answer = $answer;
     }
 
-}
+}

packages/ep_products/Classes/Domain/Model/GroupsPriceBoard.php

@@ -4,31 +4,6 @@ namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2020 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class GroupsPriceBoard extends AbstractEntity implements \JsonSerializable
 {
     /**
@@ -46,33 +21,21 @@ class GroupsPriceBoard extends AbstractEntity implements \JsonSerializable
      */
     protected $priceChf;
 
-    /**
-     * @return string
-     */
     public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * @param string $title
-     */
     public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * @return float
-     */
     public function getPrice(): float
     {
         return $this->price;
     }
 
-    /**
-     * @param float $price
-     */
     public function setPrice(float $price): void
     {
         $this->price = $price;
@@ -86,17 +49,11 @@ class GroupsPriceBoard extends AbstractEntity implements \JsonSerializable
         return $this->priceChf;
     }
 
-    /**
-     * @param float $price
-     */
     public function setPriceChf(float $price): void
     {
         $this->priceChf = $price;
     }
 
-    /**
-     * @return array
-     */
     public function jsonSerialize(): array
     {
         return [

packages/ep_products/Classes/Domain/Model/GroupsPriceConfig.php

@@ -4,31 +4,6 @@ namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2020 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class GroupsPriceConfig extends AbstractEntity implements \JsonSerializable
 {
     /**
@@ -66,65 +41,41 @@ class GroupsPriceConfig extends AbstractEntity implements \JsonSerializable
      */
     protected $priceAdditionalPersonChf;
 
-    /**
-     * @return \DateTime
-     */
     public function getDateFrom(): \DateTime
     {
         return $this->dateFrom;
     }
 
-    /**
-     * @param \DateTime $dateFrom
-     */
     public function setDateFrom(\DateTime $dateFrom): void
     {
         $this->dateFrom = $dateFrom;
     }
 
-    /**
-     * @return \DateTime
-     */
     public function getDateTo(): \DateTime
     {
         return $this->dateTo;
     }
 
-    /**
-     * @param \DateTime $dateTo
-     */
     public function setDateTo(\DateTime $dateTo): void
     {
         $this->dateTo = $dateTo;
     }
 
-    /**
-     * @return int
-     */
     public function getPersonsIncluded(): int
     {
         return $this->personsIncluded;
     }
 
-    /**
-     * @param int $personsIncluded
-     */
     public function setPersonsIncluded(int $personsIncluded): void
     {
         $this->personsIncluded = $personsIncluded;
     }
 
-    /**
-     * @return float
-     */
     public function getPrice(): float
     {
         return $this->price;
     }
 
-    /**
-     * @param float $price
-     */
     public function setPrice(float $price): void
     {
         $this->price = $price;
@@ -138,9 +89,6 @@ class GroupsPriceConfig extends AbstractEntity implements \JsonSerializable
         return $this->priceChf;
     }
 
-    /**
-     * @param float $price
-     */
     public function setPriceChf(float $price): void
     {
         $this->priceChf = $price;
@@ -154,9 +102,6 @@ class GroupsPriceConfig extends AbstractEntity implements \JsonSerializable
         return $this->priceAdditionalPerson;
     }
 
-    /**
-     * @param float $priceAdditionalPerson
-     */
     public function setPriceAdditionalPerson(float $priceAdditionalPerson): void
     {
         $this->priceAdditionalPerson = $priceAdditionalPerson;
@@ -170,17 +115,11 @@ class GroupsPriceConfig extends AbstractEntity implements \JsonSerializable
         return $this->priceAdditionalPersonChf;
     }
 
-    /**
-     * @param float $priceAdditionalPerson
-     */
     public function setPriceAdditionalPersonChf(float $priceAdditionalPerson): void
     {
         $this->priceAdditionalPersonChf = $priceAdditionalPerson;
     }
 
-    /**
-     * @return array
-     */
     public function jsonSerialize(): array
     {
         return [

packages/ep_products/Classes/Domain/Model/GroupsPriceOption.php

@@ -4,31 +4,6 @@ namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2020 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class GroupsPriceOption extends AbstractEntity implements \JsonSerializable
 {
     const TYPE_GLOBAL = 1;
@@ -61,33 +36,21 @@ class GroupsPriceOption extends AbstractEntity implements \JsonSerializable
      */
     protected $ignoreWithBoard = false;
 
-    /**
-     * @return string
-     */
     public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * @param string $title
-     */
     public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * @return float
-     */
     public function getPrice(): float
     {
         return $this->price;
     }
 
-    /**
-     * @param float $price
-     */
     public function setPrice(float $price): void
     {
         $this->price = $price;
@@ -101,49 +64,31 @@ class GroupsPriceOption extends AbstractEntity implements \JsonSerializable
         return $this->priceChf;
     }
 
-    /**
-     * @param float $price
-     */
     public function setPriceChf(float $price): void
     {
         $this->priceChf = $price;
     }
 
-    /**
-     * @return int
-     */
     public function getType(): int
     {
         return $this->type;
     }
 
-    /**
-     * @param int $type
-     */
     public function setType(int $type): void
     {
         $this->type = $type;
     }
 
-    /**
-     * @return bool
-     */
     public function isIgnoreWithBoard(): bool
     {
         return $this->ignoreWithBoard;
     }
 
-    /**
-     * @param bool $ignoreWithBoard
-     */
     public function setIgnoreWithBoard(bool $ignoreWithBoard): void
     {
         $this->ignoreWithBoard = $ignoreWithBoard;
     }
 
-    /**
-     * @return array
-     */
     public function jsonSerialize(): array
     {
         return [

packages/ep_products/Classes/Domain/Model/Hotel.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Domain\Model;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use TYPO3\CMS\Extbase\Annotation\ORM\Lazy;
 use EP\EpProducts\Utility\HotelIconUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
@@ -367,7 +343,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $hidden
      */
-    public function setHidden($hidden)
+    public function setHidden($hidden): void
     {
         $this->hidden = $hidden;
     }
@@ -383,7 +359,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $earlybird
      */
-    public function setEarlybird($earlybird)
+    public function setEarlybird($earlybird): void
     {
         $this->earlybird = $earlybird;
     }
@@ -399,7 +375,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $new
      */
-    public function setNew($new)
+    public function setNew($new): void
     {
         $this->new = $new;
     }
@@ -415,7 +391,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $lowContingent
      */
-    public function setLowContingent($lowContingent)
+    public function setLowContingent($lowContingent): void
     {
         $this->lowContingent = $lowContingent;
     }
@@ -431,7 +407,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $showAsTeaser
      */
-    public function setShowAsTeaser($showAsTeaser)
+    public function setShowAsTeaser($showAsTeaser): void
     {
         $this->showAsTeaser = $showAsTeaser;
     }
@@ -447,7 +423,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $detailPage
      */
-    public function setDetailPage($detailPage)
+    public function setDetailPage($detailPage): void
     {
         $this->detailPage = $detailPage;
     }
@@ -463,7 +439,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -483,7 +459,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $shortName
      */
-    public function setShortName($shortName)
+    public function setShortName($shortName): void
     {
         $this->shortName = $shortName;
     }
@@ -499,7 +475,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $keywords
      */
-    public function setKeywords($keywords)
+    public function setKeywords($keywords): void
     {
         $this->keywords = $keywords;
     }
@@ -514,7 +490,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headline
      */
-    public function setHeadline($headline) {
+    public function setHeadline($headline): void {
         $this->headline = $headline;
     }
 
@@ -528,7 +504,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $teaser
      */
-    public function setTeaser($teaser) {
+    public function setTeaser($teaser): void {
         $this->teaser = $teaser;
     }
 
@@ -543,7 +519,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headerTitle
      */
-    public function setHeaderTitle($headerTitle)
+    public function setHeaderTitle($headerTitle): void
     {
         $this->headerTitle = $headerTitle;
     }
@@ -559,7 +535,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headerSubtitle
      */
-    public function setHeaderSubtitle($headerSubtitle)
+    public function setHeaderSubtitle($headerSubtitle): void
     {
         $this->headerSubtitle = $headerSubtitle;
     }
@@ -575,7 +551,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $description
      */
-    public function setDescription($description)
+    public function setDescription($description): void
     {
         $this->description = $description;
     }
@@ -590,7 +566,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $features
      */
-    public function setFeatures($features) {
+    public function setFeatures($features): void {
         $this->features = $features;
     }
 
@@ -604,7 +580,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $roomTypes
      */
-    public function setRoomTypes($roomTypes) {
+    public function setRoomTypes($roomTypes): void {
         $this->roomTypes = $roomTypes;
     }
 
@@ -618,7 +594,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $additionalInformation
      */
-    public function setAdditionalInformation($additionalInformation) {
+    public function setAdditionalInformation($additionalInformation): void {
         $this->additionalInformation = $additionalInformation;
     }
 
@@ -637,7 +613,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param float $latitude
      */
-    public function setLatitude($latitude)
+    public function setLatitude($latitude): void
     {
         $this->latitude = $latitude;
     }
@@ -657,7 +633,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param float $longitude
      */
-    public function setLongitude($longitude)
+    public function setLongitude($longitude): void
     {
         $this->longitude = $longitude;
     }
@@ -673,7 +649,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $address
      */
-    public function setAddress($address)
+    public function setAddress($address): void
     {
         $this->address = $address;
     }
@@ -686,10 +662,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->images;
     }
 
-    /**
-     * @param ObjectStorage $images
-     */
-    public function setImages(ObjectStorage $images)
+    public function setImages(ObjectStorage $images): void
     {
         $this->images = $images;
     }
@@ -705,7 +678,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $resellerImages
      */
-    public function setResellerImages($resellerImages)
+    public function setResellerImages($resellerImages): void
     {
         $this->resellerImages = $resellerImages;
     }
@@ -721,7 +694,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @return null|ObjectStorage
      */
-    public function getTeaserImage()
+    public function getTeaserImage(): null|FileReference|false
     {
         if ($this->teaserImages->count() === 0) {
             return null;
@@ -735,7 +708,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $teaserImages
      */
-    public function setTeaserImages($teaserImages)
+    public function setTeaserImages($teaserImages): void
     {
         $this->teaserImages = $teaserImages;
     }
@@ -748,7 +721,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         $headerImages = $this->headerImages;
 
         if ($headerImages->count() === 0 && null !== $this->getCity()) {
-            $headerImages = $this->getCity()->getHeaderImages();
+            return $this->getCity()->getHeaderImages();
         }
 
         return $headerImages;
@@ -757,7 +730,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @return null|ObjectStorage
      */
-    public function getHeaderImage()
+    public function getHeaderImage(): null|FileReference|false
     {
         if ($this->headerImages->count() === 0) {
             return null;
@@ -771,7 +744,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $headerImages
      */
-    public function setHeaderImages($headerImages)
+    public function setHeaderImages($headerImages): void
     {
         $this->headerImages = $headerImages;
     }
@@ -787,23 +760,17 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $code
      */
-    public function setCode($code)
+    public function setCode($code): void
     {
         $this->code = $code;
     }
 
-    /**
-     * @param MatchCode $code
-     */
-    public function addAdditionalCode(MatchCode $code)
+    public function addAdditionalCode(MatchCode $code): void
     {
         $this->additionalCodes->attach($code);
     }
 
-    /**
-     * @param MatchCode $codeToRemove
-     */
-    public function removeAdditionalCodes(MatchCode $codeToRemove)
+    public function removeAdditionalCodes(MatchCode $codeToRemove): void
     {
         $this->additionalCodes->detach($codeToRemove);
     }
@@ -816,10 +783,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->additionalCodes;
     }
 
-    /**
-     * @param ObjectStorage $codes
-     */
-    public function setAdditionalCodes(ObjectStorage $codes)
+    public function setAdditionalCodes(ObjectStorage $codes): void
     {
         $this->additionalCodes = $codes;
     }
@@ -835,7 +799,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param int $type
      */
-    public function setType($type)
+    public function setType($type): void
     {
         $this->type = $type;
     }
@@ -863,7 +827,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param int $category
      */
-    public function setCategory($category)
+    public function setCategory($category): void
     {
         $this->category = $category;
     }
@@ -876,10 +840,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->country;
     }
 
-    /**
-     * @param Country $country
-     */
-    public function setCountry(Country $country)
+    public function setCountry(Country $country): void
     {
         $this->country = $country;
     }
@@ -892,10 +853,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->region;
     }
 
-    /**
-     * @param Region $region
-     */
-    public function setRegion(Region $region)
+    public function setRegion(Region $region): void
     {
         $this->region = $region;
     }
@@ -908,18 +866,12 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->city;
     }
 
-    /**
-     * @param City $city
-     */
-    public function setCity(City $city)
+    public function setCity(City $city): void
     {
         $this->city = $city;
     }
 
-    /**
-     * @param Teammember $teamer
-     */
-    public function addTeamer(Teammember $teamer)
+    public function addTeamer(Teammember $teamer): void
     {
         $this->teamer->attach($teamer);
     }
@@ -927,7 +879,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param Teammember $teamerToRemove The Teammember to be removed
      */
-    public function removeTeamer(Teammember $teamerToRemove)
+    public function removeTeamer(Teammember $teamerToRemove): void
     {
         $this->teamer->detach($teamerToRemove);
     }
@@ -940,26 +892,17 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->teamer;
     }
 
-    /**
-     * @param ObjectStorage $teamer
-     */
-    public function setTeamer(ObjectStorage $teamer)
+    public function setTeamer(ObjectStorage $teamer): void
     {
         $this->teamer = $teamer;
     }
 
-    /**
-     * @param Product $product
-     */
-    public function addProduct(Product $product)
+    public function addProduct(Product $product): void
     {
         $this->products->attach($product);
     }
 
-    /**
-     * @param Product $product
-     */
-    public function removeProduct(Product $product)
+    public function removeProduct(Product $product): void
     {
         $this->products->detach($product);
     }
@@ -972,33 +915,17 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->products;
     }
 
-    /**
-     * @param ObjectStorage $products
-     */
-    public function setProducts(ObjectStorage $products)
+    public function setProducts(ObjectStorage $products): void
     {
         $this->products = $products;
     }
 
-    /**
-     * @param ObjectStorage $rooms
-     */
-    public function setRooms($rooms) {
-        $this->rooms = $rooms;
-    }
-
-    /**
-     * @param Fact $fact
-     */
-    public function addFact(Fact $fact)
+    public function addFact(Fact $fact): void
     {
         $this->facts->attach($fact);
     }
 
-    /**
-     * @param Fact $factToRemove
-     */
-    public function removeFact(Fact $factToRemove)
+    public function removeFact(Fact $factToRemove): void
     {
         $this->facts->detach($factToRemove);
     }
@@ -1011,10 +938,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->facts;
     }
 
-    /**
-     * @param ObjectStorage $facts
-     */
-    public function setFacts(ObjectStorage $facts)
+    public function setFacts(ObjectStorage $facts): void
     {
         $this->facts = $facts;
     }
@@ -1038,31 +962,22 @@ class Hotel extends AbstractEntity implements TeaserInterface
     /**
      * @param string $externalLink
      */
-    public function setExternalLink($externalLink)
+    public function setExternalLink($externalLink): void
     {
         $this->externalLink = $externalLink;
     }
 
-    /**
-     * @return bool
-     */
-    public function getIsApartment()
+    public function getIsApartment(): bool
     {
         return $this->getType() === self::TYPE_APPARTMENT;
     }
 
-    /**
-     * @return bool
-     */
-    public function getIsHolidayFlat()
+    public function getIsHolidayFlat(): bool
     {
         return $this->getType() === self::TYPE_HOLIDAY_FLAT;
     }
 
-    /**
-     * @return bool
-     */
-    public function getIsOther()
+    public function getIsOther(): bool
     {
         return !$this->getIsApartment() && !$this->getIsHolidayFlat();
     }
@@ -1075,10 +990,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->groupsPriceConfigs;
     }
 
-    /**
-     * @param ObjectStorage $groupPriceConfigs
-     */
-    public function setGroupsPriceConfigs(ObjectStorage $groupPriceConfigs)
+    public function setGroupsPriceConfigs(ObjectStorage $groupPriceConfigs): void
     {
         $this->groupsPriceConfigs = $groupPriceConfigs;
     }
@@ -1091,10 +1003,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->groupsPriceOptions;
     }
 
-    /**
-     * @param ObjectStorage $groupsPriceOptions
-     */
-    public function setGroupsPriceOptions(ObjectStorage $groupsPriceOptions)
+    public function setGroupsPriceOptions(ObjectStorage $groupsPriceOptions): void
     {
         $this->groupsPriceOptions = $groupsPriceOptions;
     }
@@ -1107,10 +1016,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->groupsPriceBoards;
     }
 
-    /**
-     * @param ObjectStorage $groupsPriceBoards
-     */
-    public function setGroupsPriceBoards(ObjectStorage $groupsPriceBoards)
+    public function setGroupsPriceBoards(ObjectStorage $groupsPriceBoards): void
     {
         $this->groupsPriceBoards = $groupsPriceBoards;
     }
@@ -1120,7 +1026,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->groupsPriceAdolescentsAge;
     }
 
-    public function setGroupsPriceAdolescentsAge($groupsPriceAdolescentsAge)
+    public function setGroupsPriceAdolescentsAge($groupsPriceAdolescentsAge): void
     {
         $this->groupsPriceAdolescentsAge = $groupsPriceAdolescentsAge;
     }
@@ -1130,7 +1036,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->groupsPriceTaxLabel;
     }
 
-    public function setGroupsPriceTaxLabel($groupsPriceTaxLabel)
+    public function setGroupsPriceTaxLabel($groupsPriceTaxLabel): void
     {
         $this->groupsPriceTaxLabel = $groupsPriceTaxLabel;
     }
@@ -1140,7 +1046,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->mainSeasonFrom;
     }
 
-    public function setMainSeasonFrom(\DateTime $mainSeasonFrom)
+    public function setMainSeasonFrom(\DateTime $mainSeasonFrom): void
     {
         $this->mainSeasonFrom = $mainSeasonFrom;
     }
@@ -1150,7 +1056,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->mainSeasonTo;
     }
 
-    public function setMainSeasonTo(\DateTime $mainSeasonTo)
+    public function setMainSeasonTo(\DateTime $mainSeasonTo): void
     {
         $this->mainSeasonTo = $mainSeasonTo;
     }
@@ -1160,7 +1066,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->bedsCount;
     }
 
-    public function setBedsCount($bedsCount)
+    public function setBedsCount($bedsCount): void
     {
         $this->bedsCount = $bedsCount;
     }
@@ -1170,7 +1076,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->parkingCount;
     }
 
-    public function setParkingCount($parkingCount)
+    public function setParkingCount($parkingCount): void
     {
         $this->parkingCount = $parkingCount;
     }
@@ -1180,7 +1086,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->altitude;
     }
 
-    public function setAltitude($altitude)
+    public function setAltitude($altitude): void
     {
         $this->altitude = $altitude;
     }
@@ -1190,7 +1096,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->shower;
     }
 
-    public function setShower($shower)
+    public function setShower($shower): void
     {
         $this->shower = $shower;
     }
@@ -1200,7 +1106,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->partyroom;
     }
 
-    public function setPartyroom($partyroom)
+    public function setPartyroom($partyroom): void
     {
         $this->partyroom = $partyroom;
     }
@@ -1210,7 +1116,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->gamesroom;
     }
 
-    public function setGamesroom($gamesroom)
+    public function setGamesroom($gamesroom): void
     {
         $this->gamesroom = $gamesroom;
     }
@@ -1220,7 +1126,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->sauna;
     }
 
-    public function setSauna($sauna)
+    public function setSauna($sauna): void
     {
         $this->sauna = $sauna;
     }
@@ -1230,7 +1136,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->wifi;
     }
 
-    public function setWifi($wifi)
+    public function setWifi($wifi): void
     {
         $this->wifi = $wifi;
     }
@@ -1240,7 +1146,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->distanceBus;
     }
 
-    public function setDistanceBus($distanceBus)
+    public function setDistanceBus($distanceBus): void
     {
         $this->distanceBus = $distanceBus;
     }
@@ -1250,7 +1156,7 @@ class Hotel extends AbstractEntity implements TeaserInterface
         return $this->distanceLift;
     }
 
-    public function setDistanceLift($distanceLift)
+    public function setDistanceLift($distanceLift): void
     {
         $this->distanceLift = $distanceLift;
     }

packages/ep_products/Classes/Domain/Model/Infobox.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
@@ -33,7 +35,7 @@ class Infobox extends AbstractEntity
     /**
      * @param string $title
      */
-    public function setTitle($title)
+    public function setTitle($title): void
     {
         $this->title = $title;
     }
@@ -49,7 +51,7 @@ class Infobox extends AbstractEntity
     /**
      * @param string $text
      */
-    public function setText($text)
+    public function setText($text): void
     {
         $this->text = $text;
     }
@@ -65,9 +67,8 @@ class Infobox extends AbstractEntity
     /**
      * @param bool $defaultText
      */
-    public function setDefaultText($defaultText)
+    public function setDefaultText($defaultText): void
     {
         $this->defaultText = $defaultText;
     }
 }
-

packages/ep_products/Classes/Domain/Model/Journey.php

@@ -1,34 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Journey extends AbstractEntity
 {
 
@@ -63,7 +41,7 @@ class Journey extends AbstractEntity
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -79,7 +57,7 @@ class Journey extends AbstractEntity
     /**
      * @param string $byCar
      */
-    public function setByCar($byCar)
+    public function setByCar($byCar): void
     {
         $this->byCar = $byCar;
     }
@@ -95,7 +73,7 @@ class Journey extends AbstractEntity
     /**
      * @param string $byBus
      */
-    public function setByBus($byBus)
+    public function setByBus($byBus): void
     {
         $this->byBus = $byBus;
     }
@@ -111,7 +89,7 @@ class Journey extends AbstractEntity
     /**
      * @param FileReference $image
      */
-    public function setImage($image)
+    public function setImage($image): void
     {
         $this->image = $image;
     }

packages/ep_products/Classes/Domain/Model/MatchCode.php

@@ -1,33 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class MatchCode extends AbstractEntity
 {
 
@@ -47,9 +25,9 @@ class MatchCode extends AbstractEntity
     /**
      * @param string $code
      */
-    public function setCode($code)
+    public function setCode($code): void
     {
         $this->code = $code;
     }
 
-}
+}

packages/ep_products/Classes/Domain/Model/Officetip.php

@@ -1,33 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Officetip extends AbstractEntity
 {
 
@@ -57,7 +35,7 @@ class Officetip extends AbstractEntity
     /**
      * @param string $label
      */
-    public function setLabel($label)
+    public function setLabel($label): void
     {
         $this->label = $label;
     }
@@ -73,7 +51,7 @@ class Officetip extends AbstractEntity
     /**
      * @param string $text
      */
-    public function setText($text)
+    public function setText($text): void
     {
         $this->text = $text;
     }
@@ -86,10 +64,7 @@ class Officetip extends AbstractEntity
         return $this->author;
     }
 
-    /**
-     * @param Teammember $author
-     */
-    public function setAuthor(Teammember $author)
+    public function setAuthor(Teammember $author): void
     {
         $this->author = $author;
     }

packages/ep_products/Classes/Domain/Model/Product.php

@@ -6,31 +6,6 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Product extends AbstractEntity implements TeaserInterface
 {
 
@@ -330,15 +305,12 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $searchable
      */
-    public function setSearchable($searchable)
+    public function setSearchable($searchable): void
     {
         $this->searchable = (bool) $searchable;
     }
 
-    /**
-     * @return boolean
-     */
-    public function getBookable()
+    public function getBookable(): bool
     {
         return (bool) $this->bookable;
     }
@@ -346,7 +318,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param boolean $bookable
      */
-    public function setBookable($bookable)
+    public function setBookable($bookable): void
     {
         $this->bookable = (bool) $bookable;
     }
@@ -362,15 +334,12 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $hideBookingButton
      */
-    public function setHideBookingButton($hideBookingButton)
+    public function setHideBookingButton($hideBookingButton): void
     {
         $this->hideBookingButton = (bool) $hideBookingButton;
     }
 
-    /**
-     * @return bool
-     */
-    public function isDaytrip()
+    public function isDaytrip(): bool
     {
         return (bool) $this->daytrip;
     }
@@ -378,7 +347,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $daytrip
      */
-    public function setDaytrip($daytrip)
+    public function setDaytrip($daytrip): void
     {
         $this->daytrip = (bool) $daytrip;
     }
@@ -394,7 +363,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $important
      */
-    public function setImportant($important)
+    public function setImportant($important): void
     {
         $this->important = $important;
     }
@@ -410,7 +379,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param bool $skipassIncluded
      */
-    public function setSkipassIncluded($skipassIncluded)
+    public function setSkipassIncluded($skipassIncluded): void
     {
         $this->skipassIncluded = $skipassIncluded;
     }
@@ -425,7 +394,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $detailPage
      */
-    public function setDetailPage($detailPage) {
+    public function setDetailPage($detailPage): void {
         $this->detailPage = $detailPage;
     }
 
@@ -440,7 +409,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $externalLink
      */
-    public function setExternalLink($externalLink)
+    public function setExternalLink($externalLink): void
     {
         $this->externalLink = $externalLink;
     }
@@ -456,7 +425,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -472,7 +441,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $nameInternal
      */
-    public function setNameInternal($nameInternal)
+    public function setNameInternal($nameInternal): void
     {
         $this->nameInternal = $nameInternal;
     }
@@ -488,7 +457,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $keywords
      */
-    public function setKeywords($keywords)
+    public function setKeywords($keywords): void
     {
         $this->keywords = $keywords;
     }
@@ -503,7 +472,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headline
      */
-    public function setHeadline($headline) {
+    public function setHeadline($headline): void {
         $this->headline = $headline;
     }
 
@@ -518,7 +487,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param int $busProId
      */
-    public function setBusProId($busProId)
+    public function setBusProId($busProId): void
     {
         $this->busProId = $busProId;
     }
@@ -534,7 +503,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $code
      */
-    public function setCode($code)
+    public function setCode($code): void
     {
         $this->code = $code;
     }
@@ -550,7 +519,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $season
      */
-    public function setSeason($season)
+    public function setSeason($season): void
     {
         $this->season = $season;
     }
@@ -566,7 +535,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $feature
      */
-    public function setFeature($feature)
+    public function setFeature($feature): void
     {
         $this->feature = $feature;
     }
@@ -581,7 +550,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $teaser
      */
-    public function setTeaser($teaser) {
+    public function setTeaser($teaser): void {
         $this->teaser = $teaser;
     }
 
@@ -596,7 +565,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $teaserLong
      */
-    public function setTeaserLong($teaserLong)
+    public function setTeaserLong($teaserLong): void
     {
         $this->teaserLong = $teaserLong;
     }
@@ -612,7 +581,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headerTitle
      */
-    public function setHeaderTitle($headerTitle)
+    public function setHeaderTitle($headerTitle): void
     {
         $this->headerTitle = $headerTitle;
     }
@@ -628,7 +597,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $headerSubtitle
      */
-    public function setHeaderSubtitle($headerSubtitle)
+    public function setHeaderSubtitle($headerSubtitle): void
     {
         $this->headerSubtitle = $headerSubtitle;
     }
@@ -643,7 +612,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $conceptDescription
      */
-    public function setConceptDescription($conceptDescription) {
+    public function setConceptDescription($conceptDescription): void {
         $this->conceptDescription = $conceptDescription;
     }
 
@@ -657,7 +626,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $boardDescription
      */
-    public function setBoardDescription($boardDescription) {
+    public function setBoardDescription($boardDescription): void {
         $this->boardDescription = $boardDescription;
     }
 
@@ -671,7 +640,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $additionalServices
      */
-    public function setAdditionalServices($additionalServices) {
+    public function setAdditionalServices($additionalServices): void {
         $this->additionalServices = $additionalServices;
     }
 
@@ -686,7 +655,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $includedServices
      */
-    public function setIncludedServices($includedServices)
+    public function setIncludedServices($includedServices): void
     {
         $this->includedServices = $includedServices;
     }
@@ -701,7 +670,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $programmeDescription
      */
-    public function setProgrammeDescription($programmeDescription) {
+    public function setProgrammeDescription($programmeDescription): void {
         $this->programmeDescription = $programmeDescription;
     }
 
@@ -716,7 +685,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $skiPassAltTitle
      */
-    public function setSkiPassAltTitle($skiPassAltTitle)
+    public function setSkiPassAltTitle($skiPassAltTitle): void
     {
         $this->skiPassAltTitle = $skiPassAltTitle;
     }
@@ -731,7 +700,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $skiPassDescription
      */
-    public function setSkiPassDescription($skiPassDescription) {
+    public function setSkiPassDescription($skiPassDescription): void {
         $this->skiPassDescription = $skiPassDescription;
     }
 
@@ -746,7 +715,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param float $ratingAverage
      */
-    public function setRatingAverage($ratingAverage)
+    public function setRatingAverage($ratingAverage): void
     {
         $this->ratingAverage = $ratingAverage;
     }
@@ -762,7 +731,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param int $ratingVotesCount
      */
-    public function setRatingVotesCount($ratingVotesCount)
+    public function setRatingVotesCount($ratingVotesCount): void
     {
         $this->ratingVotesCount = $ratingVotesCount;
     }
@@ -778,7 +747,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $testimonials
      */
-    public function setTestimonials($testimonials)
+    public function setTestimonials($testimonials): void
     {
         $this->testimonials = $testimonials;
     }
@@ -794,7 +763,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage<FileReference> $images
      */
-    public function setImages(ObjectStorage $images)
+    public function setImages(ObjectStorage $images): void
     {
         $this->images = $images;
     }
@@ -814,7 +783,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage<FileReference> $images
      */
-    public function setResellerImages(ObjectStorage $images)
+    public function setResellerImages(ObjectStorage $images): void
     {
         $this->resellerImages = $images;
     }
@@ -845,7 +814,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $teaserImages
      */
-    public function setTeaserImages($teaserImages)
+    public function setTeaserImages($teaserImages): void
     {
         $this->teaserImages = $teaserImages;
     }
@@ -861,7 +830,7 @@ class Product extends AbstractEntity implements TeaserInterface
         $headerImages = $this->headerImages;
 
         if ($headerImages->count() === 0 && null !== $this->getRegion()) {
-            $headerImages = $this->getRegion()->getHeaderImages();
+            return $this->getRegion()->getHeaderImages();
         }
 
         return $headerImages;
@@ -888,7 +857,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage $headerImages
      */
-    public function setHeaderImages($headerImages)
+    public function setHeaderImages($headerImages): void
     {
         $this->headerImages = $headerImages;
     }
@@ -901,10 +870,7 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->concept;
     }
 
-    /**
-     * @param Concept $concept
-     */
-    public function setConcepts(Concept $concept)
+    public function setConcepts(Concept $concept): void
     {
         $this->concept = $concept;
     }
@@ -917,10 +883,7 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->country;
     }
 
-    /**
-     * @param Country $country
-     */
-    public function setCountry(Country $country)
+    public function setCountry(Country $country): void
     {
         $this->country = $country;
     }
@@ -933,10 +896,7 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->region;
     }
 
-    /**
-     * @param Region $region
-     */
-    public function setRegion(Region $region)
+    public function setRegion(Region $region): void
     {
         $this->region = $region;
     }
@@ -949,10 +909,7 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->city;
     }
 
-    /**
-     * @param City $city
-     */
-    public function setCity(City $city)
+    public function setCity(City $city): void
     {
         $this->city = $city;
     }
@@ -968,7 +925,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param Journey $journey
      */
-    public function setJourney($journey)
+    public function setJourney($journey): void
     {
         $this->journey = $journey;
     }
@@ -984,23 +941,17 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage<Fact> $facts
      */
-    public function setFacts(ObjectStorage $facts)
+    public function setFacts(ObjectStorage $facts): void
     {
         $this->facts = $facts;
     }
 
-    /**
-     * @param Hotel $hotel
-     */
-    public function addHotel(Hotel $hotel)
+    public function addHotel(Hotel $hotel): void
     {
         $this->hotels->attach($hotel);
     }
 
-    /**
-     * @param Hotel $hotel
-     */
-    public function removeHotel(Hotel $hotel)
+    public function removeHotel(Hotel $hotel): void
     {
         $this->hotels->detach($hotel);
     }
@@ -1016,7 +967,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage<Hotel> $hotels
      */
-    public function setHotels(ObjectStorage $hotels)
+    public function setHotels(ObjectStorage $hotels): void
     {
         $this->hotels = $hotels;
     }
@@ -1031,7 +982,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param ObjectStorage<Faq> $faq
      */
-    public function setFaqs(ObjectStorage $faqs)
+    public function setFaqs(ObjectStorage $faqs): void
     {
         $this->faqs = $faqs;
     }
@@ -1047,7 +998,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param Officetip $officetip
      */
-    public function setOfficetip($officetip)
+    public function setOfficetip($officetip): void
     {
         $this->officetip = $officetip;
     }
@@ -1063,7 +1014,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param Hotel $calendarHotel
      */
-    public function setCalendarHotel($calendarHotel)
+    public function setCalendarHotel($calendarHotel): void
     {
         $this->calendarHotel = $calendarHotel;
     }
@@ -1079,7 +1030,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param Product $altProduct
      */
-    public function setAltProduct($altProduct)
+    public function setAltProduct($altProduct): void
     {
         $this->altProduct = $altProduct;
     }
@@ -1095,7 +1046,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $altLabel
      */
-    public function setAltLabel($altLabel)
+    public function setAltLabel($altLabel): void
     {
         $this->altLabel = $altLabel;
     }
@@ -1111,7 +1062,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param string $video
      */
-    public function setVideo($video)
+    public function setVideo($video): void
     {
         $this->video = $video;
     }
@@ -1127,7 +1078,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param FileReference $banner
      */
-    public function setBanner($banner)
+    public function setBanner($banner): void
     {
         $this->banner = $banner;
     }
@@ -1143,7 +1094,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param Badge $badge
      */
-    public function setBadge($badge)
+    public function setBadge($badge): void
     {
         $this->badge = $badge;
     }
@@ -1156,9 +1107,6 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->nonBookableDates;
     }
 
-    /**
-     * @return int
-     */
     public function getMinPrice(): int
     {
         return $this->minPrice;
@@ -1167,7 +1115,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param int $minPrice
      */
-    public function setMinPrice($minPrice)
+    public function setMinPrice($minPrice): void
     {
         $this->minPrice = $minPrice;
     }
@@ -1183,7 +1131,7 @@ class Product extends AbstractEntity implements TeaserInterface
     /**
      * @param Infobox $nonBookableInfo
      */
-    public function setNonBookableInfo($nonBookableInfo)
+    public function setNonBookableInfo($nonBookableInfo): void
     {
         $this->nonBookableInfo = $nonBookableInfo;
     }
@@ -1193,7 +1141,7 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->tourThumbnail;
     }
 
-    public function setTourThumbnail(FileReference $tourThumbnail)
+    public function setTourThumbnail(FileReference $tourThumbnail): void
     {
         $this->tourThumbnail = $tourThumbnail;
     }
@@ -1203,7 +1151,7 @@ class Product extends AbstractEntity implements TeaserInterface
         return $this->tourLink;
     }
 
-    public function setTourLink(string $tourLink)
+    public function setTourLink(string $tourLink): void
     {
         $this->tourLink = $tourLink;
     }

packages/ep_products/Classes/Domain/Model/Region.php

@@ -6,30 +6,6 @@ use TYPO3\CMS\Extbase\Annotation\ORM\Cascade;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Region extends AbstractDestination implements TeaserInterface
 {
 
@@ -157,7 +133,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param bool $excludeFromTeasergroups
      */
-    public function setExcludeFromTeasergroups($excludeFromTeasergroups)
+    public function setExcludeFromTeasergroups($excludeFromTeasergroups): void
     {
         $this->excludeFromTeasergroups = (bool) $excludeFromTeasergroups;
     }
@@ -172,7 +148,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $skiArea
      */
-    public function setSkiArea($skiArea) {
+    public function setSkiArea($skiArea): void {
         $this->skiArea = $skiArea;
     }
 
@@ -187,7 +163,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $skiAreaExtended
      */
-    public function setSkiAreaExtended($skiAreaExtended)
+    public function setSkiAreaExtended($skiAreaExtended): void
     {
         $this->skiAreaExtended = $skiAreaExtended;
     }
@@ -202,7 +178,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $skiPass
      */
-    public function setSkiPass($skiPass) {
+    public function setSkiPass($skiPass): void {
         $this->skiPass = $skiPass;
     }
 
@@ -216,7 +192,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $news
      */
-    public function setNews($news) {
+    public function setNews($news): void {
         $this->news = $news;
     }
 
@@ -230,7 +206,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $length
      */
-    public function setLength($length) {
+    public function setLength($length): void {
         $this->length = $length;
     }
 
@@ -244,7 +220,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $height
      */
-    public function setHeight($height) {
+    public function setHeight($height): void {
         $this->height = $height;
     }
 
@@ -258,7 +234,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $lifts
      */
-    public function setLifts($lifts) {
+    public function setLifts($lifts): void {
         $this->lifts = $lifts;
     }
 
@@ -273,7 +249,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $feature
      */
-    public function setFeature($feature)
+    public function setFeature($feature): void
     {
         $this->feature = $feature;
     }
@@ -289,7 +265,7 @@ class Region extends AbstractDestination implements TeaserInterface
         $headerImages = $this->headerImages;
 
         if ($headerImages->count() === 0 && null !== $this->getCountry()) {
-            $headerImages = $this->getCountry()->getHeaderImages();
+            return $this->getCountry()->getHeaderImages();
         }
 
         return $headerImages;
@@ -303,10 +279,7 @@ class Region extends AbstractDestination implements TeaserInterface
         return $this->country;
     }
 
-    /**
-     * @param Country $country
-     */
-    public function setCountry(Country $country)
+    public function setCountry(Country $country): void
     {
         $this->country = $country;
     }
@@ -321,7 +294,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param ObjectStorage $cities
      */
-    public function setCities($cities) {
+    public function setCities($cities): void {
         $this->cities = $cities;
     }
 
@@ -335,7 +308,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param ObjectStorage $products
      */
-    public function setProducts($products) {
+    public function setProducts($products): void {
         $this->products = $products;
     }
 
@@ -352,7 +325,7 @@ class Region extends AbstractDestination implements TeaserInterface
      *
      * @param ObjectStorage<Fact> $facts
      */
-    public function setFacts(ObjectStorage $facts)
+    public function setFacts(ObjectStorage $facts): void
     {
         $this->facts = $facts;
     }
@@ -367,7 +340,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param ObjectStorage $hotels
      */
-    public function setHotels($hotels) {
+    public function setHotels($hotels): void {
         $this->hotels = $hotels;
     }
 
@@ -382,7 +355,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param Snowreport $snowreport
      */
-    public function setSnowreport($snowreport)
+    public function setSnowreport($snowreport): void
     {
         $this->snowreport = $snowreport;
     }
@@ -395,10 +368,7 @@ class Region extends AbstractDestination implements TeaserInterface
         return $this->webcam;
     }
 
-    /**
-     * @return bool
-     */
-    public function getWebcamAvailable()
+    public function getWebcamAvailable(): bool
     {
         $webcam = $this->getWebcam();
         return $webcam !== null && $webcam->getAvailable();
@@ -407,7 +377,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param Webcam $webcam
      */
-    public function setWebcam($webcam)
+    public function setWebcam($webcam): void
     {
         $this->webcam = $webcam;
     }
@@ -423,7 +393,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
      */
-    public function setRegionMaps($regionMaps)
+    public function setRegionMaps($regionMaps): void
     {
         $this->regionMaps = $regionMaps;
     }
@@ -439,7 +409,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param FileReference $awardImage
      */
-    public function setAwardImage($awardImage)
+    public function setAwardImage($awardImage): void
     {
         $this->awardImage = $awardImage;
     }
@@ -455,7 +425,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $awardLink
      */
-    public function setAwardLink($awardLink)
+    public function setAwardLink($awardLink): void
     {
         $this->awardLink = $awardLink;
     }
@@ -471,7 +441,7 @@ class Region extends AbstractDestination implements TeaserInterface
     /**
      * @param string $awardLabel
      */
-    public function setAwardLabel($awardLabel)
+    public function setAwardLabel($awardLabel): void
     {
         $this->awardLabel = $awardLabel;
     }

packages/ep_products/Classes/Domain/Model/Reseller.php

@@ -6,31 +6,6 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Annotation\ORM\Lazy;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Reseller extends AbstractEntity
 {
 
@@ -71,7 +46,7 @@ class Reseller extends AbstractEntity
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -87,7 +62,7 @@ class Reseller extends AbstractEntity
     /**
      * @param string $code
      */
-    public function setCode($code)
+    public function setCode($code): void
     {
         $this->code = $code;
     }
@@ -103,7 +78,7 @@ class Reseller extends AbstractEntity
     /**
      * @param string $paCode
      */
-    public function setPaCode($paCode)
+    public function setPaCode($paCode): void
     {
         $this->paCode = $paCode;
     }
@@ -119,7 +94,7 @@ class Reseller extends AbstractEntity
     /**
      * @param ObjectStorage $products
      */
-    public function setProducts($products)
+    public function setProducts($products): void
     {
         $this->products = $products;
     }

packages/ep_products/Classes/Domain/Model/Room.php

@@ -1,31 +1,8 @@
 <?php
 
-namespace EP\EpProducts\Domain\Model;
+declare(strict_types=1);
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
+namespace EP\EpProducts\Domain\Model;
 
 class Room
 {

packages/ep_products/Classes/Domain/Model/SearchResult.php

@@ -1,53 +1,17 @@
 <?php
 
-namespace EP\EpProducts\Domain\Model;
+declare(strict_types=1);
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
+namespace EP\EpProducts\Domain\Model;
 
 class SearchResult
 {
 
     /**
-     * @var int
-     */
-    protected $total = 0;
-
-    /**
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * @param array $data
      * @param int $total
      */
-    public function __construct(array $data = [], $total = 0)
+    public function __construct(private array $data = [], private $total = 0)
     {
-        $this->data = $data;
-        $this->total = $total;
     }
 
     /**
@@ -61,23 +25,17 @@ class SearchResult
     /**
      * @param int $total
      */
-    public function setTotal($total)
+    public function setTotal($total): void
     {
         $this->total = $total;
     }
 
-    /**
-     * @return array
-     */
-    public function getData()
+    public function getData(): array
     {
         return $this->data;
     }
 
-    /**
-     * @param array $data
-     */
-    public function setData($data)
+    public function setData(array $data): void
     {
         $this->data = $data;
     }

packages/ep_products/Classes/Domain/Model/Snowreport.php

@@ -5,31 +5,6 @@ namespace EP\EpProducts\Domain\Model;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Snowreport extends AbstractEntity
 {
 
@@ -129,7 +104,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $vendorUid
      */
-    public function setVendorUid($vendorUid)
+    public function setVendorUid($vendorUid): void
     {
         $this->vendorUid = $vendorUid;
     }
@@ -145,7 +120,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param string $regionName
      */
-    public function setRegionName($regionName)
+    public function setRegionName($regionName): void
     {
         $this->regionName = $regionName;
     }
@@ -161,7 +136,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param bool $glacier
      */
-    public function setGlacier($glacier)
+    public function setGlacier($glacier): void
     {
         $this->glacier = $glacier;
     }
@@ -177,7 +152,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $heightMax
      */
-    public function setHeightMax($heightMax)
+    public function setHeightMax($heightMax): void
     {
         $this->heightMax = $heightMax;
     }
@@ -193,7 +168,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $heightMin
      */
-    public function setHeightMin($heightMin)
+    public function setHeightMin($heightMin): void
     {
         $this->heightMin = $heightMin;
     }
@@ -209,7 +184,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param bool $opened
      */
-    public function setOpened($opened)
+    public function setOpened($opened): void
     {
         $this->opened = $opened;
     }
@@ -225,7 +200,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $snowLevelMountain
      */
-    public function setSnowLevelMountain($snowLevelMountain)
+    public function setSnowLevelMountain($snowLevelMountain): void
     {
         $this->snowLevelMountain = $snowLevelMountain;
     }
@@ -241,7 +216,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $snowLevelValley
      */
-    public function setSnowLevelValley($snowLevelValley)
+    public function setSnowLevelValley($snowLevelValley): void
     {
         $this->snowLevelValley = $snowLevelValley;
     }
@@ -257,7 +232,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param string $snowQuality
      */
-    public function setSnowQuality($snowQuality)
+    public function setSnowQuality($snowQuality): void
     {
         $this->snowQuality = $snowQuality;
     }
@@ -273,15 +248,12 @@ class Snowreport extends AbstractEntity
     /**
      * @param \DateTime $lastSnowfall
      */
-    public function setLastSnowfall($lastSnowfall)
+    public function setLastSnowfall($lastSnowfall): void
     {
         $this->lastSnowfall = $lastSnowfall;
     }
 
-    /**
-     * @return int
-     */
-    public function getLiftsTotal()
+    public function getLiftsTotal(): int
     {
         return (int) $this->liftsTotal;
     }
@@ -289,15 +261,12 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $liftsTotal
      */
-    public function setLiftsTotal($liftsTotal)
+    public function setLiftsTotal($liftsTotal): void
     {
         $this->liftsTotal = $liftsTotal;
     }
 
-    /**
-     * @return int
-     */
-    public function getLiftsOpened()
+    public function getLiftsOpened(): int
     {
         return (int) $this->liftsOpened;
     }
@@ -305,7 +274,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param int $liftsOpened
      */
-    public function setLiftsOpened($liftsOpened)
+    public function setLiftsOpened($liftsOpened): void
     {
         $this->liftsOpened = $liftsOpened;
     }
@@ -321,23 +290,17 @@ class Snowreport extends AbstractEntity
     /**
      * @param \DateTime $lastUpdate
      */
-    public function setLastUpdate($lastUpdate)
+    public function setLastUpdate($lastUpdate): void
     {
         $this->lastUpdate = $lastUpdate;
     }
 
-    /**
-     * @param Webcam $webcam
-     */
-    public function addWebcam(Webcam $webcam)
+    public function addWebcam(Webcam $webcam): void
     {
         $this->webcams->attach($webcam);
     }
 
-    /**
-     * @param Webcam $webcam
-     */
-    public function removeWebcam(Webcam $webcam)
+    public function removeWebcam(Webcam $webcam): void
     {
         $this->webcams->detach($webcam);
     }
@@ -353,7 +316,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param ObjectStorage<Webcam> $webcams
      */
-    public function setWebcams(ObjectStorage $webcams)
+    public function setWebcams(ObjectStorage $webcams): void
     {
         $this->webcams = $webcams;
     }
@@ -369,7 +332,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param \DateTime $seasonStart
      */
-    public function setSeasonStart($seasonStart)
+    public function setSeasonStart($seasonStart): void
     {
         $this->seasonStart = $seasonStart;
     }
@@ -385,7 +348,7 @@ class Snowreport extends AbstractEntity
     /**
      * @param \DateTime $seasonEnd
      */
-    public function setSeasonEnd($seasonEnd)
+    public function setSeasonEnd($seasonEnd): void
     {
         $this->seasonEnd = $seasonEnd;
     }

packages/ep_products/Classes/Domain/Model/Teammember.php

@@ -7,31 +7,6 @@ use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Extbase\Domain\Model\Category;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Teammember extends AbstractEntity
 {
 
@@ -86,7 +61,7 @@ class Teammember extends AbstractEntity
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -102,7 +77,7 @@ class Teammember extends AbstractEntity
     /**
      * @param string $email
      */
-    public function setEmail($email)
+    public function setEmail($email): void
     {
         $this->email = $email;
     }
@@ -118,7 +93,7 @@ class Teammember extends AbstractEntity
     /**
      * @param string $phone
      */
-    public function setPhone($phone)
+    public function setPhone($phone): void
     {
         $this->phone = $phone;
     }
@@ -134,7 +109,7 @@ class Teammember extends AbstractEntity
     /**
      * @param string $tasks
      */
-    public function setTasks($tasks)
+    public function setTasks($tasks): void
     {
         $this->tasks = $tasks;
     }
@@ -150,7 +125,7 @@ class Teammember extends AbstractEntity
     /**
      * @param FileReference $image
      */
-    public function setImage($image)
+    public function setImage($image): void
     {
         $this->image = $image;
     }
@@ -166,7 +141,7 @@ class Teammember extends AbstractEntity
     /**
      * @param string $description
      */
-    public function setDescription($description)
+    public function setDescription($description): void
     {
         $this->description = $description;
     }
@@ -182,7 +157,7 @@ class Teammember extends AbstractEntity
     /**
      * @param ObjectStorage $categories
      */
-    public function setCategories($categories)
+    public function setCategories($categories): void
     {
         $this->categories = $categories;
     }

packages/ep_products/Classes/Domain/Model/TeaserInterface.php

@@ -1,34 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 interface TeaserInterface
 {
 

packages/ep_products/Classes/Domain/Model/Travelinfo.php

@@ -121,7 +121,7 @@ class Travelinfo extends AbstractEntity
     /**
      * @param string $title
      */
-    public function setTitle($title)
+    public function setTitle($title): void
     {
         $this->title = $title;
     }
@@ -131,7 +131,7 @@ class Travelinfo extends AbstractEntity
         return $this->headerImage;
     }
 
-    public function setHeaderImage($headerImage)
+    public function setHeaderImage($headerImage): static
     {
         $this->headerImage = $headerImage;
 
@@ -143,7 +143,7 @@ class Travelinfo extends AbstractEntity
         return $this->footerImage;
     }
 
-    public function setFooterImage($footerImage)
+    public function setFooterImage($footerImage): static
     {
         $this->footerImage = $footerImage;
 
@@ -155,7 +155,7 @@ class Travelinfo extends AbstractEntity
         return $this->subline;
     }
 
-    public function setSubline($subline)
+    public function setSubline($subline): static
     {
         $this->subline = $subline;
 
@@ -167,7 +167,7 @@ class Travelinfo extends AbstractEntity
         return $this->headline;
     }
 
-    public function setHeadline($headline)
+    public function setHeadline($headline): static
     {
         $this->headline = $headline;
 
@@ -179,7 +179,7 @@ class Travelinfo extends AbstractEntity
         return $this->introText;
     }
 
-    public function setIntroText($introText)
+    public function setIntroText($introText): static
     {
         $this->introText = $introText;
 
@@ -191,7 +191,7 @@ class Travelinfo extends AbstractEntity
         return $this->busInfoText;
     }
 
-    public function setBusInfoText($busInfoText)
+    public function setBusInfoText($busInfoText): static
     {
         $this->busInfoText = $busInfoText;
 
@@ -203,7 +203,7 @@ class Travelinfo extends AbstractEntity
         return $this->departureText;
     }
 
-    public function setDepartureText($departureText)
+    public function setDepartureText($departureText): static
     {
         $this->departureText = $departureText;
 
@@ -215,7 +215,7 @@ class Travelinfo extends AbstractEntity
         return $this->footerText;
     }
 
-    public function setFooterText($footerText)
+    public function setFooterText($footerText): static
     {
         $this->footerText = $footerText;
 
@@ -227,7 +227,7 @@ class Travelinfo extends AbstractEntity
         return $this->additionalInfo;
     }
 
-    public function setAdditionalInfo($additionalInfo)
+    public function setAdditionalInfo($additionalInfo): static
     {
         $this->additionalInfo = $additionalInfo;
 
@@ -239,7 +239,7 @@ class Travelinfo extends AbstractEntity
         return $this->importantPhoneNumbers;
     }
 
-    public function setImportantPhoneNumbers($importantPhoneNumbers)
+    public function setImportantPhoneNumbers($importantPhoneNumbers): static
     {
         $this->importantPhoneNumbers = $importantPhoneNumbers;
 
@@ -251,7 +251,7 @@ class Travelinfo extends AbstractEntity
         return $this->importantLinks;
     }
 
-    public function setImportantLinks($importantLinks)
+    public function setImportantLinks($importantLinks): static
     {
         $this->importantLinks = $importantLinks;
 
@@ -263,7 +263,7 @@ class Travelinfo extends AbstractEntity
         return $this->selfArrangedText;
     }
 
-    public function setSelfArrangedText($selfArrangedText)
+    public function setSelfArrangedText($selfArrangedText): static
     {
         $this->selfArrangedText = $selfArrangedText;
 
@@ -275,7 +275,7 @@ class Travelinfo extends AbstractEntity
         return $this->teasers;
     }
 
-    public function setTeasers($teasers)
+    public function setTeasers($teasers): void
     {
         $this->teasers = $teasers;
     }
@@ -285,7 +285,7 @@ class Travelinfo extends AbstractEntity
         return $this->links;
     }
 
-    public function setLinks($links)
+    public function setLinks($links): static
     {
         $this->links = $links;
 
@@ -297,7 +297,7 @@ class Travelinfo extends AbstractEntity
         return $this->travelCode;
     }
 
-    public function setTravelCode($travelCode)
+    public function setTravelCode($travelCode): static
     {
         $this->travelCode = $travelCode;
 
@@ -309,7 +309,7 @@ class Travelinfo extends AbstractEntity
         return $this->product;
     }
 
-    public function setProduct($product)
+    public function setProduct($product): static
     {
         $this->product = $product;
         return $this;
@@ -320,7 +320,7 @@ class Travelinfo extends AbstractEntity
         return $this->hideAddress;
     }
 
-    public function setHideAddress($hideAddress)
+    public function setHideAddress($hideAddress): static
     {
         $this->hideAddress = $hideAddress;
         return $this;

packages/ep_products/Classes/Domain/Model/TravelinfoLink.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
@@ -32,7 +34,7 @@ class TravelinfoLink extends AbstractEntity
     /**
      * @param string $title
      */
-    public function setTitle($title)
+    public function setTitle($title): void
     {
         $this->title = $title;
     }
@@ -42,7 +44,7 @@ class TravelinfoLink extends AbstractEntity
         return $this->link;
     }
 
-    public function setLink($link)
+    public function setLink($link): void
     {
         $this->link = $link;
     }
@@ -52,9 +54,8 @@ class TravelinfoLink extends AbstractEntity
         return $this->icon;
     }
 
-    public function setIcon($icon)
+    public function setIcon($icon): void
     {
         $this->icon = $icon;
     }
 }
-

packages/ep_products/Classes/Domain/Model/TravelinfoTeaser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
@@ -38,7 +40,7 @@ class TravelinfoTeaser extends AbstractEntity
     /**
      * @param string $title
      */
-    public function setTitle($title)
+    public function setTitle($title): void
     {
         $this->title = $title;
     }
@@ -48,7 +50,7 @@ class TravelinfoTeaser extends AbstractEntity
         return $this->bodytext;
     }
 
-    public function setBodytext($bodytext)
+    public function setBodytext($bodytext): void
     {
         $this->bodytext = $bodytext;
     }
@@ -58,7 +60,7 @@ class TravelinfoTeaser extends AbstractEntity
         return $this->category;
     }
 
-    public function setCategory($category)
+    public function setCategory($category): void
     {
         $this->category = $category;
     }
@@ -68,9 +70,8 @@ class TravelinfoTeaser extends AbstractEntity
         return $this->image;
     }
 
-    public function setImage($image)
+    public function setImage($image): void
     {
         $this->image = $image;
     }
 }
-

packages/ep_products/Classes/Domain/Model/Webcam.php

@@ -1,33 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class Webcam extends AbstractEntity
 {
 
@@ -67,7 +45,7 @@ class Webcam extends AbstractEntity
     /**
      * @param Snowreport $snowreport
      */
-    public function setSnowreport($snowreport)
+    public function setSnowreport($snowreport): void
     {
         $this->snowreport = $snowreport;
     }
@@ -83,7 +61,7 @@ class Webcam extends AbstractEntity
     /**
      * @param int $vendorUid
      */
-    public function setVendorUid($vendorUid)
+    public function setVendorUid($vendorUid): void
     {
         $this->vendorUid = $vendorUid;
     }
@@ -99,7 +77,7 @@ class Webcam extends AbstractEntity
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -115,7 +93,7 @@ class Webcam extends AbstractEntity
     /**
      * @param string $url
      */
-    public function setUrl($url)
+    public function setUrl($url): void
     {
         $this->url = $url;
     }
@@ -131,9 +109,8 @@ class Webcam extends AbstractEntity
     /**
      * @param boolean $available
      */
-    public function setAvailable($available)
+    public function setAvailable($available): void
     {
         $this->available = $available;
     }
 }
-

packages/ep_products/Classes/Domain/Repository/AbstractRepository.php

@@ -25,7 +25,6 @@ abstract class AbstractRepository extends Repository
     }
 
     /**
-     * @param array $uids
      * @return QueryResultInterface
      * @throws InvalidQueryException
      */

packages/ep_products/Classes/Domain/Repository/CityRepository.php

@@ -4,38 +4,15 @@ namespace EP\EpProducts\Domain\Repository;
 
 use EP\EpProducts\Domain\Model\AbstractDestination;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class CityRepository extends AbstractRepository
 {
-    public function getTeasersByCountryOrRegionAndSeason(int $regionUid = 0, int $countryUid = 0, string $season = 'w', int $storagePid = 0)
-    {
-        if ($season === null) {
-            $season = AbstractDestination::SEASON_WINTER;
-        }
+    public function getTeasersByCountryOrRegionAndSeason(
+        int $regionUid = 0,
+        int $countryUid = 0,
+        string $season = 'w',
+        int $storagePid = 0,
+    ) {
+        $season ??= AbstractDestination::SEASON_WINTER;
         $query = $this->createQuery();
         $constraints = [
             $query->equals('season', $season),

packages/ep_products/Classes/Domain/Repository/ConceptRepository.php

@@ -1,31 +1,8 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Repository;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class ConceptRepository extends AbstractRepository
 {}

packages/ep_products/Classes/Domain/Repository/CountryRepository.php

@@ -1,31 +1,8 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Repository;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class CountryRepository extends AbstractRepository
 {}

packages/ep_products/Classes/Domain/Repository/FaqRepository.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Domain\Repository;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Domain\Model\Faq;
 use Doctrine\DBAL\ArrayParameterType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;

packages/ep_products/Classes/Domain/Repository/HotelRepository.php

@@ -2,30 +2,6 @@
 
 namespace EP\EpProducts\Domain\Repository;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
@@ -41,7 +17,7 @@ class HotelRepository extends AbstractRepository
      * @return array
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function getSingleByUid($hotelUid)
+    public function getSingleByUid($hotelUid): array|false
     {
         $qb = $this->getQueryBuilder();
         $qb
@@ -59,7 +35,7 @@ class HotelRepository extends AbstractRepository
      * @return array
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function getDateIndependentSingleByUid($hotelUid)
+    public function getDateIndependentSingleByUid($hotelUid): array|false
     {
         $qb = $this->getDbConnection()->createQueryBuilder();
 
@@ -83,10 +59,9 @@ class HotelRepository extends AbstractRepository
 
     /**
      * @param int $productUid
-     * @return array
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function getListByProduct($productUid)
+    public function getListByProduct($productUid): array
     {
         $qb = $this->getQueryBuilder(false);
         $qb
@@ -98,11 +73,9 @@ class HotelRepository extends AbstractRepository
     }
 
     /**
-     * @param array $criteria
-     * @return array
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function getListByCriteria(array $criteria)
+    public function getListByCriteria(array $criteria): array
     {
         $optionsResolver = new OptionsResolver();
         $optionsResolver->setDefined(['regionUid', 'countryUid', 'conceptUid', 'productUid', 'category', 'type']);
@@ -150,12 +123,9 @@ class HotelRepository extends AbstractRepository
     }
 
     /**
-     * @param array $criteria
-     * @param array $excludedHotelUids
-     * @return array
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function getDateIndependentListByCriteria(array $criteria, array $excludedHotelUids = [])
+    public function getDateIndependentListByCriteria(array $criteria, array $excludedHotelUids = []): array
     {
         $optionsResolver = new OptionsResolver();
         $optionsResolver->setDefined(['regionUid', 'countryUid', 'conceptUid', 'productUid', 'category', 'type']);
@@ -179,7 +149,7 @@ class HotelRepository extends AbstractRepository
         $qb->getConcreteQueryBuilder()->orderBy('FIELD(hotel.type, ' . Hotel::TYPE_SPORTS_CLUB . ') DESC');
         $qb->addOrderBy('hotel.name', 'ASC');
 
-        if ($excludedHotelUids) {
+        if ($excludedHotelUids !== []) {
             $qb
                 ->andWhere('hotel.uid NOT IN (:excludedHotelUids)')
                 ->setParameter('excludedHotelUids', $excludedHotelUids, Connection::PARAM_INT_ARRAY)
@@ -225,7 +195,7 @@ class HotelRepository extends AbstractRepository
      * @return QueryBuilder
      * @throws \Doctrine\DBAL\DBALException
      */
-    protected function getQueryBuilder($excludeNonSearchable = true)
+    private function getQueryBuilder($excludeNonSearchable = true)
     {
         $qb = $this->getDbConnection()->createQueryBuilder();
 

packages/ep_products/Classes/Domain/Repository/ProductRepository.php

@@ -244,7 +244,7 @@ class ProductRepository extends AbstractRepository
             );
         }
 
-        if ($date !== null) {
+        if ($date instanceof Date) {
             $qb->andWhere($qb->expr()->eq(
                 'date.uid',
                 $qb->createNamedParameter($date->getUid(), Connection::PARAM_INT))

packages/ep_products/Classes/Domain/Repository/RegionRepository.php

@@ -4,38 +4,11 @@ namespace EP\EpProducts\Domain\Repository;
 
 use EP\EpProducts\Domain\Model\AbstractDestination;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class RegionRepository extends AbstractRepository
 {
     public function getTeasersByCountryAndSeason(int $countryUid, string $season = 'w', int $storagePid = 0)
     {
-        if ($season === null) {
-            $season = AbstractDestination::SEASON_WINTER;
-        }
+        $season ??= AbstractDestination::SEASON_WINTER;
         $query = $this->createQuery();
         $constraints = [
             $query->equals('country', $countryUid),

packages/ep_products/Classes/Domain/Repository/SnowreportRepository.php

@@ -31,7 +31,7 @@ class SnowreportRepository extends AbstractRepository
             ->orderBy('region.name')
         ;
 
-        if ($regionUids) {
+        if ($regionUids !== []) {
             $qb->andWhere($qb->expr()->in(
                 'region.uid',
                 $qb->createNamedParameter($regionUids, Connection::PARAM_INT_ARRAY)

packages/ep_products/Classes/Domain/Repository/TeammemberRepository.php

@@ -5,41 +5,17 @@ namespace EP\EpProducts\Domain\Repository;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
 class TeammemberRepository extends AbstractRepository
 {
     /**
      * @var array
      */
+    #[\Override]
     protected $defaultOrderings = [
         'sorting' => 'ASC',
     ];
 
     /**
-     * @param array $categories
      * @return array|QueryResultInterface
      * @throws InvalidQueryException
      */

packages/ep_products/Classes/Domain/Repository/TravelinfoRepository.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Domain\Repository;
 
 class TravelinfoRepository extends AbstractRepository

packages/ep_products/Classes/Domain/Serialization/City.php

@@ -2,41 +2,12 @@
 
 namespace EP\EpProducts\Domain\Serialization;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Domain\Model\Fact;
 use EP\EpProducts\Utility\SerializationUtility;
 
 class City
 {
-    /**
-     * @param \EP\EpProducts\Domain\Model\City $entity
-     * @return array
-     */
-    public static function fromEntity(\EP\EpProducts\Domain\Model\City $entity)
+    public static function fromEntity(\EP\EpProducts\Domain\Model\City $entity): array
     {
         $city = [];
 
@@ -46,7 +17,7 @@ class City
         $city['party'] = SerializationUtility::sanitizeText($entity->getParty());
         $city['leisure'] = SerializationUtility::sanitizeText($entity->getLeisure());
         $city['facts'] = [];
-        $city['facts']['fact'] = array_map(function ($fact) {
+        $city['facts']['fact'] = array_map(function ($fact): string {
             /** @var Fact $fact */
             return htmlspecialchars($fact->getName());
         }, $entity->getFacts()->toArray());

packages/ep_products/Classes/Domain/Serialization/Date.php

@@ -2,38 +2,9 @@
 
 namespace EP\EpProducts\Domain\Serialization;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Date
 {
-    /**
-     * @param array $array
-     * @return array
-     */
-    public static function fromArray(array $array)
+    public static function fromArray(array $array): array
     {
         $date = [
             'servicesincluded' => [],

packages/ep_products/Classes/Domain/Serialization/Hotel.php

@@ -3,38 +3,9 @@ namespace EP\EpProducts\Domain\Serialization;
 
 use EP\EpProducts\Utility\SerializationUtility;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Hotel
 {
-    /**
-     * @param \EP\EpProducts\Domain\Model\Hotel $entity
-     * @return array
-     */
-    public static function fromEntity(\EP\EpProducts\Domain\Model\Hotel $entity)
+    public static function fromEntity(\EP\EpProducts\Domain\Model\Hotel $entity): array
     {
         $hotel = [
             'dates' => [],

packages/ep_products/Classes/Domain/Serialization/Product.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Domain\Serialization;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Domain\Model\Fact;
 use EP\EpProducts\Utility\SerializationUtility;
 use TYPO3\CMS\Core\Site\SiteFinder;
@@ -35,17 +10,14 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 class Product
 {
     /**
-     * @param \EP\EpProducts\Domain\Model\Product $entity
      * @param array $imageProcessingInstructions
-     * @param array $queryData
-     * @return array
      */
     public static function fromEntity
     (
         \EP\EpProducts\Domain\Model\Product $entity,
         ?array $imageProcessingInstructions = null,
         array $queryData = []
-    )
+    ): array
     {
         $product = [
             'concept' => [],
@@ -64,7 +36,7 @@ class Product
             $product['name'] .= ' (' . $entity->getConcept()->getName() . ')';
         }
 
-        $product['facts']['fact'] = array_map(function ($fact) {
+        $product['facts']['fact'] = array_map(function ($fact): string {
             /** @var Fact $fact */
             return htmlspecialchars($fact->getName());
         }, $entity->getFacts()->toArray());

packages/ep_products/Classes/Domain/Serialization/Region.php

@@ -2,41 +2,12 @@
 
 namespace EP\EpProducts\Domain\Serialization;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Domain\Model\Fact;
 use EP\EpProducts\Utility\SerializationUtility;
 
 class Region
 {
-    /**
-     * @param \EP\EpProducts\Domain\Model\Region $entity
-     * @return array
-     */
-    public static function fromEntity(\EP\EpProducts\Domain\Model\Region $entity)
+    public static function fromEntity(\EP\EpProducts\Domain\Model\Region $entity): array
     {
         $region = [];
 
@@ -50,7 +21,7 @@ class Region
         $region['skipass'] = SerializationUtility::sanitizeText($entity->getSkiPass());
         $region['news'] = SerializationUtility::sanitizeText($entity->getNews());
         $region['facts'] = [];
-        $region['facts']['fact'] = array_map(function ($fact) {
+        $region['facts']['fact'] = array_map(function ($fact): string {
             /** @var Fact $fact */
             return htmlspecialchars($fact->getName());
         }, $entity->getFacts()->toArray());

packages/ep_products/Classes/Domain/Serialization/Room.php

@@ -1,38 +1,9 @@
 <?php
 namespace EP\EpProducts\Domain\Serialization;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 class Room
 {
-    /**
-     * @param array $array
-     * @return array
-     */
-    public static function fromArray(array $array)
+    public static function fromArray(array $array): array
     {
         $room = [];
 

packages/ep_products/Classes/Domain/Serialization/Services.php

@@ -1,37 +1,12 @@
 <?php
-namespace EP\EpProducts\Domain\Serialization;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
+declare(strict_types=1);
+
+namespace EP\EpProducts\Domain\Serialization;
 
 class Services
 {
-    /**
-     * @var array
-     */
-    protected static $categoryLabels = [
+    private static array $categoryLabels = [
         'BUS' => 'Anreise',
         'VPF' => 'Verpflegung',
         'SPA' => 'Skipass',
@@ -40,11 +15,7 @@ class Services
         'SON' => 'Sonstiges',
     ];
 
-    /**
-     * @param array $array
-     * @return array
-     */
-    public static function fromArray(array $array)
+    public static function fromArray(array $array): array
     {
         $services = [
             'category' => [],

packages/ep_products/Classes/EpTeam/ApiClient.php

@@ -2,6 +2,7 @@
 
 namespace EP\EpProducts\EpTeam;
 
+use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\HttpClient\HttpClient;
@@ -25,15 +26,15 @@ class ApiClient implements LoggerAwareInterface
     /**
      * Applied when extension configuration does not override them. Seconds.
      */
-    private const DEFAULT_TIMEOUT = 5;
-    private const DEFAULT_MAX_DURATION = 15;
+    private const int DEFAULT_TIMEOUT = 5;
+    private const int DEFAULT_MAX_DURATION = 15;
 
     /**
      * Status codes the endpoint answers a stored submission with. A conflict is included for the
      * dedupe the team application may add later - it is not returned today - because a
      * double-clicked submit button is not something to report.
      */
-    private const ACCEPTED_STATUS_CODES = [
+    private const array ACCEPTED_STATUS_CODES = [
         Response::HTTP_OK,
         Response::HTTP_CREATED,
         Response::HTTP_ACCEPTED,
@@ -46,7 +47,7 @@ class ApiClient implements LoggerAwareInterface
      * offending field in its body, which is the only way to tell from a log why a submission
      * was refused.
      */
-    private const ERROR_BODY_EXCERPT_LENGTH = 500;
+    private const int ERROR_BODY_EXCERPT_LENGTH = 500;
 
     /**
      * Shared, like the MyE&P client: Symfony's CurlHttpClient keeps its connection pool and TLS
@@ -126,7 +127,7 @@ class ApiClient implements LoggerAwareInterface
     {
         try {
             $body = trim($response->getContent(false));
-        } catch (TransportExceptionInterface $e) {
+        } catch (TransportExceptionInterface) {
             return '<no response body>';
         }
 
@@ -135,7 +136,7 @@ class ApiClient implements LoggerAwareInterface
         }
 
         if (mb_strlen($body) > self::ERROR_BODY_EXCERPT_LENGTH) {
-            $body = mb_substr($body, 0, self::ERROR_BODY_EXCERPT_LENGTH) . '…';
+            return mb_substr($body, 0, self::ERROR_BODY_EXCERPT_LENGTH) . '…';
         }
 
         return $body;
@@ -151,13 +152,13 @@ class ApiClient implements LoggerAwareInterface
     {
         try {
             $data = $response->toArray(false);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             // A body that is absent (204) or not JSON costs nothing here - the submission is
             // stored either way, which the asserted status has already established.
             return;
         }
 
-        if (null !== $this->logger) {
+        if ($this->logger instanceof LoggerInterface) {
             $this->logger->info('Application form submission accepted by the EP Team API.', [
                 'form' => $payload['form'] ?? null,
                 'pageUid' => $payload['pageUid'] ?? null,
@@ -171,8 +172,8 @@ class ApiClient implements LoggerAwareInterface
      */
     private function getHttpClient(): HttpClientInterface
     {
-        if (null !== static::$httpClient) {
-            return static::$httpClient;
+        if (self::$httpClient instanceof HttpClientInterface) {
+            return self::$httpClient;
         }
 
         $config = $this->getConfiguration();
@@ -185,7 +186,7 @@ class ApiClient implements LoggerAwareInterface
         if ('' === $apiKey) {
             throw new ApiException('EP Team API key is not configured.');
         }
-        if (0 !== strpos($baseUrl, 'https://')) {
+        if (!str_starts_with($baseUrl, 'https://')) {
             // The application answers an http request with a 301 to the https URL, and this
             // client does not follow redirects, so a plain http base URL fails every submission.
             $this->logWarning(sprintf('EP Team API base URL is not https (%s); submissions will fail on the redirect.', $baseUrl));
@@ -215,29 +216,27 @@ class ApiClient implements LoggerAwareInterface
             $options['max_duration'] = $maxDuration;
         }
 
-        return static::$httpClient = HttpClient::createForBaseUri(rtrim($baseUrl, '/') . '/', $options);
+        return self::$httpClient = HttpClient::createForBaseUri(rtrim($baseUrl, '/') . '/', $options);
     }
 
     private function getConfiguration(): array
     {
-        if (null === $this->configuration) {
-            $this->configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)
-                ->get('ep_products');
-        }
+        $this->configuration ??= GeneralUtility::makeInstance(ExtensionConfiguration::class)
+            ->get('ep_products');
 
         return $this->configuration;
     }
 
     private function logError(string $message, array $context = []): void
     {
-        if (null !== $this->logger) {
+        if ($this->logger instanceof LoggerInterface) {
             $this->logger->error($message, $context);
         }
     }
 
     private function logWarning(string $message, array $context = []): void
     {
-        if (null !== $this->logger) {
+        if ($this->logger instanceof LoggerInterface) {
             $this->logger->warning($message, $context);
         }
     }

packages/ep_products/Classes/EpTeam/ApiException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\EpTeam;
 
 class ApiException extends \RuntimeException

packages/ep_products/Classes/Http/ApiKeyAuthenticator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\Http;
 
 use Psr\Http\Message\ServerRequestInterface;
@@ -14,14 +16,8 @@ use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
  */
 class ApiKeyAuthenticator
 {
-    /**
-     * @var ExtensionConfiguration
-     */
-    private $extensionConfiguration;
-
-    public function __construct(ExtensionConfiguration $extensionConfiguration)
+    public function __construct(private readonly ExtensionConfiguration $extensionConfiguration)
     {
-        $this->extensionConfiguration = $extensionConfiguration;
     }
 
     public function isAuthorized(ServerRequestInterface $request): bool

packages/ep_products/Classes/Middleware/ApiMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace EP\EpProducts\Middleware;
 
+use TYPO3\CMS\Core\Resource\FileInterface;
 use TYPO3\CMS\Core\Database\Connection;
 use EP\EpProducts\ContentFeed\ContentFeedApi;
 use EP\EpProducts\Http\ApiKeyAuthenticator;
@@ -19,57 +20,15 @@ use TYPO3\CMS\Extbase\Service\ImageService;
 
 class ApiMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var MyEpImageService
-     */
-    private $hotelImageService;
-
-    /**
-     * @var MyEpImageService
-     */
-    private $productImageService;
-
-    /**
-     * @var MyEpImageService
-     */
-    private $regionImageService;
-
-    /**
-     * @var FileRepository
-     */
-    private $fileRepository;
-
-    /**
-     * @var ImageService
-     */
-    private $imageService;
-
-    /**
-     * @var ContentFeedApi
-     */
-    private $contentFeedApi;
-
-    /**
-     * @var ApiKeyAuthenticator
-     */
-    private $authenticator;
-
     public function __construct(
-        MyEpImageService $hotelImageService,
-        MyEpImageService $productImageService,
-        MyEpImageService $regionImageService,
-        FileRepository $fileRepository,
-        ImageService $imageService,
-        ContentFeedApi $contentFeedApi,
-        ApiKeyAuthenticator $authenticator
+        private readonly MyEpImageService $hotelImageService,
+        private readonly MyEpImageService $productImageService,
+        private readonly MyEpImageService $regionImageService,
+        private readonly FileRepository $fileRepository,
+        private readonly ImageService $imageService,
+        private readonly ContentFeedApi $contentFeedApi,
+        private readonly ApiKeyAuthenticator $authenticator,
     ) {
-        $this->hotelImageService = $hotelImageService;
-        $this->productImageService = $productImageService;
-        $this->regionImageService = $regionImageService;
-        $this->fileRepository = $fileRepository;
-        $this->imageService = $imageService;
-        $this->contentFeedApi = $contentFeedApi;
-        $this->authenticator = $authenticator;
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
@@ -84,7 +43,7 @@ class ApiMiddleware implements MiddlewareInterface
             return $this->handleProductRequest($request);
         }
 
-        if (0 === strpos($path, ContentFeedApi::PATH_PREFIX)) {
+        if (str_starts_with($path, ContentFeedApi::PATH_PREFIX)) {
             return $this->contentFeedApi->handle($request);
         }
 
@@ -309,12 +268,10 @@ class ApiMiddleware implements MiddlewareInterface
 
     private function serializeFileReferences(array $files): array
     {
-        return array_map(function ($file) {
-            return [
-                'url' => $this->imageService->getImageUri($file, true),
-                'alt' => $file->getProperty('alternative'),
-                'title' => $file->getProperty('title'),
-            ];
-        }, $files);
+        return array_map(fn(FileInterface $file): array => [
+            'url' => $this->imageService->getImageUri($file, true),
+            'alt' => $file->getProperty('alternative'),
+            'title' => $file->getProperty('title'),
+        ], $files);
     }
 }

packages/ep_products/Classes/Middleware/ContentPageTypeGuardMiddleware.php

@@ -24,20 +24,10 @@ use TYPO3\CMS\Frontend\Controller\ErrorController;
  */
 class ContentPageTypeGuardMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var ApiKeyAuthenticator
-     */
-    private $authenticator;
-
-    /**
-     * @var ContentFeedConfiguration
-     */
-    private $configuration;
-
-    public function __construct(ApiKeyAuthenticator $authenticator, ContentFeedConfiguration $configuration)
-    {
-        $this->authenticator = $authenticator;
-        $this->configuration = $configuration;
+    public function __construct(
+        private readonly ApiKeyAuthenticator $authenticator,
+        private readonly ContentFeedConfiguration $configuration,
+    ) {
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

packages/ep_products/Classes/Middleware/StaticSearchParamsMiddleware.php

@@ -27,7 +27,7 @@ class StaticSearchParamsMiddleware implements MiddlewareInterface
         $params = $request->getAttribute('normalizedParams');
         $uri = $params->getRequestUri();
 
-        if (strpos($uri, self::PREFIX_PATH_SEGMENT) === false) {
+        if (!str_contains($uri, self::PREFIX_PATH_SEGMENT)) {
             return $handler->handle($request);
         }
 

packages/ep_products/Classes/MyEP/ApiClient.php

@@ -2,6 +2,7 @@
 
 namespace EP\EpProducts\MyEP;
 
+use Psr\Log\LoggerInterface;
 use EP\EpProducts\Domain\Model\Dto\NewsletterSubscriptionRequest;
 use GuzzleHttp\Exception\GuzzleException;
 use League\OAuth2\Client\Provider\AbstractProvider;
@@ -28,31 +29,31 @@ class ApiClient implements LoggerAwareInterface
     /**
      * Applied when extension configuration does not override them. Seconds.
      */
-    private const DEFAULT_TIMEOUT = 5;
-    private const DEFAULT_MAX_DURATION = 15;
+    private const int DEFAULT_TIMEOUT = 5;
+    private const int DEFAULT_MAX_DURATION = 15;
 
     /**
      * Cache identifier for the shared OAuth access token. The token is valid for the whole
      * installation, so caching it here saves one round trip per request that would otherwise
      * have to re-authenticate before it can fetch anything.
      */
-    private const ACCESS_TOKEN_CACHE_IDENTIFIER = 'myep_api_access_token';
+    private const string ACCESS_TOKEN_CACHE_IDENTIFIER = 'myep_api_access_token';
 
     /**
      * Safety margin in seconds. A token that is about to expire is treated as expired so it
      * cannot lapse between the cache read and the API call that uses it.
      */
-    private const ACCESS_TOKEN_EXPIRY_MARGIN = 60;
+    private const int ACCESS_TOKEN_EXPIRY_MARGIN = 60;
 
     /**
      * Fallback lifetime for tokens that do not report an expiry.
      */
-    private const ACCESS_TOKEN_DEFAULT_TTL = 300;
+    private const int ACCESS_TOKEN_DEFAULT_TTL = 300;
 
     /**
      * Status codes that mean the token was rejected rather than the request being wrong.
      */
-    private const UNAUTHORIZED_STATUS_CODES = [Response::HTTP_UNAUTHORIZED, Response::HTTP_FORBIDDEN];
+    private const array UNAUTHORIZED_STATUS_CODES = [Response::HTTP_UNAUTHORIZED, Response::HTTP_FORBIDDEN];
 
     private static ?AccessToken $accessToken = null;
 
@@ -192,8 +193,11 @@ class ApiClient implements LoggerAwareInterface
      *
      * @throws ApiException
      */
-    public function getContingentCalendar(string $hotelCode, \DateTimeInterface $dateFrom, \DateTimeInterface $dateTo): array
-    {
+    public function getContingentCalendar(
+        string $hotelCode,
+        \DateTimeInterface $dateFrom,
+        \DateTimeInterface $dateTo,
+    ): array {
         return $this->requestJson('GET', 'contingents/calendar', [
             'query' => [
                 'hotelCode' => $hotelCode,
@@ -219,8 +223,12 @@ class ApiClient implements LoggerAwareInterface
     /**
      * @throws ApiException
      */
-    private function requestJson(string $method, string $uri, array $options = [], array $expectedStatusCodes = [Response::HTTP_OK]): array
-    {
+    private function requestJson(
+        string $method,
+        string $uri,
+        array $options = [],
+        array $expectedStatusCodes = [Response::HTTP_OK],
+    ): array {
         $response = $this->request($method, $uri, $options);
 
         $this->assertStatusCode($response, $expectedStatusCodes, $method, $uri);
@@ -271,11 +279,15 @@ class ApiClient implements LoggerAwareInterface
      *
      * @throws ApiException
      */
-    private function assertStatusCode(ResponseInterface $response, array $expectedStatusCodes, string $method, string $uri): void
-    {
+    private function assertStatusCode(
+        ResponseInterface $response,
+        array $expectedStatusCodes,
+        string $method,
+        string $uri,
+    ): void {
         $statusCode = $this->readStatusCode($response, $method, $uri);
 
-        if (true === in_array($statusCode, $expectedStatusCodes, true)) {
+        if (in_array($statusCode, $expectedStatusCodes, true)) {
             return;
         }
 
@@ -312,7 +324,7 @@ class ApiClient implements LoggerAwareInterface
     {
         try {
             $response->getContent(false);
-        } catch (TransportExceptionInterface $e) {
+        } catch (TransportExceptionInterface) {
             // The status has already been asserted, so a failure here costs nothing but the
             // connection reuse this method exists for.
         }
@@ -338,8 +350,8 @@ class ApiClient implements LoggerAwareInterface
 
     private function getHttpClient(): HttpClientInterface
     {
-        if (null !== static::$httpClient) {
-            return static::$httpClient;
+        if (self::$httpClient instanceof HttpClientInterface) {
+            return self::$httpClient;
         }
 
         $config = $this->getConfiguration();
@@ -362,7 +374,7 @@ class ApiClient implements LoggerAwareInterface
             $options['max_duration'] = $maxDuration;
         }
 
-        return static::$httpClient = HttpClient::createForBaseUri($config['myEpApiBaseUrl'], $options);
+        return self::$httpClient = HttpClient::createForBaseUri($config['myEpApiBaseUrl'], $options);
     }
 
     /**
@@ -375,19 +387,15 @@ class ApiClient implements LoggerAwareInterface
      */
     private function getCache(): FrontendInterface
     {
-        if (null === $this->cache) {
-            $this->cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('ep_products_cache');
-        }
+        $this->cache ??= GeneralUtility::makeInstance(CacheManager::class)->getCache('ep_products_cache');
 
         return $this->cache;
     }
 
     private function getConfiguration(): array
     {
-        if (null === $this->configuration) {
-            $this->configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)
-                ->get('ep_products');
-        }
+        $this->configuration ??= GeneralUtility::makeInstance(ExtensionConfiguration::class)
+            ->get('ep_products');
 
         return $this->configuration;
     }
@@ -397,8 +405,8 @@ class ApiClient implements LoggerAwareInterface
      */
     private function getAccessToken(array $config): AccessToken
     {
-        if (true === $this->isTokenUsable(static::$accessToken)) {
-            return static::$accessToken;
+        if ($this->isTokenUsable(self::$accessToken)) {
+            return self::$accessToken;
         }
 
         // The static above only lives for one PHP request, so without this second level every
@@ -406,16 +414,16 @@ class ApiClient implements LoggerAwareInterface
         $cachedToken = $this->getCache()->get(self::ACCESS_TOKEN_CACHE_IDENTIFIER);
         if (is_array($cachedToken) && isset($cachedToken['access_token'])) {
             $token = new AccessToken($cachedToken);
-            if (true === $this->isTokenUsable($token)) {
-                static::$accessToken = $token;
+            if ($this->isTokenUsable($token)) {
+                self::$accessToken = $token;
 
-                return static::$accessToken;
+                return self::$accessToken;
             }
         }
 
         try {
-            static::$accessToken = $this->normalizeToken($this->getProvider($config)->getAccessToken('client_credentials'));
-            $this->cacheAccessToken(static::$accessToken);
+            self::$accessToken = $this->normalizeToken($this->getProvider($config)->getAccessToken('client_credentials'));
+            $this->cacheAccessToken(self::$accessToken);
         } catch (IdentityProviderException $e) {
             $message = sprintf('MyEP OAuth token request failed: %s', $e->getMessage());
             $this->logError($message, ['exception' => $e]);
@@ -430,7 +438,7 @@ class ApiClient implements LoggerAwareInterface
             throw new ApiException($message, 0, $e);
         }
 
-        return static::$accessToken;
+        return self::$accessToken;
     }
 
     /**
@@ -441,7 +449,7 @@ class ApiClient implements LoggerAwareInterface
      */
     private function isTokenUsable(?AccessToken $token): bool
     {
-        if (null === $token) {
+        if (!$token instanceof AccessToken) {
             return false;
         }
 
@@ -470,7 +478,7 @@ class ApiClient implements LoggerAwareInterface
 
     private function discardAccessToken(): void
     {
-        static::$accessToken = null;
+        self::$accessToken = null;
         $this->getCache()->remove(self::ACCESS_TOKEN_CACHE_IDENTIFIER);
     }
 
@@ -508,14 +516,14 @@ class ApiClient implements LoggerAwareInterface
 
     private function logError(string $message, array $context = []): void
     {
-        if (null !== $this->logger) {
+        if ($this->logger instanceof LoggerInterface) {
             $this->logger->error($message, $context);
         }
     }
 
     private function logWarning(string $message, array $context = []): void
     {
-        if (null !== $this->logger) {
+        if ($this->logger instanceof LoggerInterface) {
             $this->logger->warning($message, $context);
         }
     }

packages/ep_products/Classes/MyEP/ApiException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace EP\EpProducts\MyEP;
 
 class ApiException extends \Exception

packages/ep_products/Classes/Routing/Aspect/PassthroughMapper.php

@@ -1,31 +1,8 @@
 <?php
 
-namespace EP\EpProducts\Routing\Aspect;
+declare(strict_types=1);
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2020 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
+namespace EP\EpProducts\Routing\Aspect;
 
 use TYPO3\CMS\Core\Routing\Aspect\StaticMappableAspectInterface;
 
@@ -47,4 +24,4 @@ class PassthroughMapper implements StaticMappableAspectInterface
     {
         return $value;
     }
-}
+}

packages/ep_products/Classes/Service/AbstractImageService.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Service;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Imaging\ImageManipulation\Area;
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
@@ -66,7 +41,7 @@ abstract class AbstractImageService implements SingletonInterface
 
     public function getImages($uid): array
     {
-        $key = sprintf('images-%s-%d', $this->table, $uid);
+        $key = sprintf('images-%s-%s-%d', $this->table, $this->field, $uid);
         if (false === ($value = $this->cache->get($key))) {
             $original = $this->fileRepository->findByRelation(
                 $this->table,

packages/ep_products/Classes/Service/ApiImportSource.php

@@ -2,6 +2,7 @@
 
 namespace EP\EpProducts\Service;
 
+use Psr\Log\LoggerInterface;
 use EP\EpProducts\MyEP\ApiClient;
 use EP\EpProducts\MyEP\ApiException;
 use Psr\Log\LoggerAwareInterface;
@@ -27,25 +28,19 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
     /**
      * The whole export is one page at current volumes; the walk does not rely on it.
      */
-    private const PER_PAGE = 500;
+    private const int PER_PAGE = 500;
 
     /**
      * How often the walk restarts when MyE&P replaces its copy of the export
      * mid-walk before giving up until the next run.
      */
-    private const MAX_WALKS = 3;
+    private const int MAX_WALKS = 3;
 
-    private const STAGING_SUBDIR = 'ep_products_import';
-    private const BASELINE_FILE = 'api-imported.info';
+    private const string STAGING_SUBDIR = 'ep_products_import';
+    private const string BASELINE_FILE = 'api-imported.info';
 
-    /**
-     * @var ApiClient|null
-     */
-    private $apiClient;
-
-    public function __construct(?ApiClient $apiClient = null)
+    public function __construct(private ?ApiClient $apiClient = null)
     {
-        $this->apiClient = $apiClient;
     }
 
     /**
@@ -71,7 +66,7 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
 
             [$rows, $sourceGeneratedAt] = $export;
             $baseline = $this->getImportedTimestamp();
-            if ($baseline !== null && $sourceGeneratedAt <= $baseline) {
+            if ($baseline instanceof \DateTimeImmutable && $sourceGeneratedAt <= $baseline) {
                 return null;
             }
 
@@ -87,7 +82,7 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
     public function markImported(ProductImport $import): void
     {
         $sourceGeneratedAt = $import->getSourceGeneratedAt();
-        if ($sourceGeneratedAt !== null) {
+        if ($sourceGeneratedAt instanceof \DateTimeImmutable) {
             $file = $this->baselinePath();
             GeneralUtility::mkdir_deep(dirname($file));
             GeneralUtility::writeFile($file, $sourceGeneratedAt->format(\DateTimeInterface::ATOM), false);
@@ -104,13 +99,13 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
     public function isNewImportAvailable(): bool
     {
         $lastUpdateAt = $this->getApiClient()->getLastUpdateAt();
-        if ($lastUpdateAt === null) {
+        if (!$lastUpdateAt instanceof \DateTimeImmutable) {
             return false;
         }
 
         $baseline = $this->getImportedTimestamp();
 
-        return $baseline === null || $lastUpdateAt > $baseline;
+        return !$baseline instanceof \DateTimeImmutable || $lastUpdateAt > $baseline;
     }
 
     /**
@@ -132,7 +127,7 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
      *         false when the export changed mid-walk and the walk must restart
      * @throws ApiException
      */
-    private function walkPages()
+    private function walkPages(): null|false|array
     {
         $rows = [];
         $sourceGeneratedAt = null;
@@ -147,12 +142,12 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
 
             $pageGeneratedAt = $this->parseTimestamp($meta['sourceGeneratedAt'] ?? null);
             if ($page === 1) {
-                if ($pageGeneratedAt === null) {
+                if (!$pageGeneratedAt instanceof \DateTimeImmutable) {
                     $this->logWarning('MyE&P product export has no source timestamp; skipping product import');
                     return null;
                 }
                 $sourceGeneratedAt = $pageGeneratedAt;
-            } elseif ($pageGeneratedAt === null || $pageGeneratedAt != $sourceGeneratedAt) {
+            } elseif (!$pageGeneratedAt instanceof \DateTimeImmutable || $pageGeneratedAt != $sourceGeneratedAt) {
                 $this->logWarning('MyE&P product export changed during the page walk; restarting', [
                     'page' => $page,
                     'expected' => $sourceGeneratedAt->format(\DateTimeInterface::ATOM),
@@ -202,16 +197,14 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
 
         try {
             return new \DateTimeImmutable($value);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return null;
         }
     }
 
     private function getApiClient(): ApiClient
     {
-        if ($this->apiClient === null) {
-            $this->apiClient = GeneralUtility::makeInstance(ApiClient::class);
-        }
+        $this->apiClient ??= GeneralUtility::makeInstance(ApiClient::class);
 
         return $this->apiClient;
     }
@@ -223,7 +216,7 @@ final class ApiImportSource implements ProductImportSource, SingletonInterface,
 
     private function logWarning(string $message, array $context = []): void
     {
-        if ($this->logger !== null) {
+        if ($this->logger instanceof LoggerInterface) {
             $this->logger->warning($message, $context);
         }
     }

packages/ep_products/Classes/Service/DateImportService.php

@@ -2,31 +2,6 @@
 
 namespace EP\EpProducts\Service;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use Doctrine\DBAL\Connection;
 use EP\EpProducts\Domain\Model\Room;
 use EP\EpProducts\Traits\DbConnectionTrait;
@@ -85,59 +60,25 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
      */
     const SELECTION_GROUP_LABEL_PERSONNEL = 'Leistungen Personal';
 
-    /**
-     * @var int
-     */
-    protected $pid = 0;
+    private int $pid;
 
-    /**
-     * @var array
-     */
-    protected $hotelMappings = [];
+    private array $hotelMappings = [];
 
     /**
      * @var Connection
      */
-    protected $db;
+    private $db;
 
-    /**
-     * @var CacheService
-     */
-    protected $cacheService;
-
-    /**
-     * @var ProductImportSource
-     */
-    protected $importSource;
-
-    /**
-     * @var RoomTypeResolver
-     */
-    protected $roomTypeResolver;
-
-    /**
-     * @var array
-     */
-    static protected $cache = [
+    static private array $cache = [
         'datesAdded' => [],
     ];
 
-    /**
-     * @param ExtensionConfiguration $extensionConfiguration
-     * @param CacheService $cacheService
-     * @param ProductImportSource $importSource
-     * @param RoomTypeResolver $roomTypeResolver
-     */
     public function __construct(
         ExtensionConfiguration $extensionConfiguration,
-        CacheService $cacheService,
-        ProductImportSource $importSource,
-        RoomTypeResolver $roomTypeResolver
+        private CacheService $cacheService,
+        private ProductImportSource $importSource,
+        private RoomTypeResolver $roomTypeResolver
     ) {
-        $this->cacheService = $cacheService;
-        $this->importSource = $importSource;
-        $this->roomTypeResolver = $roomTypeResolver;
-
         // Extension configuration rather than TypoScript: the import runs on the CLI, where
         // TYPO3 13 has no frontend TypoScript (plugin.tx_epproducts.persistence.storagePid)
         $this->pid = (int)$extensionConfiguration->get('ep_products', 'importStoragePid');
@@ -146,7 +87,6 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     /**
      * @param iterable<array> $rows one row per travel date × hotel, in the shape
      *                              of GET /api/exports/products on MyE&P
-     * @return int
      * @throws \Doctrine\DBAL\DBALException
      */
     public function import(iterable $rows): int
@@ -175,16 +115,13 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
      * each of them imports all of the product's dates.
      *
      * @param iterable<array> $rows
-     * @return int
      */
-    protected function importProducts(iterable $rows): int
+    private function importProducts(iterable $rows): int
     {
         $products = [];
         foreach ($rows as $row) {
             $code = $row['product']['code'];
-            if (!isset($products[$code])) {
-                $products[$code] = ['busProId' => (int) $row['product']['busProId'], 'dates' => []];
-            }
+            $products[$code] ??= ['busProId' => (int) $row['product']['busProId'], 'dates' => []];
             $products[$code]['dates'][(int) $row['date']['busProId']][] = $row;
         }
 
@@ -228,12 +165,9 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     }
 
     /**
-     * @param string $code
-     * @param int $busProId
      * @param array[][] $dates rows grouped by travel date
-     * @return int
      */
-    protected function importProduct(string $code, int $busProId, array $dates): int
+    private function importProduct(string $code, int $busProId, array $dates): int
     {
         $dateCount = 0;
 
@@ -282,10 +216,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
     /**
      * @param array[] $rows one per hotel of the travel date
-     * @param array $product
-     * @return int
      */
-    protected function importDate(array $rows, array $product): int
+    private function importDate(array $rows, array $product): int
     {
         $dateCount = 0;
 
@@ -300,11 +232,11 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
             // Import daytrip dates only once per hotel as room information is taken
             // from contingents
-            if ($product['daytrip'] && \in_array($key, static::$cache['datesAdded'], true)) {
+            if ($product['daytrip'] && \in_array($key, self::$cache['datesAdded'], true)) {
                 continue;
             }
 
-            if ($this->parseHotel($row, $date) !== false) {
+            if ($this->parseHotel($row, $date)) {
                 $this->db->insert(
                     'tx_epproducts_domain_model_date_temp',
                     $date
@@ -318,7 +250,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
                 $dateCount++;
             }
 
-            static::$cache['datesAdded'][] = $key;
+            self::$cache['datesAdded'][] = $key;
         }
         $this->db->update(
             'tx_epproducts_domain_model_product',
@@ -328,12 +260,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         return $dateCount;
     }
 
-    /**
-     * @param array $product
-     * @param array $row
-     * @return array
-     */
-    protected function createDateRecord(array $product, array $row): array
+    private function createDateRecord(array $product, array $row): array
     {
         $dateStart = \DateTime::createFromFormat('Y-m-d', $row['date']['from']);
         $dateEnd = \DateTime::createFromFormat('Y-m-d', $row['date']['to']);
@@ -408,7 +335,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         $date['services_included'] = serialize($includedServices);
         $date['courses_included'] = serialize($includedCourses);
 
-        if ($includedBoard) {
+        if ($includedBoard !== []) {
             $date['board'] = implode(', ', $includedBoard);
             $date['board_bus_pro_id'] = key($includedBoard);
         }
@@ -426,9 +353,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
         $servicesTransportationOptional = [];
         if (array_key_exists('BUS', $servicesTransportation)) {
-            $servicesTransportationOptional = array_filter($servicesTransportation['BUS'], function ($service) {
-                return $service['price'] !== 0;
-            });
+            $servicesTransportationOptional = array_filter($servicesTransportation['BUS'], fn($service): bool => $service['price'] !== 0);
         }
         if (array_key_exists('BAH', $servicesTransportation)) {
             $servicesTransportationOptional = array_merge(
@@ -458,9 +383,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
         foreach ($combinedServices as $key => $list)
         {
-            uasort($list, function ($a, $b) {
-                return strcmp($a['label'], $b['label']);
-            });
+            uasort($list, fn($a, $b): int => strcmp($a['label'], $b['label']));
             $combinedServices[$key] = $list;
         }
         $date['services_general'] = serialize($combinedServices);
@@ -486,7 +409,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
                 'time' => $pickupTime,
             ];
         }
-        usort($pickups, function ($a, $b) {
+        usort($pickups, function ($a, $b): int {
             if (empty($a['date']) || empty($b['date']) || empty($a['time']) || empty($b['time'])) {
                 return 0;
             }
@@ -503,17 +426,12 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         return $date;
     }
 
-    /**
-     * @param array $row
-     * @param array $date
-     * @return bool
-     */
-    protected function parseHotel(array $row, array &$date): bool
+    private function parseHotel(array $row, array &$date): bool
     {
         $code = $row['hotel']['code'];
         $busProId = (int) $row['hotel']['busProId'];
 
-        if (!array_key_exists($code, $this->hotelMappings)) {
+        if (!array_key_exists((string) $code, $this->hotelMappings)) {
             $this->logger->warning('hotel not found', ['code' => $code]);
 
             return false;
@@ -528,9 +446,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         $this->addServices($generalServices, $services);
         $this->addServices($hotelServices, $services);
         foreach ($services as $key => $list) {
-            uasort($list, function ($a, $b) {
-                return strcmp($a['label'], $b['label']);
-            });
+            uasort($list, fn($a, $b): int => strcmp($a['label'], $b['label']));
             $services[$key] = $list;
         }
 
@@ -554,12 +470,9 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     }
 
     /**
-     * @param array $row
      * @param int $hotelUid
-     * @param array $date
-     * @param array $services
      */
-    protected function parseRooms(array $row, $hotelUid, array &$date, array $services): void
+    private function parseRooms(array $row, $hotelUid, array &$date, array $services): void
     {
         $minPriceOverall = 0.0;
         $minPriceAvailable = 0.0;
@@ -659,13 +572,9 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         $date['min_pax'] = $minPax;
     }
 
-    /**
-     * @param array $services
-     * @return float
-     */
-    protected function determineDiscount(array $services): float
+    private function determineDiscount(array $services): float
     {
-        foreach ($services as $key => $section) {
+        foreach ($services as $section) {
             foreach ($section as $service) {
                 $price = $this->parseFormattedPrice($service['price']);
                 if ($price < 0) {
@@ -679,10 +588,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
     /**
      * @param array[] $services a service list of a row
-     * @param bool $skipWithoutPrice
-     * @return array
      */
-    protected function parseService(array $services, bool $skipWithoutPrice = false): array
+    private function parseService(array $services, bool $skipWithoutPrice = false): array
     {
         $data = [];
         foreach ($services as $service) {
@@ -721,7 +628,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
                 $label = static::LABEL_TRAIN;
             }
 
-            if (!array_key_exists($type, $data)) {
+            if (!array_key_exists((string) $type, $data)) {
                 $data[$type] = [];
             }
 
@@ -739,10 +646,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
     /**
      * @param array[] $selectionGroups
-     * @param int $busProId
-     * @return array
      */
-    protected function parseSelectionGroup(array $selectionGroups, int $busProId): array
+    private function parseSelectionGroup(array $selectionGroups, int $busProId): array
     {
         $data = [];
         foreach ($selectionGroups as $group) {
@@ -758,9 +663,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
     /**
      * @param array[] $selectionGroups
-     * @return array
      */
-    protected function parsePersonnelSelectionGroup(array $selectionGroups): array
+    private function parsePersonnelSelectionGroup(array $selectionGroups): array
     {
         $data = [];
         foreach ($selectionGroups as $group) {
@@ -782,11 +686,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     /**
      * 'Gruppenkunde' and 'Endkunde' decide. A date carrying neither is judged by
      * its travel code.
-     *
-     * @param array $row
-     * @return bool
      */
-    protected function isGroupTravel(array $row): bool
+    private function isGroupTravel(array $row): bool
     {
         $customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
         $isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
@@ -801,10 +702,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     /**
      * Reports dates whose customer selection is missing or contradictory, along
      * with what they import as.
-     *
-     * @param array $row
      */
-    protected function checkCustomerSelection(array $row): void
+    private function checkCustomerSelection(array $row): void
     {
         $customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
         $isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
@@ -824,20 +723,15 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
 
     /**
      * @param array[] $selections
-     * @param array $data
      */
-    protected function addSelections(array $selections, array &$data): void
+    private function addSelections(array $selections, array &$data): void
     {
         foreach ($selections as $selection) {
             $data[(int) $selection['busProId']] = $selection['label'];
         }
     }
 
-    /**
-     * @param array $services
-     * @param array $date
-     */
-    protected function processBusConditions(array $services, array &$date): void
+    private function processBusConditions(array $services, array &$date): void
     {
         if (!array_key_exists('BUS', $services)) {
             return;
@@ -857,32 +751,28 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
      * offset is still accepted and converted to Europe/Berlin, which cannot
      * express a time inside the daylight saving gap.
      *
-     * @param string $datetime
      * @return string[] date as d.m.Y and time as H:i
      */
-    protected function parsePickupDateTime(string $datetime): array
+    private function parsePickupDateTime(string $datetime): array
     {
         if (preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::\d{2}(?:\.\d+)?)?$/', $datetime, $parts)) {
             return [$parts[3] . '.' . $parts[2] . '.' . $parts[1], $parts[4] . ':' . $parts[5]];
         }
 
-        $pickupDateTime = (new \DateTimeImmutable($datetime))->setTimezone(new \DateTimeZone('Europe/Berlin'));
+        $pickupDateTime = new \DateTimeImmutable($datetime)->setTimezone(new \DateTimeZone('Europe/Berlin'));
 
         return [$pickupDateTime->format('d.m.Y'), $pickupDateTime->format('H:i')];
     }
 
     /**
      * Reads back a price parseService() formatted for display ("1.234,50").
-     *
-     * @param string $price
-     * @return float
      */
-    protected function parseFormattedPrice(string $price): float
+    private function parseFormattedPrice(string $price): float
     {
         return (float) str_replace(['.', ','], ['', '.'], $price);
     }
 
-    protected function getHotelMappings(): void
+    private function getHotelMappings(): void
     {
         $sql = '
             SELECT u.code code, u.uid uid, h.name name, h.type type,
@@ -924,9 +814,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     /**
      * @param string $table
      * @param int $uid
-     * @return string
      */
-    protected function getTopFactForRecord($table, $uid): string
+    private function getTopFactForRecord($table, $uid): string
     {
         $sql = '
             SELECT f.name
@@ -940,11 +829,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         return $this->db->fetchOne($sql, ['uid' => $uid]);
     }
 
-    /**
-     * @param array $services
-     * @param array $list
-     */
-    protected function addServices(array $services, array &$list): void
+    private function addServices(array $services, array &$list): void
     {
         foreach ($services as $key => $section) {
             if (!array_key_exists($key, $list)) {

packages/ep_products/Classes/Service/DateService.php

@@ -1,68 +1,21 @@
 <?php
 namespace EP\EpProducts\Service;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use EP\EpProducts\Domain\Model\Date;
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\Domain\Model\Product;
-use EP\EpProducts\Domain\Repository\DateRepository;
 use EP\EpProducts\Domain\Repository\ProductRepository;
 use EP\EpProducts\Utility\BookingUrlUtility;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 
 class DateService implements SingletonInterface
 {
-    /**
-     * @var ProductRepository
-     */
-    protected $productRepository;
-
-    /**
-     * @var FilterService
-     */
-    protected $filterService;
-
-    /**
-     * @var DateRepository
-     */
-    protected $dateRepository;
-
-    /**
-     * @var UriBuilder
-     */
-    protected $uriBuilder;
-
     /**
      * @var string[]
      */
-    protected  $serviceSections = [
+    private  array $serviceSections = [
         'BUS' => 'Anreise',
         'VPF' => 'Verpflegung',
         'SPA' => 'Skipass',
@@ -73,7 +26,7 @@ class DateService implements SingletonInterface
         'PAR' => 'Parkplatz',
     ];
 
-    private $serviceSectionsMapping = [
+    private array $serviceSectionsMapping = [
         'VE2' => 'VER',
         'VE3' => 'VER',
         'VE4' => 'VER',
@@ -83,29 +36,13 @@ class DateService implements SingletonInterface
         'VE8' => 'VER',
     ];
 
-    /**
-     * @param ProductRepository $productRepository
-     * @param DateRepository $dateRepository
-     * @param FilterService $filterService
-     * @param UriBuilder $uriBuilder
-     */
-    public function __construct
-    (
-        ProductRepository $productRepository,
-        DateRepository $dateRepository,
-        FilterService $filterService,
-        UriBuilder $uriBuilder
-    )
-    {
-        $this->productRepository = $productRepository;
-        $this->filterService = $filterService;
-        $this->dateRepository = $dateRepository;
-        $this->uriBuilder = $uriBuilder;
+    public function __construct(
+        private readonly ProductRepository $productRepository,
+        private readonly FilterService $filterService,
+    ) {
     }
 
     /**
-     * @param array $options
-     * @return array
      * @throws \Doctrine\DBAL\DBALException
      */
     public function getPriceTable(array $options): array
@@ -122,9 +59,7 @@ class DateService implements SingletonInterface
         $myEpUrl = $resolvedOptions['myEpUrl'];
         $paCode = $resolvedOptions['paCode'] ?? null;
 
-        if ($filterSettings === null) {
-            $filterSettings = $this->filterService->getNormalizedFilterSettings();
-        }
+        $filterSettings ??= $this->filterService->getNormalizedFilterSettings();
 
         $nonBookableDateUids = GeneralUtility::trimExplode(',', $product->getNonBookableDates(), true);
 
@@ -137,7 +72,7 @@ class DateService implements SingletonInterface
         ]);
     }
 
-    protected function configurePriceTableOptions(OptionsResolver $resolver)
+    private function configurePriceTableOptions(OptionsResolver $resolver): void
     {
         $resolver->setRequired(['product', 'hotel', 'myEpUrl']);
         $resolver->setDefined(['filterSettings', 'date', 'paCode']);
@@ -162,17 +97,12 @@ class DateService implements SingletonInterface
         $hotel = $resolvedOptions['hotel'];
         $filterSettings = $resolvedOptions['filterSettings'] ?? null;
 
-        if ($filterSettings === null) {
-            $filterSettings = $this->filterService->getNormalizedFilterSettings();
-        }
+        $filterSettings ??= $this->filterService->getNormalizedFilterSettings();
 
         return $this->productRepository->getAvailableDates($product, $hotel, $filterSettings);
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
-    protected function configureDatesTableOptions(OptionsResolver $resolver)
+    private function configureDatesTableOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefined(['filterSettings']);
         $resolver->setRequired(['product', 'hotel']);
@@ -256,16 +186,14 @@ class DateService implements SingletonInterface
         $processed = [];
 
         foreach ($servicesFlat as $key => $services) {
-            $servicesWithCosts = array_filter($services, function ($service) {
-                return '0,00' !== $service['price'];
-            });
+            $servicesWithCosts = array_filter($services, fn($service): bool => '0,00' !== $service['price']);
             if (0 === count($servicesWithCosts)) {
                 continue;
             }
             if (array_key_exists($key, $this->serviceSectionsMapping)) {
                 $key = $this->serviceSectionsMapping[$key];
             }
-            if (!array_key_exists($key, $processed)) {
+            if (!array_key_exists((string) $key, $processed)) {
                 $processed[$key] = [
                     'label' => $this->serviceSections[$key] ?? null,
                     'services' => [],
@@ -297,7 +225,7 @@ class DateService implements SingletonInterface
             // Default booking button status is determined by the product
             $showBookingButton = ($resolvedOptions['showBookingButton'] ?? null);
             // Check if booking button is disabled for this date
-            if (true === in_array($row['dateBusProId'], $nonBookableDateUids)) {
+            if (in_array($row['dateBusProId'], $nonBookableDateUids)) {
                 $showBookingButton = false;
             }
 
@@ -370,7 +298,7 @@ class DateService implements SingletonInterface
             }
             $hotelUid = $row['hotelUid'];
 
-            if (!array_key_exists($hotelUid, $priceTable[$categoryUid])) {
+            if (!array_key_exists((string) $hotelUid, $priceTable[$categoryUid])) {
 
                 $priceTable[$categoryUid][$hotelUid] = [
                     'category' => $categoryUid,
@@ -400,7 +328,7 @@ class DateService implements SingletonInterface
             // Add new entry or replace possible existing entry that is not
             // bookable with current record in case of matching category
             // and pax
-            if (!array_key_exists($roomPax, $entry)) {
+            if (!array_key_exists((string) $roomPax, $entry)) {
                 $entry[$roomPax] = [
                     'price' => $row['roomPrice'],
                     'available' => $row['available'] && $row['roomPrice'],
@@ -423,12 +351,10 @@ class DateService implements SingletonInterface
         {
             // The rooms are keyed by pax, so this compares the 4-person prices; hotels without
             // one compare as '' (what PHP 7.4 read from the missing offset)
-            uasort($rows, function ($a, $b) {
-                return strcmp(
-                    $a['rooms'][Hotel::CATEGORY_SUPER_DELUXE]['price'] ?? '',
-                    $b['rooms'][Hotel::CATEGORY_SUPER_DELUXE]['price'] ?? ''
-                );
-            });
+            uasort($rows, fn($a, $b): int => strcmp(
+                $a['rooms'][Hotel::CATEGORY_SUPER_DELUXE]['price'] ?? '',
+                $b['rooms'][Hotel::CATEGORY_SUPER_DELUXE]['price'] ?? ''
+            ));
             $priceTable[$category] = $rows;
         }
 
@@ -437,13 +363,7 @@ class DateService implements SingletonInterface
 
     public function hasIncludedServices(array $tableData): bool
     {
-        foreach ($tableData as $row) {
-            if (($row['busIncluded'] ?? null) || ($row['skiPassIncluded'] ?? null)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any($tableData, fn($row): bool => ($row['busIncluded'] ?? null) || ($row['skiPassIncluded'] ?? null));
     }
 
     /**
@@ -452,7 +372,6 @@ class DateService implements SingletonInterface
      * Returns services that appear in every supplied date and services that
      * appear in at least one supplied date but not all of them.
      *
-     * @param array $dates
      * @return array{allDates: array, someDates: array}
      */
     public function groupIncludedServices(array $dates): array

packages/ep_products/Classes/Service/FilterService.php

@@ -39,21 +39,17 @@ class FilterService implements SingletonInterface
             'bus' => null,
         ]);
         foreach (['hotelUid', 'productUid', 'nights', 'pax'] as $key) {
-            $optionsResolver->setNormalizer($key, function (Options $options, $value) {
-                return null !== $value ? (int)$value : null;
-            });
+            $optionsResolver->setNormalizer($key, fn(Options $options, $value): ?int => null !== $value ? (int)$value : null);
         }
         foreach (['productsPid', 'priceRanges', 'countryUids', 'regionUids', 'cityUids', 'conceptUids', 'boardTypes', 'hotelTypes', 'roomTypes'] as $key) {
-            $optionsResolver->setNormalizer($key, function (Options $options, $value) {
+            $optionsResolver->setNormalizer($key, function (Options $options, $value): array {
                 if (empty($value)) {
                     return [];
                 }
-                return array_map('intval', (array) $value);
+                return array_map(intval(...), (array) $value);
             });
         }
-        $optionsResolver->setNormalizer('bus', function (Options $options, $value) {
-            return null !== $value ? (bool)$value : null;
-        });
+        $optionsResolver->setNormalizer('bus', fn(Options $options, $value): ?bool => null !== $value ? (bool)$value : null);
 
         $filterSettings = $optionsResolver->resolve($filterSettings);
 
@@ -174,7 +170,7 @@ class FilterService implements SingletonInterface
                 if (null === $dateMax || $item['maxDateEnd'] > $dateMax) {
                     $dateMax = $item['maxDateEnd'];
                 }
-                if ((bool) $item['busAvailable'] === true) {
+                if ((bool) $item['busAvailable']) {
                     $busAvailable = true;
                 }
                 foreach ($item['nights'] as $nightsOption) {
@@ -250,9 +246,7 @@ class FilterService implements SingletonInterface
         }
 
         foreach ($destinations as $key => $value) {
-            usort($value['regions'], function ($a, $b) {
-                return strcmp($a['label'], $b['label']);
-            });
+            usort($value['regions'], fn($a, $b): int => strcmp($a['label'], $b['label']));
             $destinations[$key] = $value;
         }
         sort($destinations);
@@ -260,9 +254,7 @@ class FilterService implements SingletonInterface
         sort($roomTypes);
         ksort($priceRanges);
 
-        usort($boardTypes, function ($a, $b) {
-            return strcmp($a['label'], $b['label']);
-        });
+        usort($boardTypes, fn($a, $b): int => strcmp($a['label'], $b['label']));
 
         $filterOptions = new FilterOptions();
         $filterOptions->setPriceRanges($priceRanges);
@@ -305,7 +297,7 @@ class FilterService implements SingletonInterface
             $filterSettings['hotelUid'] = $settings['hotelUid'];
         }
         $conceptUids = GeneralUtility::intExplode(',', $settings['conceptUid'], true);
-        if ($conceptUids) {
+        if ($conceptUids !== []) {
             $filterSettings['conceptUids'] = $conceptUids;
         }
         if (isset($settings['dateFrom']) && (int) $settings['dateFrom'] > 0) {
@@ -318,7 +310,7 @@ class FilterService implements SingletonInterface
             $dateTo->setTimestamp($settings['dateTo']);
             $filterSettings['dateTo'] = $dateTo->format('Y-m-d');
         }
-        if (isset($settings['busAvailable']) && (bool) $settings['busAvailable'] === true) {
+        if (isset($settings['busAvailable']) && (bool) $settings['busAvailable']) {
             $filterSettings['bus'] = true;
         }
         if (array_key_exists('hotelTypes', $settings)) {
@@ -329,7 +321,7 @@ class FilterService implements SingletonInterface
         return $this->getNormalizedFilterSettings($filterSettings);
     }
 
-    protected function getTypoScriptSettings(): ?array
+    private function getTypoScriptSettings(): ?array
     {
         /** @var ConfigurationManager $configurationManager */
         $configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class);

packages/ep_products/Classes/Service/FilterSettingsEncoder.php

@@ -2,39 +2,11 @@
 
 namespace EP\EpProducts\Service;
 
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class FilterSettingsEncoder
 {
-    /**
-     * @return array
-     */
-    protected function getMapping()
+    private function getMapping(): array
     {
         return [
             [ 'countryUids', 'array' ],
@@ -84,7 +56,6 @@ class FilterSettingsEncoder
      * would be read into the wrong setting. Such input is rejected outright
      * rather than silently producing a shifted - and therefore wrong - result.
      *
-     * @param string $data
      * @return array the decoded settings, or an empty array if $data is malformed
      */
     public function decode(string $data): array