From 9ef14f691ed8544efdb0fa7ad50d260f25388c26 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 9 May 2025 09:37:29 -0500 Subject: [PATCH] Revert "Make Blueprint Resolver Statically (#55607)" This reverts commit ea9c4813bd278d9e172d46f73d295dfb9cd7d372. --- src/Illuminate/Database/Schema/Builder.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php index d70cb9314231..109932a27d12 100755 --- a/src/Illuminate/Database/Schema/Builder.php +++ b/src/Illuminate/Database/Schema/Builder.php @@ -9,9 +9,6 @@ use InvalidArgumentException; use LogicException; -/** - * @template TResolver of \Closure(string, \Closure, string): \Illuminate\Database\Schema\Blueprint - */ class Builder { use Macroable; @@ -33,9 +30,9 @@ class Builder /** * The Blueprint resolver callback. * - * @var TResolver|null + * @var \Closure */ - protected static $resolver = null; + protected $resolver; /** * The default string length for migrations. @@ -632,8 +629,8 @@ protected function createBlueprint($table, ?Closure $callback = null) { $connection = $this->connection; - if (static::$resolver !== null) { - return call_user_func(static::$resolver, $connection, $table, $callback); + if (isset($this->resolver)) { + return call_user_func($this->resolver, $connection, $table, $callback); } return Container::getInstance()->make(Blueprint::class, compact('connection', 'table', 'callback')); @@ -701,11 +698,11 @@ public function getConnection() /** * Set the Schema Blueprint resolver callback. * - * @param TResolver|null $resolver + * @param \Closure $resolver * @return void */ - public function blueprintResolver(?Closure $resolver) + public function blueprintResolver(Closure $resolver) { - static::$resolver = $resolver; + $this->resolver = $resolver; } }