Skip to content

Commit d617223

Browse files
committed
bug #5563 Priority fix: SingleSpaceAfterConstructFixer must run before BracesFixer (kubawerlos)
This PR was merged into the 2.18 branch. Discussion ---------- Priority fix: SingleSpaceAfterConstructFixer must run before BracesFixer Fixes #5559 Commits ------- 4e77042 Priority fix: SingleSpaceAfterConstructFixer must run before BracesFixer
2 parents c409758 + 4e77042 commit d617223

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

src/Fixer/Basic/BracesFixer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function bar($baz)
126126
* {@inheritdoc}
127127
*
128128
* Must run before ArrayIndentationFixer, MethodArgumentSpaceFixer, MethodChainingIndentationFixer.
129-
* Must run after ClassAttributesSeparationFixer, ElseifFixer, LineEndingFixer, MethodSeparationFixer, NoAlternativeSyntaxFixer, NoEmptyStatementFixer, NoUselessElseFixer, SingleTraitInsertPerStatementFixer.
129+
* Must run after ClassAttributesSeparationFixer, ElseifFixer, LineEndingFixer, MethodSeparationFixer, NoAlternativeSyntaxFixer, NoEmptyStatementFixer, NoUselessElseFixer, SingleSpaceAfterConstructFixer, SingleTraitInsertPerStatementFixer.
130130
*/
131131
public function getPriority()
132132
{

src/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixer.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@ public function getDefinition()
175175
);
176176
}
177177

178+
/**
179+
* {@inheritdoc}
180+
*
181+
* Must run before BracesFixer.
182+
*/
183+
public function getPriority()
184+
{
185+
return 36;
186+
}
187+
178188
/**
179189
* {@inheritdoc}
180190
*/

tests/AutoReview/FixerFactoryTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ public function provideFixersPriorityCases()
266266
[$fixers['single_import_per_statement'], $fixers['no_unused_imports']],
267267
[$fixers['single_import_per_statement'], $fixers['space_after_semicolon']],
268268
[$fixers['single_line_throw'], $fixers['concat_space']],
269+
[$fixers['single_space_after_construct'], $fixers['braces']],
269270
[$fixers['single_trait_insert_per_statement'], $fixers['braces']],
270271
[$fixers['single_trait_insert_per_statement'], $fixers['space_after_semicolon']],
271272
[$fixers['standardize_increment'], $fixers['increment_style']],
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--TEST--
2+
Integration of fixers: single_space_after_construct,braces.
3+
--RULESET--
4+
{ "single_space_after_construct": true, "braces": {"position_after_control_structures": "next"}}
5+
--EXPECT--
6+
<?php
7+
if (true)
8+
{
9+
}
10+
else
11+
{
12+
}
13+
14+
--INPUT--
15+
<?php
16+
if (true) {
17+
}
18+
else {
19+
}

0 commit comments

Comments
 (0)