Skip to content

Commit 024294e

Browse files
nijelnijel
committed
Run php-cs-fixer
Signed-off-by: Michal Čihař <[email protected]>
1 parent 65fb611 commit 024294e

1 file changed

Lines changed: 43 additions & 85 deletions

File tree

‎tests/Utils/FormatterTest.php‎

Lines changed: 43 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -255,34 +255,28 @@ public function formatQueries()
255255
),
256256
'minimal' => array(
257257
'query' => 'select 1',
258-
'text' =>
259-
'SELECT' . "\n" .
258+
'text' => 'SELECT' . "\n" .
260259
' 1',
261-
'cli' =>
262-
"\x1b[35mSELECT" . "\n" .
260+
'cli' => "\x1b[35mSELECT" . "\n" .
263261
" \x1b[92m1" . "\x1b[0m",
264-
'html' =>
265-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
262+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
266263
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
267264
),
268265
'simply' => array(
269266
'query' => 'select * from tbl where 1',
270-
'text' =>
271-
'SELECT' . "\n" .
267+
'text' => 'SELECT' . "\n" .
272268
' *' . "\n" .
273269
'FROM' . "\n" .
274270
' tbl' . "\n" .
275271
'WHERE' . "\n" .
276272
' 1',
277-
'cli' =>
278-
"\x1b[35mSELECT" . "\n" .
273+
'cli' => "\x1b[35mSELECT" . "\n" .
279274
" \x1b[39m*" . "\n" .
280275
"\x1b[35mFROM" . "\n" .
281276
" \x1b[39mtbl" . "\n" .
282277
"\x1b[35mWHERE" . "\n" .
283278
" \x1b[92m1" . "\x1b[0m",
284-
'html' =>
285-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
279+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
286280
'&nbsp;&nbsp;&nbsp;&nbsp;*' . '<br/>' .
287281
'<span class="sql-reserved">FROM</span>' . '<br/>' .
288282
'&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
@@ -291,8 +285,7 @@ public function formatQueries()
291285
),
292286
'typical' => array(
293287
'query' => 'SELECT id, if(id=1,"Si","No") from `tbl` where id = 0 or id = 1 group by id order by id desc limit 1 offset 0',
294-
'text' =>
295-
'SELECT' . "\n" .
288+
'text' => 'SELECT' . "\n" .
296289
' id,' . "\n" .
297290
' IF(id = 1, "Si", "No")' . "\n" .
298291
'FROM' . "\n" .
@@ -305,8 +298,7 @@ public function formatQueries()
305298
' id' . "\n" .
306299
'DESC' . "\n" .
307300
'LIMIT 1 OFFSET 0',
308-
'cli' =>
309-
"\x1b[35mSELECT" . "\n" .
301+
'cli' => "\x1b[35mSELECT" . "\n" .
310302
" \x1b[39mid\x1b[39m," . "\n" .
311303
" \x1b[35mIF\x1b[39m(\x1b[39mid \x1b[39m= \x1b[92m1\x1b[39m, \x1b[91m\"Si\"\x1b[39m, \x1b[91m\"No\"\x1b[39m)" . "\n" .
312304
"\x1b[35mFROM" . "\n" .
@@ -319,8 +311,7 @@ public function formatQueries()
319311
" \x1b[39mid" . "\n" .
320312
"\x1b[35mDESC" . "\n" .
321313
"\x1b[35mLIMIT \x1b[92m1 \x1b[95mOFFSET \x1b[92m0" . "\x1b[0m",
322-
'html' =>
323-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
314+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
324315
'&nbsp;&nbsp;&nbsp;&nbsp;id,' . '<br/>' .
325316
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">IF</span>(id = <span class="sql-number">1</span>, <span class="sql-string">"Si"</span>, <span class="sql-string">"No"</span>)' . '<br/>' .
326317
'<span class="sql-reserved">FROM</span>' . '<br/>' .
@@ -335,53 +326,45 @@ public function formatQueries()
335326
'<span class="sql-reserved">LIMIT</span> <span class="sql-number">1</span> <span class="sql-keyword">OFFSET</span> <span class="sql-number">0</span>',
336327
),
337328
'comments' => array(
338-
'query' =>
339-
'select /* Comment */ *' . "\n" .
329+
'query' => 'select /* Comment */ *' . "\n" .
340330
'from tbl # Comment' . "\n" .
341331
'where 1 -- Comment',
342-
'text' =>
343-
'SELECT' . "\n" .
332+
'text' => 'SELECT' . "\n" .
344333
' /* Comment */ *' . "\n" .
345334
'FROM' . "\n" .
346335
' tbl # Comment' . "\n" .
347336
'WHERE' . "\n" .
348337
' 1 -- Comment',
349-
'cli' =>
350-
"\x1b[35mSELECT" . "\n" .
338+
'cli' => "\x1b[35mSELECT" . "\n" .
351339
" \x1b[37m/* Comment */ \x1b[39m*" . "\n" .
352340
"\x1b[35mFROM" . "\n" .
353341
" \x1b[39mtbl \x1b[37m# Comment" . "\n" .
354342
"\x1b[35mWHERE" . "\n" .
355343
" \x1b[92m1 \x1b[37m-- Comment" . "\x1b[0m",
356-
'html' =>
357-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
344+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
358345
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-comment">/* Comment */</span> *' . '<br/>' .
359346
'<span class="sql-reserved">FROM</span>' . '<br/>' .
360347
'&nbsp;&nbsp;&nbsp;&nbsp;tbl <span class="sql-comment"># Comment</span>' . '<br/>' .
361348
'<span class="sql-reserved">WHERE</span>' . '<br/>' .
362349
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span> <span class="sql-comment">-- Comment</span>',
363350
),
364351
'strip comments' => array(
365-
'query' =>
366-
'select /* Comment */ *' . "\n" .
352+
'query' => 'select /* Comment */ *' . "\n" .
367353
'from tbl # Comment' . "\n" .
368354
'where 1 -- Comment',
369-
'text' =>
370-
'SELECT' . "\n" .
355+
'text' => 'SELECT' . "\n" .
371356
' *' . "\n" .
372357
'FROM' . "\n" .
373358
' tbl' . "\n" .
374359
'WHERE' . "\n" .
375360
' 1',
376-
'cli' =>
377-
"\x1b[35mSELECT" . "\n" .
361+
'cli' => "\x1b[35mSELECT" . "\n" .
378362
" \x1b[39m*" . "\n" .
379363
"\x1b[35mFROM" . "\n" .
380364
" \x1b[39mtbl" . "\n" .
381365
"\x1b[35mWHERE" . "\n" .
382366
" \x1b[92m1" . "\x1b[0m",
383-
'html' =>
384-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
367+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
385368
'&nbsp;&nbsp;&nbsp;&nbsp;*' . '<br/>' .
386369
'<span class="sql-reserved">FROM</span>' . '<br/>' .
387370
'&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
@@ -393,50 +376,41 @@ public function formatQueries()
393376
),
394377
'keywords' => array(
395378
'query' => 'select hex("1")',
396-
'text' =>
397-
'SELECT' . "\n" .
379+
'text' => 'SELECT' . "\n" .
398380
' HEX("1")',
399-
'cli' =>
400-
"\x1b[35mSELECT" . "\n" .
381+
'cli' => "\x1b[35mSELECT" . "\n" .
401382
" \x1b[95mHEX\x1b[39m(\x1b[91m\"1\"\x1b[39m)" . "\x1b[0m",
402-
'html' =>
403-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
383+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
404384
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-keyword">HEX</span>(<span class="sql-string">"1"</span>)',
405385
),
406386
'distinct count' => array(
407387
'query' => 'select distinct count(*)',
408-
'text' =>
409-
'SELECT DISTINCT' . "\n" .
388+
'text' => 'SELECT DISTINCT' . "\n" .
410389
' COUNT(*)',
411-
'cli' =>
412-
"\x1b[35mSELECT \x1b[35mDISTINCT" . "\n" .
390+
'cli' => "\x1b[35mSELECT \x1b[35mDISTINCT" . "\n" .
413391
" \x1b[95mCOUNT\x1b[39m(\x1b[39m*\x1b[39m)" . "\x1b[0m",
414-
'html' =>
415-
'<span class="sql-reserved">SELECT</span> <span class="sql-reserved">DISTINCT</span>' . '<br/>' .
392+
'html' => '<span class="sql-reserved">SELECT</span> <span class="sql-reserved">DISTINCT</span>' . '<br/>' .
416393
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-keyword">COUNT</span>(*)',
417394
),
418395
'create procedure' => array(
419396
'query' => 'create procedure test_procedure() begin from tbl select *; end',
420-
'text' =>
421-
'CREATE' . "\n" .
397+
'text' => 'CREATE' . "\n" .
422398
'PROCEDURE test_procedure()' . "\n" .
423399
'BEGIN' . "\n" .
424400
'FROM' . "\n" .
425401
' tbl' . "\n" .
426402
'SELECT' . "\n" .
427403
' *;' . "\n" .
428404
'END',
429-
'cli' =>
430-
"\x1b[35mCREATE" . "\n" .
405+
'cli' => "\x1b[35mCREATE" . "\n" .
431406
"\x1b[35mPROCEDURE \x1b[39mtest_procedure\x1b[39m(\x1b[39m)\n" .
432407
"\x1b[95mBEGIN" . "\n" .
433408
"\x1b[35mFROM" . "\n" .
434409
" \x1b[39mtbl" . "\n" .
435410
"\x1b[35mSELECT" . "\n" .
436411
" \x1b[39m*\x1b[39m;\n" .
437412
"\x1b[95mEND" . "\x1b[0m",
438-
'html' =>
439-
'<span class="sql-reserved">CREATE</span>' . '<br/>' .
413+
'html' => '<span class="sql-reserved">CREATE</span>' . '<br/>' .
440414
'<span class="sql-reserved">PROCEDURE</span> test_procedure()' . '<br/>' .
441415
'<span class="sql-keyword">BEGIN</span>' . '<br/>' .
442416
'<span class="sql-reserved">FROM</span>' . '<br/>' .
@@ -447,93 +421,77 @@ public function formatQueries()
447421
),
448422
'insert' => array(
449423
'query' => 'insert into foo values (0, 0, 0), (1, 1, 1)',
450-
'text' =>
451-
'INSERT' . "\n" .
424+
'text' => 'INSERT' . "\n" .
452425
'INTO' . "\n" .
453426
' foo' . "\n" .
454427
'VALUES(0, 0, 0),(1, 1, 1)',
455-
'cli' =>
456-
"\x1b[35mINSERT" . "\n" .
428+
'cli' => "\x1b[35mINSERT" . "\n" .
457429
"\x1b[35mINTO" . "\n" .
458430
" \x1b[39mfoo" . "\n" .
459431
"\x1b[35mVALUES\x1b[39m(\x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m, \x1b[92m0\x1b[39m)\x1b[39m,\x1b[39m(\x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m, \x1b[92m1\x1b[39m)" . "\x1b[0m",
460-
'html' =>
461-
'<span class="sql-reserved">INSERT</span>' . '<br/>' .
432+
'html' => '<span class="sql-reserved">INSERT</span>' . '<br/>' .
462433
'<span class="sql-reserved">INTO</span>' . '<br/>' .
463434
'&nbsp;&nbsp;&nbsp;&nbsp;foo' . '<br/>' .
464435
'<span class="sql-reserved">VALUES</span>(<span class="sql-number">0</span>, <span class="sql-number">0</span>, <span class="sql-number">0</span>),(<span class="sql-number">1</span>, <span class="sql-number">1</span>, <span class="sql-number">1</span>)',
465436
),
466437
'string as alias' => array(
467438
'query' => 'select "Text" as bar',
468-
'text' =>
469-
'SELECT' . "\n" .
439+
'text' => 'SELECT' . "\n" .
470440
' "Text" AS bar',
471-
'cli' =>
472-
"\x1b[35mSELECT" . "\n" .
441+
'cli' => "\x1b[35mSELECT" . "\n" .
473442
" \x1b[91m\"Text\" \x1b[35mAS \x1b[39mbar" . "\x1b[0m",
474-
'html' =>
475-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
443+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
476444
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">"Text"</span> <span class="sql-reserved">AS</span> bar',
477445
),
478446
'escape cli' => array(
479447
'query' => "select 'text\x1b[33mcolor-inj'",
480-
'text' =>
481-
'SELECT' . "\n" .
448+
'text' => 'SELECT' . "\n" .
482449
" 'text\x1B[33mcolor-inj'",
483-
'cli' =>
484-
"\x1b[35mSELECT" . "\n" .
450+
'cli' => "\x1b[35mSELECT" . "\n" .
485451
" \x1b[91m'text\\x1B[33mcolor-inj'" . "\x1b[0m",
486-
'html' =>
487-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
488-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'text'."\x1b[33m".'color-inj\'</span>',
452+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
453+
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'text' . "\x1b[33m" . 'color-inj\'</span>',
489454
),
490455
'escape html' => array(
491456
'query' => "select '<s>xss' from `<s>xss` , <s>nxss /*s<s>xss*/",
492-
'text' =>
493-
'SELECT' . "\n" .
457+
'text' => 'SELECT' . "\n" .
494458
' \'<s>xss\'' . "\n" .
495459
'FROM' . "\n" .
496460
' `<s>xss`,' . "\n" .
497461
' < s > nxss /*s<s>xss*/',
498-
'cli' =>
499-
"\x1b[35mSELECT" . "\n" .
462+
'cli' => "\x1b[35mSELECT" . "\n" .
500463
" \x1b[91m'<s>xss'" . "\n" .
501464
"\x1b[35mFROM" . "\n" .
502465
" \x1b[36m`<s>xss`\x1b[39m," . "\n" .
503466
" \x1b[39m< \x1b[39ms \x1b[39m> \x1b[39mnxss \x1b[37m/*s<s>xss*/" . "\x1b[0m",
504-
'html' =>
505-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
467+
'html' => '<span class="sql-reserved">SELECT</span>' . '<br/>' .
506468
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'&lt;s&gt;xss\'</span>' . '<br/>' .
507469
'<span class="sql-reserved">FROM</span>' . '<br/>' .
508470
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`&lt;s&gt;xss`</span>,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt; s &gt; nxss <span class="sql-comment">/*s&lt;s&gt;xss*/</span>',
509471
),
510472
'create table' => array(
511-
'query' =>
512-
'create table if not exists `pma__bookmark` (' . "\n" .
473+
'query' => 'create table if not exists `pma__bookmark` (' . "\n" .
513474
'`id` int(11) not null auto_increment,' . "\n" .
514475
'`dbase` varchar(255) not null default "",' . "\n" .
515476
'`user` varchar(255) not null default "",' . "\n" .
516477
'`label` varchar(255) collate utf8_general_ci not null default "",' . "\n" .
517478
'`query` text not null,' . "\n" .
518479
'primary key (`id`)',
519-
'text' =>
520-
'CREATE TABLE IF NOT EXISTS `pma__bookmark`(' . "\n" .
480+
'text' => 'CREATE TABLE IF NOT EXISTS `pma__bookmark`(' . "\n" .
521481
' `id` INT(11) NOT NULL AUTO_INCREMENT,' . "\n" .
522482
' `dbase` VARCHAR(255) NOT NULL DEFAULT "",' . "\n" .
523483
' `user` VARCHAR(255) NOT NULL DEFAULT "",' . "\n" .
524484
' `label` VARCHAR(255) COLLATE utf8_general_ci NOT NULL DEFAULT "",' . "\n" .
525485
' `query` TEXT NOT NULL,' . "\n" .
526486
' PRIMARY KEY(`id`)',
527-
'cli' =>
528-
"\x1b[35mCREATE \x1b[35mTABLE \x1b[35mIF NOT EXISTS \x1b[36m`pma__bookmark`\x1b[39m(" . "\n" .
487+
'cli' => "\x1b[35mCREATE \x1b[35mTABLE \x1b[35mIF NOT EXISTS \x1b[36m`pma__bookmark`\x1b[39m(" . "\n" .
529488
" \x1b[36m`id` \x1b[35mINT\x1b[39m(\x1b[92m11\x1b[39m) \x1b[35mNOT NULL \x1b[95mAUTO_INCREMENT\x1b[39m," . "\n" .
530489
" \x1b[36m`dbase` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mNOT NULL \x1b[35mDEFAULT \x1b[91m\"\"\x1b[39m," . "\n" .
531490
" \x1b[36m`user` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mNOT NULL \x1b[35mDEFAULT \x1b[91m\"\"\x1b[39m," . "\n" .
532491
" \x1b[36m`label` \x1b[35mVARCHAR\x1b[39m(\x1b[92m255\x1b[39m) \x1b[35mCOLLATE \x1b[39mutf8_general_ci \x1b[35mNOT NULL \x1b[35mDEFAULT \x1b[91m\"\"\x1b[39m," . "\n" .
533492
" \x1b[36m`query` \x1b[95mTEXT \x1b[35mNOT NULL\x1b[39m," . "\n" .
534493
" \x1b[35mPRIMARY KEY\x1b[39m(\x1b[36m`id`\x1b[39m)" . "\x1b[0m",
535-
'html' =>
536-
'<span class="sql-reserved">CREATE</span> <span class="sql-reserved">TABLE</span> <span class="sql-reserved">IF NOT EXISTS</span> <span class="sql-variable">`pma__bookmark`</span>(' . '<br/>' .
494+
'html' => '<span class="sql-reserved">CREATE</span> <span class="sql-reserved">TABLE</span> <span class="sql-reserved">IF NOT EXISTS</span> <span class="sql-variable">`pma__bookmark`</span>(' . '<br/>' .
537495
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`id`</span> <span class="sql-reserved">INT</span>(<span class="sql-number">11</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-keyword">AUTO_INCREMENT</span>,' . '<br/>' .
538496
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`dbase`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
539497
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`user`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .

0 commit comments

Comments
 (0)