Fix RRuleIterator

ProtonMail · Jun 28, 2024 · b085028 · b085028
1 parent a79bc13
commit b085028
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 548 deletions.
diff --git a/lib/Recur/RRuleIterator.php b/lib/Recur/RRuleIterator.php
@@ -709,8 +709,8 @@ protected function nextMonthly($amount = 1): void
         $this->currentDate = $this->currentDate->setDate(
             (int) $this->currentDate->format('Y'),
             (int) $this->currentDate->format('n'),
-            (int) $occurrence
-        )->modify($this->startTime());
+            $occurrence[0]
+        )->setTime($occurrence[1], $occurrence[2], $occurrence[3]);
     }
 
     /**
@@ -868,10 +868,10 @@ protected function nextYearly($amount = 1): void
                             continue;
                         }
                         if ($occurrence[3] > $currentSecondOfMonth) {
-			    break 2;
-			}
-		    }
-		}
+                            break 2;
+                        }
+                    }
+                }
 
                 // If we made it here, it means we need to advance to
                 // the next month or year.
@@ -905,8 +905,8 @@ protected function nextYearly($amount = 1): void
             $this->currentDate = $this->currentDate->setDate(
                 (int) $currentYear,
                 (int) $currentMonth,
-                (int) $occurrence
-            )->modify($this->startTime());
+                (int) $occurrence[0]
+            )->setTime($occurrence[1], $occurrence[2], $occurrence[3]);
 
             return;
         } else {