Skip to content

Commit 34a985d

Browse files
sebastianbergmannsebastianbergmann
committed
Fix CS/WS issues
1 parent 05ea64c commit 34a985d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+344
-344
lines changed

‎src/CodeCoverage.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function stop(bool $append = true, TestStatus $status = null, array|false
183183

184184
$this->linesToBeIgnored = array_merge_recursive(
185185
$this->linesToBeIgnored,
186-
$linesToBeIgnored
186+
$linesToBeIgnored,
187187
);
188188

189189
$this->append($data, null, $append, $status, $linesToBeCovered, $linesToBeUsed, $linesToBeIgnored);
@@ -246,7 +246,7 @@ public function append(RawCodeCoverageData $rawData, string $id = null, bool $ap
246246
$rawData,
247247
$linesToBeCovered,
248248
$linesToBeUsed,
249-
$size
249+
$size,
250250
);
251251

252252
if (empty($rawData->lineCoverage())) {
@@ -267,7 +267,7 @@ public function append(RawCodeCoverageData $rawData, string $id = null, bool $ap
267267
public function merge(self $that): void
268268
{
269269
$this->filter->includeFiles(
270-
$that->filter()->files()
270+
$that->filter()->files(),
271271
);
272272

273273
$this->data->merge($that->data);
@@ -342,7 +342,7 @@ public function cacheDirectory(): string
342342
{
343343
if (!$this->cachesStaticAnalysis()) {
344344
throw new StaticAnalysisCacheNotConfiguredException(
345-
'The static analysis cache is not configured'
345+
'The static analysis cache is not configured',
346346
);
347347
}
348348

@@ -436,12 +436,12 @@ private function applyExecutableLinesFilter(RawCodeCoverageData $data): void
436436

437437
$data->keepLineCoverageDataOnlyForLines(
438438
$filename,
439-
array_keys($linesToBranchMap)
439+
array_keys($linesToBranchMap),
440440
);
441441

442442
$data->markExecutableLineByBranch(
443443
$filename,
444-
$linesToBranchMap
444+
$linesToBranchMap,
445445
);
446446
}
447447
}
@@ -459,13 +459,13 @@ private function applyIgnoredLinesFilter(RawCodeCoverageData $data, array $lines
459459
if (isset($linesToBeIgnored[$filename])) {
460460
$data->removeCoverageDataForLines(
461461
$filename,
462-
$linesToBeIgnored[$filename]
462+
$linesToBeIgnored[$filename],
463463
);
464464
}
465465

466466
$data->removeCoverageDataForLines(
467467
$filename,
468-
$this->analyser()->ignoredLinesFor($filename)
468+
$this->analyser()->ignoredLinesFor($filename),
469469
);
470470
}
471471
}
@@ -477,18 +477,18 @@ private function addUncoveredFilesFromFilter(): void
477477
{
478478
$uncoveredFiles = array_diff(
479479
$this->filter->files(),
480-
$this->data->coveredFiles()
480+
$this->data->coveredFiles(),
481481
);
482482

483483
foreach ($uncoveredFiles as $uncoveredFile) {
484484
if (is_file($uncoveredFile)) {
485485
$this->append(
486486
RawCodeCoverageData::fromUncoveredFile(
487487
$uncoveredFile,
488-
$this->analyser()
488+
$this->analyser(),
489489
),
490490
self::UNCOVERED_FILES,
491-
linesToBeIgnored: $this->linesToBeIgnored
491+
linesToBeIgnored: $this->linesToBeIgnored,
492492
);
493493
}
494494
}
@@ -502,7 +502,7 @@ private function performUnintentionallyCoveredCodeCheck(RawCodeCoverageData $dat
502502
{
503503
$allowedLines = $this->getAllowedLines(
504504
$linesToBeCovered,
505-
$linesToBeUsed
505+
$linesToBeUsed,
506506
);
507507

508508
$unintentionallyCoveredUnits = [];
@@ -519,7 +519,7 @@ private function performUnintentionallyCoveredCodeCheck(RawCodeCoverageData $dat
519519

520520
if (!empty($unintentionallyCoveredUnits)) {
521521
throw new UnintentionallyCoveredCodeException(
522-
$unintentionallyCoveredUnits
522+
$unintentionallyCoveredUnits,
523523
);
524524
}
525525
}
@@ -535,7 +535,7 @@ private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed):
535535

536536
$allowedLines[$file] = array_merge(
537537
$allowedLines[$file],
538-
$linesToBeCovered[$file]
538+
$linesToBeCovered[$file],
539539
);
540540
}
541541

@@ -546,13 +546,13 @@ private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed):
546546

547547
$allowedLines[$file] = array_merge(
548548
$allowedLines[$file],
549-
$linesToBeUsed[$file]
549+
$linesToBeUsed[$file],
550550
);
551551
}
552552

553553
foreach (array_keys($allowedLines) as $file) {
554554
$allowedLines[$file] = array_flip(
555-
array_unique($allowedLines[$file])
555+
array_unique($allowedLines[$file]),
556556
);
557557
}
558558

@@ -592,7 +592,7 @@ private function processUnintentionallyCoveredUnits(array $unintentionallyCovere
592592
throw new ReflectionException(
593593
$e->getMessage(),
594594
$e->getCode(),
595-
$e
595+
$e,
596596
);
597597
}
598598

@@ -614,15 +614,15 @@ private function analyser(): FileAnalyser
614614

615615
$this->analyser = new ParsingFileAnalyser(
616616
$this->useAnnotationsForIgnoringCode,
617-
$this->ignoreDeprecatedCode
617+
$this->ignoreDeprecatedCode,
618618
);
619619

620620
if ($this->cachesStaticAnalysis()) {
621621
$this->analyser = new CachingFileAnalyser(
622622
$this->cacheDirectory,
623623
$this->analyser,
624624
$this->useAnnotationsForIgnoringCode,
625-
$this->ignoreDeprecatedCode
625+
$this->ignoreDeprecatedCode,
626626
);
627627
}
628628

‎src/Data/ProcessedCodeCoverageData.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ public function merge(self $newData): void
164164
$compareLineNumbers = array_unique(
165165
array_merge(
166166
array_keys($this->lineCoverage[$file]),
167-
array_keys($newData->lineCoverage[$file])
168-
)
167+
array_keys($newData->lineCoverage[$file]),
168+
),
169169
);
170170

171171
foreach ($compareLineNumbers as $line) {
@@ -176,7 +176,7 @@ public function merge(self $newData): void
176176
$this->lineCoverage[$file][$line] = $newData->lineCoverage[$file][$line];
177177
} elseif ($thatPriority === $thisPriority && is_array($this->lineCoverage[$file][$line])) {
178178
$this->lineCoverage[$file][$line] = array_unique(
179-
array_merge($this->lineCoverage[$file][$line], $newData->lineCoverage[$file][$line])
179+
array_merge($this->lineCoverage[$file][$line], $newData->lineCoverage[$file][$line]),
180180
);
181181
}
182182
}

‎src/Data/RawCodeCoverageData.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function keepLineCoverageDataOnlyForLines(string $filename, array $lines)
144144

145145
$this->lineCoverage[$filename] = array_intersect_key(
146146
$this->lineCoverage[$filename],
147-
array_flip($lines)
147+
array_flip($lines),
148148
);
149149
}
150150

@@ -223,7 +223,7 @@ public function removeCoverageDataForLines(string $filename, array $lines): void
223223

224224
$this->lineCoverage[$filename] = array_diff_key(
225225
$this->lineCoverage[$filename],
226-
array_flip($lines)
226+
array_flip($lines),
227227
);
228228

229229
if (isset($this->functionCoverage[$filename])) {

‎src/Driver/Driver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function enableBranchAndPathCoverage(): void
7575
throw new BranchAndPathCoverageNotSupportedException(
7676
sprintf(
7777
'%s does not support branch and path coverage',
78-
$this->nameAndVersion()
79-
)
78+
$this->nameAndVersion(),
79+
),
8080
);
8181
}
8282

@@ -107,8 +107,8 @@ public function enableDeadCodeDetection(): void
107107
throw new DeadCodeDetectionNotSupportedException(
108108
sprintf(
109109
'%s does not support dead code detection',
110-
$this->nameAndVersion()
111-
)
110+
$this->nameAndVersion(),
111+
),
112112
);
113113
}
114114

‎src/Driver/XdebugDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function __construct(Filter $filter)
7575
xdebug_set_filter(
7676
XDEBUG_FILTER_CODE_COVERAGE,
7777
XDEBUG_PATH_INCLUDE,
78-
$filter->files()
78+
$filter->files(),
7979
);
8080
}
8181
}

‎src/Node/AbstractNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ public function percentageOfExecutedBranches(): Percentage
131131
{
132132
return Percentage::fromFractionAndTotal(
133133
$this->numberOfExecutedBranches(),
134-
$this->numberOfExecutableBranches()
134+
$this->numberOfExecutableBranches(),
135135
);
136136
}
137137

138138
public function percentageOfExecutedPaths(): Percentage
139139
{
140140
return Percentage::fromFractionAndTotal(
141141
$this->numberOfExecutedPaths(),
142-
$this->numberOfExecutablePaths()
142+
$this->numberOfExecutablePaths(),
143143
);
144144
}
145145

‎src/Node/Builder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public function build(CodeCoverage $coverage): Directory
4545
$commonPath = $this->reducePaths($data);
4646
$root = new Directory(
4747
$commonPath,
48-
null
48+
null,
4949
);
5050

5151
$this->addItems(
5252
$root,
5353
$this->buildDirectoryStructure($data),
54-
$coverage->getTests()
54+
$coverage->getTests(),
5555
);
5656

5757
return $root;
@@ -80,8 +80,8 @@ private function addItems(Directory $root, array $items, array $tests): void
8080
$this->analyser->classesIn($filename),
8181
$this->analyser->traitsIn($filename),
8282
$this->analyser->functionsIn($filename),
83-
$this->analyser->linesOfCodeFor($filename)
84-
)
83+
$this->analyser->linesOfCodeFor($filename),
84+
),
8585
);
8686
}
8787
} else {

‎src/Node/CrapIndex.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function asString(): string
3737

3838
return sprintf(
3939
'%01.2F',
40-
$this->cyclomaticComplexity ** 2 * (1 - $this->codeCoverage / 100) ** 3 + $this->cyclomaticComplexity
40+
$this->cyclomaticComplexity ** 2 * (1 - $this->codeCoverage / 100) ** 3 + $this->cyclomaticComplexity,
4141
);
4242
}
4343
}

‎src/Node/Directory.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function getIterator(): RecursiveIteratorIterator
7676
{
7777
return new RecursiveIteratorIterator(
7878
new Iterator($this),
79-
RecursiveIteratorIterator::SELF_FIRST
79+
RecursiveIteratorIterator::SELF_FIRST,
8080
);
8181
}
8282

@@ -122,7 +122,7 @@ public function classes(): array
122122
foreach ($this->children as $child) {
123123
$this->classes = array_merge(
124124
$this->classes,
125-
$child->classes()
125+
$child->classes(),
126126
);
127127
}
128128
}
@@ -138,7 +138,7 @@ public function traits(): array
138138
foreach ($this->children as $child) {
139139
$this->traits = array_merge(
140140
$this->traits,
141-
$child->traits()
141+
$child->traits(),
142142
);
143143
}
144144
}
@@ -154,7 +154,7 @@ public function functions(): array
154154
foreach ($this->children as $child) {
155155
$this->functions = array_merge(
156156
$this->functions,
157-
$child->functions()
157+
$child->functions(),
158158
);
159159
}
160160
}
@@ -177,8 +177,8 @@ public function linesOfCode(): array
177177
foreach ($this->children as $child) {
178178
$childLinesOfCode = $child->linesOfCode();
179179

180-
$this->linesOfCode['linesOfCode'] += $childLinesOfCode['linesOfCode'];
181-
$this->linesOfCode['commentLinesOfCode'] += $childLinesOfCode['commentLinesOfCode'];
180+
$this->linesOfCode['linesOfCode'] += $childLinesOfCode['linesOfCode'];
181+
$this->linesOfCode['commentLinesOfCode'] += $childLinesOfCode['commentLinesOfCode'];
182182
$this->linesOfCode['nonCommentLinesOfCode'] += $childLinesOfCode['nonCommentLinesOfCode'];
183183
}
184184
}

0 commit comments

Comments
 (0)