Skip to content

Commit 699b15e

Browse files
sebastianbergmannsebastianbergmann
committed
Fix CS/WS issues
1 parent eabfc87 commit 699b15e

File tree

17 files changed

+131
-128
lines changed

17 files changed

+131
-128
lines changed

‎src/CodeCoverage.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ public function start($id, $clear = false)
281281
* @param array $linesToBeUsed
282282
* @param bool $ignoreForceCoversAnnotation
283283
*
284-
* @return array
285-
*
286284
* @throws \SebastianBergmann\CodeCoverage\RuntimeException
287285
* @throws InvalidArgumentException
286+
*
287+
* @return array
288288
*/
289289
public function stop($append = true, $linesToBeCovered = [], array $linesToBeUsed = [], $ignoreForceCoversAnnotation = false)
290290
{
@@ -746,9 +746,9 @@ private function addUncoveredFilesFromWhitelist()
746746
*
747747
* @param string $filename
748748
*
749-
* @return array
750-
*
751749
* @throws InvalidArgumentException
750+
*
751+
* @return array
752752
*/
753753
private function getLinesToBeIgnored($filename)
754754
{
@@ -823,7 +823,7 @@ private function getLinesToBeIgnored($filename)
823823
}
824824

825825
if ($this->disableIgnoredLines) {
826-
$this->ignoredLines[$filename] = array_unique($this->ignoredLines[$filename]);
826+
$this->ignoredLines[$filename] = \array_unique($this->ignoredLines[$filename]);
827827
\sort($this->ignoredLines[$filename]);
828828

829829
return $this->ignoredLines[$filename];
@@ -923,7 +923,7 @@ private function getLinesToBeIgnored($filename)
923923
$this->ignoredLines[$filename]
924924
);
925925

926-
$this->ignoredLines[$filename] = array_unique($this->ignoredLines[$filename]);
926+
$this->ignoredLines[$filename] = \array_unique($this->ignoredLines[$filename]);
927927
\sort($this->ignoredLines[$filename]);
928928

929929
return $this->ignoredLines[$filename];
@@ -1040,9 +1040,9 @@ private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
10401040
}
10411041

10421042
/**
1043-
* @return Driver
1044-
*
10451043
* @throws RuntimeException
1044+
*
1045+
* @return Driver
10461046
*/
10471047
private function selectDriver()
10481048
{
@@ -1066,9 +1066,9 @@ private function selectDriver()
10661066
/**
10671067
* @param array $unintentionallyCoveredUnits
10681068
*
1069-
* @return array
1070-
*
10711069
* @throws \ReflectionException
1070+
*
1071+
* @return array
10721072
*/
10731073
private function processUnintentionallyCoveredUnits(array $unintentionallyCoveredUnits)
10741074
{
@@ -1102,7 +1102,7 @@ private function processUnintentionallyCoveredUnits(array $unintentionallyCovere
11021102
*
11031103
* @throws \SebastianBergmann\CodeCoverage\RuntimeException
11041104
*/
1105-
protected function initializeData()
1105+
private function initializeData()
11061106
{
11071107
$this->isInitialized = true;
11081108

‎src/Node/Directory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ final class Directory extends AbstractNode implements \IteratorAggregate
5050
/**
5151
* @var array
5252
*/
53-
private $linesOfCode = null;
53+
private $linesOfCode;
5454

5555
/**
5656
* @var int
@@ -163,9 +163,9 @@ public function addDirectory($name)
163163
* @param array $testData
164164
* @param bool $cacheTokens
165165
*
166-
* @return File
167-
*
168166
* @throws InvalidArgumentException
167+
*
168+
* @return File
169169
*/
170170
public function addFile($name, array $coverageData, array $testData, $cacheTokens)
171171
{

‎src/Node/File.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ final class File extends AbstractNode
6060
/**
6161
* @var int
6262
*/
63-
private $numClasses = null;
63+
private $numClasses;
6464

6565
/**
6666
* @var int
@@ -70,7 +70,7 @@ final class File extends AbstractNode
7070
/**
7171
* @var int
7272
*/
73-
private $numTraits = null;
73+
private $numTraits;
7474

7575
/**
7676
* @var int
@@ -80,17 +80,17 @@ final class File extends AbstractNode
8080
/**
8181
* @var int
8282
*/
83-
private $numMethods = null;
83+
private $numMethods;
8484

8585
/**
8686
* @var int
8787
*/
88-
private $numTestedMethods = null;
88+
private $numTestedMethods;
8989

9090
/**
9191
* @var int
9292
*/
93-
private $numTestedFunctions = null;
93+
private $numTestedFunctions;
9494

9595
/**
9696
* @var array
@@ -705,7 +705,7 @@ protected function processFunctions(\PHP_Token_Stream $tokens)
705705
protected function crap($ccn, $coverage)
706706
{
707707
if ($coverage == 0) {
708-
return (string) (\pow($ccn, 2) + $ccn);
708+
return (string) ($ccn ** 2 + $ccn);
709709
}
710710

711711
if ($coverage >= 95) {
@@ -714,7 +714,7 @@ protected function crap($ccn, $coverage)
714714

715715
return \sprintf(
716716
'%01.2F',
717-
\pow($ccn, 2) * \pow(1 - $coverage / 100, 3) + $ccn
717+
$ccn ** 2 * (1 - $coverage / 100) ** 3 + $ccn
718718
);
719719
}
720720

‎src/Report/Html/Facade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ private function copyFiles($target)
162162
/**
163163
* @param string $directory
164164
*
165-
* @return string
166-
*
167165
* @throws RuntimeException
166+
*
167+
* @return string
168168
*/
169169
private function getDirectory($directory)
170170
{

‎src/Report/Html/Renderer.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,13 @@ protected function getColorLevel($percent)
262262
{
263263
if ($percent <= $this->lowUpperBound) {
264264
return 'danger';
265-
} elseif ($percent > $this->lowUpperBound &&
265+
}
266+
if ($percent > $this->lowUpperBound &&
266267
$percent < $this->highLowerBound) {
267268
return 'warning';
268-
} else {
269-
return 'success';
270269
}
270+
271+
return 'success';
271272
}
272273

273274
/**

‎src/Report/Html/Renderer/Dashboard.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ protected function insufficientCoverage(array $classes, $baseLink)
218218
}
219219

220220
foreach ($leastTestedMethods as $methodName => $coverage) {
221-
list($class, $method) = \explode('::', $methodName);
221+
[$class, $method] = \explode('::', $methodName);
222222

223223
$result['method'] .= \sprintf(
224224
' <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d%%</td></tr>' . "\n",
@@ -279,7 +279,7 @@ protected function projectRisks(array $classes, $baseLink)
279279
}
280280

281281
foreach ($methodRisks as $methodName => $crap) {
282-
list($class, $method) = \explode('::', $methodName);
282+
[$class, $method] = \explode('::', $methodName);
283283

284284
$result['method'] .= \sprintf(
285285
' <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",

‎src/Report/Html/Renderer/File.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ protected function renderFunctionItems(array $functions, \Text_Template $templat
243243

244244
/**
245245
* @param \Text_Template $template
246+
* @param mixed $indent
246247
*
247248
* @return string
248249
*/
@@ -454,7 +455,7 @@ protected function loadFile($file)
454455
continue;
455456
}
456457

457-
list($token, $value) = $token;
458+
[$token, $value] = $token;
458459

459460
$value = \str_replace(
460461
["\t", ' '],

‎src/Report/PHP.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public function process(CodeCoverage $coverage, $target = null)
4444

4545
if ($target !== null) {
4646
return \file_put_contents($target, $output);
47-
} else {
48-
return $output;
4947
}
48+
49+
return $output;
5050
}
5151
}

‎src/Report/Text.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public function process(CodeCoverage $coverage, $showColors = false)
218218
return $output . PHP_EOL;
219219
}
220220

221-
protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)
221+
private function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)
222222
{
223223
$coverage = Util::percent(
224224
$numberOfCoveredElements,
@@ -227,14 +227,15 @@ protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElem
227227

228228
if ($coverage >= $this->highLowerBound) {
229229
return $this->colors['green'];
230-
} elseif ($coverage > $this->lowUpperBound) {
230+
}
231+
if ($coverage > $this->lowUpperBound) {
231232
return $this->colors['yellow'];
232233
}
233234

234235
return $this->colors['red'];
235236
}
236237

237-
protected function printCoverageCounts($numberOfCoveredElements, $totalNumberOfElements, $precision)
238+
private function printCoverageCounts($numberOfCoveredElements, $totalNumberOfElements, $precision)
238239
{
239240
$format = '%' . $precision . 's';
240241

‎src/Report/Xml/BuildInformation.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,24 @@ public function setRuntimeInformation(Runtime $runtime)
5151
}
5252
}
5353

54+
/**
55+
* @param \DateTime $date
56+
*/
57+
public function setBuildTime(\DateTime $date)
58+
{
59+
$this->contextNode->setAttribute('time', $date->format('D M j G:i:s T Y'));
60+
}
61+
62+
/**
63+
* @param string $phpUnitVersion
64+
* @param string $coverageVersion
65+
*/
66+
public function setGeneratorVersions($phpUnitVersion, $coverageVersion)
67+
{
68+
$this->contextNode->setAttribute('phpunit', $phpUnitVersion);
69+
$this->contextNode->setAttribute('coverage', $coverageVersion);
70+
}
71+
5472
/**
5573
* @param $name
5674
*
@@ -74,22 +92,4 @@ private function getNodeByName($name)
7492

7593
return $node;
7694
}
77-
78-
/**
79-
* @param \DateTime $date
80-
*/
81-
public function setBuildTime(\DateTime $date)
82-
{
83-
$this->contextNode->setAttribute('time', $date->format('D M j G:i:s T Y'));
84-
}
85-
86-
/**
87-
* @param string $phpUnitVersion
88-
* @param string $coverageVersion
89-
*/
90-
public function setGeneratorVersions($phpUnitVersion, $coverageVersion)
91-
{
92-
$this->contextNode->setAttribute('phpunit', $phpUnitVersion);
93-
$this->contextNode->setAttribute('coverage', $coverageVersion);
94-
}
9595
}

0 commit comments

Comments
 (0)