[12.x] Handle Enum::cases() for enum column type (#56565)

iamgergo · web-flow · commit b11b3c71b5d7 · 2025-08-06T10:04:44.000-05:00
* [12.x] Handle Enum::cases() for enum column type

* cleanup tests

* import function
diff --git a/src/Illuminate/Database/Schema/Blueprint.php b/src/Illuminate/Database/Schema/Blueprint.php
@@ -13,6 +13,8 @@
 use Illuminate\Support\Fluent;
 use Illuminate\Support\Traits\Macroable;
 
+use function Illuminate\Support\enum_value;
+
 class Blueprint
 {
     use Macroable;
@@ -1102,6 +1104,8 @@ public function boolean($column)
      */
     public function enum($column, array $allowed)
     {
+        $allowed = array_map(fn ($value) => enum_value($value), $allowed);
+
         return $this->addColumn('enum', $column, compact('allowed'));
     }
 
diff --git a/tests/Database/DatabaseMariaDbSchemaGrammarTest.php b/tests/Database/DatabaseMariaDbSchemaGrammarTest.php
@@ -835,10 +835,12 @@ public function testAddingEnum()
     {
         $blueprint = new Blueprint($this->getConnection(), 'users');
         $blueprint->enum('role', ['member', 'admin']);
+        $blueprint->enum('status', Foo::cases());
         $statements = $blueprint->toSql();
 
-        $this->assertCount(1, $statements);
+        $this->assertCount(2, $statements);
         $this->assertSame('alter table `users` add `role` enum(\'member\', \'admin\') not null', $statements[0]);
+        $this->assertSame('alter table `users` add `status` enum(\'bar\') not null', $statements[1]);
     }
 
     public function testAddingSet()
diff --git a/tests/Database/DatabaseMySqlSchemaGrammarTest.php b/tests/Database/DatabaseMySqlSchemaGrammarTest.php
@@ -834,10 +834,12 @@ public function testAddingEnum()
     {
         $blueprint = new Blueprint($this->getConnection(), 'users');
         $blueprint->enum('role', ['member', 'admin']);
+        $blueprint->enum('status', Foo::cases());
         $statements = $blueprint->toSql();
 
-        $this->assertCount(1, $statements);
+        $this->assertCount(2, $statements);
         $this->assertSame('alter table `users` add `role` enum(\'member\', \'admin\') not null', $statements[0]);
+        $this->assertSame('alter table `users` add `status` enum(\'bar\') not null', $statements[1]);
     }
 
     public function testAddingSet()
diff --git a/tests/Database/DatabasePostgresSchemaGrammarTest.php b/tests/Database/DatabasePostgresSchemaGrammarTest.php
@@ -9,6 +9,7 @@
 use Illuminate\Database\Schema\ForeignIdColumnDefinition;
 use Illuminate\Database\Schema\Grammars\PostgresGrammar;
 use Illuminate\Database\Schema\PostgresBuilder;
+use Illuminate\Tests\Database\Fixtures\Enums\Foo;
 use Mockery as m;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\TestWith;
@@ -718,10 +719,12 @@ public function testAddingEnum()
     {
         $blueprint = new Blueprint($this->getConnection(), 'users');
         $blueprint->enum('role', ['member', 'admin']);
+        $blueprint->enum('status', Foo::cases());
         $statements = $blueprint->toSql();
 
-        $this->assertCount(1, $statements);
+        $this->assertCount(2, $statements);
         $this->assertSame('alter table "users" add column "role" varchar(255) check ("role" in (\'member\', \'admin\')) not null', $statements[0]);
+        $this->assertSame('alter table "users" add column "status" varchar(255) check ("status" in (\'bar\')) not null', $statements[1]);
     }
 
     public function testAddingDate()
diff --git a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php
@@ -10,6 +10,7 @@
 use Illuminate\Database\Schema\ForeignIdColumnDefinition;
 use Illuminate\Database\Schema\Grammars\SQLiteGrammar;
 use Illuminate\Database\Schema\SQLiteBuilder;
+use Illuminate\Tests\Database\Fixtures\Enums\Foo;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -566,10 +567,12 @@ public function testAddingEnum()
     {
         $blueprint = new Blueprint($this->getConnection(), 'users');
         $blueprint->enum('role', ['member', 'admin']);
+        $blueprint->enum('status', Foo::cases());
         $statements = $blueprint->toSql();
 
-        $this->assertCount(1, $statements);
+        $this->assertCount(2, $statements);
         $this->assertSame('alter table "users" add column "role" varchar check ("role" in (\'member\', \'admin\')) not null', $statements[0]);
+        $this->assertSame('alter table "users" add column "status" varchar check ("status" in (\'bar\')) not null', $statements[1]);
     }
 
     public function testAddingJson()
diff --git a/tests/Database/DatabaseSqlServerSchemaGrammarTest.php b/tests/Database/DatabaseSqlServerSchemaGrammarTest.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Schema\ForeignIdColumnDefinition;
 use Illuminate\Database\Schema\Grammars\SqlServerGrammar;
 use Illuminate\Database\Schema\SqlServerBuilder;
+use Illuminate\Tests\Database\Fixtures\Enums\Foo;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
@@ -578,10 +579,12 @@ public function testAddingEnum()
     {
         $blueprint = new Blueprint($this->getConnection(), 'users');
         $blueprint->enum('role', ['member', 'admin']);
+        $blueprint->enum('status', Foo::cases());
         $statements = $blueprint->toSql();
 
-        $this->assertCount(1, $statements);
+        $this->assertCount(2, $statements);
         $this->assertSame('alter table "users" add "role" nvarchar(255) check ("role" in (N\'member\', N\'admin\')) not null', $statements[0]);
+        $this->assertSame('alter table "users" add "status" nvarchar(255) check ("status" in (N\'bar\')) not null', $statements[1]);
     }
 
     public function testAddingJson()

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`use Illuminate\Support\Fluent;`
`14`	`14`	`use Illuminate\Support\Traits\Macroable;`
`15`	`15`
	`16`	`+use function Illuminate\Support\enum_value;`
	`17`	`+`
`16`	`18`	`class Blueprint`
`17`	`19`	`{`
`18`	`20`	`use Macroable;`
`@@ -1102,6 +1104,8 @@ public function boolean($column)`
`1102`	`1104`	`*/`
`1103`	`1105`	`public function enum($column, array $allowed)`
`1104`	`1106`	`{`
	`1107`	`+ $allowed = array_map(fn ($value) => enum_value($value), $allowed);`
	`1108`	`+`
`1105`	`1109`	`return $this->addColumn('enum', $column, compact('allowed'));`
`1106`	`1110`	`}`
`1107`	`1111`
Original file line number	Diff line number	Diff line change
`@@ -835,10 +835,12 @@ public function testAddingEnum()`
`835`	`835`	`{`
`836`	`836`	`$blueprint = new Blueprint($this->getConnection(), 'users');`
`837`	`837`	`$blueprint->enum('role', ['member', 'admin']);`
	`838`	`+ $blueprint->enum('status', Foo::cases());`
`838`	`839`	`$statements = $blueprint->toSql();`
`839`	`840`
`840`		`- $this->assertCount(1, $statements);`
	`841`	`+ $this->assertCount(2, $statements);`
`841`	`842`	$this->assertSame('alter table `users` add `role` enum(\'member\', \'admin\') not null', $statements[0]);
	`843`	+ $this->assertSame('alter table `users` add `status` enum(\'bar\') not null', $statements[1]);
`842`	`844`	`}`
`843`	`845`
`844`	`846`	`public function testAddingSet()`
Original file line number	Diff line number	Diff line change
`@@ -834,10 +834,12 @@ public function testAddingEnum()`
`834`	`834`	`{`
`835`	`835`	`$blueprint = new Blueprint($this->getConnection(), 'users');`
`836`	`836`	`$blueprint->enum('role', ['member', 'admin']);`
	`837`	`+ $blueprint->enum('status', Foo::cases());`
`837`	`838`	`$statements = $blueprint->toSql();`
`838`	`839`
`839`		`- $this->assertCount(1, $statements);`
	`840`	`+ $this->assertCount(2, $statements);`
`840`	`841`	$this->assertSame('alter table `users` add `role` enum(\'member\', \'admin\') not null', $statements[0]);
	`842`	+ $this->assertSame('alter table `users` add `status` enum(\'bar\') not null', $statements[1]);
`841`	`843`	`}`
`842`	`844`
`843`	`845`	`public function testAddingSet()`