Merge branch '9.x'

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Support/composer.json
#	tests/Support/SupportTestingQueueFakeTest.php

Author: driesvints

README.md

@@ -26,6 +26,8 @@ Laravel is accessible, yet powerful, providing tools needed for large, robust ap
 
 Laravel has the most extensive and thorough documentation and video tutorial library of any modern web application framework. The [Laravel documentation](https://laravel.com/docs) is in-depth and complete, making it a breeze to get started learning the framework.
 
+You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch.
+
 If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials covering a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
 
 ## Contributing

composer.json

@@ -41,6 +41,7 @@
         "symfony/mime": "^6.2",
         "symfony/process": "^6.2",
         "symfony/routing": "^6.2",
+        "symfony/uid": "^6.2",
         "symfony/var-dumper": "^6.2",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2",
         "vlucas/phpdotenv": "^5.4.1",
@@ -88,6 +89,7 @@
         "guzzlehttp/guzzle": "^7.2",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-ftp": "^3.0",
+        "league/flysystem-path-prefixing": "^3.3",
         "league/flysystem-read-only": "^3.3",
         "league/flysystem-sftp-v3": "^3.0",
         "mockery/mockery": "^1.4.4",
@@ -152,6 +154,7 @@
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
         "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
+        "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
         "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
         "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
         "mockery/mockery": "Required to use mocking (^1.4.4).",

src/Illuminate/Bus/Batchable.php

@@ -2,7 +2,10 @@
 
 namespace Illuminate\Bus;
 
+use Carbon\CarbonImmutable;
 use Illuminate\Container\Container;
+use Illuminate\Support\Str;
+use Illuminate\Support\Testing\Fakes\BatchFake;
 
 trait Batchable
 {
@@ -13,13 +16,24 @@ trait Batchable
      */
     public $batchId;
 
+    /**
+     * The fake batch, if applicable.
+     *
+     * @var \Illuminate\Support\Testing\BatchFake
+     */
+    private $fakeBatch;
+
     /**
      * Get the batch instance for the job, if applicable.
      *
      * @return \Illuminate\Bus\Batch|null
      */
     public function batch()
     {
+        if ($this->fakeBatch) {
+            return $this->fakeBatch;
+        }
+
         if ($this->batchId) {
             return Container::getInstance()->make(BatchRepository::class)->find($this->batchId);
         }
@@ -49,4 +63,43 @@ public function withBatchId(string $batchId)
 
         return $this;
     }
+
+    /**
+     * Indicate that the job should use a fake batch.
+     *
+     * @param  string  $id
+     * @param  string  $name
+     * @param  int  $totalJobs
+     * @param  int  $pendingJobs
+     * @param  int  $failedJobs
+     * @param  array  $failedJobIds
+     * @param  array  $options
+     * @return array{0: $this, 1: \Illuminate\Support\Testing\BatchFake}
+     */
+    public function withFakeBatch(string $id = '',
+                                  string $name = '',
+                                  int $totalJobs = 0,
+                                  int $pendingJobs = 0,
+                                  int $failedJobs = 0,
+                                  array $failedJobIds = [],
+                                  array $options = [],
+                                  CarbonImmutable $createdAt = null,
+                                  ?CarbonImmutable $cancelledAt = null,
+                                  ?CarbonImmutable $finishedAt = null)
+    {
+        $this->fakeBatch = new BatchFake(
+            empty($id) ? (string) Str::uuid() : $id,
+            $name,
+            $totalJobs,
+            $pendingJobs,
+            $failedJobs,
+            $failedJobIds,
+            $options,
+            $createdAt ?? CarbonImmutable::now(),
+            $cancelledAt,
+            $finishedAt,
+        );
+
+        return [$this, $this->fakeBatch];
+    }
 }

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -1057,6 +1057,7 @@ protected function operatorForWhere($key, $operator = null, $value = null)
                 case '>=':  return $retrieved >= $value;
                 case '===': return $retrieved === $value;
                 case '!==': return $retrieved !== $value;
+                case '<=>': return $retrieved <=> $value;
             }
         };
     }

src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -546,7 +546,7 @@ public function timezone($timezone)
      */
     protected function spliceIntoPosition($position, $value)
     {
-        $segments = explode(' ', $this->expression);
+        $segments = preg_split("/\s+/", $this->expression);
 
         $segments[$position - 1] = $value;
 

src/Illuminate/Console/Scheduling/ScheduleListCommand.php

@@ -134,7 +134,7 @@ public function handle(Schedule $schedule)
      */
     private function getCronExpressionSpacing($events)
     {
-        $rows = $events->map(fn ($event) => array_map('mb_strlen', explode(' ', $event->expression)));
+        $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));
     }
@@ -148,7 +148,7 @@ private function getCronExpressionSpacing($events)
      */
     private function formatCronExpression($expression, $spacing)
     {
-        $expressions = explode(' ', $expression);
+        $expressions = preg_split("/\s+/", $expression);
 
         return collect($spacing)
             ->map(fn ($length, $index) => str_pad($expressions[$index], $length))

src/Illuminate/Contracts/View/ViewCompilationException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Illuminate\Contracts\View;
+
+use Exception;
+
+class ViewCompilationException extends Exception
+{
+    //
+}

src/Illuminate/Database/Connection.php

@@ -1134,15 +1134,15 @@ public function getDoctrineConnection()
     /**
      * Register a custom Doctrine mapping type.
      *
-     * @param  string  $class
+     * @param  Type|class-string<Type>  $class
      * @param  string  $name
      * @param  string  $type
      * @return void
      *
      * @throws \Doctrine\DBAL\DBALException
      * @throws \RuntimeException
      */
-    public function registerDoctrineType(string $class, string $name, string $type): void
+    public function registerDoctrineType(Type|string $class, string $name, string $type): void
     {
         if (! $this->isDoctrineAvailable()) {
             throw new RuntimeException(
@@ -1151,7 +1151,8 @@ public function registerDoctrineType(string $class, string $name, string $type):
         }
 
         if (! Type::hasType($name)) {
-            Type::addType($name, $class);
+            Type::getTypeRegistry()
+                ->register($name, is_string($class) ? new $class() : $class);
         }
 
         $this->doctrineTypeMappings[$name] = $type;

src/Illuminate/Database/Console/Migrations/MigrateCommand.php

@@ -9,6 +9,8 @@
 use Illuminate\Database\Migrations\Migrator;
 use Illuminate\Database\SQLiteDatabaseDoesNotExistException;
 use Illuminate\Database\SqlServerConnection;
+use PDOException;
+use Throwable;
 
 class MigrateCommand extends BaseCommand
 {
@@ -134,26 +136,88 @@ protected function prepareDatabase()
     protected function repositoryExists()
     {
         return retry(2, fn () => $this->migrator->repositoryExists(), 0, function ($e) {
-            if (! $e->getPrevious() instanceof SQLiteDatabaseDoesNotExistException) {
-                return false;
-            }
+            try {
+                if ($e->getPrevious() instanceof SQLiteDatabaseDoesNotExistException) {
+                    return $this->createMissingSqliteDatbase($e->getPrevious()->path);
+                }
 
-            if ($this->option('force')) {
-                return touch($e->getPrevious()->path);
-            }
+                $connection = $this->migrator->resolveConnection($this->option('database'));
 
-            if ($this->option('no-interaction')) {
+                if (
+                    $e->getPrevious() instanceof PDOException &&
+                    $e->getPrevious()->getCode() === 1049 &&
+                    $connection->getDriverName() === 'mysql') {
+                    return $this->createMissingMysqlDatabase($connection);
+                }
+
+                return false;
+            } catch (Throwable) {
                 return false;
             }
+        });
+    }
 
-            $this->components->warn('The SQLite database does not exist: '.$e->getPrevious()->path);
+    /**
+     * Create a missing SQLite database.
+     *
+     * @param  string  $path
+     * @return bool
+     */
+    protected function createMissingSqliteDatbase($path)
+    {
+        if ($this->option('force')) {
+            return touch($path);
+        }
+
+        if ($this->option('no-interaction')) {
+            return false;
+        }
+
+        $this->components->warn('The SQLite database does not exist: '.$path);
+
+        if (! $this->components->confirm('Would you like to create it?')) {
+            return false;
+        }
+
+        return touch($path);
+    }
+
+    /**
+     * Create a missing MySQL database.
+     *
+     * @return bool
+     */
+    protected function createMissingMysqlDatabase($connection)
+    {
+        if ($this->laravel['config']->get("database.connections.{$connection->getName()}.database") !== $connection->getDatabaseName()) {
+            return false;
+        }
+
+        if (! $this->option('force') && $this->option('no-interaction')) {
+            return false;
+        }
+
+        if (! $this->option('force') && ! $this->option('no-interaction')) {
+            $this->components->warn("The database '{$connection->getDatabaseName()}' does not exist on the '{$connection->getName()}' connection.");
 
             if (! $this->components->confirm('Would you like to create it?')) {
                 return false;
             }
+        }
 
-            return touch($e->getPrevious()->path);
-        });
+        try {
+            $this->laravel['config']->set("database.connections.{$connection->getName()}.database", null);
+
+            $this->laravel['db']->purge();
+
+            $freshConnection = $this->migrator->resolveConnection($this->option('database'));
+
+            return tap($freshConnection->unprepared("CREATE DATABASE IF NOT EXISTS {$connection->getDatabaseName()}"), function () {
+                $this->laravel['db']->purge();
+            });
+        } finally {
+            $this->laravel['config']->set("database.connections.{$connection->getName()}.database", $connection->getDatabaseName());
+        }
     }
 
     /**

src/Illuminate/Database/DetectsLostConnections.php

@@ -60,6 +60,7 @@ protected function causedByLostConnection(Throwable $e)
             'TCP Provider: Error code 0x274C',
             'SQLSTATE[HY000] [2002] No such file or directory',
             'SSL: Operation timed out',
+            'Reason: Server is in script upgrade mode. Only administrator can connect at this time.',
         ]);
     }
 }