Merge branch '9.x'

# Conflicts:
#	CHANGELOG.md
#	src/Illuminate/Foundation/Application.php

Author: driesvints

src/Illuminate/Auth/SessionGuard.php

@@ -401,7 +401,7 @@ public function attempt(array $credentials = [], $remember = false)
      * Attempt to authenticate a user with credentials and additional callbacks.
      *
      * @param  array  $credentials
-     * @param  array|callable  $callbacks
+     * @param  array|callable|null  $callbacks
      * @param  bool  $remember
      * @return bool
      */

src/Illuminate/Bus/Batchable.php

@@ -74,6 +74,9 @@ public function withBatchId(string $batchId)
      * @param  int  $failedJobs
      * @param  array  $failedJobIds
      * @param  array  $options
+     * @param  \Carbon\CarbonImmutable  $createdAt
+     * @param  \Carbon\CarbonImmutable|null  $cancelledAt
+     * @param  \Carbon\CarbonImmutable|null  $finishedAt
      * @return array{0: $this, 1: \Illuminate\Support\Testing\BatchFake}
      */
     public function withFakeBatch(string $id = '',

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -780,7 +780,7 @@ public function reduceWithKeys(callable $callback, $initial = null)
     /**
      * Create a collection of all elements that do not pass a given truth test.
      *
-     * @param  (callable(TValue, TKey): bool)|bool  $callback
+     * @param  (callable(TValue, TKey): bool)|bool|TValue  $callback
      * @return static
      */
     public function reject($callback = true)

src/Illuminate/Collections/helpers.php

@@ -180,6 +180,7 @@ function last($array)
      * Return the default value of the given value.
      *
      * @param  mixed  $value
+     * @param  mixed  $args
      * @return mixed
      */
     function value($value, ...$args)

src/Illuminate/Console/Command.php

@@ -79,7 +79,11 @@ public function __construct()
         // Once we have constructed the command, we'll set the description and other
         // related properties of the command. If a signature wasn't used to build
         // the command we'll set the arguments and the options on this command.
-        $this->setDescription((string) $this->description);
+        if (! isset($this->description)) {
+            $this->setDescription((string) static::getDefaultDescription());
+        } else {
+            $this->setDescription((string) $this->description);
+        }
 
         $this->setHelp((string) $this->help);
 

src/Illuminate/Console/Scheduling/Event.php

@@ -149,6 +149,13 @@ class Event
      */
     public $mutex;
 
+    /**
+     * The mutex name resolver callback.
+     *
+     * @var \Closure|null
+     */
+    public $mutexNameResolver;
+
     /**
      * The exit status code of the command.
      *
@@ -935,9 +942,28 @@ public function preventOverlapsUsing(EventMutex $mutex)
      */
     public function mutexName()
     {
+        $mutexNameResolver = $this->mutexNameResolver;
+
+        if (! is_null($mutexNameResolver) && is_callable($mutexNameResolver)) {
+            return $mutexNameResolver($this);
+        }
+
         return 'framework'.DIRECTORY_SEPARATOR.'schedule-'.sha1($this->expression.$this->command);
     }
 
+    /**
+     * Set the mutex name or name resolver callback.
+     *
+     * @param  \Closure|string  $mutexName
+     * @return $this
+     */
+    public function createMutexNameUsing(Closure|string $mutexName)
+    {
+        $this->mutexNameResolver = is_string($mutexName) ? fn () => $mutexName : $mutexName;
+
+        return $this;
+    }
+
     /**
      * Delete the mutex for the event.
      *

src/Illuminate/Console/Scheduling/ScheduleWorkCommand.php

@@ -33,7 +33,7 @@ public function handle()
     {
         $this->components->info('Running schedule tasks every minute.');
 
-        [$lastExecutionStartedAt, $keyOfLastExecutionWithOutput, $executions] = [null, null, []];
+        [$lastExecutionStartedAt, $executions] = [null, []];
 
         while (true) {
             usleep(100 * 1000);

src/Illuminate/Database/Concerns/CompilesJsonPaths.php

@@ -35,7 +35,7 @@ protected function wrapJsonPath($value, $delimiter = '->')
         $value = preg_replace("/([\\\\]+)?\\'/", "''", $value);
 
         $jsonPath = collect(explode($delimiter, $value))
-            ->map(fn ($segment) =>  $this->wrapJsonPathSegment($segment))
+            ->map(fn ($segment) => $this->wrapJsonPathSegment($segment))
             ->join('.');
 
         return "'$".(str_starts_with($jsonPath, '[') ? '' : '.').$jsonPath."'";

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -532,7 +532,7 @@ public function isRelation($key)
         }
 
         return method_exists($this, $key) ||
-            (static::$relationResolvers[get_class($this)][$key] ?? null);
+               $this->relationResolver(static::class, $key);
     }
 
     /**

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -54,6 +54,26 @@ trait HasRelationships
      */
     protected static $relationResolvers = [];
 
+    /**
+     * Get the dynamic relation resolver if defined or inherited, or return null.
+     *
+     * @param  string  $class
+     * @param  string  $key
+     * @return mixed
+     */
+    public function relationResolver($class, $key)
+    {
+        if ($resolver = static::$relationResolvers[$class][$key] ?? null) {
+            return $resolver;
+        }
+
+        if ($parent = get_parent_class($class)) {
+            return $this->relationResolver($parent, $key);
+        }
+
+        return null;
+    }
+
     /**
      * Define a dynamic relation resolver.
      *