5.2.7

Author: laravelwebdev

composer.json

@@ -162,5 +162,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.2.6"
+  "version": "5.2.7"
 }

src/Console/asset-stubs/.gitignore

@@ -2,7 +2,6 @@
 /vendor
 /node_modules
 /auth.json
-package-lock.json
 composer.phar
 composer.lock
 phpunit.xml

src/Console/card-stubs/.gitignore

@@ -2,7 +2,6 @@
 /vendor
 /node_modules
 /auth.json
-package-lock.json
 composer.phar
 composer.lock
 phpunit.xml

src/Console/field-stubs/.gitignore

@@ -2,7 +2,6 @@
 /vendor
 /node_modules
 /auth.json
-package-lock.json
 composer.phar
 composer.lock
 phpunit.xml

src/Console/filter-stubs/.gitignore

@@ -2,7 +2,6 @@
 /vendor
 /node_modules
 /auth.json
-package-lock.json
 composer.phar
 composer.lock
 phpunit.xml

src/Console/resource-tool-stubs/.gitignore

@@ -2,7 +2,6 @@
 /vendor
 /node_modules
 /auth.json
-package-lock.json
 composer.phar
 composer.lock
 phpunit.xml

src/Console/tool-stubs/.gitignore

@@ -2,7 +2,6 @@
 /vendor
 /node_modules
 /auth.json
-package-lock.json
 composer.phar
 composer.lock
 phpunit.xml

src/Fields/MorphTo.php

@@ -305,22 +305,25 @@ public function fill(NovaRequest $request, object $model)
     {
         $instance = Nova::modelInstanceForKey($request->{$this->attribute.'_type'});
 
-        $morphType = $model->{$this->attribute}()->getMorphType();
+        $relationship = $model->{$this->attribute}();
 
-        $model->{$morphType} = ! is_null($instance)
-            ? $this->getMorphAliasForClass(get_class($instance))
-            : null;
+        $morphType = $relationship->getMorphType();
 
-        $foreignKey = $this->getRelationForeignKeyName($model->{$this->attribute}());
+        $model->setAttribute(
+            $morphType,
+            ! is_null($instance) ? $this->getMorphAliasForClass($instance::class) : null
+        );
+
+        $foreignKey = $this->getRelationForeignKeyName($relationship);
 
-        if ($model->isDirty([$morphType, $foreignKey])) {
-            $model->unsetRelation($this->attribute);
-        }
-        
         parent::fillInto($request, $model, $foreignKey);
 
-        if (is_null($model->{$this->attribute.'_type'})) {
-            $model->{$this->attribute.'_id'} = null;
+        if (is_null($model->getAttribute($morphType))) {
+            $model->setAttribute($foreignKey, null);
+        }
+
+        if ($model->isDirty([$morphType, $foreignKey])) {
+            $model->unsetRelation($this->attribute);
         }
     }