Don't try access interval elem when ANNUALLY freq is selected

Icinga · May 12, 2023 · c14a053 · c14a053
1 parent 45ab6c2
commit c14a053
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/FormElement/ScheduleElement.php b/src/FormElement/ScheduleElement.php
@@ -502,7 +502,10 @@ protected function assemble()
                         $isValid = $this->isValid();
                         $reason = null;
                         if (! $isValid && $this->getFrequency() === static::CUSTOM_EXPR) {
-                            if (! $this->getElement('interval')->isValid()) {
+                            if (
+                                $this->getCustomFrequency() !== RRule::YEARLY
+                                && ! $this->getElement('interval')->isValid()
+                            ) {
                                 $reason = current($this->getElement('interval')->getMessages());
                             } else {
                                 $frequency = $this->getCustomFrequency();
@@ -511,9 +514,13 @@ protected function assemble()
                                         $reason = current($this->weeklyField->getMessages());
 
                                         break;
-                                    default: // monthly
+                                    case RRule::MONTHLY:
                                         $reason = current($this->monthlyFields->getMessages());
 
+                                        break;
+                                    default: // annually
+                                        $reason = current($this->annuallyFields->getMessages());
+
                                         break;
                                 }
                             }