Merge branch '9.x'

Author: GrahamCampbell

.github/workflows/tests.yml

@@ -65,7 +65,7 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer require ramsey/collection:^1.2 brick/math:^0.9.3 --no-interaction --no-update
+          command: composer require ramsey/collection:^1.2 brick/math:^0.9.3 symfony/css-selector:^6.0 --no-interaction --no-update
         if: matrix.php >= 8.1
 
       - name: Set Minimum PHP 8.2 Versions
@@ -137,12 +137,20 @@ jobs:
           command: composer require ramsey/collection:^1.2 brick/math:^0.9.3 --no-interaction --no-update
         if: matrix.php >= 8.1
 
+      - name: Set Minimum PHP 8.1 Versions
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require ramsey/collection:~1.2 brick/math:~0.9.3 symfony/css-selector:~6.0 --no-interaction --no-update
+        if: matrix.php >= 8.1
+
       - name: Set Minimum PHP 8.2 Versions
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer require guzzlehttp/guzzle:~7.5 guzzlehttp/psr7:~2.4 predis/predis:^2.0.2 --no-interaction --no-update
+          command: composer require guzzlehttp/guzzle:~7.5 guzzlehttp/psr7:~2.4 predis/predis:~2.0.2 --no-interaction --no-update
         if: matrix.php >= 8.2
 
       - name: Install dependencies

composer.json

@@ -23,7 +23,7 @@
         "egulias/email-validator": "^3.2.1",
         "fruitcake/php-cors": "^1.2",
         "laravel/serializable-closure": "^1.2.2",
-        "league/commonmark": "^2.2",
+        "league/commonmark": "^2.2.1",
         "league/flysystem": "^3.8.0",
         "monolog/monolog": "^3.0",
         "nesbot/carbon": "^2.62.1",
@@ -85,7 +85,7 @@
         "ably/ably-php": "^1.0",
         "aws/aws-sdk-php": "^3.235.5",
         "doctrine/dbal": "^3.5.1",
-        "fakerphp/faker": "^1.9.2",
+        "fakerphp/faker": "^1.21",
         "guzzlehttp/guzzle": "^7.5",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-ftp": "^3.0",

src/Illuminate/Auth/EloquentUserProvider.php

@@ -80,8 +80,7 @@ public function retrieveByToken($identifier, $token)
 
         $rememberToken = $retrievedModel->getRememberToken();
 
-        return $rememberToken && hash_equals($rememberToken, $token)
-                        ? $retrievedModel : null;
+        return $rememberToken && hash_equals($rememberToken, $token) ? $retrievedModel : null;
     }
 
     /**

src/Illuminate/Console/Command.php

@@ -42,7 +42,7 @@ class Command extends SymfonyCommand
     /**
      * The console command description.
      *
-     * @var string
+     * @var string|null
      */
     protected $description;
 

src/Illuminate/Console/Scheduling/CallbackEvent.php

@@ -184,7 +184,7 @@ public function getSummaryForDisplay()
      */
     public function mutexName()
     {
-        return 'framework/schedule-'.sha1($this->description);
+        return 'framework/schedule-'.sha1($this->description ?? '');
     }
 
     /**

src/Illuminate/Console/Scheduling/Event.php

@@ -26,7 +26,7 @@ class Event
     /**
      * The command string.
      *
-     * @var string
+     * @var string|null
      */
     public $command;
 
@@ -47,7 +47,7 @@ class Event
     /**
      * The user the command should run as.
      *
-     * @var string
+     * @var string|null
      */
     public $user;
 
@@ -138,7 +138,7 @@ class Event
     /**
      * The human readable description of the event.
      *
-     * @var string
+     * @var string|null
      */
     public $description;
 

src/Illuminate/Console/Scheduling/ScheduleListCommand.php

@@ -69,19 +69,20 @@ public function handle(Schedule $schedule)
         $events = $events->map(function ($event) use ($terminalWidth, $expressionSpacing, $timezone) {
             $expression = $this->formatCronExpression($event->expression, $expressionSpacing);
 
-            $command = $event->command;
-            $description = $event->description;
+            $command = $event->command ?? '';
+
+            $description = $event->description ?? '';
 
             if (! $this->output->isVerbose()) {
                 $command = str_replace([Application::phpBinary(), Application::artisanBinary()], [
                     'php',
                     preg_replace("#['\"]#", '', Application::artisanBinary()),
-                ], $event->command);
+                ], $command);
             }
 
             if ($event instanceof CallbackEvent) {
-                if (class_exists($event->description)) {
-                    $command = $event->description;
+                if (class_exists($description)) {
+                    $command = $description;
                     $description = '';
                 } else {
                     $command = 'Closure at: '.$this->getClosureLocation($event);
@@ -138,7 +139,7 @@ private function getCronExpressionSpacing($events)
     {
         $rows = $events->map(fn ($event) => array_map('mb_strlen', preg_split("/\s+/", $event->expression)));
 
-        return collect($rows[0] ?? [])->keys()->map(fn ($key) => $rows->max($key));
+        return collect($rows[0] ?? [])->keys()->map(fn ($key) => $rows->max($key))->all();
     }
 
     /**
@@ -164,7 +165,7 @@ private function sortEvents(\Illuminate\Support\Collection $events, DateTimeZone
      */
     private function getNextDueDateForEvent($event, DateTimeZone $timezone)
     {
-        return Carbon::create(
+        return Carbon::instance(
             (new CronExpression($event->expression))
                 ->getNextRunDate(Carbon::now()->setTimezone($event->timezone))
                 ->setTimezone($timezone)

src/Illuminate/Database/Eloquent/BroadcastableModelEventOccurred.php

@@ -46,6 +46,13 @@ class BroadcastableModelEventOccurred implements ShouldBroadcast
      */
     public $queue;
 
+    /**
+     * Indicates whether the job should be dispatched after all database transactions have committed.
+     *
+     * @var bool|null
+     */
+    public $afterCommit;
+
     /**
      * Create a new event instance.
      *

src/Illuminate/Database/Eloquent/Builder.php

@@ -1910,8 +1910,8 @@ public static function __callStatic($method, $parameters)
     protected static function registerMixin($mixin, $replace)
     {
         $methods = (new ReflectionClass($mixin))->getMethods(
-                ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
-            );
+            ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
+        );
 
         foreach ($methods as $method) {
             if ($replace || ! static::hasGlobalMacro($method->name)) {

src/Illuminate/Database/composer.json

@@ -36,7 +36,7 @@
     },
     "suggest": {
         "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
-        "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
+        "fakerphp/faker": "Required to use the eloquent factory builder (^1.21).",
         "illuminate/console": "Required to use the database commands (^10.0).",
         "illuminate/events": "Required to use the observers with Eloquent (^10.0).",
         "illuminate/filesystem": "Required to use the migrations (^10.0).",