Added support prepare values of attributes with same name as the relation. Added comments, removed unused code.

Author: execut

src/components/BaseColumn.php

@@ -255,11 +255,6 @@ protected function prepareValue($contextParams = [])
         return $value;
     }
 
-    protected function isEmpty($value)
-    {
-        return $value === null || $value === [] || $value === '';
-    }
-
     /**
      * Returns element id.
      *

src/components/ValuePreparer.php

@@ -1,9 +1,9 @@
 <?php
+
 /**
- * Created by PhpStorm.
- * User: execut
- * Date: 12/3/19
- * Time: 11:37 AM
+ * @link https://github.com/unclead/yii2-multiple-input
+ * @copyright Copyright (c) 2014 unclead
+ * @license https://github.com/unclead/yii2-multiple-input/blob/master/LICENSE.md
  */
 
 namespace unclead\multipleinput\components;
@@ -13,28 +13,52 @@
 use yii\db\ActiveRecordInterface;
 use yii\helpers\ArrayHelper;
 
+/**
+ * Class ValuePreparer.
+ *
+ * @package unclead\multipleinput\components
+ */
 class ValuePreparer
 {
-    protected $model = null;
+    /**
+     * @var string Key of prepared attribute
+     */
     protected $name = null;
+
+    /**
+     * @var mixed default value
+     */
     protected $defaultValue = null;
+
+    /**
+     * ValuePreparer constructor.
+     * @param string|null $name
+     * @param mixed|null $defaultValue
+     */
     public function __construct($name = null, $defaultValue = null)
     {
         $this->name = $name;
         $this->defaultValue = $defaultValue;
     }
 
-    public function prepare($data, $contextParams = [])
+    /**
+     * @param $data Prepared data
+     *
+     * @return int|mixed|null|string
+     */
+    public function prepare($data)
     {
         $value = null;
         if ($data instanceof ActiveRecordInterface) {
-            $relation = $data->getRelation($this->name, false);
-            if ($relation !== null) {
-                $value = $relation->findFor($this->name, $data);
-            } else if ($data->hasAttribute($this->name)) {
-                $value = $data->getAttribute($this->name);
-            } else {
+            if ($data->canGetProperty($this->name)) {
                 $value = $data->{$this->name};
+            } else {
+                $relation = $data->getRelation($this->name, false);
+                if ($relation !== null) {
+                    $value = $relation->findFor($this->name, $data);
+                } else {
+                    $value = $data->{$this->name};
+                }
             }
         } else if ($data instanceof Model) {
             $value = $data->{$this->name};

tests/unit/components/ValuePreparerTest.php

@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: execut
- * Date: 12/3/19
- * Time: 11:25 AM
- */
-
 namespace unclead\multipleinput\tests\unit\components;
+
 use unclead\multipleinput\components\ValuePreparer;
 use unclead\multipleinput\tests\unit\data\TestActiveRecord;
 use unclead\multipleinput\tests\unit\data\TestActiveRecordRelated;
@@ -79,12 +73,12 @@ public function testPrepareActiveRecordRelation() {
         $this->assertEquals($relatedModel, $result);
     }
 
-    public function testPrepareActiveRecordDatabaseAttribute() {
+    public function testPrepareActiveRecordRelationWithSameAsAttributeName() {
         $model = new TestActiveRecord();
-        $exprectedValue = 'test';
-        $model->setDatabaseAttribute($exprectedValue);
+        $relatedModel = new TestActiveRecordRelated();
+        $model->testRelation = $relatedModel;
 
-        $preparer = new ValuePreparer('databaseAttribute');
-        $this->assertEquals($exprectedValue, $preparer->prepare($model));
+        $preparer = new ValuePreparer( 'testRelation');
+        $this->assertEquals($relatedModel, $preparer->prepare($model));
     }
 }

tests/unit/data/TestActiveRecord.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: execut
- * Date: 12/3/19
- * Time: 1:14 PM
- */
-
 namespace unclead\multipleinput\tests\unit\data;
 
 
@@ -17,6 +10,7 @@ class TestActiveRecord extends ActiveRecord
      * @var string
      */
     public $email;
+    public $testRelation = null;
 
     public function rules()
     {
@@ -36,20 +30,19 @@ public function getTestHasOneRelation() {}
 
     public function attributes()
     {
-        return ['databaseAttribute']; // TODO: Change the autogenerated stub
-    }
-
-    protected $_databaseAttribute = null;
-    public function setDatabaseAttribute($value) {
-        $this->_databaseAttribute = $value;
+        return ['testRelation']; // TODO: Change the autogenerated stub
     }
 
     public function getAttribute($name)
     {
-        if ($name === 'databaseAttribute') {
-            return $this->_databaseAttribute;
+        if ($name === 'testRelation') {
+            return $this->testRelation;
         }
 
         return parent::getAttribute($name);
     }
+
+    public function getTestRelation() {
+        return $this->hasOne(TestActiveRecordRelated::class, []);
+    }
 }