Merge pull request #13176 from aydun/flatten_fix

Flatten fix

CRM/Dedupe/Finder.php

@@ -125,6 +125,8 @@ class CRM_Dedupe_Finder {
     if (!$params) {
       return array();
     }
+    // This may no longer be required - see https://github.com/civicrm/civicrm-core/pull/13176
+    $params = array_filter($params);
 
     $foundByID = FALSE;
     if ($ruleGroupID) {

CRM/Utils/Array.php

@@ -238,9 +238,7 @@ class CRM_Utils_Array {
         self::flatten($value, $flat, $newPrefix, $seperator);
       }
       else {
-        if (!empty($value)) {
-          $flat[$newPrefix] = $value;
-        }
+        $flat[$newPrefix] = $value;
       }
     }
   }

tests/phpunit/CRM/Utils/ArrayTest.php

@@ -328,4 +328,43 @@ class CRM_Utils_ArrayTest extends CiviUnitTestCase {
     $this->assertEquals($expected, $source);
   }
 
+  /**
+   * Test the flatten function
+   */
+  public function testFlatten() {
+    $data = [
+      'my_array' => [
+        '0' => 'bar',
+        '1' => 'baz',
+        '2' => 'boz',
+      ],
+      'my_complex' => [
+         'dog' => 'woof',
+         'asdf' => [
+           'my_zero' => 0,
+           'my_int' => 1,
+           'my_null' => NULL,
+           'my_empty' => '',
+         ],
+      ],
+      'my_simple' => 999,
+    ];
+
+    $expected = [
+      'my_array.0' => 'bar',
+      'my_array.1' => 'baz',
+      'my_array.2' => 'boz',
+      'my_complex.dog' => 'woof',
+      'my_complex.asdf.my_zero' => 0,
+      'my_complex.asdf.my_int' => 1,
+      'my_complex.asdf.my_null' => NULL,
+      'my_complex.asdf.my_empty' => '',
+      'my_simple' => 999,
+    ];
+
+    $flat = [];
+    CRM_Utils_Array::flatten($data, $flat);
+    $this->assertEquals($flat, $expected);
+  }
+
 }

tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php

@@ -156,6 +156,7 @@ class WhitelistSubscriberTest extends \CiviUnitTestCase {
           'id' => 2,
           'title' => 'second widget',
           'api.Sprocket.get' => array(
+            'is_error' => 0,
             'count' => 2,
             'version' => 3,
             'values' => array(