fix: setting values of PodioItemField subtypes to empty array had no …

…effect
podio-community · Aug 16, 2023 · 89cf310 · 89cf310
1 parent 7e6633b
commit 89cf310
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 63 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@
 * BREAKING: `Podio::debug` changed from public to protected: use `PodioClient::set_debug(..)`
 * BREAKING: Kint is now an optional dependency of the package. Use `composer require kint-php/kint` to install it, if you need it.
 * Bugfix: Error on fetching single contact with `PodioContact::get`.
+* Bugfix: Setting values to empty array of several `PodioItemField` subtypes was broken.
 * Bugfix: Debug output via Kint is now working again. #240
 * See [migration guide](https://github.com/podio-community/podio-php/blob/master/MIGRATION_GUIDE_v7.md) for details.
 

diff --git a/models/field/PodioAppItemField.php b/models/field/PodioAppItemField.php
@@ -48,24 +48,22 @@ public function humanized_value()
 
     public function set_value($values)
     {
-        if ($values) {
-            // Ensure that we have an array of values
-            if (is_a($values, 'PodioCollection')) {
-                $values = $values->_get_items();
-            }
-            if (is_object($values) || (is_array($values) && !empty($values['item_id']))) {
-                $values = array($values);
-            }
+        // Ensure that we have an array of values
+        if (is_a($values, 'PodioCollection')) {
+            $values = $values->_get_items();
+        }
+        if (is_object($values) || (is_array($values) && !empty($values['item_id']))) {
+            $values = array($values);
+        }
 
-            $values = array_map(function ($value) {
-                if (is_object($value)) {
-                    return array('value' => $value->as_json(false));
-                }
-                return array('value' => $value);
-            }, $values);
+        $values = array_map(function ($value) {
+            if (is_object($value)) {
+                return array('value' => $value->as_json(false));
+            }
+            return array('value' => $value);
+        }, $values);
 
-            parent::__set('values', $values);
-        }
+        parent::__set('values', $values);
     }
 
     public function api_friendly_values()

diff --git a/models/field/PodioCategoryItemField.php b/models/field/PodioCategoryItemField.php
@@ -46,19 +46,17 @@ public function api_friendly_values()
 
     public function set_value($values)
     {
-        if ($values) {
-            if (is_array($values)) {
-                $formatted_values = array_map(function ($value) {
-                    if (is_array($value)) {
-                        return array('value' => $value);
-                    } else {
-                        return array('value' => array('id' => $value));
-                    }
-                }, $values);
-                parent::__set('values', $formatted_values);
-            } else {
-                parent::__set('values', array(array('value' => array('id' => $values))));
-            }
+        if (is_array($values)) {
+            $formatted_values = array_map(function ($value) {
+                if (is_array($value)) {
+                    return array('value' => $value);
+                } else {
+                    return array('value' => array('id' => $value));
+                }
+            }, $values);
+            parent::__set('values', $formatted_values);
+        } else {
+            parent::__set('values', array(array('value' => array('id' => $values))));
         }
     }
 

diff --git a/models/field/PodioContactItemField.php b/models/field/PodioContactItemField.php
@@ -48,24 +48,22 @@ public function humanized_value()
 
     public function set_value($values)
     {
-        if ($values) {
-            // Ensure that we have an array of values
-            if (is_a($values, 'PodioCollection')) {
-                $values = $values->_get_items();
-            }
-            if (is_object($values) || (is_array($values) && !empty($values['profile_id']))) {
-                $values = array($values);
-            }
+        // Ensure that we have an array of values
+        if (is_a($values, 'PodioCollection')) {
+            $values = $values->_get_items();
+        }
+        if (is_object($values) || (is_array($values) && !empty($values['profile_id']))) {
+            $values = array($values);
+        }
 
-            $values = array_map(function ($value) {
-                if (is_object($value)) {
-                    return array('value' => $value->as_json(false));
-                }
-                return array('value' => $value);
-            }, $values);
+        $values = array_map(function ($value) {
+            if (is_object($value)) {
+                return array('value' => $value->as_json(false));
+            }
+            return array('value' => $value);
+        }, $values);
 
-            parent::__set('values', $values);
-        }
+        parent::__set('values', $values);
     }
 
     public function api_friendly_values()

diff --git a/models/field/PodioEmbedItemField.php b/models/field/PodioEmbedItemField.php
@@ -52,27 +52,25 @@ public function humanized_value()
 
     public function set_value($values)
     {
-        if ($values) {
-            // Ensure that we have an array of values
-            if (is_a($values, 'PodioCollection')) {
-                $values = $values->_get_items();
-            }
-            if (is_object($values) || (is_array($values) && !empty($values['embed']))) {
-                $values = array($values);
-            }
+        // Ensure that we have an array of values
+        if (is_a($values, 'PodioCollection')) {
+            $values = $values->_get_items();
+        }
+        if (is_object($values) || (is_array($values) && !empty($values['embed']))) {
+            $values = array($values);
+        }
 
-            $values = array_map(function ($value) {
-                if (is_object($value)) {
-                    $file = $value->files ? $value->files[0] : null;
-                    unset($value->files);
+        $values = array_map(function ($value) {
+            if (is_object($value)) {
+                $file = $value->files ? $value->files[0] : null;
+                unset($value->files);
 
-                    return array('embed' => $value->as_json(false), 'file' => $file ? $file->as_json(false) : null);
-                }
-                return $value;
-            }, $values);
+                return array('embed' => $value->as_json(false), 'file' => $file ? $file->as_json(false) : null);
+            }
+            return $value;
+        }, $values);
 
-            parent::__set('values', $values);
-        }
+        parent::__set('values', $values);
     }
 
     public function api_friendly_values()

diff --git a/tests/PodioAppItemFieldTest.php b/tests/PodioAppItemFieldTest.php
@@ -102,6 +102,12 @@ public function test_can_set_value_from_array_of_hashes(): void
         ], $this->object->__attribute('values'));
     }
 
+    public function test_can_set_values_from_empty_array(): void
+    {
+        $this->object->values = [];
+        $this->assertSame([], $this->object->__attribute('values'));
+    }
+
     public function test_can_humanize_value(): void
     {
         // Empty values

diff --git a/tests/PodioAssetItemFieldTest.php b/tests/PodioAssetItemFieldTest.php
@@ -102,6 +102,12 @@ public function test_can_set_value_from_array_of_hashes(): void
         ], $this->object->__attribute('values'));
     }
 
+    public function test_can_set_value_from_empty_array(): void
+    {
+        $this->object->values = [];
+        $this->assertSame([], $this->object->__attribute('values'));
+    }
+
     public function test_can_humanize_value(): void
     {
         // Empty values

diff --git a/tests/PodioCategoryItemFieldTest.php b/tests/PodioCategoryItemFieldTest.php
@@ -62,6 +62,12 @@ public function test_can_set_values_from_array(): void
         $this->assertSame([['value' => ['id' => 4]]], $this->object->__attribute('values'));
     }
 
+    public function test_can_set_values_from_empty_array(): void
+    {
+        $this->object->values = [];
+        $this->assertSame([], $this->object->__attribute('values'));
+    }
+
     public function test_can_set_values_from_hash(): void
     {
         $this->object->values = [['id' => 4, 'text' => 'Captain Crunch']];

diff --git a/tests/PodioContactItemFieldTest.php b/tests/PodioContactItemFieldTest.php
@@ -107,6 +107,12 @@ public function test_can_set_value_from_array_of_hashes(): void
         ], $this->object->__attribute('values'));
     }
 
+    public function test_can_set_value_from_empty_array(): void
+    {
+        $this->object->values = [];
+        $this->assertSame([], $this->object->__attribute('values'));
+    }
+
     public function test_can_humanize_value(): void
     {
         // Empty values

diff --git a/tests/PodioEmbedItemFieldTest.php b/tests/PodioEmbedItemFieldTest.php
@@ -117,6 +117,12 @@ public function test_can_set_value_from_array_of_hashes(): void
         ], $this->object->__attribute('values'));
     }
 
+    public function test_can_set_value_from_empty_array(): void
+    {
+        $this->object->values = [];
+        $this->assertSame([], $this->object->__attribute('values'));
+    }
+
     public function test_can_humanize_value(): void
     {
         // Empty values