diff options
Diffstat (limited to 'vendor/mtdowling/jmespath.php/src')
-rw-r--r-- | vendor/mtdowling/jmespath.php/src/SyntaxErrorException.php | 2 | ||||
-rw-r--r-- | vendor/mtdowling/jmespath.php/src/TreeCompiler.php | 2 | ||||
-rw-r--r-- | vendor/mtdowling/jmespath.php/src/TreeInterpreter.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/mtdowling/jmespath.php/src/SyntaxErrorException.php b/vendor/mtdowling/jmespath.php/src/SyntaxErrorException.php index 68683d0..b9e376e 100644 --- a/vendor/mtdowling/jmespath.php/src/SyntaxErrorException.php +++ b/vendor/mtdowling/jmespath.php/src/SyntaxErrorException.php @@ -16,7 +16,7 @@ class SyntaxErrorException extends \InvalidArgumentException array $token, $expression ) { - $message = "Syntax error at character {$token['pos']}\n" + $message = sprintf("Syntax error at character %d\n", max($token['pos'], 0)) . $expression . "\n" . str_repeat(' ', max($token['pos'], 0)) . "^\n"; $message .= !is_array($expectedTypesOrMessage) ? $expectedTypesOrMessage diff --git a/vendor/mtdowling/jmespath.php/src/TreeCompiler.php b/vendor/mtdowling/jmespath.php/src/TreeCompiler.php index fe27f41..b5f0658 100644 --- a/vendor/mtdowling/jmespath.php/src/TreeCompiler.php +++ b/vendor/mtdowling/jmespath.php/src/TreeCompiler.php @@ -305,7 +305,7 @@ class TreeCompiler ->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/vendor/mtdowling/jmespath.php/src/TreeInterpreter.php b/vendor/mtdowling/jmespath.php/src/TreeInterpreter.php index 934c506..f7eea86 100644 --- a/vendor/mtdowling/jmespath.php/src/TreeInterpreter.php +++ b/vendor/mtdowling/jmespath.php/src/TreeInterpreter.php @@ -107,7 +107,7 @@ class TreeInterpreter $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; |