Skip to content

Commit d6cf731

Browse files
sebastianbergmannsebastianbergmann
committed
Fix CS/WS issues
1 parent 8095d42 commit d6cf731

9 files changed

+36
-57
lines changed

‎tests/tests/BuilderTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
use SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData;
1414
use SebastianBergmann\CodeCoverage\TestCase;
1515

16-
class BuilderTest extends TestCase
16+
final class BuilderTest extends TestCase
1717
{
18-
protected $factory;
18+
private $factory;
1919

2020
protected function setUp(): void
2121
{
@@ -204,9 +204,7 @@ public function reducePathsProvider()
204204
$this->pathsToProcessedDataObjectHelper([]),
205205
];
206206

207-
$prefixes = ["C:$s", "$s"];
208-
209-
foreach ($prefixes as $p) {
207+
foreach (["C:$s", "$s"] as $p) {
210208
yield [
211209
[
212210
'Money.php' => [],

‎tests/tests/CloverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use SebastianBergmann\CodeCoverage\TestCase;
1313

1414
/**
15-
* @covers SebastianBergmann\CodeCoverage\Report\Clover
15+
* @covers \SebastianBergmann\CodeCoverage\Report\Clover
1616
*/
17-
class CloverTest extends TestCase
17+
final class CloverTest extends TestCase
1818
{
1919
public function testCloverForBankAccountTest(): void
2020
{

‎tests/tests/CodeCoverageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
use SebastianBergmann\Environment\Runtime;
1414

1515
/**
16-
* @covers SebastianBergmann\CodeCoverage\CodeCoverage
16+
* @covers \SebastianBergmann\CodeCoverage\CodeCoverage
1717
*/
18-
class CodeCoverageTest extends TestCase
18+
final class CodeCoverageTest extends TestCase
1919
{
2020
/**
2121
* @var CodeCoverage

‎tests/tests/Crap4jTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use SebastianBergmann\CodeCoverage\TestCase;
1313

1414
/**
15-
* @covers SebastianBergmann\CodeCoverage\Report\Crap4j
15+
* @covers \SebastianBergmann\CodeCoverage\Report\Crap4j
1616
*/
17-
class Crap4jTest extends TestCase
17+
final class Crap4jTest extends TestCase
1818
{
1919
public function testForBankAccountTest(): void
2020
{

‎tests/tests/FilterTest.php

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
use PHPUnit\Framework\TestCase;
1313
use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
1414

15-
class FilterTest extends TestCase
15+
/**
16+
* @covers \SebastianBergmann\CodeCoverage\Filter
17+
*/
18+
final class FilterTest extends TestCase
1619
{
1720
/**
1821
* @var Filter
@@ -76,10 +79,6 @@ protected function setUp(): void
7679
];
7780
}
7881

79-
/**
80-
* @covers SebastianBergmann\CodeCoverage\Filter::addFileToWhitelist
81-
* @covers SebastianBergmann\CodeCoverage\Filter::getWhitelist
82-
*/
8382
public function testAddingAFileToTheWhitelistWorks(): void
8483
{
8584
$this->filter->addFileToWhitelist($this->files[0]);
@@ -90,10 +89,6 @@ public function testAddingAFileToTheWhitelistWorks(): void
9089
);
9190
}
9291

93-
/**
94-
* @covers SebastianBergmann\CodeCoverage\Filter::removeFileFromWhitelist
95-
* @covers SebastianBergmann\CodeCoverage\Filter::getWhitelist
96-
*/
9792
public function testRemovingAFileFromTheWhitelistWorks(): void
9893
{
9994
$this->filter->addFileToWhitelist($this->files[0]);
@@ -103,8 +98,6 @@ public function testRemovingAFileFromTheWhitelistWorks(): void
10398
}
10499

105100
/**
106-
* @covers SebastianBergmann\CodeCoverage\Filter::addDirectoryToWhitelist
107-
* @covers SebastianBergmann\CodeCoverage\Filter::getWhitelist
108101
* @depends testAddingAFileToTheWhitelistWorks
109102
*/
110103
public function testAddingADirectoryToTheWhitelistWorks(): void
@@ -117,15 +110,9 @@ public function testAddingADirectoryToTheWhitelistWorks(): void
117110
$this->assertEquals($this->files, $whitelist);
118111
}
119112

120-
/**
121-
* @covers SebastianBergmann\CodeCoverage\Filter::addFilesToWhitelist
122-
* @covers SebastianBergmann\CodeCoverage\Filter::getWhitelist
123-
*/
124113
public function testAddingFilesToTheWhitelistWorks(): void
125114
{
126-
$facade = new FileIteratorFacade;
127-
128-
$files = $facade->getFilesAsArray(
115+
$files = (new FileIteratorFacade)->getFilesAsArray(
129116
TEST_FILES_PATH,
130117
$suffixes = '.php'
131118
);
@@ -139,8 +126,6 @@ public function testAddingFilesToTheWhitelistWorks(): void
139126
}
140127

141128
/**
142-
* @covers SebastianBergmann\CodeCoverage\Filter::removeDirectoryFromWhitelist
143-
* @covers SebastianBergmann\CodeCoverage\Filter::getWhitelist
144129
* @depends testAddingADirectoryToTheWhitelistWorks
145130
*/
146131
public function testRemovingADirectoryFromTheWhitelistWorks(): void
@@ -151,9 +136,6 @@ public function testRemovingADirectoryFromTheWhitelistWorks(): void
151136
$this->assertEquals([], $this->filter->getWhitelist());
152137
}
153138

154-
/**
155-
* @covers SebastianBergmann\CodeCoverage\Filter::isFile
156-
*/
157139
public function testIsFile(): void
158140
{
159141
$this->assertFalse($this->filter->isFile('vfs://root/a/path'));
@@ -165,28 +147,18 @@ public function testIsFile(): void
165147
$this->assertTrue($this->filter->isFile(__FILE__));
166148
}
167149

168-
/**
169-
* @covers SebastianBergmann\CodeCoverage\Filter::isFiltered
170-
*/
171150
public function testWhitelistedFileIsNotFiltered(): void
172151
{
173152
$this->filter->addFileToWhitelist($this->files[0]);
174153
$this->assertFalse($this->filter->isFiltered($this->files[0]));
175154
}
176155

177-
/**
178-
* @covers SebastianBergmann\CodeCoverage\Filter::isFiltered
179-
*/
180156
public function testNotWhitelistedFileIsFiltered(): void
181157
{
182158
$this->filter->addFileToWhitelist($this->files[0]);
183159
$this->assertTrue($this->filter->isFiltered($this->files[1]));
184160
}
185161

186-
/**
187-
* @covers SebastianBergmann\CodeCoverage\Filter::isFiltered
188-
* @covers SebastianBergmann\CodeCoverage\Filter::isFile
189-
*/
190162
public function testNonFilesAreFiltered(): void
191163
{
192164
$this->assertTrue($this->filter->isFiltered('vfs://root/a/path'));
@@ -198,9 +170,6 @@ public function testNonFilesAreFiltered(): void
198170
}
199171

200172
/**
201-
* @covers SebastianBergmann\CodeCoverage\Filter::addFileToWhitelist
202-
* @covers SebastianBergmann\CodeCoverage\Filter::getWhitelist
203-
*
204173
* @ticket https://github.com/sebastianbergmann/php-code-coverage/issues/664
205174
*/
206175
public function testTryingToAddFileThatDoesNotExistDoesNotChangeFilter(): void

‎tests/tests/ProcessedCodeCoverageDataTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
*/
1010
namespace SebastianBergmann\CodeCoverage;
1111

12-
class ProcessedCodeCoverageDataTest extends TestCase
12+
final class ProcessedCodeCoverageDataTest extends TestCase
1313
{
1414
public function testMerge(): void
1515
{
1616
$coverage = $this->getCoverageForBankAccountForFirstTwoTests()->getData();
17+
1718
$coverage->merge($this->getCoverageForBankAccountForLastTwoTests()->getData());
1819

1920
$this->assertEquals(
@@ -24,7 +25,8 @@ public function testMerge(): void
2425

2526
public function testMergeOfAPreviouslyUnseenLine(): void
2627
{
27-
$newCoverage = new ProcessedCodeCoverageData();
28+
$newCoverage = new ProcessedCodeCoverageData;
29+
2830
$newCoverage->setLineCoverage(
2931
[
3032
'/some/path/SomeClass.php' => [
@@ -34,8 +36,10 @@ public function testMergeOfAPreviouslyUnseenLine(): void
3436
]
3537
);
3638

37-
$existingCoverage = new ProcessedCodeCoverageData();
39+
$existingCoverage = new ProcessedCodeCoverageData;
40+
3841
$existingCoverage->merge($newCoverage);
42+
3943
$this->assertArrayHasKey(12, $existingCoverage->getLineCoverage()['/some/path/SomeClass.php']);
4044
}
4145
}

‎tests/tests/RawCodeCoverageDataTest.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
namespace SebastianBergmann\CodeCoverage;
1111

12-
class RawCodeCoverageDataTest extends TestCase
12+
final class RawCodeCoverageDataTest extends TestCase
1313
{
1414
/**
1515
* In the standard XDebug format, there is only line data. Therefore output should match input.
@@ -25,6 +25,7 @@ public function testLineDataFromStandardXDebugFormat(): void
2525
];
2626

2727
$dataObject = RawCodeCoverageData::fromXdebugWithoutPathCoverage($lineDataFromDriver);
28+
2829
$this->assertEquals($lineDataFromDriver, $dataObject->getLineCoverage());
2930
}
3031

@@ -55,6 +56,7 @@ public function testLineDataFromPathCoverageXDebugFormat(): void
5556
];
5657

5758
$dataObject = RawCodeCoverageData::fromXdebugWithPathCoverage($rawDataFromDriver);
59+
5860
$this->assertEquals($lineData, $dataObject->getLineCoverage());
5961
}
6062

@@ -69,7 +71,9 @@ public function testClear(): void
6971
];
7072

7173
$dataObject = RawCodeCoverageData::fromXdebugWithoutPathCoverage($lineDataFromDriver);
74+
7275
$dataObject->clear();
76+
7377
$this->assertEmpty($dataObject->getLineCoverage());
7478
}
7579

@@ -107,7 +111,9 @@ public function testRemoveCoverageDataForFile(): void
107111
];
108112

109113
$dataObject = RawCodeCoverageData::fromXdebugWithoutPathCoverage($lineDataFromDriver);
114+
110115
$dataObject->removeCoverageDataForFile('/some/path/SomeOtherClass.php');
116+
111117
$this->assertEquals($expectedFilterResult, $dataObject->getLineCoverage());
112118
}
113119

@@ -144,9 +150,11 @@ public function testKeepCoverageDataOnlyForLines(): void
144150
];
145151

146152
$dataObject = RawCodeCoverageData::fromXdebugWithoutPathCoverage($lineDataFromDriver);
153+
147154
$dataObject->keepCoverageDataOnlyForLines('/some/path/SomeClass.php', [9, 13]);
148155
$dataObject->keepCoverageDataOnlyForLines('/some/path/SomeOtherClass.php', [999]);
149156
$dataObject->keepCoverageDataOnlyForLines('/some/path/AnotherClass.php', [28]);
157+
150158
$this->assertEquals($expectedFilterResult, $dataObject->getLineCoverage());
151159
}
152160

@@ -186,9 +194,11 @@ public function testRemoveCoverageDataForLines(): void
186194
];
187195

188196
$dataObject = RawCodeCoverageData::fromXdebugWithoutPathCoverage($lineDataFromDriver);
197+
189198
$dataObject->removeCoverageDataForLines('/some/path/SomeClass.php', [9, 13]);
190199
$dataObject->removeCoverageDataForLines('/some/path/SomeOtherClass.php', [999]);
191200
$dataObject->removeCoverageDataForLines('/some/path/AnotherClass.php', [28]);
201+
192202
$this->assertEquals($expectedFilterResult, $dataObject->getLineCoverage());
193203
}
194204
}

‎tests/tests/TextTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use SebastianBergmann\CodeCoverage\TestCase;
1313

1414
/**
15-
* @covers SebastianBergmann\CodeCoverage\Report\Text
15+
* @covers \SebastianBergmann\CodeCoverage\Report\Text
1616
*/
17-
class TextTest extends TestCase
17+
final class TextTest extends TestCase
1818
{
1919
public function testTextForBankAccountTest(): void
2020
{

‎tests/tests/XmlTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
use SebastianBergmann\CodeCoverage\TestCase;
1313

14-
class XmlTest extends TestCase
14+
final class XmlTest extends TestCase
1515
{
1616
private static $TEST_REPORT_PATH_SOURCE;
1717

@@ -26,9 +26,7 @@ protected function tearDown(): void
2626
{
2727
parent::tearDown();
2828

29-
$tmpFilesIterator = new \FilesystemIterator(self::$TEST_TMP_PATH);
30-
31-
foreach ($tmpFilesIterator as $path => $fileInfo) {
29+
foreach (new \FilesystemIterator(self::$TEST_TMP_PATH) as $path => $fileInfo) {
3230
/* @var \SplFileInfo $fileInfo */
3331
\unlink($fileInfo->getPathname());
3432
}

0 commit comments

Comments
 (0)