Skip to content

Commit 6c3f09b

Browse files
williamdeswilliamdes
committed
Merge branch '5.8.x'
2 parents d896f57 + c1cf0ba commit 6c3f09b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+483
-486
lines changed

‎src/Tools/TestGenerator.php‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use PhpMyAdmin\SqlParser\Lexer;
1212
use PhpMyAdmin\SqlParser\Parser;
1313
use PhpMyAdmin\SqlParser\Token;
14-
use PhpMyAdmin\SqlParser\UtfString;
1514

15+
use function dirname;
1616
use function file_exists;
1717
use function file_get_contents;
1818
use function file_put_contents;
@@ -32,6 +32,7 @@
3232

3333
use const JSON_PRESERVE_ZERO_FRACTION;
3434
use const JSON_PRETTY_PRINT;
35+
use const JSON_UNESCAPED_SLASHES;
3536
use const JSON_UNESCAPED_UNICODE;
3637

3738
/**
@@ -176,19 +177,15 @@ public static function build($type, $input, $output, $debug = null, $ansi = fals
176177
// Writing test's data.
177178
$encoded = $serializer->serialize($test);
178179

179-
/**
180-
* Can not decode null char in keys.
181-
*
182-
* @see UtfString::$asciiMap
183-
*/
184-
if (str_contains($encoded, '"asciiMap":{"\u0000":0,"')) {
185-
$encoded = str_replace('"asciiMap":{"\u0000":0,"', '"asciiMap":{"', $encoded);
186-
}
187-
188-
$encoded = json_encode(
180+
$encoded = (string) json_encode(
189181
json_decode($encoded),
190-
JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION
182+
JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION | JSON_UNESCAPED_SLASHES
191183
);
184+
185+
// Remove the project path from .out file, it changes for each dev
186+
$projectFolder = dirname(__DIR__, 2);// Jump to root
187+
$encoded = str_replace($projectFolder, '<project-root>', $encoded);
188+
192189
file_put_contents($output, $encoded);
193190

194191
// Dumping test's data in human readable format too (if required).

‎tests/data/lexer/lexComment.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"query": "# comment\nSELECT \/*!50000 STRAIGHT_JOIN *\/ col1 FROM table1, table2 \/* select query *\/\n-- comment\n-- comment 2",
2+
"query": "# comment\nSELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */\n-- comment\n-- comment 2",
33
"lexer": {
44
"@type": "PhpMyAdmin\\SqlParser\\Lexer",
5-
"str": "# comment\nSELECT \/*!50000 STRAIGHT_JOIN *\/ col1 FROM table1, table2 \/* select query *\/\n-- comment\n-- comment 2",
5+
"str": "# comment\nSELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */\n-- comment\n-- comment 2",
66
"len": 110,
77
"last": 111,
88
"list": {
@@ -46,8 +46,8 @@
4646
},
4747
{
4848
"@type": "PhpMyAdmin\\SqlParser\\Token",
49-
"token": "\/*!50000",
50-
"value": "\/*!50000",
49+
"token": "/*!50000",
50+
"value": "/*!50000",
5151
"keyword": null,
5252
"type": 4,
5353
"flags": 10,
@@ -82,8 +82,8 @@
8282
},
8383
{
8484
"@type": "PhpMyAdmin\\SqlParser\\Token",
85-
"token": "*\/",
86-
"value": "*\/",
85+
"token": "*/",
86+
"value": "*/",
8787
"keyword": null,
8888
"type": 4,
8989
"flags": 2,
@@ -181,8 +181,8 @@
181181
},
182182
{
183183
"@type": "PhpMyAdmin\\SqlParser\\Token",
184-
"token": "\/* select query *\/",
185-
"value": "\/* select query *\/",
184+
"token": "/* select query */",
185+
"value": "/* select query */",
186186
"keyword": null,
187187
"type": 4,
188188
"flags": 2,

‎tests/data/lexer/lexDelimiter2.out‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"query": "DELIMTER \/\/\nSELECT a,b FROM test \/\/\nSELECT * FROM bar \/\/",
2+
"query": "DELIMTER //\nSELECT a,b FROM test //\nSELECT * FROM bar //",
33
"lexer": {
44
"@type": "PhpMyAdmin\\SqlParser\\Lexer",
5-
"str": "DELIMTER \/\/\nSELECT a,b FROM test \/\/\nSELECT * FROM bar \/\/",
5+
"str": "DELIMTER //\nSELECT a,b FROM test //\nSELECT * FROM bar //",
66
"len": 56,
77
"last": 56,
88
"list": {
@@ -28,17 +28,17 @@
2828
},
2929
{
3030
"@type": "PhpMyAdmin\\SqlParser\\Token",
31-
"token": "\/",
32-
"value": "\/",
31+
"token": "/",
32+
"value": "/",
3333
"keyword": null,
3434
"type": 2,
3535
"flags": 1,
3636
"position": 9
3737
},
3838
{
3939
"@type": "PhpMyAdmin\\SqlParser\\Token",
40-
"token": "\/",
41-
"value": "\/",
40+
"token": "/",
41+
"value": "/",
4242
"keyword": null,
4343
"type": 2,
4444
"flags": 1,
@@ -145,17 +145,17 @@
145145
},
146146
{
147147
"@type": "PhpMyAdmin\\SqlParser\\Token",
148-
"token": "\/",
149-
"value": "\/",
148+
"token": "/",
149+
"value": "/",
150150
"keyword": null,
151151
"type": 2,
152152
"flags": 1,
153153
"position": 33
154154
},
155155
{
156156
"@type": "PhpMyAdmin\\SqlParser\\Token",
157-
"token": "\/",
158-
"value": "\/",
157+
"token": "/",
158+
"value": "/",
159159
"keyword": null,
160160
"type": 2,
161161
"flags": 1,
@@ -244,17 +244,17 @@
244244
},
245245
{
246246
"@type": "PhpMyAdmin\\SqlParser\\Token",
247-
"token": "\/",
248-
"value": "\/",
247+
"token": "/",
248+
"value": "/",
249249
"keyword": null,
250250
"type": 2,
251251
"flags": 1,
252252
"position": 54
253253
},
254254
{
255255
"@type": "PhpMyAdmin\\SqlParser\\Token",
256-
"token": "\/",
257-
"value": "\/",
256+
"token": "/",
257+
"value": "/",
258258
"keyword": null,
259259
"type": 2,
260260
"flags": 1,

0 commit comments

Comments
 (0)