EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect usage of options resolver

Browse Source
This commit is contained in:
Björn Fromme
2018-08-08 12:46:51 +02:00
parent 6efb897061
commit 24f9387f59
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/typo3conf/ext/ep_products/Classes/Service/DateService.php
+9 -20
View File
@@ -106,12 +106,8 @@ class DateService implements SingletonInterface
protected function configurePriceTableOptions(OptionsResolver $resolver)
{
$resolver->setRequired(['product', 'hotel']);
$resolver->setDefaults([
'filterSettings' => null,
'date' => null,
'template' => 'base',
'paCode' => null,
]);
$resolver->setDefined(['filterSettings', 'date', 'paCode']);
$resolver->setDefault('template', 'base');
$resolver->setAllowedTypes('product', Product::class);
$resolver->setAllowedTypes('hotel', Hotel::class);
$resolver->setAllowedTypes('date', Date::class);
@@ -150,12 +146,9 @@ class DateService implements SingletonInterface
*/
protected function configureDatesTableOptions(OptionsResolver $resolver)
{
$resolver->setDefined(['filterSettings', 'paCode']);
$resolver->setRequired(['product', 'hotel']);
$resolver->setDefaults([
'filterSettings' => null,
'template' => 'base',
'paCode' => null,
]);
$resolver->setDefault('template', 'base');
$resolver->setAllowedTypes('product', Product::class);
$resolver->setAllowedTypes('hotel', Hotel::class);
}
@@ -244,11 +237,9 @@ class DateService implements SingletonInterface
public function preprocessPriceTable(array $options)
{
$resolver = new OptionsResolver();
$resolver->setDefined('paCode');
$resolver->setRequired(['priceTableData', 'template']);
$resolver->setDefaults([
'paCode' => null,
'isDayTrip' => false,
]);
$resolver->setDefault('isDayTrip', false);
$resolvedOptions = $resolver->resolve($options);
$priceTable = [];
@@ -299,11 +290,9 @@ class DateService implements SingletonInterface
public function preprocessDateTable(array $options)
{
$resolver = new OptionsResolver();
$resolver->setDefined('paCode');
$resolver->setRequired(['dateTableData', 'template']);
$resolver->setDefaults([
'paCode' => null,
'isDayTrip' => false,
]);
$resolver->setDefault('isDayTrip', false);
$resolvedOptions = $resolver->resolve($options);
$dateTable = [];
@@ -352,11 +341,11 @@ class DateService implements SingletonInterface
public function preprocessEventPriceTable(array $options)
{
$resolver = new OptionsResolver();
$resolver->setDefined('paCode');
$resolver->setRequired(['priceTableData']);
$resolver->setDefaults([
'maxPax' => 99,
'template' => 'base',
'paCode' => null,
]);
$resolvedOptions = $resolver->resolve($options);
web/typo3conf/ext/ep_products/Classes/Utility/BookingUrlUtility.php
+2 -2
View File
@@ -44,10 +44,10 @@ class BookingUrlUtility
public static function generateUrl(array $options)
{
$resolver = new OptionsResolver();
$resolver->setDefined('paCode');
$resolver->setRequired(['bookingId', 'hotelId', 'dateEnd']);
$resolver->setDefaults([
'template' => 'base',
'paCode' => null,
'isDayTrip' => false,
]);
@@ -91,10 +91,10 @@ class BookingUrlUtility
public static function generateResellerUrl(array $options)
{
$resolver = new OptionsResolver();
$resolver->setDefined('paCode');
$resolver->setRequired(['bookingId', 'hotelId', 'dateEnd']);
$resolver->setDefaults([
'template' => 'base',
'paCode' => null,
'isDayTrip' => false,
]);