Merge branch 'MAGETWO-52535' into PR-5

Author: Valeriy Nayda

lib/internal/Magento/Framework/Search/Request/Binder.php

@@ -73,7 +73,10 @@ private function processData($data, $bindData)
         array_walk_recursive($bindData, function (&$item) {
             $item = trim($item);
         });
-        $bindData = array_filter($bindData);
+        $bindData = array_filter($bindData, function ($element) {
+            return is_array($element) ? count($element) : strlen($element);
+        });
+
         foreach ($data as $key => $value) {
             if (is_array($value)) {
                 $data[$key] = $this->processData($value, $bindData);

lib/internal/Magento/Framework/Search/Test/Unit/Request/BinderTest.php

@@ -34,9 +34,18 @@ public function testBind()
             'queries' => [
                 'query' => ['value' => '$query$'],
                 'empty_query' => ['value' => '$empty_query$'],
-                'space_query' => ['value' => '$space_query$']
+                'space_query' => ['value' => '$space_query$'],
+                'zero_value_query' => ['name' => 'zero_value', 'type' => 'filteredQuery'],
+            ],
+            'filters' => [
+                'filter' => ['from' => '$from$', 'to' => '$to$', 'value' => '$filter$'],
+                'zero_value_filter' => [
+                    'type' => 'termFilter',
+                    'name' => 'zero_value',
+                    'field' => 'zero_value',
+                    'value' => '$zero_value$',
+                ],
             ],
-            'filters' => ['filter' => ['from' => '$from$', 'to' => '$to$', 'value' => '$filter$']],
             'aggregations' => ['price' => ['method' => '$method$']],
             'from' => 0,
             'size' => 15,
@@ -51,6 +60,7 @@ public function testBind()
                 '$to$' => 'filter_to',
                 '$filter$' => 'filter_value',
                 '$method$' => 'filter_method',
+                '$zero_value$' => '0',
             ],
             'from' => 1,
             'size' => 10,
@@ -60,14 +70,22 @@ public function testBind()
             'queries' => [
                 'query' => ['value' => 'match_query', 'is_bind' => true],
                 'empty_query' => ['value' => '$empty_query$'],
-                'space_query' => ['value' => 'value', 'is_bind' => true]
+                'space_query' => ['value' => 'value', 'is_bind' => true],
+                'zero_value_query' => ['name' => 'zero_value', 'type' => 'filteredQuery'],
             ],
             'filters' => [
                 'filter' => [
                     'from' => 'filter_from',
                     'to' => 'filter_to',
                     'value' => 'filter_value',
                     'is_bind' => true
+                ],
+                'zero_value_filter' => [
+                    'type' => 'termFilter',
+                    'name' => 'zero_value',
+                    'field' => 'zero_value',
+                    'value' => '0',
+                    'is_bind' => true,
                 ]
             ],
             'aggregations' => ['price' => ['method' => 'filter_method', 'is_bind' => true]],