Merge branch '10.x'

Author: driesvints

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
           - 6379:6379
         options: --entrypoint redis-server
       dynamodb:
-        image: amazon/dynamodb-local:latest
+        image: amazon/dynamodb-local:2.0.0
         ports:
           - 8888:8000
 
@@ -82,8 +82,8 @@ jobs:
           DB_USERNAME: root
           DYNAMODB_CACHE_TABLE: laravel_dynamodb_test
           DYNAMODB_ENDPOINT: "http://localhost:8888"
-          AWS_ACCESS_KEY_ID: random_key
-          AWS_SECRET_ACCESS_KEY: random_secret
+          AWS_ACCESS_KEY_ID: randomKey
+          AWS_SECRET_ACCESS_KEY: randomSecret
 
       - name: Store artifacts
         uses: actions/upload-artifact@v3

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   dynamodb:
-    image: amazon/dynamodb-local
+    image: amazon/dynamodb-local:2.0.0
     ports:
       - "8000:8000"
     command: ["-jar", "DynamoDBLocal.jar", "-sharedDb", "-inMemory"]

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -63,14 +63,14 @@ public function sendResetLink(array $credentials, Closure $callback = null)
         $token = $this->tokens->create($user);
 
         if ($callback) {
-            $callback($user, $token);
-        } else {
-            // Once we have the reset token, we are ready to send the message out to this
-            // user with a link to reset their password. We will then redirect back to
-            // the current URI having nothing set in the session to indicate errors.
-            $user->sendPasswordResetNotification($token);
+            return $callback($user, $token) ?? static::RESET_LINK_SENT;
         }
 
+        // Once we have the reset token, we are ready to send the message out to this
+        // user with a link to reset their password. We will then redirect back to
+        // the current URI having nothing set in the session to indicate errors.
+        $user->sendPasswordResetNotification($token);
+
         return static::RESET_LINK_SENT;
     }
 

src/Illuminate/Broadcasting/Broadcasters/AblyBroadcaster.php

@@ -216,7 +216,7 @@ protected function getPublicToken()
     /**
      * Get the private token value from the Ably key.
      *
-     * @return mixed
+     * @return string
      */
     protected function getPrivateToken()
     {

src/Illuminate/Collections/Collection.php

@@ -424,12 +424,13 @@ public function flip()
     /**
      * Remove an item from the collection by key.
      *
-     * @param  TKey|array<array-key, TKey>  $keys
+     * \Illuminate\Contracts\Support\Arrayable<array-key, TValue>|iterable<array-key, TKey>|TKey  $keys
+     *
      * @return $this
      */
     public function forget($keys)
     {
-        foreach ((array) $keys as $key) {
+        foreach ($this->getArrayableItems($keys) as $key) {
             $this->offsetUnset($key);
         }
 

src/Illuminate/Console/Scheduling/Event.php

@@ -38,6 +38,13 @@ class Event
      */
     public $expression = '* * * * *';
 
+    /**
+     * How often to repeat the event during a minute.
+     *
+     * @var int|null
+     */
+    public $repeatSeconds = null;
+
     /**
      * The timezone the date should be evaluated on.
      *
@@ -157,6 +164,15 @@ class Event
      */
     public $mutexNameResolver;
 
+    /**
+     * The last time the event was checked for eligibility to run.
+     *
+     * Utilized by sub-minute repeated events.
+     *
+     * @var \Illuminate\Support\Carbon|null
+     */
+    protected $lastChecked;
+
     /**
      * The exit status code of the command.
      *
@@ -222,6 +238,27 @@ public function shouldSkipDueToOverlapping()
         return $this->withoutOverlapping && ! $this->mutex->create($this);
     }
 
+    /**
+     * Determine if the event has been configured to repeat multiple times per minute.
+     *
+     * @return bool
+     */
+    public function isRepeatable()
+    {
+        return ! is_null($this->repeatSeconds);
+    }
+
+    /**
+     * Determine if the event is ready to repeat.
+     *
+     * @return bool
+     */
+    public function shouldRepeatNow()
+    {
+        return $this->isRepeatable()
+            && $this->lastChecked?->diffInSeconds() >= $this->repeatSeconds;
+    }
+
     /**
      * Run the command process.
      *
@@ -371,6 +408,8 @@ public function runsInEnvironment($environment)
      */
     public function filtersPass($app)
     {
+        $this->lastChecked = Date::now();
+
         foreach ($this->filters as $callback) {
             if (! $app->call($callback)) {
                 return false;

src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Console\Scheduling;
 
 use Illuminate\Support\Carbon;
+use InvalidArgumentException;
 
 trait ManagesFrequencies
 {
@@ -69,6 +70,93 @@ private function inTimeInterval($startTime, $endTime)
         return fn () => $now->between($startTime, $endTime);
     }
 
+    /**
+     * Schedule the event to run every second.
+     *
+     * @return $this
+     */
+    public function everySecond()
+    {
+        return $this->repeatEvery(1);
+    }
+
+    /**
+     * Schedule the event to run every two seconds.
+     *
+     * @return $this
+     */
+    public function everyTwoSeconds()
+    {
+        return $this->repeatEvery(2);
+    }
+
+    /**
+     * Schedule the event to run every five seconds.
+     *
+     * @return $this
+     */
+    public function everyFiveSeconds()
+    {
+        return $this->repeatEvery(5);
+    }
+
+    /**
+     * Schedule the event to run every ten seconds.
+     *
+     * @return $this
+     */
+    public function everyTenSeconds()
+    {
+        return $this->repeatEvery(10);
+    }
+
+    /**
+     * Schedule the event to run every fifteen seconds.
+     *
+     * @return $this
+     */
+    public function everyFifteenSeconds()
+    {
+        return $this->repeatEvery(15);
+    }
+
+    /**
+     * Schedule the event to run every twenty seconds.
+     *
+     * @return $this
+     */
+    public function everyTwentySeconds()
+    {
+        return $this->repeatEvery(20);
+    }
+
+    /**
+     * Schedule the event to run every thirty seconds.
+     *
+     * @return $this
+     */
+    public function everyThirtySeconds()
+    {
+        return $this->repeatEvery(30);
+    }
+
+    /**
+     * Schedule the event to run multiple times per minute.
+     *
+     * @param  int  $seconds
+     * @return $this
+     */
+    protected function repeatEvery($seconds)
+    {
+        if (60 % $seconds !== 0) {
+            throw new InvalidArgumentException("The seconds [$seconds] are not evenly divisible by 60.");
+        }
+
+        $this->repeatSeconds = $seconds;
+
+        return $this->everyMinute();
+    }
+
     /**
      * Schedule the event to run every minute.
      *

src/Illuminate/Console/Scheduling/Schedule.php

@@ -70,6 +70,13 @@ class Schedule
      */
     protected $dispatcher;
 
+    /**
+     * The cache of mutex results.
+     *
+     * @var array<string, bool>
+     */
+    protected $mutexCache = [];
+
     /**
      * Create a new schedule instance.
      *
@@ -299,7 +306,7 @@ public function compileArrayInput($key, $value)
      */
     public function serverShouldRun(Event $event, DateTimeInterface $time)
     {
-        return $this->schedulingMutex->create($event, $time);
+        return $this->mutexCache[$event->mutexName()] ??= $this->schedulingMutex->create($event, $time);
     }
 
     /**

src/Illuminate/Console/Scheduling/ScheduleInterruptCommand.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Illuminate\Console\Scheduling;
+
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Cache\Repository as Cache;
+use Illuminate\Support\Facades\Date;
+use Symfony\Component\Console\Attribute\AsCommand;
+
+#[AsCommand(name: 'schedule:interrupt')]
+class ScheduleInterruptCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'schedule:interrupt';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Interrupt the current schedule run';
+
+    /**
+     * The cache store implementation.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * Create a new schedule interrupt command.
+     *
+     * @param  \Illuminate\Contracts\Cache\Repository  $cache
+     * @return void
+     */
+    public function __construct(Cache $cache)
+    {
+        parent::__construct();
+
+        $this->cache = $cache;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $this->cache->put('illuminate:schedule:interrupt', true, Date::now()->endOfMinute());
+
+        $this->components->info('Broadcasting schedule interrupt signal.');
+    }
+}