Skip to content

Commit af8e8e0

Browse files
sebastianbergmannsebastianbergmann
committed
Rename
1 parent e424dfd commit af8e8e0

File tree

7 files changed

+45
-45
lines changed

7 files changed

+45
-45
lines changed

‎src/CodeCoverage.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
use SebastianBergmann\CodeCoverage\Driver\Driver;
3030
use SebastianBergmann\CodeCoverage\Node\Builder;
3131
use SebastianBergmann\CodeCoverage\Node\Directory;
32-
use SebastianBergmann\CodeCoverage\StaticAnalysis\CachingExecutedFileAnalyser;
33-
use SebastianBergmann\CodeCoverage\StaticAnalysis\ExecutedFileAnalyser;
34-
use SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingExecutedFileAnalyser;
32+
use SebastianBergmann\CodeCoverage\StaticAnalysis\CachingCoveredFileAnalyser;
33+
use SebastianBergmann\CodeCoverage\StaticAnalysis\CoveredFileAnalyser;
34+
use SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingCoveredFileAnalyser;
3535
use SebastianBergmann\CodeUnitReverseLookup\Wizard;
3636

3737
/**
@@ -113,9 +113,9 @@ final class CodeCoverage
113113
private $isInitialized = false;
114114

115115
/**
116-
* @var ?ExecutedFileAnalyser
116+
* @var ?CoveredFileAnalyser
117117
*/
118-
private $executedFileAnalyser;
118+
private $coveredFileAnalyser;
119119

120120
/**
121121
* @var ?string
@@ -137,7 +137,7 @@ public function __construct(Driver $driver, Filter $filter)
137137
*/
138138
public function getReport(): Directory
139139
{
140-
return (new Builder($this->executedFileAnalyser()))->build($this);
140+
return (new Builder($this->coveredFileAnalyser()))->build($this);
141141
}
142142

143143
/**
@@ -480,7 +480,7 @@ private function applyIgnoredLinesFilter(RawCodeCoverageData $data): void
480480

481481
$data->removeCoverageDataForLines(
482482
$filename,
483-
$this->executedFileAnalyser()->ignoredLinesFor($filename)
483+
$this->coveredFileAnalyser()->ignoredLinesFor($filename)
484484
);
485485
}
486486
}
@@ -634,24 +634,24 @@ private function initializeData(): void
634634
}
635635
}
636636

637-
private function executedFileAnalyser(): ExecutedFileAnalyser
637+
private function coveredFileAnalyser(): CoveredFileAnalyser
638638
{
639-
if ($this->executedFileAnalyser !== null) {
640-
return $this->executedFileAnalyser;
639+
if ($this->coveredFileAnalyser !== null) {
640+
return $this->coveredFileAnalyser;
641641
}
642642

643-
$this->executedFileAnalyser = new ParsingExecutedFileAnalyser(
643+
$this->coveredFileAnalyser = new ParsingCoveredFileAnalyser(
644644
$this->useAnnotationsForIgnoringCode,
645645
$this->ignoreDeprecatedCode
646646
);
647647

648648
if ($this->cachesStaticAnalysis()) {
649-
$this->executedFileAnalyser = new CachingExecutedFileAnalyser(
649+
$this->coveredFileAnalyser = new CachingCoveredFileAnalyser(
650650
$this->cacheDirectory,
651-
$this->executedFileAnalyser
651+
$this->coveredFileAnalyser
652652
);
653653
}
654654

655-
return $this->executedFileAnalyser;
655+
return $this->coveredFileAnalyser;
656656
}
657657
}

‎src/Node/Builder.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
use function substr;
2323
use SebastianBergmann\CodeCoverage\CodeCoverage;
2424
use SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData;
25-
use SebastianBergmann\CodeCoverage\StaticAnalysis\ExecutedFileAnalyser;
25+
use SebastianBergmann\CodeCoverage\StaticAnalysis\CoveredFileAnalyser;
2626

2727
/**
2828
* @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
2929
*/
3030
final class Builder
3131
{
3232
/**
33-
* @var ExecutedFileAnalyser
33+
* @var CoveredFileAnalyser
3434
*/
35-
private $executedFileAnalyser;
35+
private $coveredFileAnalyser;
3636

37-
public function __construct(ExecutedFileAnalyser $executedFileAnalyser)
37+
public function __construct(CoveredFileAnalyser $coveredFileAnalyser)
3838
{
39-
$this->executedFileAnalyser = $executedFileAnalyser;
39+
$this->coveredFileAnalyser = $coveredFileAnalyser;
4040
}
4141

4242
public function build(CodeCoverage $coverage): Directory
@@ -74,10 +74,10 @@ private function addItems(Directory $root, array $items, array $tests): void
7474
$value['lineCoverage'],
7575
$value['functionCoverage'],
7676
$tests,
77-
$this->executedFileAnalyser->classesIn($filename),
78-
$this->executedFileAnalyser->traitsIn($filename),
79-
$this->executedFileAnalyser->functionsIn($filename),
80-
$this->executedFileAnalyser->linesOfCodeFor($filename)
77+
$this->coveredFileAnalyser->classesIn($filename),
78+
$this->coveredFileAnalyser->traitsIn($filename),
79+
$this->coveredFileAnalyser->functionsIn($filename),
80+
$this->coveredFileAnalyser->linesOfCodeFor($filename)
8181
)
8282
);
8383
}

‎src/StaticAnalysis/CachingExecutedFileAnalyser.php renamed to ‎src/StaticAnalysis/CachingCoveredFileAnalyser.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020
use SebastianBergmann\CodeCoverage\Directory;
2121
use SebastianBergmann\LinesOfCode\LinesOfCode;
2222

23-
final class CachingExecutedFileAnalyser implements ExecutedFileAnalyser
23+
final class CachingCoveredFileAnalyser implements CoveredFileAnalyser
2424
{
2525
/**
2626
* @var string
2727
*/
2828
private $directory;
2929

3030
/**
31-
* @var ExecutedFileAnalyser
31+
* @var CoveredFileAnalyser
3232
*/
33-
private $executedFileAnalyser;
33+
private $coveredFileAnalyser;
3434

35-
public function __construct(string $directory, ExecutedFileAnalyser $executedFileAnalyser)
35+
public function __construct(string $directory, CoveredFileAnalyser $coveredFileAnalyser)
3636
{
3737
Directory::create($directory);
3838

39-
$this->directory = $directory;
40-
$this->executedFileAnalyser = $executedFileAnalyser;
39+
$this->directory = $directory;
40+
$this->coveredFileAnalyser = $coveredFileAnalyser;
4141
}
4242

4343
public function classesIn(string $filename): array
@@ -46,7 +46,7 @@ public function classesIn(string $filename): array
4646
return $this->cacheRead($filename, __METHOD__);
4747
}
4848

49-
$data = $this->executedFileAnalyser->classesIn($filename);
49+
$data = $this->coveredFileAnalyser->classesIn($filename);
5050

5151
$this->cacheWrite($filename, __METHOD__, $data);
5252

@@ -59,7 +59,7 @@ public function traitsIn(string $filename): array
5959
return $this->cacheRead($filename, __METHOD__);
6060
}
6161

62-
$data = $this->executedFileAnalyser->traitsIn($filename);
62+
$data = $this->coveredFileAnalyser->traitsIn($filename);
6363

6464
$this->cacheWrite($filename, __METHOD__, $data);
6565

@@ -72,7 +72,7 @@ public function functionsIn(string $filename): array
7272
return $this->cacheRead($filename, __METHOD__);
7373
}
7474

75-
$data = $this->executedFileAnalyser->functionsIn($filename);
75+
$data = $this->coveredFileAnalyser->functionsIn($filename);
7676

7777
$this->cacheWrite($filename, __METHOD__, $data);
7878

@@ -85,7 +85,7 @@ public function linesOfCodeFor(string $filename): LinesOfCode
8585
return $this->cacheRead($filename, __METHOD__, [LinesOfCode::class]);
8686
}
8787

88-
$data = $this->executedFileAnalyser->linesOfCodeFor($filename);
88+
$data = $this->coveredFileAnalyser->linesOfCodeFor($filename);
8989

9090
$this->cacheWrite($filename, __METHOD__, $data);
9191

@@ -98,7 +98,7 @@ public function ignoredLinesFor(string $filename): array
9898
return $this->cacheRead($filename, __METHOD__);
9999
}
100100

101-
$data = $this->executedFileAnalyser->ignoredLinesFor($filename);
101+
$data = $this->coveredFileAnalyser->ignoredLinesFor($filename);
102102

103103
$this->cacheWrite($filename, __METHOD__, $data);
104104

‎src/StaticAnalysis/ExecutedFileAnalyser.php renamed to ‎src/StaticAnalysis/CoveredFileAnalyser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
use SebastianBergmann\LinesOfCode\LinesOfCode;
1313

14-
interface ExecutedFileAnalyser
14+
interface CoveredFileAnalyser
1515
{
1616
public function classesIn(string $filename): array;
1717

‎src/StaticAnalysis/ParsingExecutedFileAnalyser.php renamed to ‎src/StaticAnalysis/ParsingCoveredFileAnalyser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
use SebastianBergmann\LinesOfCode\LineCountingVisitor;
2626
use SebastianBergmann\LinesOfCode\LinesOfCode;
2727

28-
final class ParsingExecutedFileAnalyser implements ExecutedFileAnalyser
28+
final class ParsingCoveredFileAnalyser implements CoveredFileAnalyser
2929
{
3030
/**
3131
* @var array

‎tests/tests/BuilderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use ReflectionMethod;
1515
use SebastianBergmann\CodeCoverage\Node\Builder;
1616
use SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData;
17-
use SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingExecutedFileAnalyser;
17+
use SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingCoveredFileAnalyser;
1818
use SebastianBergmann\CodeCoverage\TestCase;
1919

2020
final class BuilderTest extends TestCase
@@ -23,7 +23,7 @@ final class BuilderTest extends TestCase
2323

2424
protected function setUp(): void
2525
{
26-
$this->factory = new Builder(new ParsingExecutedFileAnalyser(true, true));
26+
$this->factory = new Builder(new ParsingCoveredFileAnalyser(true, true));
2727
}
2828

2929
public function testSomething(): void

‎tests/tests/StaticAnalysis/ExecutedFileAnalyserTest.php renamed to ‎tests/tests/StaticAnalysis/CoveredFileAnalyserTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
use PHPUnit\Framework\TestCase;
1313

1414
/**
15-
* @covers \SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingExecutedFileAnalyser
15+
* @covers \SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingCoveredFileAnalyser
1616
* @covers \SebastianBergmann\CodeCoverage\StaticAnalysis\CodeUnitFindingVisitor
1717
* @covers \SebastianBergmann\CodeCoverage\StaticAnalysis\IgnoredLinesFindingVisitor
1818
*/
19-
final class ExecutedFileAnalyserTest extends TestCase
19+
final class CoveredFileAnalyserTest extends TestCase
2020
{
2121
public function testGetLinesToBeIgnored(): void
2222
{
@@ -38,7 +38,7 @@ public function testGetLinesToBeIgnored(): void
3838
30,
3939
33,
4040
],
41-
(new ParsingExecutedFileAnalyser(true, true))->ignoredLinesFor(
41+
(new ParsingCoveredFileAnalyser(true, true))->ignoredLinesFor(
4242
TEST_FILES_PATH . 'source_with_ignore.php'
4343
)
4444
);
@@ -48,7 +48,7 @@ public function testGetLinesToBeIgnored2(): void
4848
{
4949
$this->assertEquals(
5050
[],
51-
(new ParsingExecutedFileAnalyser(true, true))->ignoredLinesFor(
51+
(new ParsingCoveredFileAnalyser(true, true))->ignoredLinesFor(
5252
TEST_FILES_PATH . 'source_without_ignore.php'
5353
)
5454
);
@@ -60,7 +60,7 @@ public function testGetLinesToBeIgnored3(): void
6060
[
6161
3,
6262
],
63-
(new ParsingExecutedFileAnalyser(true, true))->ignoredLinesFor(
63+
(new ParsingCoveredFileAnalyser(true, true))->ignoredLinesFor(
6464
TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php'
6565
)
6666
);
@@ -77,7 +77,7 @@ public function testGetLinesToBeIgnoredOneLineAnnotations(): void
7777
32,
7878
33,
7979
],
80-
(new ParsingExecutedFileAnalyser(true, true))->ignoredLinesFor(
80+
(new ParsingCoveredFileAnalyser(true, true))->ignoredLinesFor(
8181
TEST_FILES_PATH . 'source_with_oneline_annotations.php'
8282
)
8383
);
@@ -91,7 +91,7 @@ public function testGetLinesToBeIgnoredWhenIgnoreIsDisabled(): void
9191
18,
9292
33,
9393
],
94-
(new ParsingExecutedFileAnalyser(false, false))->ignoredLinesFor(
94+
(new ParsingCoveredFileAnalyser(false, false))->ignoredLinesFor(
9595
TEST_FILES_PATH . 'source_with_ignore.php'
9696
)
9797
);

0 commit comments

Comments
 (0)