Merge pull request #598 from SanderMuller/allow-use-of-property-option-to-resolve-value

Allow use of the property option to resolve value

Author: rudiedirkx

src/Kris/LaravelFormBuilder/Fields/FormField.php

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

tests/FormBuilderTestCase.php

@@ -11,6 +11,11 @@
 
 class TestModel extends Model {
     protected $fillable = ['m', 'f'];
+
+    public function getAccessorAttribute($value)
+    {
+        return 'accessor value';
+    }
 }
 
 abstract class FormBuilderTestCase extends TestCase {

tests/FormTest.php

@@ -716,11 +716,12 @@ public function it_renders_rest_of_the_form_until_specified_field()
     /** @test */
     public function it_can_add_child_form_as_field()
     {
-        $form = $this->formBuilder->plain();
+        $model = ['song' => ['body' => 'test body'], 'title' => 'main title'];
+        $form = $this->formBuilder->plain([
+            'model' => $model,
+        ]);
         $customForm = $this->formBuilder->create('CustomDummyForm');
         $customForm->add('img', 'file')->add('name', 'text', ['label_show' => false]);
-        $model = ['song' => ['body' => 'test body'], 'title' => 'main title'];
-        $form->setModel($model);
 
         $form
             ->add('title', 'text', [
@@ -779,6 +780,20 @@ public function it_can_add_child_form_as_field()
         $this->fail('No exception on bad method call on child form.');
     }
 
+    /** @test */
+    public function it_can_use_model_property_to_set_value()
+    {
+        $form = $this->formBuilder->plain([
+            'model' => $this->model,
+        ]);
+
+        $form->add('alias_accessor', 'choice', [
+            'property' => 'accessor',
+        ]);
+
+        $this->assertEquals($form->alias_accessor->getValue(), $this->model->accessor);
+    }
+
     /** @test */
     public function it_reads_configuration_properly()
     {
@@ -820,10 +835,11 @@ public function it_works_when_setModel_method_is_called()
     /** @test */
     public function it_removes_children_from_parent_type_fields()
     {
-        $form = $this->formBuilder->plain();
-        $customForm = $this->formBuilder->create('CustomDummyForm');
         $model = ['song' => ['title' => 'test song title', 'body' => 'test body'], 'title' => 'main title'];
-        $form->setModel($model);
+        $form = $this->formBuilder->plain([
+            'model' => $model,
+        ]);
+        $customForm = $this->formBuilder->create('CustomDummyForm');
 
         $form
             ->add('title', 'text')