Fix flattening in arrays starting with null

Co-Authored-By: Albert Boada <albert.boada.flaquer@gmail.com>
jmespath · Aug 25, 2023 · bbb69a9 · bbb69a9
1 parent f3734e2
commit bbb69a9
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 2.7.0 - UPCOMING
 
+* Fixed flattening in arrays starting with null
 * Drop support for HHVM and PHP earlier than 7.2.5.
 * Add support for PHP 8.1, 8.2, and 8.3.
 

diff --git a/src/TreeCompiler.php b/src/TreeCompiler.php
@@ -305,7 +305,7 @@ private function visit_flatten(array $node)
                 ->write('%s = [];', $merged)
                 ->write('foreach ($value as %s) {', $val)
                     ->indent()
-                    ->write('if (is_array(%s) && isset(%s[0])) {', $val, $val)
+                    ->write('if (is_array(%s) && array_key_exists(0, %s)) {', $val, $val)
                         ->indent()
                         ->write('%s = array_merge(%s, %s);', $merged, $merged, $val)
                         ->outdent()

diff --git a/src/TreeInterpreter.php b/src/TreeInterpreter.php
@@ -107,7 +107,7 @@ private function dispatch(array $node, $value)
                 $merged = [];
                 foreach ($value as $values) {
                     // Only merge up arrays lists and not hashes
-                    if (is_array($values) && isset($values[0])) {
+                    if (is_array($values) && array_key_exists(0, $values)) {
                         $merged = array_merge($merged, $values);
                     } elseif ($values !== $skipElement) {
                         $merged[] = $values;

diff --git a/tests/compliance/indices.json b/tests/compliance/indices.json
@@ -297,6 +297,29 @@
         }
     ]
 },
+{
+    "given":
+        {
+            "foo": [
+                {"bar": [null, null, 3, 5, 6, null]},
+                {"bar": [1, 3, null, 5]}
+            ]
+        },
+    "cases": [
+        {
+            "expression": "foo[*].bar",
+            "result": [[null, null, 3, 5, 6, null], [1, 3, null, 5]]
+        },
+        {
+            "expression": "foo[*].bar[*]",
+            "result": [[3, 5, 6], [1, 3, 5]]
+        },
+        {
+            "expression": "foo[*].bar[]",
+            "result": [3, 5, 6, 1, 3, 5]
+        }
+    ]
+},
 {
     "given": {
         "string": "string",

diff --git a/tests/compliance/wildcard.json b/tests/compliance/wildcard.json
@@ -456,5 +456,16 @@
             "result": [0, 0]
          }
      ]
+},
+{
+    "given": {
+        "foo": [null, 1, null, 2, null]
+    },
+    "cases": [
+        {
+            "expression": "foo[*]",
+            "result": [1, 2]
+        }
+    ]
 }
 ]