Unset nested attributes in fillable override

Author: Dan Fletcher

src/Traits/HasNestedAttributesTrait.php

@@ -8,12 +8,11 @@
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Database\Eloquent\Builder;
 
 trait HasNestedAttributesTrait
 {
     /**
-     * Defined nested attributes 
+     * Defined nested attributes
      *
      * @var array
      */
@@ -53,12 +52,13 @@ public function fill(array $attributes)
             foreach ($this->nested as $attr) {
                 if (isset($attributes[$attr])) {
                     $this->acceptNestedAttributesFor[$attr] = $attributes[$attr];
+                    unset($attributes[$attr]);
                 }
             }
         }
         return parent::fill($attributes);
     }
-    
+
     /**
      * Save the model to the database.
      *
@@ -75,7 +75,7 @@ public function save(array $options = [])
 
         foreach ($this->getAcceptNestedAttributesFor() as $attribute => $stack) {
             $methodName = lcfirst(join(array_map('ucfirst', explode('_', $attribute))));
-    
+
             if (!method_exists($this, $methodName)) {
                 throw new Exception('The nested atribute relation "' . $methodName . '" does not exists.');
             }
@@ -86,7 +86,7 @@ public function save(array $options = [])
                 if (!$this->saveNestedAttributes($relation, $stack)) {
                     return false;
                 }
-            } else if ($relation instanceof HasMany || $relation instanceof MorphMany) {
+            } elseif ($relation instanceof HasMany || $relation instanceof MorphMany) {
                 foreach ($stack as $params) {
                     if (!$this->saveManyNestedAttributes($this->$methodName(), $params)) {
                         return false;
@@ -115,7 +115,7 @@ protected function saveNestedAttributes($relation, array $params)
                 return $model->delete();
             }
             return $model->update($stack);
-        } else if ($relation->create($stack)) {
+        } elseif ($relation->create($stack)) {
             return true;
         }
         return false;
@@ -135,9 +135,9 @@ protected function saveManyNestedAttributes($relation, array $params)
 
             if ($this->allowDestroyNestedAttributes($params)) {
                 return $model->delete();
-            }            
+            }
             return $model->update($params);
-        } else if ($relation->create($params)) {
+        } elseif ($relation->create($params)) {
             return true;
         }
         return false;
@@ -153,4 +153,4 @@ protected function allowDestroyNestedAttributes(array $params)
     {
         return isset($params[$this->destroyNestedKey]) && (bool) $params[$this->destroyNestedKey] == true;
     }
-}
+}