Skip to content

Commit be1bff3

Browse files
sebastianbergmannsebastianbergmann
committed
Fix CS/WS issues
1 parent 0a4c4ed commit be1bff3

File tree

6 files changed

+477
-439
lines changed

6 files changed

+477
-439
lines changed

‎tests/PHP/CodeCoverage/FilterTest.php‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
if (!defined('TEST_FILES_PATH')) {
1212
define(
13-
'TEST_FILES_PATH',
14-
dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
15-
'_files' . DIRECTORY_SEPARATOR
13+
'TEST_FILES_PATH',
14+
dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
15+
'_files' . DIRECTORY_SEPARATOR
1616
);
1717
}
1818

@@ -38,47 +38,47 @@ protected function setUp()
3838
$this->filter = unserialize('O:23:"PHP_CodeCoverage_Filter":0:{}');
3939

4040
$this->files = array(
41-
TEST_FILES_PATH . 'BankAccount.php',
42-
TEST_FILES_PATH . 'BankAccountTest.php',
43-
TEST_FILES_PATH . 'CoverageClassExtendedTest.php',
44-
TEST_FILES_PATH . 'CoverageClassTest.php',
45-
TEST_FILES_PATH . 'CoverageFunctionParenthesesTest.php',
46-
TEST_FILES_PATH . 'CoverageFunctionParenthesesWhitespaceTest.php',
47-
TEST_FILES_PATH . 'CoverageFunctionTest.php',
48-
TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php',
49-
TEST_FILES_PATH . 'CoverageMethodParenthesesTest.php',
50-
TEST_FILES_PATH . 'CoverageMethodParenthesesWhitespaceTest.php',
51-
TEST_FILES_PATH . 'CoverageMethodTest.php',
52-
TEST_FILES_PATH . 'CoverageNoneTest.php',
53-
TEST_FILES_PATH . 'CoverageNotPrivateTest.php',
54-
TEST_FILES_PATH . 'CoverageNotProtectedTest.php',
55-
TEST_FILES_PATH . 'CoverageNotPublicTest.php',
56-
TEST_FILES_PATH . 'CoverageNothingTest.php',
57-
TEST_FILES_PATH . 'CoveragePrivateTest.php',
58-
TEST_FILES_PATH . 'CoverageProtectedTest.php',
59-
TEST_FILES_PATH . 'CoveragePublicTest.php',
60-
TEST_FILES_PATH . 'CoverageTwoDefaultClassAnnotations.php',
61-
TEST_FILES_PATH . 'CoveredClass.php',
62-
TEST_FILES_PATH . 'CoveredFunction.php',
63-
TEST_FILES_PATH . 'NamespaceCoverageClassExtendedTest.php',
64-
TEST_FILES_PATH . 'NamespaceCoverageClassTest.php',
65-
TEST_FILES_PATH . 'NamespaceCoverageCoversClassPublicTest.php',
66-
TEST_FILES_PATH . 'NamespaceCoverageCoversClassTest.php',
67-
TEST_FILES_PATH . 'NamespaceCoverageMethodTest.php',
68-
TEST_FILES_PATH . 'NamespaceCoverageNotPrivateTest.php',
69-
TEST_FILES_PATH . 'NamespaceCoverageNotProtectedTest.php',
70-
TEST_FILES_PATH . 'NamespaceCoverageNotPublicTest.php',
71-
TEST_FILES_PATH . 'NamespaceCoveragePrivateTest.php',
72-
TEST_FILES_PATH . 'NamespaceCoverageProtectedTest.php',
73-
TEST_FILES_PATH . 'NamespaceCoveragePublicTest.php',
74-
TEST_FILES_PATH . 'NamespaceCoveredClass.php',
75-
TEST_FILES_PATH . 'NotExistingCoveredElementTest.php',
76-
TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php',
77-
TEST_FILES_PATH . 'source_with_ignore.php',
78-
TEST_FILES_PATH . 'source_with_namespace.php',
79-
TEST_FILES_PATH . 'source_with_oneline_annotations.php',
80-
TEST_FILES_PATH . 'source_without_ignore.php',
81-
TEST_FILES_PATH . 'source_without_namespace.php'
41+
TEST_FILES_PATH . 'BankAccount.php',
42+
TEST_FILES_PATH . 'BankAccountTest.php',
43+
TEST_FILES_PATH . 'CoverageClassExtendedTest.php',
44+
TEST_FILES_PATH . 'CoverageClassTest.php',
45+
TEST_FILES_PATH . 'CoverageFunctionParenthesesTest.php',
46+
TEST_FILES_PATH . 'CoverageFunctionParenthesesWhitespaceTest.php',
47+
TEST_FILES_PATH . 'CoverageFunctionTest.php',
48+
TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php',
49+
TEST_FILES_PATH . 'CoverageMethodParenthesesTest.php',
50+
TEST_FILES_PATH . 'CoverageMethodParenthesesWhitespaceTest.php',
51+
TEST_FILES_PATH . 'CoverageMethodTest.php',
52+
TEST_FILES_PATH . 'CoverageNoneTest.php',
53+
TEST_FILES_PATH . 'CoverageNotPrivateTest.php',
54+
TEST_FILES_PATH . 'CoverageNotProtectedTest.php',
55+
TEST_FILES_PATH . 'CoverageNotPublicTest.php',
56+
TEST_FILES_PATH . 'CoverageNothingTest.php',
57+
TEST_FILES_PATH . 'CoveragePrivateTest.php',
58+
TEST_FILES_PATH . 'CoverageProtectedTest.php',
59+
TEST_FILES_PATH . 'CoveragePublicTest.php',
60+
TEST_FILES_PATH . 'CoverageTwoDefaultClassAnnotations.php',
61+
TEST_FILES_PATH . 'CoveredClass.php',
62+
TEST_FILES_PATH . 'CoveredFunction.php',
63+
TEST_FILES_PATH . 'NamespaceCoverageClassExtendedTest.php',
64+
TEST_FILES_PATH . 'NamespaceCoverageClassTest.php',
65+
TEST_FILES_PATH . 'NamespaceCoverageCoversClassPublicTest.php',
66+
TEST_FILES_PATH . 'NamespaceCoverageCoversClassTest.php',
67+
TEST_FILES_PATH . 'NamespaceCoverageMethodTest.php',
68+
TEST_FILES_PATH . 'NamespaceCoverageNotPrivateTest.php',
69+
TEST_FILES_PATH . 'NamespaceCoverageNotProtectedTest.php',
70+
TEST_FILES_PATH . 'NamespaceCoverageNotPublicTest.php',
71+
TEST_FILES_PATH . 'NamespaceCoveragePrivateTest.php',
72+
TEST_FILES_PATH . 'NamespaceCoverageProtectedTest.php',
73+
TEST_FILES_PATH . 'NamespaceCoveragePublicTest.php',
74+
TEST_FILES_PATH . 'NamespaceCoveredClass.php',
75+
TEST_FILES_PATH . 'NotExistingCoveredElementTest.php',
76+
TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php',
77+
TEST_FILES_PATH . 'source_with_ignore.php',
78+
TEST_FILES_PATH . 'source_with_namespace.php',
79+
TEST_FILES_PATH . 'source_with_oneline_annotations.php',
80+
TEST_FILES_PATH . 'source_without_ignore.php',
81+
TEST_FILES_PATH . 'source_without_namespace.php'
8282
);
8383
}
8484

@@ -91,7 +91,8 @@ public function testAddingAFileToTheBlacklistWorks()
9191
$this->filter->addFileToBlacklist($this->files[0]);
9292

9393
$this->assertEquals(
94-
array($this->files[0]), $this->filter->getBlacklist()
94+
array($this->files[0]),
95+
$this->filter->getBlacklist()
9596
);
9697
}
9798

@@ -130,7 +131,8 @@ public function testAddingFilesToTheBlacklistWorks()
130131
{
131132
$facade = new File_Iterator_Facade;
132133
$files = $facade->getFilesAsArray(
133-
TEST_FILES_PATH, $suffixes = '.php'
134+
TEST_FILES_PATH,
135+
$suffixes = '.php'
134136
);
135137

136138
$this->filter->addFilesToBlacklist($files);
@@ -163,7 +165,8 @@ public function testAddingAFileToTheWhitelistWorks()
163165
$this->filter->addFileToWhitelist($this->files[0]);
164166

165167
$this->assertEquals(
166-
array($this->files[0]), $this->filter->getWhitelist()
168+
array($this->files[0]),
169+
$this->filter->getWhitelist()
167170
);
168171
}
169172

@@ -202,7 +205,8 @@ public function testAddingFilesToTheWhitelistWorks()
202205
{
203206
$facade = new File_Iterator_Facade;
204207
$files = $facade->getFilesAsArray(
205-
TEST_FILES_PATH, $suffixes = '.php'
208+
TEST_FILES_PATH,
209+
$suffixes = '.php'
206210
);
207211

208212
$this->filter->addFilesToWhitelist($files);

‎tests/PHP/CodeCoverage/Report/CloverTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
if (!defined('TEST_FILES_PATH')) {
1212
define(
13-
'TEST_FILES_PATH',
14-
dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
15-
'_files' . DIRECTORY_SEPARATOR
13+
'TEST_FILES_PATH',
14+
dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
15+
'_files' . DIRECTORY_SEPARATOR
1616
);
1717
}
1818

@@ -40,8 +40,8 @@ public function testCloverForBankAccountTest()
4040
$clover = new PHP_CodeCoverage_Report_Clover;
4141

4242
$this->assertStringMatchesFormatFile(
43-
TEST_FILES_PATH . 'BankAccount-clover.xml',
44-
$clover->process($this->getCoverageForBankAccount(), null, 'BankAccount')
43+
TEST_FILES_PATH . 'BankAccount-clover.xml',
44+
$clover->process($this->getCoverageForBankAccount(), null, 'BankAccount')
4545
);
4646
}
4747

@@ -53,8 +53,8 @@ public function testCloverForFileWithIgnoredLines()
5353
$clover = new PHP_CodeCoverage_Report_Clover;
5454

5555
$this->assertStringMatchesFormatFile(
56-
TEST_FILES_PATH . 'ignored-lines-clover.xml',
57-
$clover->process($this->getCoverageForFileWithIgnoredLines())
56+
TEST_FILES_PATH . 'ignored-lines-clover.xml',
57+
$clover->process($this->getCoverageForFileWithIgnoredLines())
5858
);
5959
}
6060

@@ -66,8 +66,8 @@ public function testCloverForClassWithAnonymousFunction()
6666
$clover = new PHP_CodeCoverage_Report_Clover;
6767

6868
$this->assertStringMatchesFormatFile(
69-
TEST_FILES_PATH . 'class-with-anonymous-function-clover.xml',
70-
$clover->process($this->getCoverageForClassWithAnonymousFunction())
69+
TEST_FILES_PATH . 'class-with-anonymous-function-clover.xml',
70+
$clover->process($this->getCoverageForClassWithAnonymousFunction())
7171
);
7272
}
7373
}

0 commit comments

Comments
 (0)