Merge pull request #3 from DanJFletcher/master

Fix issues with composer parse error and mass assignment exception

Author: mits87

composer.json

@@ -17,12 +17,12 @@
     "require": {
         "php": ">=7.1",
         "illuminate/database": "^5.6",
-        "illuminate/support": "~5.6",
-        "mockery/mockery": "~1.0",
+        "illuminate/support": "~5.6"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0",
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3.0",
+        "mockery/mockery": "~1.0"
     },
     "autoload": {
         "psr-4": {

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;
     }
-}
+}

tests/HasNestedAttributesTraitTest.php

@@ -13,6 +13,19 @@ public function setUp()
         // Mock the Model that uses the custom traits
         $this->model = Mockery::mock('ModelEloquentStub');
         $this->model->makePartial();
+
+        // Mock the Model without fillable array set
+        $this->modelWithoutFillable = Mockery::mock('ModelEloquentStubWithoutFillable');
+        $this->modelWithoutFillable->makePartial();
+
+        // Default payload for Model
+        $this->payload = [
+            'model_bar'  => ['text' => 'bar'],
+            'model_foos' => [
+                ['text' => 'foo1'],
+                ['text' => 'foo2'],
+            ]
+        ];
     }
 
     /**
@@ -28,55 +41,72 @@ public function tearDown()
      */
     public function testFillable()
     {
-        $payload = [
-            'title'      => 'foo',
-            'not_exists' => [],
+        $this->model->fill(array_merge($this->payload, ['title' => 'foo', 'not_exists' => []]));
+
+        $this->assertEquals(['title' => 'foo'], $this->model->getAttributes());
+        $this->assertEquals([
             'model_bar'  => ['text' => 'bar'],
             'model_foos' => [
                 ['text' => 'foo1'],
-                ['text' => 'foo2'],
+                ['text' => 'foo2']
             ]
-        ];
+        ], $this->model->getAcceptNestedAttributesFor());
+    }
 
-        $this->model->fill($payload);
+    /**
+     * Test that a model with nested attributes can still save without fillable array.
+     */
+    public function testModelWithNestedAttributesCanSaveWithoutFillableArraySet()
+    {
+        $this->modelWithoutFillable->fill($this->payload);
 
-        $this->assertEquals(['title' => 'foo'], $this->model->getAttributes());
         $this->assertEquals([
             'model_bar'  => ['text' => 'bar'],
             'model_foos' => [
-                ['text' => 'foo1'], 
+                ['text' => 'foo1'],
                 ['text' => 'foo2']
             ]
-        ], $this->model->getAcceptNestedAttributesFor());
+        ], $this->modelWithoutFillable->getAcceptNestedAttributesFor());
     }
 }
 
-class ModelEloquentStub extends Model {
+class ModelEloquentStubWithoutFillable extends Model
+{
     protected $table    = 'stubs';
-    protected $fillable = ['title'];
     protected $nested   = ['model_bar', 'model_foos' ];
-    
-    public function modelBar() {
+
+    public function modelBar()
+    {
         return $this->hasOne(ModelBarStub::class);
     }
 
-    public function modelFoos() {
+    public function modelFoos()
+    {
         return $this->hasOne(ModelFooStub::class);
     }
 }
 
-class ModelBarStub extends Model {
+class ModelEloquentStub extends ModelEloquentStubWithoutFillable
+{
+    protected $fillable = ['title'];
+}
+
+class ModelBarStub extends Model
+{
     protected $fillable = ['text'];
-    
-    public function parent() {
+
+    public function parent()
+    {
         return $this->belongsTo(ModelEloquentStub::class);
     }
 }
 
-class ModelFooStub extends Model {
+class ModelFooStub extends Model
+{
     protected $fillable = ['text'];
 
-    public function parent() {
+    public function parent()
+    {
         return $this->belongsTo(ModelEloquentStub::class);
     }
-}
+}