Improve error handling of invalid values provided to the DatePicker F…

…ormWidget
wintercms · May 23, 2022 · 734cfe8 · 734cfe8
1 parent c3c0279
commit 734cfe8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/formwidgets/DatePicker.php b/formwidgets/DatePicker.php
@@ -5,6 +5,7 @@
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
 use System\Helpers\DateTime as DateTimeHelper;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Date picker
@@ -108,7 +109,12 @@ public function init()
      */
     public function render()
     {
-        $this->prepareVars();
+        try {
+            $this->prepareVars();
+        } catch (ApplicationException $ex) {
+            $this->vars['error'] = $ex->getMessage();
+        }
+
         return $this->makePartial('datepicker');
     }
 
@@ -119,6 +125,11 @@ public function prepareVars()
     {
         if ($value = $this->getLoadValue()) {
             $value = DateTimeHelper::makeCarbon($value, false);
+
+            if (!($value instanceof Carbon)) {
+                throw new ApplicationException(sprintf('"%s" is not a valid date / time value.', $value));
+            }
+
             if ($this->mode === 'date' && !$this->ignoreTimezone) {
                 $backendTimeZone = \Backend\Models\Preference::get('timezone');
                 $value->setTimezone($backendTimeZone);

diff --git a/formwidgets/datepicker/partials/_datepicker.php b/formwidgets/datepicker/partials/_datepicker.php
@@ -1,3 +1,9 @@
+<?php if (!empty($error)) : ?>
+    <p class="flash-message static error">
+        <?= e($error); ?></p>
+    </p>
+    <?php return; ?>
+<?php endif; ?>
 <?php if ($this->previewMode): ?>
     <div class="form-control"><?= Backend::dateTime($value, [
         'format' => $format,