fixed behavior on collection update

Author: Indigerd

src/model/ActiveRecord.php

@@ -4,13 +4,26 @@
 
 use yii\helpers\ArrayHelper;
 use yii\db\ActiveRecord as BaseModel;
+use indigerd\embedded\behavior\HydrateCollectionBehavior;
 
 class ActiveRecord extends BaseModel
 {
     public function setAttributes($values, $safeOnly = true)
     {
         $this->trigger(Model::EVENT_BEFORE_POPULATE);
-        $oldValues = $this->getAttributes(\array_keys($values));
+        $keys = [];
+        foreach ($values as $key => $value) {
+            if ($this->hasAttribute($key)) {
+                $keys[] = $key;
+            }
+        }
+        $oldValues = $this->getAttributes($keys);
+        $behaviors = $this->getBehaviors();
+        foreach ($behaviors as $behavior) {
+            if ($behavior instanceof HydrateCollectionBehavior and isset($values[$behavior->attribute])) {
+                unset($oldValues[$behavior->attribute]);
+            }
+        }
         $values = ArrayHelper::merge($oldValues, $values);
         parent::setAttributes($values, $safeOnly);
         $this->trigger(Model::EVENT_AFTER_POPULATE);

src/model/Model.php

@@ -4,6 +4,7 @@
 
 use yii\helpers\ArrayHelper;
 use yii\base\Model as BaseModel;
+use indigerd\embedded\behavior\HydrateCollectionBehavior;
 
 class Model extends BaseModel
 {
@@ -12,10 +13,23 @@ class Model extends BaseModel
 
     public function setAttributes($values, $safeOnly = true)
     {
-        $this->trigger(self::EVENT_BEFORE_POPULATE);
-        $oldValues = $this->getAttributes(\array_keys($values));
+        $this->trigger(Model::EVENT_BEFORE_POPULATE);
+        $keys = [];
+        $reflection = new \ReflectionClass($this);
+        foreach ($values as $key => $value) {
+            if ($reflection->hasProperty($key)) {
+                $keys[] = $key;
+            }
+        }
+        $oldValues = $this->getAttributes($keys);
+        $behaviors = $this->getBehaviors();
+        foreach ($behaviors as $behavior) {
+            if ($behavior instanceof HydrateCollectionBehavior and isset($values[$behavior->attribute])) {
+                unset($oldValues[$behavior->attribute]);
+            }
+        }
         $values = ArrayHelper::merge($oldValues, $values);
         parent::setAttributes($values, $safeOnly);
-        $this->trigger(self::EVENT_AFTER_POPULATE);
+        $this->trigger(Model::EVENT_AFTER_POPULATE);
     }
 }

src/model/mongodb/ActiveRecord.php

@@ -5,13 +5,26 @@
 use yii\helpers\ArrayHelper;
 use yii\mongodb\ActiveRecord as BaseModel;
 use indigerd\embedded\model\Model;
+use indigerd\embedded\behavior\HydrateCollectionBehavior;
 
 class ActiveRecord extends BaseModel
 {
     public function setAttributes($values, $safeOnly = true)
     {
         $this->trigger(Model::EVENT_BEFORE_POPULATE);
-        $oldValues = $this->getAttributes(\array_keys($values));
+        $keys = [];
+        foreach ($values as $key => $value) {
+            if ($this->hasAttribute($key)) {
+                $keys[] = $key;
+            }
+        }
+        $oldValues = $this->getAttributes($keys);
+        $behaviors = $this->getBehaviors();
+        foreach ($behaviors as $behavior) {
+            if ($behavior instanceof HydrateCollectionBehavior and isset($values[$behavior->attribute])) {
+                unset($oldValues[$behavior->attribute]);
+            }
+        }
         $values = ArrayHelper::merge($oldValues, $values);
         parent::setAttributes($values, $safeOnly);
         $this->trigger(Model::EVENT_AFTER_POPULATE);