[12.x] Const to enum

src/Illuminate/Auth/Enums/PasswordStatus.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Illuminate\Auth\Enums;
+
+enum PasswordStatus: string
+{
+    /**
+     * Constant representing a successfully sent reminder.
+     */
+    case ResetLinkSent = 'passwords.sent';
+
+    /**
+     * Constant representing a successfully reset password.
+     */
+    case PasswordReset = 'passwords.reset';
+
+    /**
+     * Constant representing the user not found response.
+     */
+    case InvalidUser = 'passwords.user';
+
+    /**
+     * Constant representing an invalid token.
+     */
+    case InvalidToken = 'passwords.token';
+
+    /**
+     * Constant representing a throttled reset attempt.
+     */
+    case ResetThrottled = 'passwords.throttled';
+}

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Auth\Passwords;
 
 use Closure;
+use Illuminate\Auth\Enums\PasswordStatus;
 use Illuminate\Auth\Events\PasswordResetLinkSent;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Contracts\Auth\PasswordBroker as PasswordBrokerContract;
@@ -54,7 +55,7 @@ public function __construct(#[\SensitiveParameter] TokenRepositoryInterface $tok
      *
      * @param  array  $credentials
      * @param  \Closure|null  $callback
-     * @return string
+     * @return \Illuminate\Auth\Enums\PasswordStatus
      */
     public function sendResetLink(#[\SensitiveParameter] array $credentials, ?Closure $callback = null)
     {
@@ -64,17 +65,17 @@ public function sendResetLink(#[\SensitiveParameter] array $credentials, ?Closur
         $user = $this->getUser($credentials);
 
         if (is_null($user)) {
-            return static::INVALID_USER;
+            return PasswordStatus::InvalidUser;
         }
 
         if ($this->tokens->recentlyCreatedToken($user)) {
-            return static::RESET_THROTTLED;
+            return PasswordStatus::ResetThrottled;
         }
 
         $token = $this->tokens->create($user);
 
         if ($callback) {
-            return $callback($user, $token) ?? static::RESET_LINK_SENT;
+            return $callback($user, $token) ?? PasswordStatus::ResetLinkSent;
         }
 
         // Once we have the reset token, we are ready to send the message out to this
@@ -84,7 +85,7 @@ public function sendResetLink(#[\SensitiveParameter] array $credentials, ?Closur
 
         $this->events?->dispatch(new PasswordResetLinkSent($user));
 
-        return static::RESET_LINK_SENT;
+        return PasswordStatus::ResetLinkSent;
     }
 
     /**
@@ -114,23 +115,23 @@ public function reset(#[\SensitiveParameter] array $credentials, Closure $callba
 
         $this->tokens->delete($user);
 
-        return static::PASSWORD_RESET;
+        return PasswordStatus::PasswordReset;
     }
 
     /**
      * Validate a password reset for the given credentials.
      *
      * @param  array  $credentials
-     * @return \Illuminate\Contracts\Auth\CanResetPassword|string
+     * @return \Illuminate\Contracts\Auth\CanResetPassword|\Illuminate\Auth\Enums\PasswordStatus
      */
     protected function validateReset(#[\SensitiveParameter] array $credentials)
     {
         if (is_null($user = $this->getUser($credentials))) {
-            return static::INVALID_USER;
+            return PasswordStatus::InvalidUser;
         }
 
         if (! $this->tokens->exists($user, $credentials['token'])) {
-            return static::INVALID_TOKEN;
+            return PasswordStatus::InvalidToken;
         }
 
         return $user;

src/Illuminate/Console/Enums/ScheduleOn.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Illuminate\Console\Enums;
+
+enum ScheduleOn: int
+{
+    case SUNDAY = 0;
+
+    case MONDAY = 1;
+
+    case TUESDAY = 2;
+
+    case WEDNESDAY = 3;
+
+    case THURSDAY = 4;
+
+    case FRIDAY = 5;
+
+    case SATURDAY = 6;
+}

src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -2,9 +2,12 @@
 
 namespace Illuminate\Console\Scheduling;
 
+use Illuminate\Console\Enums\ScheduleOn;
 use Illuminate\Support\Carbon;
 use InvalidArgumentException;
 
+use function Illuminate\Support\enum_value;
+
 trait ManagesFrequencies
 {
     /**
@@ -401,7 +404,7 @@ protected function hourBasedSchedule($minutes, $hours)
      */
     public function weekdays()
     {
-        return $this->days(Schedule::MONDAY.'-'.Schedule::FRIDAY);
+        return $this->days(ScheduleOn::MONDAY->value.'-'.ScheduleOn::FRIDAY->value);
     }
 
     /**
@@ -411,7 +414,7 @@ public function weekdays()
      */
     public function weekends()
     {
-        return $this->days(Schedule::SATURDAY.','.Schedule::SUNDAY);
+        return $this->days(ScheduleOn::SATURDAY->value.','.ScheduleOn::SUNDAY->value);
     }
 
     /**
@@ -421,7 +424,7 @@ public function weekends()
      */
     public function mondays()
     {
-        return $this->days(Schedule::MONDAY);
+        return $this->days(ScheduleOn::MONDAY);
     }
 
     /**
@@ -431,7 +434,7 @@ public function mondays()
      */
     public function tuesdays()
     {
-        return $this->days(Schedule::TUESDAY);
+        return $this->days(ScheduleOn::TUESDAY);
     }
 
     /**
@@ -441,7 +444,7 @@ public function tuesdays()
      */
     public function wednesdays()
     {
-        return $this->days(Schedule::WEDNESDAY);
+        return $this->days(ScheduleOn::WEDNESDAY);
     }
 
     /**
@@ -451,7 +454,7 @@ public function wednesdays()
      */
     public function thursdays()
     {
-        return $this->days(Schedule::THURSDAY);
+        return $this->days(ScheduleOn::THURSDAY);
     }
 
     /**
@@ -461,7 +464,7 @@ public function thursdays()
      */
     public function fridays()
     {
-        return $this->days(Schedule::FRIDAY);
+        return $this->days(ScheduleOn::FRIDAY);
     }
 
     /**
@@ -471,7 +474,7 @@ public function fridays()
      */
     public function saturdays()
     {
-        return $this->days(Schedule::SATURDAY);
+        return $this->days(ScheduleOn::SATURDAY);
     }
 
     /**
@@ -481,7 +484,7 @@ public function saturdays()
      */
     public function sundays()
     {
-        return $this->days(Schedule::SUNDAY);
+        return $this->days(ScheduleOn::SUNDAY);
     }
 
     /**
@@ -633,6 +636,8 @@ public function days($days)
     {
         $days = is_array($days) ? $days : func_get_args();
 
+        $days = array_map(enum_value(...), $days);
+
         return $this->spliceIntoPosition(5, implode(',', $days));
     }
 
@@ -660,7 +665,7 @@ protected function spliceIntoPosition($position, $value)
     {
         $segments = preg_split("/\s+/", $this->expression);
 
-        $segments[$position - 1] = $value;
+        $segments[$position - 1] = enum_value($value);
 
         return $this->cron(implode(' ', $segments));
     }

src/Illuminate/Console/Scheduling/Schedule.php

@@ -7,6 +7,7 @@
 use DateTimeInterface;
 use Illuminate\Bus\UniqueLock;
 use Illuminate\Console\Application;
+use Illuminate\Console\Enums\ScheduleOn;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Contracts\Cache\Repository as Cache;
@@ -28,19 +29,26 @@ class Schedule
         __call as macroCall;
     }
 
-    const SUNDAY = 0;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::SUNDAY instead */
+    const SUNDAY = ScheduleOn::SUNDAY;
 
-    const MONDAY = 1;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::MONDAY instead */
+    const MONDAY = ScheduleOn::MONDAY;
 
-    const TUESDAY = 2;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::TUESDAY instead */
+    const TUESDAY = ScheduleOn::TUESDAY;
 
-    const WEDNESDAY = 3;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::WEDNESDAY instead */
+    const WEDNESDAY = ScheduleOn::WEDNESDAY;
 
-    const THURSDAY = 4;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::THURSDAY instead */
+    const THURSDAY = ScheduleOn::THURSDAY;
 
-    const FRIDAY = 5;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::FRIDAY instead */
+    const FRIDAY = ScheduleOn::FRIDAY;
 
-    const SATURDAY = 6;
+    /** @deprecated Use \Illuminate\Console\Enums\ScheduleOn::SATURDAY instead */
+    const SATURDAY = ScheduleOn::SATURDAY;
 
     /**
      * All of the events on the schedule.

src/Illuminate/Contracts/Auth/PasswordBroker.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Contracts\Auth;
 
 use Closure;
+use Illuminate\Auth\Enums\PasswordStatus;
 
 interface PasswordBroker
 {
@@ -11,42 +12,42 @@ interface PasswordBroker
      *
      * @var string
      */
-    const RESET_LINK_SENT = 'passwords.sent';
+    const RESET_LINK_SENT = PasswordStatus::ResetLinkSent;
 
     /**
      * Constant representing a successfully reset password.
      *
      * @var string
      */
-    const PASSWORD_RESET = 'passwords.reset';
+    const PASSWORD_RESET = PasswordStatus::PasswordReset;
 
     /**
      * Constant representing the user not found response.
      *
      * @var string
      */
-    const INVALID_USER = 'passwords.user';
+    const INVALID_USER = PasswordStatus::InvalidUser;
 
     /**
      * Constant representing an invalid token.
      *
      * @var string
      */
-    const INVALID_TOKEN = 'passwords.token';
+    const INVALID_TOKEN = PasswordStatus::InvalidToken;
 
     /**
      * Constant representing a throttled reset attempt.
      *
      * @var string
      */
-    const RESET_THROTTLED = 'passwords.throttled';
+    const RESET_THROTTLED = PasswordStatus::ResetThrottled;
 
     /**
      * Send a password reset link to a user.
      *
      * @param  array  $credentials
      * @param  \Closure|null  $callback
-     * @return string
+     * @return \Illuminate\Auth\Enums\PasswordStatus
      */
     public function sendResetLink(array $credentials, ?Closure $callback = null);
 

src/Illuminate/Queue/Events/WorkerStopping.php

@@ -15,5 +15,6 @@ public function __construct(
         public $status = 0,
         public $workerOptions = null
     ) {
+        $this->status = $status;
     }
 }

src/Illuminate/Queue/Worker.php

@@ -232,7 +232,7 @@ protected function registerTimeoutHandler($job, WorkerOptions $options)
                 ));
             }
 
-            $this->kill(static::EXIT_ERROR, $options);
+            $this->kill(self::EXIT_ERROR, $options);
         }, true);
 
         pcntl_alarm(
@@ -304,12 +304,12 @@ protected function pauseWorker(WorkerOptions $options, $lastRestart)
     protected function stopIfNecessary(WorkerOptions $options, $lastRestart, $startTime = 0, $jobsProcessed = 0, $job = null)
     {
         return match (true) {
-            $this->shouldQuit => static::EXIT_SUCCESS,
-            $this->memoryExceeded($options->memory) => static::EXIT_MEMORY_LIMIT,
-            $this->queueShouldRestart($lastRestart) => static::EXIT_SUCCESS,
-            $options->stopWhenEmpty && is_null($job) => static::EXIT_SUCCESS,
-            $options->maxTime && hrtime(true) / 1e9 - $startTime >= $options->maxTime => static::EXIT_SUCCESS,
-            $options->maxJobs && $jobsProcessed >= $options->maxJobs => static::EXIT_SUCCESS,
+            $this->shouldQuit => self::EXIT_SUCCESS,
+            $this->memoryExceeded($options->memory) => self::EXIT_MEMORY_LIMIT,
+            $this->queueShouldRestart($lastRestart) => self::EXIT_SUCCESS,
+            $options->stopWhenEmpty && is_null($job) => self::EXIT_SUCCESS,
+            $options->maxTime && hrtime(true) / 1e9 - $startTime >= $options->maxTime => self::EXIT_SUCCESS,
+            $options->maxJobs && $jobsProcessed >= $options->maxJobs => self::EXIT_SUCCESS,
             default => null
         };
     }