Split restart method into setRestart and shouldRestart

Jeroeny · Jeroeny · commit 9586d9c4cc57 · 2023-09-18T10:47:47.000+02:00
diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
@@ -36,10 +36,10 @@ public function getMessages(): \Generator
     {
         $checkpoint = $this->checkpoint();
 
-        if ($this->schedule?->restart()) {
+        if ($this->schedule?->shouldRestart()) {
             unset($this->triggerHeap);
             $this->waitUntil = new \DateTimeImmutable('@0');
-            $this->schedule->restart(false);
+            $this->schedule->setRestart(false);
         }
 
         if (!$this->waitUntil
diff --git a/src/Symfony/Component/Scheduler/Schedule.php b/src/Symfony/Component/Scheduler/Schedule.php
@@ -21,8 +21,7 @@ final class Schedule implements ScheduleProviderInterface
     private array $messages = [];
     private ?LockInterface $lock = null;
     private ?CacheInterface $state = null;
-
-    private bool $restart = false;
+    private bool $shouldRestart = false;
 
     public static function with(RecurringMessage $message, RecurringMessage ...$messages): static
     {
@@ -34,7 +33,7 @@ public static function with(RecurringMessage $message, RecurringMessage ...$mess
      */
     public function add(RecurringMessage $message, RecurringMessage ...$messages): static
     {
-        $this->restart(true);
+        $this->setRestart(true);
 
         return static::doAdd($this, $message, ...$messages);
     }
@@ -58,15 +57,18 @@ private static function doAdd(self $schedule, RecurringMessage $message, Recurri
     public function remove(RecurringMessage $message): static
     {
         unset($this->messages[$message->getId()]);
-        $this->restart(true);
+        $this->setRestart(true);
 
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function clear(): static
     {
         $this->messages = [];
-        $this->restart(true);
+        $this->setRestart(true);
 
         return $this;
     }
@@ -117,8 +119,13 @@ public function getSchedule(): static
         return $this;
     }
 
-    public function restart(bool $restart = null): bool
+    public function shouldRestart(): bool
+    {
+        return $this->shouldRestart;
+    }
+
+    public function setRestart(bool $shouldRestart): bool
     {
-        return $this->restart = $restart ?? $this->restart;
+        return $this->shouldRestart = $shouldRestart;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ public function getMessages(): \Generator`
`36`	`36`	`{`
`37`	`37`	`$checkpoint = $this->checkpoint();`
`38`	`38`
`39`		`- if ($this->schedule?->restart()) {`
	`39`	`+ if ($this->schedule?->shouldRestart()) {`
`40`	`40`	`unset($this->triggerHeap);`
`41`	`41`	`$this->waitUntil = new \DateTimeImmutable('@0');`
`42`		`- $this->schedule->restart(false);`
	`42`	`+ $this->schedule->setRestart(false);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`if (!$this->waitUntil`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ final class Schedule implements ScheduleProviderInterface`
`21`	`21`	`private array $messages = [];`
`22`	`22`	`private ?LockInterface $lock = null;`
`23`	`23`	`private ?CacheInterface $state = null;`
`24`		`-`
`25`		`- private bool $restart = false;`
	`24`	`+ private bool $shouldRestart = false;`
`26`	`25`
`27`	`26`	`public static function with(RecurringMessage $message, RecurringMessage ...$messages): static`
`28`	`27`	`{`
`@@ -34,7 +33,7 @@ public static function with(RecurringMessage $message, RecurringMessage ...$mess`
`34`	`33`	`*/`
`35`	`34`	`public function add(RecurringMessage $message, RecurringMessage ...$messages): static`
`36`	`35`	`{`
`37`		`- $this->restart(true);`
	`36`	`+ $this->setRestart(true);`
`38`	`37`
`39`	`38`	`return static::doAdd($this, $message, ...$messages);`
`40`	`39`	`}`
`@@ -58,15 +57,18 @@ private static function doAdd(self $schedule, RecurringMessage $message, Recurri`
`58`	`57`	`public function remove(RecurringMessage $message): static`
`59`	`58`	`{`
`60`	`59`	`unset($this->messages[$message->getId()]);`
`61`		`- $this->restart(true);`
	`60`	`+ $this->setRestart(true);`
`62`	`61`
`63`	`62`	`return $this;`
`64`	`63`	`}`
`65`	`64`
	`65`	`+ /**`
	`66`	`+ * @return $this`
	`67`	`+ */`
`66`	`68`	`public function clear(): static`
`67`	`69`	`{`
`68`	`70`	`$this->messages = [];`
`69`		`- $this->restart(true);`
	`71`	`+ $this->setRestart(true);`
`70`	`72`
`71`	`73`	`return $this;`
`72`	`74`	`}`
`@@ -117,8 +119,13 @@ public function getSchedule(): static`
`117`	`119`	`return $this;`
`118`	`120`	`}`
`119`	`121`
`120`		`- public function restart(bool $restart = null): bool`
	`122`	`+ public function shouldRestart(): bool`
	`123`	`+ {`
	`124`	`+ return $this->shouldRestart;`
	`125`	`+ }`
	`126`	`+`
	`127`	`+ public function setRestart(bool $shouldRestart): bool`
`121`	`128`	`{`
`122`		`- return $this->restart = $restart ?? $this->restart;`
	`129`	`+ return $this->shouldRestart = $shouldRestart;`
`123`	`130`	`}`
`124`	`131`	`}`