fixed recursive merge

Author: Indigerd

src/helper/ArrayMerge.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace indigerd\embedded\helper;
+
+class ArrayMerge
+{
+    public static function isAssoc($val) {
+        if (!\is_array($val)) {
+            return false;
+        }
+        $assoc = false;
+        foreach ($val as $k => $v) {
+            if (!\is_int($k)) {
+                $assoc = true;
+                break;
+            }
+        }
+        return $assoc;
+    }
+
+    public static function mergeRecursive($array1, $array2)
+    {
+        foreach($array2 as $key=>$val) {
+            if(isset($array1[$key])) {
+                if(self::isAssoc($val)) {
+                    $array1[$key] = self::mergeRecursive($array1[$key], $val);
+                } else {
+                    $array1[$key] = $val;
+                }
+            } else {
+                $array1[$key] = $val;
+            }
+        }
+        return $array1;
+    }
+}

src/model/ActiveRecord.php

@@ -2,9 +2,9 @@
 
 namespace indigerd\embedded\model;
 
-use yii\helpers\ArrayHelper;
 use yii\db\ActiveRecord as BaseModel;
 use indigerd\embedded\behavior\HydrateCollectionBehavior;
+use indigerd\embedded\helper\ArrayMerge;
 
 class ActiveRecord extends BaseModel
 {
@@ -24,7 +24,7 @@ public function setAttributes($values, $safeOnly = true)
                 unset($oldValues[$behavior->attribute]);
             }
         }
-        $values = ArrayHelper::merge($oldValues, $values);
+        $values = ArrayMerge::mergeRecursive($oldValues, $values);
         parent::setAttributes($values, $safeOnly);
         $this->trigger(Model::EVENT_AFTER_POPULATE);
     }

src/model/Model.php

@@ -2,9 +2,9 @@
 
 namespace indigerd\embedded\model;
 
-use yii\helpers\ArrayHelper;
 use yii\base\Model as BaseModel;
 use indigerd\embedded\behavior\HydrateCollectionBehavior;
+use indigerd\embedded\helper\ArrayMerge;
 
 class Model extends BaseModel
 {
@@ -28,7 +28,7 @@ public function setAttributes($values, $safeOnly = true)
                 unset($oldValues[$behavior->attribute]);
             }
         }
-        $values = ArrayHelper::merge($oldValues, $values);
+        $values = ArrayMerge::mergeRecursive($oldValues, $values);
         parent::setAttributes($values, $safeOnly);
         $this->trigger(Model::EVENT_AFTER_POPULATE);
     }

src/model/mongodb/ActiveRecord.php

@@ -2,10 +2,11 @@
 
 namespace indigerd\embedded\model\mongodb;
 
-use yii\helpers\ArrayHelper;
+use MongoDB\BSON\ObjectId;
 use yii\mongodb\ActiveRecord as BaseModel;
 use indigerd\embedded\model\Model;
 use indigerd\embedded\behavior\HydrateCollectionBehavior;
+use indigerd\embedded\helper\ArrayMerge;
 
 class ActiveRecord extends BaseModel
 {
@@ -15,6 +16,9 @@ public function setAttributes($values, $safeOnly = true)
         $keys = [];
         foreach ($values as $key => $value) {
             if ($this->hasAttribute($key)) {
+                if ($this->getAttribute($key) instanceof ObjectId) {
+                    continue;
+                }
                 $keys[] = $key;
             }
         }
@@ -25,7 +29,7 @@ public function setAttributes($values, $safeOnly = true)
                 unset($oldValues[$behavior->attribute]);
             }
         }
-        $values = ArrayHelper::merge($oldValues, $values);
+        $values = ArrayMerge::mergeRecursive($oldValues, $values);
         parent::setAttributes($values, $safeOnly);
         $this->trigger(Model::EVENT_AFTER_POPULATE);
     }