Skip to content

Commit 8ca9a1b

Browse files
nijelnijel
authored
Merge pull request #82 from remicollet/issue-newline
fix default options in Formater constructor
2 parents 00e0a65 + c7f2d0c commit 8ca9a1b

File tree

3 files changed

+40
-36
lines changed

3 files changed

+40
-36
lines changed

‎src/Utils/Formatter.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function __construct(array $options = array())
7373
*
7474
* @var string
7575
*/
76-
'line_ending' => $this->options['type'] == 'html' ? '<br/>' : "\n",
76+
'line_ending' => NULL,
7777

7878
/**
7979
* The string used for indentation.
@@ -172,6 +172,10 @@ public function __construct(array $options = array())
172172
$options
173173
);
174174

175+
if (is_null($this->options['line_ending'])) {
176+
$this->options['line_ending'] = $this->options['type'] == 'html' ? '<br/>' : "\n";
177+
}
178+
175179
// `parts_newline` requires `clause_newline`
176180
$this->options['parts_newline'] &= $this->options['clause_newline'];
177181
}

‎tests/Utils/CLITest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function highlightParams()
4343
),
4444
array(
4545
array('q' => 'SELECT 1', 'f' => 'html'),
46-
'<span class="sql-reserved">SELECT</span>' . "\n" .
46+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
4747
' <span class="sql-number">1</span>' . "\n",
4848
0,
4949
),

‎tests/Utils/FormatterTest.php

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,50 @@ public function formatQueries()
2424
return array(
2525
array(
2626
'SELECT 1',
27-
'<span class="sql-reserved">SELECT</span>' . "\n" .
27+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
2828
' <span class="sql-number">1</span>',
2929
array('type' => 'html')
3030
),
3131
array(
3232
'SELECT 1 # Comment',
33-
'<span class="sql-reserved">SELECT</span>' . "\n" .
33+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
3434
' <span class="sql-number">1</span> <span class="sql-comment"># Comment' . "\n" .
3535
'</span>',
3636
array('type' => 'html')
3737
),
3838
array(
3939
'SELECT HEX("1")',
40-
'<span class="sql-reserved">SELECT</span>' . "\n" .
40+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
4141
' <span class="sql-keyword">HEX</span>(<span class="sql-string">"1"</span>)',
4242
array('type' => 'html')
4343
),
4444
array(
4545
'SELECT * FROM foo WHERE bar=1',
46-
'<span class="sql-reserved">SELECT</span>' . "\n" .
47-
' *' . "\n" .
48-
'<span class="sql-reserved">FROM</span>' . "\n" .
49-
' foo' . "\n" .
50-
'<span class="sql-reserved">WHERE</span>' . "\n" .
46+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
47+
' *' . '<br/>' .
48+
'<span class="sql-reserved">FROM</span>' . '<br/>' .
49+
' foo' . '<br/>' .
50+
'<span class="sql-reserved">WHERE</span>' . '<br/>' .
5151
' bar = <span class="sql-number">1</span>',
5252
array('type' => 'html')
5353
),
5454
array(
5555
'CREATE PROCEDURE SPTEST() BEGIN FROM a SELECT *; END',
56-
'<span class="sql-reserved">CREATE</span>' . "\n" .
57-
'<span class="sql-reserved">PROCEDURE</span> SPTEST()' . "\n" .
58-
'<span class="sql-keyword">BEGIN</span>' . "\n" .
59-
'<span class="sql-reserved">FROM</span>' . "\n" .
60-
' a' . "\n" .
61-
'<span class="sql-reserved">SELECT</span>' . "\n" .
62-
' *;' . "\n" .
56+
'<span class="sql-reserved">CREATE</span>' . '<br/>' .
57+
'<span class="sql-reserved">PROCEDURE</span> SPTEST()' . '<br/>' .
58+
'<span class="sql-keyword">BEGIN</span>' . '<br/>' .
59+
'<span class="sql-reserved">FROM</span>' . '<br/>' .
60+
' a' . '<br/>' .
61+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
62+
' *;' . '<br/>' .
6363
'<span class="sql-keyword">END</span>',
6464
array('type' => 'html')
6565
),
6666
array(
6767
'INSERT INTO foo VALUES (0, 0, 0), (1, 1, 1)',
68-
'<span class="sql-reserved">INSERT</span>' . "\n" .
69-
'<span class="sql-reserved">INTO</span>' . "\n" .
70-
' foo' . "\n" .
68+
'<span class="sql-reserved">INSERT</span>' . '<br/>' .
69+
'<span class="sql-reserved">INTO</span>' . '<br/>' .
70+
' foo' . '<br/>' .
7171
'<span class="sql-reserved">VALUES</span>' .
7272
'(<span class="sql-number">0</span>, <span class="sql-number">0</span>, <span class="sql-number">0</span>),' .
7373
'(<span class="sql-number">1</span>, <span class="sql-number">1</span>, <span class="sql-number">1</span>)',
@@ -85,27 +85,27 @@ public function formatQueries()
8585
),
8686
array(
8787
'SELECT coditm AS Item, descripcion AS Descripcion, contenedores AS Contenedores, IF(suspendido = 1, Si, NO) AS Suspendido FROM `DW_articulos` WHERE superado = 0',
88-
'<span class="sql-reserved">SELECT</span>' . "\n" .
89-
' coditm <span class="sql-reserved">AS</span> Item,' . "\n" .
90-
' descripcion <span class="sql-reserved">AS</span> Descripcion,' . "\n" .
91-
' contenedores <span class="sql-reserved">AS</span> Contenedores,' . "\n" .
92-
' <span class="sql-reserved">IF</span>(suspendido = <span class="sql-number">1</span>, Si, <span class="sql-keyword">NO</span>) <span class="sql-reserved">AS</span> Suspendido' . "\n" .
93-
'<span class="sql-reserved">FROM</span>' . "\n" .
94-
' <span class="sql-variable">`DW_articulos`</span>' . "\n" .
95-
'<span class="sql-reserved">WHERE</span>' . "\n" .
88+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
89+
' coditm <span class="sql-reserved">AS</span> Item,' . '<br/>' .
90+
' descripcion <span class="sql-reserved">AS</span> Descripcion,' . '<br/>' .
91+
' contenedores <span class="sql-reserved">AS</span> Contenedores,' . '<br/>' .
92+
' <span class="sql-reserved">IF</span>(suspendido = <span class="sql-number">1</span>, Si, <span class="sql-keyword">NO</span>) <span class="sql-reserved">AS</span> Suspendido' . '<br/>' .
93+
'<span class="sql-reserved">FROM</span>' . '<br/>' .
94+
' <span class="sql-variable">`DW_articulos`</span>' . '<br/>' .
95+
'<span class="sql-reserved">WHERE</span>' . '<br/>' .
9696
' superado = <span class="sql-number">0</span>',
9797
array('type' => 'html'),
9898
),
9999
array(
100100
'SELECT 1 -- comment',
101-
'<span class="sql-reserved">SELECT</span>' . "\n" .
101+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
102102
' <span class="sql-number">1</span> <span class="sql-comment">-- comment' . "\n" .
103103
'</span>',
104104
array('type' => 'html'),
105105
),
106106
array(
107107
'SELECT 1 -- comment',
108-
'<span class="sql-reserved">SELECT</span>' . "\n" .
108+
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
109109
' <span class="sql-number">1</span>',
110110
array('type' => 'html', 'remove_comments' => true),
111111
),
@@ -117,12 +117,12 @@ public function formatQueries()
117117
' `label` varchar(255) COLLATE utf8_general_ci NOT NULL default "",' . "\n" .
118118
' `query` text NOT NULL,' . "\n" .
119119
' PRIMARY KEY (`id`)' . "\n",
120-
'<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>(' . "\n" .
121-
' <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>,' . "\n" .
122-
' <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>,' . "\n" .
123-
' <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>,' . "\n" .
124-
' <span class="sql-variable">`label`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">COLLATE</span> utf8_general_ci <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . "\n" .
125-
' <span class="sql-variable">`query`</span> <span class="sql-keyword">TEXT</span> <span class="sql-reserved">NOT NULL</span>,' . "\n" .
120+
'<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/>' .
121+
' <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/>' .
122+
' <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/>' .
123+
' <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/>' .
124+
' <span class="sql-variable">`label`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">COLLATE</span> utf8_general_ci <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
125+
' <span class="sql-variable">`query`</span> <span class="sql-keyword">TEXT</span> <span class="sql-reserved">NOT NULL</span>,' . '<br/>' .
126126
' <span class="sql-reserved">PRIMARY KEY</span>(<span class="sql-variable">`id`</span>)',
127127
array('type' => 'html'),
128128
),

0 commit comments

Comments
 (0)