WIP Upgrade to TYPO3 10.4

This commit is contained in:
Björn Fromme
2021-04-01 21:33:24 +02:00
parent 571bba47f1
commit 0263d9fdd0
36 changed files with 1751 additions and 854 deletions
@@ -50,7 +50,6 @@ class ActivityController extends ActionController
*/
public function __construct(ActivityRepository $activityRepository, OfferRepository $offerRepository)
{
parent::__construct();
$this->activityRepository = $activityRepository;
$this->offerRepository = $offerRepository;
}
@@ -48,8 +48,6 @@ class AjaxFormController extends ActionController
public function __construct(EmailService $emailService, ConfigurationService $configurationService)
{
parent::__construct();
$this->emailService = $emailService;
$this->configurationService = $configurationService;
}
@@ -40,8 +40,6 @@ class AjaxOfferController extends ActionController
FileRepository $fileRepository,
ImageService $imageService
) {
parent::__construct();
$this->offerRepository = $offerRepository;
$this->fileRepository = $fileRepository;
$this->imageService = $imageService;
@@ -44,8 +44,6 @@ class FormController extends ActionController
*/
public function __construct(ConfigurationService $configurationService)
{
parent::__construct();
$this->configurationService = $configurationService;
}
@@ -45,7 +45,6 @@ class OfferController extends ActionController
*/
public function __construct(OfferRepository $offerRepository)
{
parent::__construct();
$this->offerRepository = $offerRepository;
}
@@ -45,7 +45,6 @@ class SearchController extends ActionController
*/
public function __construct(OfferRepository $offerRepository)
{
parent::__construct();
$this->offerRepository = $offerRepository;
}
@@ -46,7 +46,6 @@ class AjaxCalendarController extends ActionController
*/
public function __construct(ContingentRepository $contingentRepository)
{
parent::__construct();
$this->contingentRepository = $contingentRepository;
}
@@ -54,7 +54,6 @@ class AjaxContingentController extends ActionController
ContingentDataService $contingentDataService
)
{
parent::__construct();
$this->contingentRepository = $contingentRepository;
$this->contingentDataService = $contingentDataService;
}
@@ -78,7 +78,6 @@ class AjaxDateController extends ActionController
ProductRepository $productRepository
)
{
parent::__construct();
$this->filterService = $filterService;
$this->dateService = $dateService;
$this->resellerDataService = $resellerDataService;
@@ -54,7 +54,6 @@ class AjaxFilterpanelController extends ActionController
*/
public function __construct(FilterService $filterService, DateService $dateService)
{
parent::__construct();
$this->filterService = $filterService;
$this->dateService = $dateService;
}
@@ -49,8 +49,6 @@ class AjaxGroupsPriceController extends ActionController
public function __construct(GroupsPriceOptionRepository $groupsPriceOptionRepository, EmailService $emailService)
{
parent::__construct();
$this->groupsPriceOptionRepository = $groupsPriceOptionRepository;
$this->emailService = $emailService;
}
@@ -69,8 +69,6 @@ class AjaxSearchController extends ActionController
SearchResultUrlService $searchResultUrlService
)
{
parent::__construct();
$this->filterService = $filterService;
$this->searchResultService = $searchResultService;
$this->searchResultUrlService = $searchResultUrlService;
@@ -50,7 +50,6 @@ class AjaxSearchbarController extends ActionController
*/
public function __construct(FilterService $filterService)
{
parent::__construct();
$this->filterService = $filterService;
}
@@ -69,7 +69,6 @@ class AjaxTableController extends ActionController
ResellerDataService $resellerDataService
)
{
parent::__construct();
$this->dateService = $dateService;
$this->filterService = $filterService;
$this->resellerDataService = $resellerDataService;
@@ -71,8 +71,6 @@ class AjaxWatchlistController extends ActionController
FilterService $filterService
)
{
parent::__construct();
$this->productRepository = $productRepository;
$this->searchResultService = $searchResultService;
$this->searchResultUrlService = $searchResultUrlService;
@@ -83,8 +83,6 @@ class BackendController extends ActionController
LogService $logService
)
{
parent::__construct();
$this->dateImportService = $dateImportService;
$this->contingentImportService = $contingentImportService;
$this->snowreportImportService = $snowreportService;
@@ -44,7 +44,6 @@ class CityController extends ActionController
*/
public function __construct(CityRepository $cityRepository)
{
parent::__construct();
$this->cityRepository = $cityRepository;
}
@@ -53,7 +53,6 @@ class ConceptController extends ActionController
*/
public function __construct(ConceptRepository $conceptRepository, ProductDataService $productDataService)
{
parent::__construct();
$this->conceptRepository = $conceptRepository;
$this->productDataService = $productDataService;
}
@@ -53,7 +53,6 @@ class CountryController extends ActionController
*/
public function __construct(CountryRepository $countryRepository, ProductDataService $productDataService)
{
parent::__construct();
$this->countryRepository = $countryRepository;
$this->productDataService = $productDataService;
}
@@ -43,7 +43,6 @@ class FaqController extends ActionController
*/
public function __construct(FaqRepository $faqRepository)
{
parent::__construct();
$this->faqRepository = $faqRepository;
}
@@ -73,7 +73,6 @@ class HotelController extends ActionController
ProductDataService $productDataService
)
{
parent::__construct();
$this->hotelRepository = $hotelRepository;
$this->productRepository = $productRepository;
$this->hotelDataService = $hotelDataService;
@@ -40,8 +40,6 @@ class IcalController extends ActionController
public function __construct(IcalService $icalService)
{
parent::__construct();
$this->icalService = $icalService;
}
@@ -55,7 +55,6 @@ class MapController extends ActionController
ProductRepository $productRepository
)
{
parent::__construct();
$this->hotelRepository = $hotelRepository;
$this->productRepository = $productRepository;
}
@@ -88,7 +88,6 @@ class ProductController extends ActionController
DateService $dateService,
FilterService $filterService
) {
parent::__construct();
$this->productRepository = $productRepository;
$this->productDataService = $productDataService;
$this->hotelRepository = $hotelRepository;
@@ -53,7 +53,6 @@ class RegionController extends ActionController
*/
public function __construct(RegionRepository $regionRepository, ProductDataService $productDataService)
{
parent::__construct();
$this->regionRepository = $regionRepository;
$this->productDataService = $productDataService;
}
@@ -44,8 +44,6 @@ class ResellerController extends ActionController
*/
public function __construct(ResellerDataService $resellerDataService)
{
parent::__construct();
$this->resellerDataService = $resellerDataService;
}
@@ -63,7 +63,6 @@ class SearchController extends ActionController
*/
public function __construct(FilterService $filterService)
{
parent::__construct();
$this->filterService = $filterService;
}
@@ -44,7 +44,6 @@ class SnowreportController extends ActionController
*/
public function __construct(SnowreportRepository $snowreportRepository)
{
parent::__construct();
$this->snowreportRepository = $snowreportRepository;
}
@@ -55,4 +54,4 @@ class SnowreportController extends ActionController
$this->view->assign('list', $list);
}
}
}
@@ -44,8 +44,6 @@ class TeamController extends ActionController
*/
public function __construct(TeammemberRepository $teammemberRepository)
{
parent::__construct();
$this->teammemberRepository = $teammemberRepository;
}
@@ -4,29 +4,29 @@ if (!defined('TYPO3_MODE')) {
die('Access denied.');
}
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][$_EXTKEY] =
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['ep_products'] =
\EP\EpProducts\Hook\Tcemain::class;
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\ImportDatesTask::class] = [
'extension' => $_EXTKEY,
'extension' => 'ep_products',
'title' => 'EP Reisedaten Import',
'description' => 'Importiert Reisedaten aus busProNet',
];
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\ImportContingentsTask::class] = [
'extension' => $_EXTKEY,
'extension' => 'ep_products',
'title' => 'EP Kontingent Import',
'description' => 'Importiert Kontingentdaten aus busProNet',
];
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\ImportSnowreportTask::class] = [
'extension' => $_EXTKEY,
'extension' => 'ep_products',
'title' => 'EP Schneehöhen Import',
'description' => 'Importiert Schneehöhen',
];
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\GroupsSwissTask::class] = [
'extension' => $_EXTKEY,
'extension' => 'ep_products',
'title' => 'EP Groups Swiss Export',
'description' => 'Publiziert Verfügbarkeiten nach groups.swiss',
];
@@ -47,29 +47,23 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'searchbar',
[
'Search' => 'searchbar',
],
[
'Search' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'searchbox',
[
'Search' => 'searchbox',
],
[
'Search' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'searchresult',
[
'Search' => 'searchresult,processSearch',
@@ -80,7 +74,7 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'staticresult',
[
'Search' => 'staticresult',
@@ -91,139 +85,103 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'product_detail',
[
'Product' => 'detail,hotelList',
],
[
'Product' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'booking_link',
[
'Product' => 'detail,hotelList',
],
[
'Product' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'product_teasergroup',
[
'Product' => 'teasergroup',
],
[
'Product' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'product_pricetable',
[
'Product' => 'pricetable',
],
[
'Product' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'country_detail',
[
'Country' => 'detail',
],
[
'Country' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'region_teasergroup',
[
'Region' => 'teasergroup',
],
[
'Region' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'region_detail',
[
'Region' => 'detail',
],
[
'Region' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'city_teasergroup',
[
'City' => 'teasergroup',
],
[
'City' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'city_detail',
[
'City' => 'detail',
],
[
'City' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'hotel_teasergroup',
[
'Hotel' => 'teasergroup',
],
[
'Hotel' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'hotel_teasergroup_nodate',
[
'Hotel' => 'dateIndependentTeasergroup',
],
[
'Hotel' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'hotel_detail',
[
'Hotel' => 'detail',
],
[
'Hotel' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'hotel_groups_price',
[
'GroupsPrice' => 'index',
@@ -234,73 +192,55 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'hotel_detail_event',
[
'Hotel' => 'detailEvent',
],
[
'Hotel' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'faq',
[
'Faq' => 'detail',
],
[
'Faq' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'concept_teasergroup',
[
'Concept' => 'teasergroup',
],
[
'Concept' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'concept_detail',
[
'Concept' => 'detail',
],
[
'Concept' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'snowreport_list',
[
'Snowreport' => 'list',
],
[
'Snowreport' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'teammembers',
[
'Team' => 'list, show',
],
[
'Team' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'newsletter',
[
'Newsletter' => 'index',
@@ -311,29 +251,23 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'maps',
[
'Map' => 'general',
],
[
'Map' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'pricetable',
[
'Pricetable' => 'event',
],
[
'Pricetable' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'reseller',
[
'Reseller' => 'list,copypaste',
@@ -344,29 +278,23 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'watchlist',
[
'Watchlist' => 'list',
],
[
'Watchlist' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'password',
[
'Password' => 'index',
],
[
'Password' => '',
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'ajax',
[
'AjaxSearch' => 'searchresult',
@@ -393,7 +321,7 @@ $iconRegistry->registerIcon(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.' . $_EXTKEY,
'EP.ep_products',
'ical',
[
'Ical' => 'contingents',
@@ -51,8 +51,6 @@ class AjaxFormController extends ActionController
*/
public function __construct(EmailService $emailService, BookingApiService $bookingApiService)
{
parent::__construct();
$this->emailService = $emailService;
$this->bookingApiService = $bookingApiService;
}
@@ -64,8 +64,6 @@ class BackendController extends ActionController
*/
public function __construct(PageRepository $pageRepository)
{
parent::__construct();
$this->pageRepository = $pageRepository;
}
@@ -29,7 +29,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'SimpleForm',
[
'Form' => 'simpleForm',
@@ -40,7 +40,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'FullForm',
[
'Form' => 'fullForm',
@@ -51,7 +51,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'FullForm',
[
'Form' => 'fullForm',
@@ -62,7 +62,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'Ajax',
[
'AjaxForm' => 'processForm',