Sync Laravel updates: #58255 → #58336

src/broadcasting/src/BroadcastManager.php

@@ -217,8 +217,7 @@ public function queue(mixed $event): void
 
         if (is_null($queue)) {
             $queue = $this->getAttributeValue($event, QueueAttribute::class, 'queue')
-                ?? $this->resolveQueueFromQueueRoute($event)
-                ?? null;
+                ?? $this->resolveQueueFromQueueRoute($event);
         }
 
         $broadcastEvent = $event instanceof ShouldBeUnique
@@ -233,8 +232,7 @@ public function queue(mixed $event): void
             ->connection(
                 $event->connection
                     ?? $this->getAttributeValue($event, ConnectionAttribute::class, 'connection')
-                    ?? $this->resolveConnectionFromQueueRoute($event)
-                    ?? null
+                    ?? $this->resolveConnectionFromQueueRoute($event, $queue)
             )
             ->pushOn($queue, $broadcastEvent);
 
@@ -254,6 +252,14 @@ public function queue(mixed $event): void
             : $push();
     }
 
+    /**
+     * Get the container that owns the queue routes.
+     */
+    protected function queueRoutesContainer(): Container
+    {
+        return $this->app;
+    }
+
     /**
      * Determine if the broadcastable event must be unique and determine if we can acquire the necessary lock.
      */

src/bus/src/Dispatcher.php

@@ -287,6 +287,14 @@ public function dispatchAfterResponse(mixed $command, mixed $handler = null): vo
         }
     }
 
+    /**
+     * Get the container that owns the queue routes.
+     */
+    protected function queueRoutesContainer(): Container
+    {
+        return $this->container;
+    }
+
     /**
      * Set the pipes through which commands should be piped before dispatching.
      *

src/collections/src/LazyCollection.php

@@ -1225,6 +1225,8 @@ public function slice(int $offset, ?int $length = null): static
     }
 
     /**
+     * Split a collection into a certain number of groups.
+     *
      * @throws InvalidArgumentException
      */
     #[Override]

src/console/src/Concerns/InteractsWithIO.php

@@ -35,7 +35,7 @@ trait InteractsWithIO
     protected int $verbosity = OutputInterface::VERBOSITY_NORMAL;
 
     /**
-     * The mapping between human readable verbosity levels and Symfony's OutputInterface.
+     * The mapping between human-readable verbosity levels and Symfony's OutputInterface.
      */
     protected array $verbosityMap = [
         'v' => OutputInterface::VERBOSITY_VERBOSE,

src/console/src/Scheduling/ManagesAttributes.php

@@ -80,7 +80,7 @@ trait ManagesAttributes
     protected array $rejects = [];
 
     /**
-     * The human readable description of the event.
+     * The human-readable description of the event.
      */
     public ?string $description = null;
 

src/database/src/Concerns/ManagesTransactions.php

@@ -123,7 +123,7 @@ protected function handleTransactionException(Throwable $e, int $currentAttempt,
 
             $exception = new DeadlockException(
                 $e->getMessage(),
-                is_int($e->getCode()) ? $e->getCode() : 0,
+                $e->getCode(),
                 $e
             );
 

src/database/src/DatabaseServiceProvider.php

@@ -128,8 +128,8 @@ protected function registerConnectionServices(): void
             return $app->make('db')->connection();
         });
 
-        $this->app->singleton('db.schema', function () {
-            return new SchemaProxy;
+        $this->app->singleton('db.schema', function ($app) {
+            return new SchemaProxy($app);
         });
 
         $this->app->singleton('db.transactions', function () {

src/database/src/DeadlockException.php

@@ -5,7 +5,22 @@
 namespace Hypervel\Database;
 
 use PDOException;
+use Throwable;
 
 class DeadlockException extends PDOException
 {
+    /**
+     * Create a new deadlock exception instance.
+     */
+    public function __construct(string $message = '', int|string $code = 0, ?Throwable $previous = null)
+    {
+        parent::__construct($message, 0, $previous);
+
+        // Losing driver metadata makes nested concurrency failures unrecognizable to error detectors.
+        $this->code = $code;
+
+        if ($previous instanceof PDOException) {
+            $this->errorInfo = $previous->errorInfo;
+        }
+    }
 }

src/database/src/Eloquent/Casts/AsBinary.php

@@ -15,12 +15,17 @@ class AsBinary implements Castable
      * Get the caster class to use when casting from / to this cast target.
      *
      * @param array{string} $arguments
+     *
+     * @throws InvalidArgumentException
      */
     public static function castUsing(array $arguments): CastsAttributes
     {
         return new class($arguments) implements CastsAttributes {
             protected string $format;
 
+            /**
+             * Create a new binary cast instance.
+             */
             public function __construct(protected array $arguments)
             {
                 $this->format = $this->arguments[0]
@@ -35,6 +40,9 @@ public function __construct(protected array $arguments)
                 }
             }
 
+            /**
+             * Transform the attribute from the underlying model values.
+             */
             public function get(mixed $model, string $key, mixed $value, array $attributes): ?string
             {
                 $attribute = $attributes[$key] ?? null;
@@ -50,6 +58,9 @@ public function get(mixed $model, string $key, mixed $value, array $attributes):
                 return BinaryCodec::decode($attribute, $this->format);
             }
 
+            /**
+             * Transform the attribute to its underlying model values.
+             */
             public function set(mixed $model, string $key, mixed $value, array $attributes): array
             {
                 return [$key => BinaryCodec::encode($value, $this->format)];

src/database/src/Migrations/DatabaseMigrationRepository.php

@@ -26,6 +26,8 @@ public function __construct(
 
     /**
      * Get the completed migrations.
+     *
+     * @return string[]
      */
     public function getRan(): array
     {
@@ -37,6 +39,8 @@ public function getRan(): array
 
     /**
      * Get the list of migrations.
+     *
+     * @return object{id: int, migration: string, batch: int}[]
      */
     public function getMigrations(int $steps): array
     {
@@ -51,6 +55,8 @@ public function getMigrations(int $steps): array
 
     /**
      * Get the list of the migrations by batch number.
+     *
+     * @return object{id: int, migration: string, batch: int}[]
      */
     public function getMigrationsByBatch(int $batch): array
     {
@@ -63,6 +69,8 @@ public function getMigrationsByBatch(int $batch): array
 
     /**
      * Get the last migration batch.
+     *
+     * @return object{id: int, migration: string, batch: int}[]
      */
     public function getLast(): array
     {
@@ -73,6 +81,8 @@ public function getLast(): array
 
     /**
      * Get the completed migrations with their batch numbers.
+     *
+     * @return array<string, int>
      */
     public function getMigrationBatches(): array
     {
@@ -94,6 +104,8 @@ public function log(string $file, int $batch): void
 
     /**
      * Remove a migration from the log.
+     *
+     * @param object{id?: int, migration: string, batch?: int} $migration
      */
     public function delete(object $migration): void
     {

src/database/src/Migrations/MigrationCreator.php

@@ -19,6 +19,8 @@ class MigrationCreator
 
     /**
      * The registered post create hooks.
+     *
+     * @var (Closure(?string, string): void)[]
      */
     protected array $postCreate = [];
 
@@ -169,6 +171,11 @@ protected function firePostCreateHooks(?string $table, string $path): void
 
     /**
      * Register a post migration create hook.
+     *
+     * Boot-only. Hooks persist on the migration creator for the worker
+     * lifetime and run for every subsequent migration creation.
+     *
+     * @param Closure(?string, string): void $callback
      */
     public function afterCreate(Closure $callback): void
     {

src/database/src/Migrations/MigrationRepositoryInterface.php

@@ -8,26 +8,36 @@ interface MigrationRepositoryInterface
 {
     /**
      * Get the completed migrations.
+     *
+     * @return string[]
      */
     public function getRan(): array;
 
     /**
      * Get the list of migrations.
+     *
+     * @return object{id: int, migration: string, batch: int}[]
      */
     public function getMigrations(int $steps): array;
 
     /**
      * Get the list of the migrations by batch.
+     *
+     * @return object{id: int, migration: string, batch: int}[]
      */
     public function getMigrationsByBatch(int $batch): array;
 
     /**
      * Get the last migration batch.
+     *
+     * @return object{id: int, migration: string, batch: int}[]
      */
     public function getLast(): array;
 
     /**
      * Get the completed migrations with their batch numbers.
+     *
+     * @return array<string, int>
      */
     public function getMigrationBatches(): array;
 
@@ -38,6 +48,8 @@ public function log(string $file, int $batch): void;
 
     /**
      * Remove a migration from the log.
+     *
+     * @param object{id?: int, migration: string, batch?: int} $migration
      */
     public function delete(object $migration): void;
 

src/database/src/Migrations/Migrator.php

@@ -35,6 +35,8 @@ class Migrator
 {
     /**
      * The custom connection resolver callback.
+     *
+     * @var null|(Closure(Resolver, ?string): Connection)
      */
     protected static ?Closure $connectionResolverCallback = null;
 
@@ -263,6 +265,7 @@ public function rollback(array|string $paths = [], array $options = []): array
      * Get the migrations for a rollback operation.
      *
      * @param array<string, mixed> $options
+     * @return object{id: int, migration: string, batch: int}[]
      */
     protected function getMigrationsForRollback(array $options): array
     {
@@ -799,6 +802,8 @@ public function resolveConnection(?string $connection): Connection
      *
      * Boot-only. The callback persists in a static property for the worker
      * lifetime and runs on every migration's connection resolution.
+     *
+     * @param Closure(Resolver, ?string): Connection $callback
      */
     public static function resolveConnectionsUsing(Closure $callback): void
     {

src/database/src/PdoConnection.php

@@ -352,7 +352,8 @@ public function getPdo(): PDO
         $this->latestReadWriteTypeRetrieved = 'write';
         $pdo = $this->resolvePdo();
 
-        return static::$sessionConfigurators === []
+        // Transaction and cleanup failures can invalidate a PDO even without session configurators.
+        return static::$sessionConfigurators === [] && ! static::sessionStateIsUnknown($pdo)
             ? $pdo
             : $this->synchronizeSession($pdo, read: false);
     }
@@ -376,7 +377,7 @@ public function getReadPdo(): PDO
 
         $pdo = $this->resolveReadPdo();
 
-        return static::$sessionConfigurators === []
+        return static::$sessionConfigurators === [] && ! static::sessionStateIsUnknown($pdo)
             ? $pdo
             : $this->synchronizeSession($pdo, read: true);
     }