From b0b3135d2677fb795e853bbb5fdd25a4a77f094a Mon Sep 17 00:00:00 2001 From: Hayno Ries Date: Fri, 1 Sep 2017 10:32:00 +0200 Subject: [PATCH 1/2] Replaced wrong variable --- src/Query/AST/Functions/Mysql/JsonMerge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Query/AST/Functions/Mysql/JsonMerge.php b/src/Query/AST/Functions/Mysql/JsonMerge.php index f5ce757..bf8bf9a 100644 --- a/src/Query/AST/Functions/Mysql/JsonMerge.php +++ b/src/Query/AST/Functions/Mysql/JsonMerge.php @@ -61,7 +61,7 @@ public function parse(Parser $parser) $parser->match(Lexer::T_OPEN_PARENTHESIS); $this->firstJsonDocExpr = $parser->StringPrimary(); - $this->jsonDocs[] = $this->firstJsonPathExpr; + $this->jsonDocs[] = $this->firstJsonDocExpr; $parser->match(Lexer::T_COMMA); From 3733fb1209b83911f2ac851ae9bf1472def56660 Mon Sep 17 00:00:00 2001 From: Hayno Ries Date: Fri, 1 Sep 2017 10:33:08 +0200 Subject: [PATCH 2/2] removed empty spaces with double tab --- src/Query/AST/Functions/Mysql/JsonMerge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Query/AST/Functions/Mysql/JsonMerge.php b/src/Query/AST/Functions/Mysql/JsonMerge.php index bf8bf9a..a912caf 100644 --- a/src/Query/AST/Functions/Mysql/JsonMerge.php +++ b/src/Query/AST/Functions/Mysql/JsonMerge.php @@ -61,7 +61,7 @@ public function parse(Parser $parser) $parser->match(Lexer::T_OPEN_PARENTHESIS); $this->firstJsonDocExpr = $parser->StringPrimary(); - $this->jsonDocs[] = $this->firstJsonDocExpr; + $this->jsonDocs[] = $this->firstJsonDocExpr; $parser->match(Lexer::T_COMMA);