Skip to content

Commit c0344b0

Browse files
jrfnljrfnl
authored
CS: class/function braces on new line (sirbrillig#258)
... as per PSR2/PSR12. Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
1 parent 5058218 commit c0344b0

19 files changed

+404
-206
lines changed

‎Tests/BaseTestCase.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
use PHP_CodeSniffer\Ruleset;
77
use PHP_CodeSniffer\Config;
88

9-
class BaseTestCase extends TestCase {
9+
class BaseTestCase extends TestCase
10+
{
1011
const STANDARD_NAME = 'VariableAnalysis';
1112

12-
public function prepareLocalFileForSniffs($fixtureFile) {
13+
public function prepareLocalFileForSniffs($fixtureFile)
14+
{
1315
$sniffFile = __DIR__ . '/../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php';
1416

1517
$config = new Config();
@@ -27,21 +29,25 @@ public function prepareLocalFileForSniffs($fixtureFile) {
2729
return new LocalFile($fixtureFile, $ruleset, $config);
2830
}
2931

30-
public function getLineNumbersFromMessages(array $messages) {
32+
public function getLineNumbersFromMessages(array $messages)
33+
{
3134
$lines = array_keys($messages);
3235
sort($lines);
3336
return $lines;
3437
}
3538

36-
public function getWarningLineNumbersFromFile(LocalFile $phpcsFile) {
39+
public function getWarningLineNumbersFromFile(LocalFile $phpcsFile)
40+
{
3741
return $this->getLineNumbersFromMessages($phpcsFile->getWarnings());
3842
}
3943

40-
public function getErrorLineNumbersFromFile(LocalFile $phpcsFile) {
44+
public function getErrorLineNumbersFromFile(LocalFile $phpcsFile)
45+
{
4146
return $this->getLineNumbersFromMessages($phpcsFile->getErrors());
4247
}
4348

44-
public function getFixture($fixtureFilename) {
49+
public function getFixture($fixtureFilename)
50+
{
4551
return realpath(__DIR__ . '/VariableAnalysisSniff/fixtures/' . $fixtureFilename);
4652
}
4753
}

‎Tests/VariableAnalysisSniff/ArrayAssignmentShortcutTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class ArrayAssignmentShortcutTest extends BaseTestCase {
7-
public function testArrayAssignmentReportsCorrectLines() {
6+
class ArrayAssignmentShortcutTest extends BaseTestCase
7+
{
8+
public function testArrayAssignmentReportsCorrectLines()
9+
{
810
$fixtureFile = $this->getFixture('ArrayAssignmentShortcutFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->process();
@@ -19,7 +21,8 @@ public function testArrayAssignmentReportsCorrectLines() {
1921
$this->assertSame($expectedWarnings, $lines);
2022
}
2123

22-
public function testArrayAssignmentHasCorrectSniffCodes() {
24+
public function testArrayAssignmentHasCorrectSniffCodes()
25+
{
2326
$fixtureFile = $this->getFixture('ArrayAssignmentShortcutFixture.php');
2427
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
2528
$phpcsFile->process();

‎Tests/VariableAnalysisSniff/ArrowFunctionTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class ArrowFunctionTest extends BaseTestCase {
7-
public function testArrowFunctions() {
6+
class ArrowFunctionTest extends BaseTestCase
7+
{
8+
public function testArrowFunctions()
9+
{
810
$fixtureFile = $this->getFixture('ArrowFunctionFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->ruleset->setSniffProperty(
@@ -30,7 +32,8 @@ public function testArrowFunctions() {
3032
$this->assertSame($expectedWarnings, $lines);
3133
}
3234

33-
public function testArrowFunctionsWithoutUnusedBeforeUsed() {
35+
public function testArrowFunctionsWithoutUnusedBeforeUsed()
36+
{
3437
$fixtureFile = $this->getFixture('ArrowFunctionFixture.php');
3538
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
3639
$phpcsFile->ruleset->setSniffProperty(

‎Tests/VariableAnalysisSniff/ClosingPhpTagsTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class ClosingPhpTagsTest extends BaseTestCase {
7-
public function testVariableWarningsWhenClosingTagsAreUsed() {
6+
class ClosingPhpTagsTest extends BaseTestCase
7+
{
8+
public function testVariableWarningsWhenClosingTagsAreUsed()
9+
{
810
$fixtureFile = $this->getFixture('ClosingPhpTagsFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->process();
@@ -18,7 +20,8 @@ public function testVariableWarningsWhenClosingTagsAreUsed() {
1820
$this->assertSame($expectedWarnings, $lines);
1921
}
2022

21-
public function testVariableWarningsHaveCorrectSniffCodesWhenClosingTagsAreUsed() {
23+
public function testVariableWarningsHaveCorrectSniffCodesWhenClosingTagsAreUsed()
24+
{
2225
$fixtureFile = $this->getFixture('ClosingPhpTagsFixture.php');
2326
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
2427
$phpcsFile->process();

‎Tests/VariableAnalysisSniff/GlobalScopeTest.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class GlobalScopeTest extends BaseTestCase {
7-
public function testGlobalScopeWarnings() {
6+
class GlobalScopeTest extends BaseTestCase
7+
{
8+
public function testGlobalScopeWarnings()
9+
{
810
$fixtureFile = $this->getFixture('GlobalScopeFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->ruleset->setSniffProperty(
@@ -23,7 +25,8 @@ public function testGlobalScopeWarnings() {
2325
$this->assertSame($expectedErrors, $lines);
2426
}
2527

26-
public function testGlobalScopeWarningsWithAllowUndefinedVariablesInFileScope() {
28+
public function testGlobalScopeWarningsWithAllowUndefinedVariablesInFileScope()
29+
{
2730
$fixtureFile = $this->getFixture('GlobalScopeFixture.php');
2831
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
2932
$phpcsFile->ruleset->setSniffProperty(
@@ -41,7 +44,8 @@ public function testGlobalScopeWarningsWithAllowUndefinedVariablesInFileScope()
4144
$this->assertSame($expectedErrors, $lines);
4245
}
4346

44-
public function testGlobalScopeWarningsWithAllowUnusedVariablesInFileScope() {
47+
public function testGlobalScopeWarningsWithAllowUnusedVariablesInFileScope()
48+
{
4549
$fixtureFile = $this->getFixture('GlobalScopeFixture.php');
4650
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
4751
$phpcsFile->ruleset->setSniffProperty(

‎Tests/VariableAnalysisSniff/IfConditionTest.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class IfConditionTest extends BaseTestCase {
7-
public function testIfConditionWarnings() {
6+
class IfConditionTest extends BaseTestCase
7+
{
8+
public function testIfConditionWarnings()
9+
{
810
$fixtureFile = $this->getFixture('FunctionWithIfConditionFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->ruleset->setSniffProperty(
@@ -36,7 +38,8 @@ public function testIfConditionWarnings() {
3638
$this->assertSame($expectedWarnings, $lines);
3739
}
3840

39-
public function testIfConditionWarningsWithValidUndefinedVariableNames() {
41+
public function testIfConditionWarningsWithValidUndefinedVariableNames()
42+
{
4043
$fixtureFile = $this->getFixture('FunctionWithIfConditionFixture.php');
4144
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
4245
$phpcsFile->ruleset->setSniffProperty(
@@ -67,7 +70,8 @@ public function testIfConditionWarningsWithValidUndefinedVariableNames() {
6770
$this->assertSame($expectedWarnings, $lines);
6871
}
6972

70-
public function testInlineIfConditionWarnings() {
73+
public function testInlineIfConditionWarnings()
74+
{
7175
$fixtureFile = $this->getFixture('FunctionWithInlineIfConditionFixture.php');
7276
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
7377
$phpcsFile->ruleset->setSniffProperty(
@@ -99,7 +103,8 @@ public function testInlineIfConditionWarnings() {
99103
$this->assertSame($expectedWarnings, $lines);
100104
}
101105

102-
public function testInlineIfConditionWarningsWithValidUndefinedVariableNames() {
106+
public function testInlineIfConditionWarningsWithValidUndefinedVariableNames()
107+
{
103108
$fixtureFile = $this->getFixture('FunctionWithInlineIfConditionFixture.php');
104109
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
105110
$phpcsFile->ruleset->setSniffProperty(

‎Tests/VariableAnalysisSniff/IssetTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class IssetTest extends BaseTestCase {
7-
public function testIssetVariableUse() {
6+
class IssetTest extends BaseTestCase
7+
{
8+
public function testIssetVariableUse()
9+
{
810
$fixtureFile = $this->getFixture('IssetFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->process();

‎Tests/VariableAnalysisSniff/UnsetTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class UnsetTest extends BaseTestCase {
7-
public function testUnsetReportsUndefinedVariables() {
6+
class UnsetTest extends BaseTestCase
7+
{
8+
public function testUnsetReportsUndefinedVariables()
9+
{
810
$fixtureFile = $this->getFixture('UnsetFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->process();
@@ -17,7 +19,8 @@ public function testUnsetReportsUndefinedVariables() {
1719
$this->assertSame($expectedWarnings, $lines);
1820
}
1921

20-
public function testUnsetHasCorrectSniffCodes() {
22+
public function testUnsetHasCorrectSniffCodes()
23+
{
2124
$fixtureFile = $this->getFixture('UnsetFixture.php');
2225
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
2326
$phpcsFile->process();

‎Tests/VariableAnalysisSniff/UnusedFollowedByRequireTest.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
use VariableAnalysis\Tests\BaseTestCase;
55

6-
class UnusedFollowedByRequire extends BaseTestCase {
7-
public function testUnusedFollowedByRequireWarnsByDefault() {
6+
class UnusedFollowedByRequire extends BaseTestCase
7+
{
8+
public function testUnusedFollowedByRequireWarnsByDefault()
9+
{
810
$fixtureFile = $this->getFixture('UnusedFollowedByRequireFixture.php');
911
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
1012
$phpcsFile->process();
@@ -26,7 +28,8 @@ public function testUnusedFollowedByRequireWarnsByDefault() {
2628
$this->assertSame($expectedWarnings, $lines);
2729
}
2830

29-
public function testUnusedFollowedByRequireDoesNotWarnWhenSet() {
31+
public function testUnusedFollowedByRequireDoesNotWarnWhenSet()
32+
{
3033
$fixtureFile = $this->getFixture('UnusedFollowedByRequireFixture.php');
3134
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
3235
$phpcsFile->ruleset->setSniffProperty(
@@ -45,7 +48,8 @@ public function testUnusedFollowedByRequireDoesNotWarnWhenSet() {
4548
$this->assertSame($expectedWarnings, $lines);
4649
}
4750

48-
public function testUnusedFollowedByRequireDoesNotBreakOtherThingsWhenSet() {
51+
public function testUnusedFollowedByRequireDoesNotBreakOtherThingsWhenSet()
52+
{
4953
$fixtureFile = $this->getFixture('FunctionWithoutParamFixture.php');
5054
$phpcsFile = $this->prepareLocalFileForSniffs($fixtureFile);
5155
$phpcsFile->ruleset->setSniffProperty(

0 commit comments

Comments
 (0)