From 24f9387f59b62a76838976466fa515c7e76d130f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Wed, 8 Aug 2018 12:46:51 +0200
Subject: [PATCH] Fix incorrect usage of options resolver

---
 .../Classes/Service/DateService.php           | 29 ++++++-------------
 .../Classes/Utility/BookingUrlUtility.php     |  4 +--
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/web/typo3conf/ext/ep_products/Classes/Service/DateService.php b/web/typo3conf/ext/ep_products/Classes/Service/DateService.php
index f293d080..58e5dc70 100644
--- a/web/typo3conf/ext/ep_products/Classes/Service/DateService.php
+++ b/web/typo3conf/ext/ep_products/Classes/Service/DateService.php
@@ -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);
 
diff --git a/web/typo3conf/ext/ep_products/Classes/Utility/BookingUrlUtility.php b/web/typo3conf/ext/ep_products/Classes/Utility/BookingUrlUtility.php
index 4f4d7e50..edaa94d2 100644
--- a/web/typo3conf/ext/ep_products/Classes/Utility/BookingUrlUtility.php
+++ b/web/typo3conf/ext/ep_products/Classes/Utility/BookingUrlUtility.php
@@ -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,
         ]);