improve

Author: frostealth

composer.json

@@ -1,6 +1,7 @@
 {
     "name": "frostealth/yii2-array-field",
     "description": "Yii2 Array Field Behavior",
+    "keywords": ["yii2", "array", "attribute", "json", "behavior"],
     "license": "MIT",
     "homepage": "https://github.com/frostealth/yii2-array-field",
     "type": "yii2-extension",

src/behaviors/ArrayFieldBehavior.php

@@ -4,6 +4,7 @@
 
 use yii\base\Behavior;
 use yii\db\ActiveRecord;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
 
 /**
@@ -25,6 +26,8 @@
  * }
  * ~~~
  *
+ * @property ActiveRecord $owner
+ *
  * @package frostealth\yii2\behaviors
  */
 class ArrayFieldBehavior extends Behavior
@@ -44,13 +47,25 @@ class ArrayFieldBehavior extends Behavior
      */
     public $defaultDecodedValue = [];
 
+    /**
+     * @var array
+     */
+    private $_cache = [];
+
+    /**
+     * @var array
+     */
+    private $_oldAttributes = [];
+
     /**
      * @inheritdoc
      */
     public function events()
     {
         return [
             ActiveRecord::EVENT_AFTER_FIND => 'decode',
+            ActiveRecord::EVENT_AFTER_INSERT => 'decode',
+            ActiveRecord::EVENT_AFTER_UPDATE => 'decode',
             ActiveRecord::EVENT_BEFORE_UPDATE => 'encode',
             ActiveRecord::EVENT_BEFORE_INSERT => 'encode',
         ];
@@ -62,10 +77,16 @@ public function events()
     public function encode()
     {
         foreach ($this->attributes as $attribute) {
-            $value = $this->owner->{$attribute};
-            $value = !empty($value) ? Json::encode($value) : $this->defaultEncodedValue;
+            if (!$this->owner->getIsNewRecord()) {
+                $oldValue = ArrayHelper::getValue($this->_oldAttributes, $this->defaultEncodedValue);
+                $this->owner->setOldAttribute($attribute, $oldValue);
+            }
+
+            $value = $this->owner->getAttribute($attribute);
+            $this->_cache[$attribute] = $value;
 
-            $this->owner->{$attribute} = $value;
+            $value = !empty($value) ? Json::encode($value) : $this->defaultEncodedValue;
+            $this->owner->setAttribute($attribute, $value);
         }
     }
 
@@ -75,9 +96,21 @@ public function encode()
     public function decode()
     {
         foreach ($this->attributes as $attribute) {
-            $value = Json::decode($this->owner->{$attribute});
+            if (!empty($this->_cache[$attribute])) {
+                $value = $this->_cache[$attribute];
+            } else {
+                $value = Json::decode($this->owner->getAttribute($attribute));
+            }
+
+            $value = !empty($value) ? $value : $this->defaultDecodedValue;
+            $this->owner->setAttribute($attribute, $value);
 
-            $this->owner->{$attribute} = !empty($value) ? $value : $this->defaultDecodedValue;
+            if (!$this->owner->getIsNewRecord()) {
+                $this->_oldAttributes[$attribute] = $this->owner->getOldAttribute($attribute);
+                $this->owner->setOldAttribute($attribute, $value);
+            }
         }
+
+        $this->_cache = [];
     }
 }