fixup! fix: update dateMin and dateMax to accept string or integer formats and enhance validation logic

Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>

Author: Chartman123

lib/Service/FormsService.php

@@ -867,8 +867,8 @@ public function areExtraSettingsValid(array $extraSettings, string $questionType
 
 			// Validate dateMin format
 			if (isset($extraSettings['dateMin'])) {
-				if (is_int($extraSettings['dateMin'])) {
-					$dateMinDate = (new \DateTime())->setTimestamp($extraSettings['dateMin'])->setTime(0, 0, 0);
+				if (is_numeric($extraSettings['dateMin'])) {
+					$dateMinDate = (new \DateTime())->setTimestamp((int) $extraSettings['dateMin'])->setTime(0, 0, 0);
 				} else {
 					$dateMinString = $extraSettings['dateMin'];
 					$dateMinDate = \DateTime::createFromFormat('!' . $format, $dateMinString);
@@ -880,8 +880,8 @@ public function areExtraSettingsValid(array $extraSettings, string $questionType
 
 			// Validate dateMax format
 			if (isset($extraSettings['dateMax'])) {
-				if (is_int($extraSettings['dateMax'])) {
-					$dateMaxDate = (new \DateTime())->setTimestamp($extraSettings['dateMax'])->setTime(0, 0, 0);
+				if (is_numeric($extraSettings['dateMax'])) {
+					$dateMaxDate = (new \DateTime())->setTimestamp((int) $extraSettings['dateMax'])->setTime(0, 0, 0);
 				} else {
 					$dateMaxString = $extraSettings['dateMax'];
 					$dateMaxDate = \DateTime::createFromFormat('!' . $format, $dateMaxString);

lib/Service/SubmissionService.php

@@ -753,13 +753,13 @@ private function validateDateTime(array $answers, string $format, ?string $text
 
 			if ($extraSettings) {
 				$dateMin = isset($extraSettings['dateMin'])
-					? (is_int($extraSettings['dateMin'])
-						? (new DateTime())->setTimestamp($extraSettings['dateMin'])->setTime(0, 0, 0)
+					? (is_numeric($extraSettings['dateMin'])
+						? (new DateTime())->setTimestamp((int) $extraSettings['dateMin'])->setTime(0, 0, 0)
 						: DateTime::createFromFormat('!' . $format, $extraSettings['dateMin']))
 					: null;
 				$dateMax = isset($extraSettings['dateMax'])
-					? (is_int($extraSettings['dateMax'])
-						? (new DateTime())->setTimestamp($extraSettings['dateMax'])->setTime(0, 0, 0)
+					? (is_numeric($extraSettings['dateMax'])
+						? (new DateTime())->setTimestamp((int) $extraSettings['dateMax'])->setTime(0, 0, 0)
 						: DateTime::createFromFormat('!' . $format, $extraSettings['dateMax']))
 					: null;
 				$timeMin = isset($extraSettings['timeMin'])
@@ -773,10 +773,10 @@ private function validateDateTime(array $answers, string $format, ?string $text
 					? (DateTime::createFromFormat('!' . $format, $dateStr) ?: $d)
 					: $d;
 
-				if (($dateMin !== null && $compareDate < $dateMin)
-					|| ($dateMax !== null && $compareDate > $dateMax)
-					|| ($timeMin !== null && $d < $timeMin)
-					|| ($timeMax !== null && $d > $timeMax)
+				if (($dateMin instanceof \DateTimeInterface && $compareDate < $dateMin)
+					|| ($dateMax instanceof \DateTimeInterface && $compareDate > $dateMax)
+					|| ($timeMin instanceof \DateTimeInterface && $d < $timeMin)
+					|| ($timeMax instanceof \DateTimeInterface && $d > $timeMax)
 				) {
 					throw new \InvalidArgumentException(sprintf('Date/time is not in the allowed range for question "%s".', $text));
 				}