Allow mass assigmnet with mutators when using guard

laravel · Sep 28, 2024 · e345471 · e345471
1 parent 0d78422
commit e345471
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php
@@ -214,6 +214,10 @@ public function isGuarded($key)
      */
     protected function isGuardableColumn($key)
     {
+        if ($this->hasSetMutator($key) || $this->hasAttributeSetMutator($key)) {
+            return true;
+        }
+
         if (! isset(static::$guardableColumns[get_class($this)])) {
             $columns = $this->getConnection()
                         ->getSchemaBuilder()
@@ -222,6 +226,7 @@ protected function isGuardableColumn($key)
             if (empty($columns)) {
                 return true;
             }
+
             static::$guardableColumns[get_class($this)] = $columns;
         }
 

diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -3143,6 +3143,32 @@ public function testModelToJsonSucceedsWithPriorErrors(): void
 
         $this->assertSame('{"name":"Mateus"}', $user->toJson(JSON_THROW_ON_ERROR));
     }
+
+    public function testFillableWithMutators()
+    {
+        $model = new EloquentModelWithMutators;
+        $model->fillable(['full_name', 'full_address']);
+        $model->fill(['id' => 1, 'full_name' => 'John Doe', 'full_address' => '123 Main Street, Anytown']);
+
+        $this->assertNull($model->id);
+        $this->assertSame('John', $model->first_name);
+        $this->assertSame('Doe', $model->last_name);
+        $this->assertSame('123 Main Street', $model->address_line_one);
+        $this->assertSame('Anytown', $model->address_line_two);
+    }
+
+    public function testGuardedWithMutators()
+    {
+        $model = new EloquentModelWithMutators;
+        $model->guard(['id']);
+        $model->fill(['id' => 1, 'full_name' => 'John Doe', 'full_address' => '123 Main Street, Anytown']);
+
+        $this->assertNull($model->id);
+        $this->assertSame('John', $model->first_name);
+        $this->assertSame('Doe', $model->last_name);
+        $this->assertSame('123 Main Street', $model->address_line_one);
+        $this->assertSame('Anytown', $model->address_line_two);
+    }
 }
 
 class EloquentTestObserverStub
@@ -3870,3 +3896,35 @@ protected function stepOut(): void
         }
     }
 }
+
+class EloquentModelWithMutators extends Model
+{
+    public $attributes = [
+        'first_name' => null,
+        'last_name' => null,
+        'address_line_one' => null,
+        'address_line_two' => null,
+    ];
+
+    protected function fullName(): Attribute
+    {
+        return Attribute::make(
+            set: function (string $fullName) {
+                [$firstName, $lastName] = explode(' ', $fullName);
+
+                return [
+                    'first_name' => $firstName,
+                    'last_name' => $lastName,
+                ];
+            }
+        );
+    }
+
+    public function setFullAddressAttribute($fullAddress)
+    {
+        [$addressLineOne, $addressLineTwo] = explode(', ', $fullAddress);
+
+        $this->attributes['address_line_one'] = $addressLineOne;
+        $this->attributes['address_line_two'] = $addressLineTwo;
+    }
+}