Merge pull request #55 from symbiote/fix-empty-array

fix(MultiValueField) Fixed issue with setting an empty array as a val…
symbiote · Mar 20, 2018 · 03e335d · 03e335d
2 parents 7f412df + e4c5de2
commit 03e335d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/ORM/FieldType/MultiValueField.php b/src/ORM/FieldType/MultiValueField.php
@@ -61,7 +61,9 @@ public function getValues()
     public function setValue($value, $record = null, $markChanged = true)
     {
         $this->changed = $this->changed || $markChanged;
-        if ($value) {
+        if (!is_null($value)) {
+            // so that subsequent getValue calls re-load the value item correctly
+            $this->value = null;
             if (!is_string($value)) {
                 $value = $this->serializeValue($value);
             }

diff --git a/tests/MultiValueFieldTest.php b/tests/MultiValueFieldTest.php
@@ -59,6 +59,19 @@ public function testSetJsonStringAsProperty()
         $this->assertEquals(['One', 'Two'], $obj->obj('MVField')->getValues());
     }
 
+    public function testSetEmptyArrayAsValue() {
+
+        $field = new MultiValueField();
+
+        $field->setValue(['one' => 'one']);
+
+        $this->assertEquals(['one' => 'one'], $field->getValue());
+
+        $field->setValue([]);
+
+        $this->assertEquals([], $field->getValue());
+    }
+
     public function testIsChanged()
     {
         $field = new MultiValueField();