[8.x] Enum casts accept backed values (laravel#39608)

* Enum casts accept backed values * styleci
s4muel · Nov 15, 2021 · 23912e7 · 23912e7
1 parent da7aa38
commit 23912e7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -930,7 +930,15 @@ function () {
      */
     protected function setEnumCastableAttribute($key, $value)
     {
-        $this->attributes[$key] = isset($value) ? $value->value : null;
+        $enumClass = $this->getCasts()[$key];
+
+        if (! isset($value)) {
+            $this->attributes[$key] = null;
+        } elseif ($value instanceof $enumClass) {
+            $this->attributes[$key] = $value->value;
+        } else {
+            $this->attributes[$key] = $enumClass::from($value)->value;
+        }
     }
 
     /**

diff --git a/tests/Integration/Database/EloquentModelEnumCastingTest.php b/tests/Integration/Database/EloquentModelEnumCastingTest.php
@@ -109,6 +109,21 @@ public function testEnumsAcceptNullOnSave()
         ], DB::table('enum_casts')->where('id', $model->id)->first());
     }
 
+    public function testEnumsAcceptBackedValueOnSave()
+    {
+        $model = new EloquentModelEnumCastingTestModel([
+            'string_status' => 'pending',
+            'integer_status' => 1,
+        ]);
+
+        $model->save();
+
+        $model = EloquentModelEnumCastingTestModel::first();
+
+        $this->assertEquals(StringStatus::pending, $model->string_status);
+        $this->assertEquals(IntegerStatus::pending, $model->integer_status);
+    }
+
     public function testFirstOrNew()
     {
         DB::table('enum_casts')->insert([