Merge branch 'MDL-72478-310' of git://github.com/sarjona/moodle into …

…MOODLE_310_STABLE
moodle · Sep 3, 2021 · 7aded62 · 7aded62
2 parents 3e69001 + 9fa81da
commit 7aded62
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/calendar/tests/rrule_manager_test.php b/calendar/tests/rrule_manager_test.php
@@ -2154,11 +2154,7 @@ public function test_yearly_every_20th_monday_forever() {
         // Change our event's date to the 20th Monday of the current year.
         $twentiethmonday = new DateTime(date('Y-01-01'));
         $twentiethmonday->modify('+20 Monday');
-        $startdatetime = $this->change_event_startdate($twentiethmonday->format('Ymd\T090000'), 'US/Eastern');
-
-        $startdate = new DateTime($startdatetime->format('Y-m-d'));
-
-        $offset = $startdatetime->diff($startdate, true);
+        $startdatetime = $this->change_event_startdate($twentiethmonday->format('Ymd\T000000'), 'US/Eastern');
 
         $interval = new DateInterval('P1Y');
 
@@ -2183,7 +2179,6 @@ public function test_yearly_every_20th_monday_forever() {
             $expecteddate->modify('January 1');
             $expecteddate->add($interval);
             $expecteddate->modify("+20 Monday");
-            $expecteddate->add($offset);
         }
     }