Commit9baf427

committed

Match next run timezone with from timezone

1 parent1df143d commit9baf427Copy full SHA for 9baf427

File tree

-4

lines changed

src/Symfony/Component/Scheduler
- Tests/Trigger
  - PeriodicalTriggerTest.php
- Trigger
  - PeriodicalTrigger.php

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ class PeriodicalTriggerTest extends TestCase`
`23`	`23`	`*/`
`24`	`24`	`publicfunctiontestConstructor(PeriodicalTrigger$trigger,bool$optimizable =true)`
`25`	`25`	`{`
`26`		`-$run =new \DateTimeImmutable('2922-02-2213:34:00+00:00');`
	`26`	`+$run =new \DateTimeImmutable('2922-02-2212:34:00+00:00');`
`27`	`27`
`28`		`-$this->assertSame('2922-02-23 13:34:00+00:00',$trigger->getNextRunDate($run)->format('Y-m-d H:i:sP'));`
	`28`	`+$this->assertSame('2922-02-23 13:34:00+01:00',$trigger->getNextRunDate($run)->format('Y-m-d H:i:sP'));`
`29`	`29`
`30`	`30`	`if ($optimizable) {`
`31`	`31`	`// test that we are using the fast algorithm for short period of time`
`@@ -37,7 +37,7 @@ public function testConstructor(PeriodicalTrigger $trigger, bool $optimizable =`
`37`	`37`
`38`	`38`	`publicstaticfunctionprovideForConstructor():iterable`
`39`	`39`	`{`
`40`		`-$from =new \DateTimeImmutable($now ='2022-02-22 13:34:00+00:00');`
	`40`	`+$from =new \DateTimeImmutable($now ='2022-02-22 13:34:00+01:00');`
`41`	`41`	`$until =new \DateTimeImmutable($farFuture ='3000-01-01');`
`42`	`42`
`43`	`43`	`yield [newPeriodicalTrigger(86400,$from,$until)];`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable`
`97`	`97`	`$delta =$run->format('U.u') -$from;`
`98`	`98`	`$recurrencesPassed =floor($delta /$this->intervalInSeconds);`
`99`	`99`	`$nextRunTimestamp =sprintf('%.6F', ($recurrencesPassed +1) *$this->intervalInSeconds +$from);`
`100`		`-$nextRun = \DateTimeImmutable::createFromFormat('U.u',$nextRunTimestamp,$fromDate->getTimezone());`
	`100`	`+$nextRun = \DateTimeImmutable::createFromFormat('U.u',$nextRunTimestamp)->setTimezone($fromDate->getTimezone());`
`101`	`101`
`102`	`102`	`if ($this->from >$nextRun) {`
`103`	`103`	`return$this->from;`

Comments

(0)