fix: replace deprecated chrono functions (lte, lt, gte, addMinute, ad…

…dSecond) (#1531) * fix: replace deprecated chronos functions (lte, lt, gte, addMinute, addSecond) * style: fix code style according to StyleCI
laravel · Jan 27, 2025 · 4219de6 · 4219de6
1 parent b3fba0d
commit 4219de6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/src/Listeners/MonitorWaitTimes.php b/src/Listeners/MonitorWaitTimes.php
@@ -99,6 +99,6 @@ protected function dueToMonitor()
      */
     protected function timeToMonitor()
     {
-        return Chronos::now()->subMinutes(1)->lte($this->lastMonitored);
+        return Chronos::now()->subMinutes(1)->lessThanOrEquals($this->lastMonitored);
     }
 }
diff --git a/src/Listeners/TrimFailedJobs.php b/src/Listeners/TrimFailedJobs.php
@@ -38,7 +38,7 @@ public function handle(MasterSupervisorLooped $event)
             $this->lastTrimmed = Chronos::now()->subMinutes($this->frequency + 1);
         }
 
-        if ($this->lastTrimmed->lte(Chronos::now()->subMinutes($this->frequency))) {
+        if ($this->lastTrimmed->lessThanOrEquals(Chronos::now()->subMinutes($this->frequency))) {
             app(JobRepository::class)->trimFailedJobs();
 
             $this->lastTrimmed = Chronos::now();

diff --git a/src/Listeners/TrimMonitoredJobs.php b/src/Listeners/TrimMonitoredJobs.php
@@ -38,7 +38,7 @@ public function handle(MasterSupervisorLooped $event)
             $this->lastTrimmed = Chronos::now()->subMinutes($this->frequency + 1);
         }
 
-        if ($this->lastTrimmed->lte(Chronos::now()->subMinutes($this->frequency))) {
+        if ($this->lastTrimmed->lessThanOrEquals(Chronos::now()->subMinutes($this->frequency))) {
             app(JobRepository::class)->trimMonitoredJobs();
 
             $this->lastTrimmed = Chronos::now();

diff --git a/src/Listeners/TrimRecentJobs.php b/src/Listeners/TrimRecentJobs.php
@@ -34,7 +34,7 @@ public function handle(MasterSupervisorLooped $event)
             $this->lastTrimmed = Chronos::now()->subMinutes($this->frequency + 1);
         }
 
-        if ($this->lastTrimmed->lte(Chronos::now()->subMinutes($this->frequency))) {
+        if ($this->lastTrimmed->lessThanOrEquals(Chronos::now()->subMinutes($this->frequency))) {
             app(JobRepository::class)->trimRecentJobs();
 
             $this->lastTrimmed = Chronos::now();

diff --git a/src/MasterSupervisor.php b/src/MasterSupervisor.php
@@ -179,7 +179,7 @@ public function terminate($status = 0)
         // process does not get stuck in an infinite loop here waiting for these.
         while (count($this->supervisors->filter->isRunning())) {
             if (Chronos::now()->subSeconds($longest)
-                        ->gte($startedTerminating)) {
+                        ->greaterThanOrEquals($startedTerminating)) {
                 break;
             }
 
@@ -217,6 +217,7 @@ public function monitor()
      * Ensure that this is the only master supervisor running for this machine.
      *
      * @return void
+     *
      * @throws \Exception
      */
     public function ensureNoOtherMasterSupervisors()

diff --git a/src/ProcessPool.php b/src/ProcessPool.php
@@ -270,7 +270,7 @@ protected function stopTerminatingProcessesThatAreHanging()
         foreach ($this->terminatingProcesses as $process) {
             $timeout = $this->options->timeout;
 
-            if ($process['terminatedAt']->addSeconds($timeout)->lte(Chronos::now())) {
+            if ($process['terminatedAt']->addSeconds($timeout)->lessThanOrEquals(Chronos::now())) {
                 $process['process']->stop();
             }
         }

diff --git a/src/Supervisor.php b/src/Supervisor.php
@@ -162,7 +162,8 @@ public function balance(array $balance)
         foreach ($balance as $queue => $scale) {
             $this->processPools->first(function ($pool) use ($queue) {
                 return $pool->queue() === $queue;
-            }, new class {
+            }, new class
+            {
                 public function __call($method, $arguments)
                 {
                 }
@@ -271,6 +272,7 @@ public function monitor()
      * Ensure no other supervisors are running with the same name.
      *
      * @return void
+     *
      * @throws \Exception
      */
     public function ensureNoDuplicateSupervisors()
@@ -334,7 +336,7 @@ protected function autoScale()
         $this->lastAutoScaled = $this->lastAutoScaled ?:
                     Chronos::now()->subSeconds($this->autoScaleCooldown + 1);
 
-        if (Chronos::now()->subSeconds($this->autoScaleCooldown)->gte($this->lastAutoScaled)) {
+        if (Chronos::now()->subSeconds($this->autoScaleCooldown)->greaterThanOrEquals($this->lastAutoScaled)) {
             $this->lastAutoScaled = Chronos::now();
 
             app(AutoScaler::class)->scale($this);

diff --git a/src/WorkerProcess.php b/src/WorkerProcess.php
@@ -159,14 +159,14 @@ protected function cooldown()
 
         if ($this->restartAgainAt) {
             $this->restartAgainAt = ! $this->process->isRunning()
-                            ? Chronos::now()->addMinute()
+                            ? Chronos::now()->addMinutes(1)
                             : null;
 
             if (! $this->process->isRunning()) {
                 event(new UnableToLaunchProcess($this));
             }
         } else {
-            $this->restartAgainAt = Chronos::now()->addSecond();
+            $this->restartAgainAt = Chronos::now()->addSeconds(1);
         }
     }
 
@@ -178,7 +178,7 @@ protected function cooldown()
     public function coolingDown()
     {
         return isset($this->restartAgainAt) &&
-               Chronos::now()->lt($this->restartAgainAt);
+               Chronos::now()->lessThan($this->restartAgainAt);
     }
 
     /**