Getting relation data for model accessor (LaravelCollective#474)

nge-no · Feb 5, 2018 · 137a2ef · 137a2ef
1 parent 32c27a5
commit 137a2ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Eloquent/FormAccessible.php b/src/Eloquent/FormAccessible.php
@@ -49,11 +49,11 @@ public function getFormValue($key)
  unset($keys[0]);
  $key = implode('.', $keys);
 
- if (method_exists($relatedModel, 'hasFormMutator') && $relatedModel->hasFormMutator($key)) {
+ if (method_exists($relatedModel, 'hasFormMutator') && $key !== '' && $relatedModel->hasFormMutator($key)) {
  return $relatedModel->getFormValue($key);
  }
 
- return data_get($relatedModel, $key);
+ return data_get($relatedModel, empty($key)? null: $key);
  }
 
  // No form mutator, let the model resolve this

diff --git a/tests/FormAccessibleTest.php b/tests/FormAccessibleTest.php
@@ -48,6 +48,9 @@ public function testItCanMutateValuesForForms()
 
  $this->assertEquals($model->getFormValue('string'), 'ponmlkjihgfedcba');
  $this->assertEquals($model->getFormValue('created_at'), $this->now->timestamp);
+
+ $this->assertEquals($user, $model->getFormValue('user'));
+ $this->assertEquals('Get name: Anton', $model->getFormValue('user')->name);
  $this->assertEquals('Get name for form: Anton', $model->getFormValue('user.name'));
  }
 
@@ -171,4 +174,9 @@ public function formNameAttribute($value)
  {
  return 'Get name for form: ' . $value;
  }
+
+ public function getNameAttribute($value)
+ {
+ return 'Get name: ' . $value;
+ }
 }