Add support for array values in filterBy() for 'equal' and 'notEqual'.

Author: ivopetkov

src/DataListTrait.php

@@ -649,6 +649,21 @@ private function internalDataListUpdateData($data, $actions): array
                 return false;
             };
 
+            $sortAndSerializeArray = function ($data) {
+                $walkData = function ($data) use (&$walkData) {
+                    $result = [];
+                    foreach ($data as $key => $value) {
+                        if (is_array($value)) {
+                            $value = $walkData($value);
+                        }
+                        $result[$key] = $value;
+                    }
+                    ksort($result);
+                    return $result;
+                };
+                return serialize($walkData($data));
+            };
+
             $pendingNotStartWithFilters = [];
             $processPendingNotStartWithFilters = function () use (&$data, &$pendingNotStartWithFilters, &$buildPrefixesIndex, &$existsInPrefixesIndex) {
                 if (!empty($pendingNotStartWithFilters)) {
@@ -721,9 +736,17 @@ private function internalDataListUpdateData($data, $actions): array
                             if (!$add) {
                                 $value = $object->$propertyName;
                                 if ($operator === 'equal') {
-                                    $add = $value === $targetValue;
+                                    if (is_array($value) && is_array($targetValue)) {
+                                        $add = $sortAndSerializeArray($value) === $sortAndSerializeArray($targetValue);
+                                    } else {
+                                        $add = $value === $targetValue;
+                                    }
                                 } elseif ($operator === 'notEqual') {
-                                    $add = $value !== $targetValue;
+                                    if (is_array($value) && is_array($targetValue)) {
+                                        $add = $sortAndSerializeArray($value) !== $sortAndSerializeArray($targetValue);
+                                    } else {
+                                        $add = $value !== $targetValue;
+                                    }
                                 } elseif ($operator === 'regExp') {
                                     $add = preg_match('/' . $targetValue . '/', $value) === 1;
                                 } elseif ($operator === 'notRegExp') {

tests/DataListTest.php

@@ -464,6 +464,19 @@ function () {
         $this->assertTrue($list[1]->other === 2);
         $this->assertTrue(count($list) === 2);
 
+        $data = [
+            ['value' => ['a' => 1, 'b' => ['b1' => 1, 'b2' => 2]], 'other' => 1],
+            ['other' => 2],
+            function () {
+                return ['value' => ['b' => ['b2' => 2, 'b1' => 1], 'a' => 1], 'other' => 3];
+            }
+        ];
+        $list = new DataList($data);
+        $list->filterBy('value', ['a' => 1, 'b' => ['b1' => 1, 'b2' => 2]], 'equal');
+        $this->assertTrue($list[0]->other === 1);
+        $this->assertTrue($list[1]->other === 3);
+        $this->assertTrue(count($list) === 2);
+
 
         $data = [
             ['value' => null, 'other' => 1],