Fix #120 Reset time to midnight to fix timezone offsets.

rlanvin · Jan 6, 2023 · fa13bf3 · fa13bf3
1 parent 15646f8
commit fa13bf3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/RRule.php b/src/RRule.php
@@ -1510,8 +1510,8 @@ public function getIterator()
 							$tmp = $year.':'.$yearday.':'.$time[0].':'.$time[1].':'.$time[2];
 							if (! isset($filtered_set[$tmp])) {
 								$occurrence = \DateTime::createFromFormat(
-									'Y z',
-									"$year $yearday",
+									'Y z H:i:s',
+									"$year $yearday 00:00:00",
 									$this->dtstart->getTimezone()
 								);
 								$occurrence->setTime($time[0], $time[1], $time[2]);
@@ -1553,8 +1553,8 @@ public function getIterator()
 				// normal loop, without BYSETPOS
 				foreach ($dayset as $yearday) {
 					$occurrence = \DateTime::createFromFormat(
-						'Y z',
-						"$year $yearday",
+						'Y z H:i:s',
+						"$year $yearday 00:00:00",
 						$this->dtstart->getTimezone()
 					);
 

diff --git a/tests/RRuleTest.php b/tests/RRuleTest.php
@@ -1815,6 +1815,19 @@ public function testMaxCyclesDoesntKickInIfTheRuleProduceOccurrences($frequency,
 		$this->assertEquals($count, $rrule->count());
 	}
 
+	/**
+	 * Tests timezone transition in Daylight Savings Time switch.
+	 */
+	public function testDST()
+	{
+		$rrule = new RRule([
+			'FREQ' => 'WEEKLY',
+			'DTSTART' => new \DateTime('2022-10-30T01:00', new \DateTimeZone('America/Chicago')),
+			'COUNT' => 2,
+		]);
+		$this->assertSame('2022-11-06T01:00:00-05:00 CDT 1667714400', $rrule[1]->format('c T U'));
+	}
+
 ///////////////////////////////////////////////////////////////////////////////
 // GetOccurrences