Merge branch '9.x'

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

Author: driesvints

src/Illuminate/Auth/Notifications/ResetPassword.php

@@ -18,14 +18,14 @@ class ResetPassword extends Notification
     /**
      * The callback that should be used to create the reset password URL.
      *
-     * @var \Closure|null
+     * @var (\Closure(mixed, string): string)|null
      */
     public static $createUrlCallback;
 
     /**
      * The callback that should be used to build the mail message.
      *
-     * @var \Closure|null
+     * @var (\Closure(mixed, string): \Illuminate\Notifications\Messages\MailMessage)|null
      */
     public static $toMailCallback;
 
@@ -103,7 +103,7 @@ protected function resetUrl($notifiable)
     /**
      * Set a callback that should be used when creating the reset password button URL.
      *
-     * @param  \Closure  $callback
+     * @param  \Closure(mixed, string): string  $callback
      * @return void
      */
     public static function createUrlUsing($callback)
@@ -114,7 +114,7 @@ public static function createUrlUsing($callback)
     /**
      * Set a callback that should be used when building the notification mail message.
      *
-     * @param  \Closure  $callback
+     * @param  \Closure(mixed, string): \Illuminate\Notifications\Messages\MailMessage  $callback
      * @return void
      */
     public static function toMailUsing($callback)

src/Illuminate/Bus/PendingBatch.php

@@ -57,12 +57,12 @@ public function __construct(Container $container, Collection $jobs)
     /**
      * Add jobs to the batch.
      *
-     * @param  iterable  $jobs
+     * @param  \Illuminate\Support\Enumerable|object|array  $jobs
      * @return $this
      */
     public function add($jobs)
     {
-        foreach ($jobs as $job) {
+        foreach (Arr::wrap($jobs) as $job) {
             $this->jobs->push($job);
         }
 

src/Illuminate/Collections/Arr.php

@@ -25,7 +25,7 @@ public static function accessible($value)
      * Add an element to an array using "dot" notation if it doesn't exist.
      *
      * @param  array  $array
-     * @param  string  $key
+     * @param  string|int|float  $key
      * @param  mixed  $value
      * @return array
      */
@@ -142,7 +142,7 @@ public static function undot($array)
      * Get all of the given array except for a specified array of keys.
      *
      * @param  array  $array
-     * @param  array|string  $keys
+     * @param  array|string|int|float  $keys
      * @return array
      */
     public static function except($array, $keys)
@@ -169,6 +169,10 @@ public static function exists($array, $key)
             return $array->offsetExists($key);
         }
 
+        if (is_float($key)) {
+            $key = (string) $key;
+        }
+
         return array_key_exists($key, $array);
     }
 
@@ -252,7 +256,7 @@ public static function flatten($array, $depth = INF)
      * Remove one or many array items from a given array using "dot" notation.
      *
      * @param  array  $array
-     * @param  array|string  $keys
+     * @param  array|string|int|float  $keys
      * @return void
      */
     public static function forget(&$array, $keys)
@@ -597,7 +601,7 @@ public static function random($array, $number = null, $preserveKeys = false)
      * If no key is given to the method, the entire array will be replaced.
      *
      * @param  array  $array
-     * @param  string|null  $key
+     * @param  string|int|null  $key
      * @param  mixed  $value
      * @return array
      */

src/Illuminate/Collections/Collection.php

@@ -583,7 +583,7 @@ public function hasAny($key)
      */
     public function implode($value, $glue = null)
     {
-        if (is_callable($value)) {
+        if ($this->useAsCallable($value)) {
             return implode($glue ?? '', $this->map($value)->all());
         }
 

src/Illuminate/Console/Scheduling/ScheduleListCommand.php

@@ -7,6 +7,8 @@
 use Illuminate\Console\Application;
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
+use ReflectionClass;
+use ReflectionFunction;
 use Symfony\Component\Console\Terminal;
 
 class ScheduleListCommand extends Command
@@ -50,6 +52,7 @@ public function handle(Schedule $schedule)
             $expression = $this->formatCronExpression($event->expression, $expressionSpacing);
 
             $command = $event->command;
+            $description = $event->description;
 
             if (! $this->output->isVerbose()) {
                 $command = str_replace(
@@ -59,6 +62,15 @@ public function handle(Schedule $schedule)
                 );
             }
 
+            if ($event instanceof CallbackEvent) {
+                if (class_exists($event->description)) {
+                    $command = $event->description;
+                    $description = '';
+                } else {
+                    $command = 'Closure at: '.$this->getClosureLocation($event);
+                }
+            }
+
             $command = mb_strlen($command) > 1 ? "{$command} " : '';
 
             $nextDueDateLabel = 'Next Due:';
@@ -89,11 +101,11 @@ public function handle(Schedule $schedule)
                 $hasMutex,
                 $nextDueDateLabel,
                 $nextDueDate
-            ), $this->output->isVerbose() && mb_strlen($event->description) > 1 ? sprintf(
+            ), $this->output->isVerbose() && mb_strlen($description) > 1 ? sprintf(
                 '  <fg=#6C7280>%s%s %s</>',
                 str_repeat(' ', mb_strlen($expression) + 2),
                 '⇁',
-                $event->description
+                $description
             ) : ''];
         });
 
@@ -135,6 +147,25 @@ private function formatCronExpression($expression, $spacing)
             ->implode(' ');
     }
 
+    /**
+     * Get the file and line number for the event closure.
+     *
+     * @param  \Illuminate\Console\Scheduling\CallbackEvent  $event
+     * @return string
+     */
+    private function getClosureLocation(CallbackEvent $event)
+    {
+        $function = new ReflectionFunction(tap((new ReflectionClass($event))->getProperty('callback'))
+                        ->setAccessible(true)
+                        ->getValue($event));
+
+        return sprintf(
+            '%s:%s',
+            str_replace($this->laravel->basePath().DIRECTORY_SEPARATOR, '', $function->getFileName() ?: ''),
+            $function->getStartLine()
+        );
+    }
+
     /**
      * Get the terminal width.
      *

src/Illuminate/Database/Connectors/ConnectionFactory.php

@@ -177,7 +177,7 @@ protected function createPdoResolver(array $config)
     protected function createPdoResolverWithHosts(array $config)
     {
         return function () use ($config) {
-            foreach (Arr::shuffle($hosts = $this->parseHosts($config)) as $key => $host) {
+            foreach (Arr::shuffle($this->parseHosts($config)) as $host) {
                 $config['host'] = $host;
 
                 try {
@@ -218,9 +218,7 @@ protected function parseHosts(array $config)
      */
     protected function createPdoResolverWithoutHosts(array $config)
     {
-        return function () use ($config) {
-            return $this->createConnector($config)->connect($config);
-        };
+        return fn () => $this->createConnector($config)->connect($config);
     }
 
     /**

src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Console\Seeds;
 
 use Illuminate\Console\GeneratorCommand;
+use Illuminate\Support\Str;
 
 class SeederMakeCommand extends GeneratorCommand
 {
@@ -77,21 +78,22 @@ protected function resolveStubPath($stub)
      */
     protected function getPath($name)
     {
+        $name = str_replace('\\', '/', Str::replaceFirst($this->rootNamespace(), '', $name));
+
         if (is_dir($this->laravel->databasePath().'/seeds')) {
             return $this->laravel->databasePath().'/seeds/'.$name.'.php';
-        } else {
-            return $this->laravel->databasePath().'/seeders/'.$name.'.php';
         }
+
+        return $this->laravel->databasePath().'/seeders/'.$name.'.php';
     }
 
     /**
-     * Parse the class name and format according to the root namespace.
+     * Get the root namespace for the class.
      *
-     * @param  string  $name
      * @return string
      */
-    protected function qualifyClass($name)
+    protected function rootNamespace()
     {
-        return $name;
+        return 'Database\Seeders\\';
     }
 }

src/Illuminate/Database/Console/Seeds/stubs/seeder.stub

@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Seeders;
+namespace {{ namespace }};
 
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;

src/Illuminate/Database/DatabaseTransactionsManager.php

@@ -44,10 +44,9 @@ public function begin($connection, $level)
      */
     public function rollback($connection, $level)
     {
-        $this->transactions = $this->transactions->reject(function ($transaction) use ($connection, $level) {
-            return $transaction->connection == $connection &&
-                   $transaction->level > $level;
-        })->values();
+        $this->transactions = $this->transactions->reject(
+            fn ($transaction) => $transaction->connection == $connection && $transaction->level > $level
+        )->values();
     }
 
     /**
@@ -59,9 +58,7 @@ public function rollback($connection, $level)
     public function commit($connection)
     {
         [$forThisConnection, $forOtherConnections] = $this->transactions->partition(
-            function ($transaction) use ($connection) {
-                return $transaction->connection == $connection;
-            }
+            fn ($transaction) => $transaction->connection == $connection
         );
 
         $this->transactions = $forOtherConnections->values();

src/Illuminate/Database/Eloquent/Builder.php

@@ -1246,7 +1246,7 @@ protected function callScope(callable $scope, array $parameters = [])
         $originalWhereCount = is_null($query->wheres)
                     ? 0 : count($query->wheres);
 
-        $result = $scope(...array_values($parameters)) ?? $this;
+        $result = $scope(...$parameters) ?? $this;
 
         if (count((array) $query->wheres) > $originalWhereCount) {
             $this->addNewWheresWithinGroup($query, $originalWhereCount);