Fixes issue where the entity field was not set to the model value (#599)

Co-authored-by: Sander Muller <[email protected]>

Author: SanderMuller

src/Kris/LaravelFormBuilder/Fields/FormField.php

@@ -142,7 +142,12 @@ protected function setupValue()
         }
 
         if (($value === null || $value instanceof \Closure) && !$isChild) {
-            $attributeName = $this->getOption('property', $this->name);
+            if ($this instanceof EntityType) {
+                $attributeName = $this->name;
+            } else {
+                $attributeName = $this->getOption('property', $this->name);
+            }
+
             $this->setValue($this->getModelValueAttribute($this->parent->getModel(), $attributeName));
         } elseif (!$isChild) {
             $this->hasDefault = true;

tests/FormTest.php

@@ -794,6 +794,26 @@ public function it_can_use_model_property_to_set_value()
         $this->assertEquals($form->alias_accessor->getValue(), $this->model->accessor);
     }
 
+    /** @test */
+    public function it_sets_entity_field_value_to_the_entity_model_value()
+    {
+        $dummyModel = new DummyModel();
+        $dummyModel->id = 1;
+
+        $this->model->dummy_model_id = $dummyModel->id;
+
+        $form = $this->formBuilder
+            ->plain([
+                'model' => $this->model,
+            ])
+            ->add('dummy_model_id', 'entity', [
+                'class' => DummyModel::class,
+                'property' => 'name',
+            ]);
+
+        $this->assertEquals($form->dummy_model_id->getValue(), $this->model->dummy_model_id);
+    }
+
     /** @test */
     public function it_reads_configuration_properly()
     {