diff --git a/typo3/sysext/form/Classes/Mvc/Validation/DateRangeValidator.php b/typo3/sysext/form/Classes/Mvc/Validation/DateRangeValidator.php index d76efa4f42..593e83d947 100644 --- a/typo3/sysext/form/Classes/Mvc/Validation/DateRangeValidator.php +++ b/typo3/sysext/form/Classes/Mvc/Validation/DateRangeValidator.php @@ -41,7 +41,7 @@ class DateRangeValidator extends AbstractValidator */ public function isValid($value) { - $this->validateOptions(); + $options = $this->validateOptions(); if (!($value instanceof \DateTime)) { $this->addError( @@ -56,9 +56,9 @@ class DateRangeValidator extends AbstractValidator return; } - $minimum = $this->options['minimum']; - $maximum = $this->options['maximum']; - $format = $this->options['format']; + $minimum = $options['minimum']; + $maximum = $options['maximum']; + $format = $options['format']; $value->modify('midnight'); if ( @@ -96,9 +96,11 @@ class DateRangeValidator extends AbstractValidator * Checks if this validator is correctly configured * * @throws InvalidValidationOptionsException if the configured validation options are incorrect + * @return array */ protected function validateOptions() { + $options = ['format' => $this->options['format']]; if (!empty($this->options['minimum'])) { $minimum = \DateTime::createFromFormat($this->options['format'], $this->options['minimum']); if (!($minimum instanceof \DateTime)) { @@ -107,7 +109,7 @@ class DateRangeValidator extends AbstractValidator } $minimum->modify('midnight'); - $this->options['minimum'] = $minimum; + $options['minimum'] = $minimum; } if (!empty($this->options['maximum'])) { @@ -118,7 +120,8 @@ class DateRangeValidator extends AbstractValidator } $maximum->modify('midnight'); - $this->options['maximum'] = $maximum; + $options['maximum'] = $maximum; } + return $options; } }