Skip to content

Commit d164da8

Browse files
sebastianbergmannsebastianbergmann
committed
Refactor
1 parent 3ea1ec5 commit d164da8

File tree

8 files changed

+229
-153
lines changed

8 files changed

+229
-153
lines changed

‎src/Node/AbstractNode.php‎

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

12-
use SebastianBergmann\CodeCoverage\Util;
12+
use SebastianBergmann\CodeCoverage\Percentage;
1313

1414
/**
1515
* Base class for nodes in the code coverage information tree.
@@ -117,11 +117,16 @@ public function getParent(): ?self
117117
*/
118118
public function getTestedClassesPercent(bool $asString = true)
119119
{
120-
return Util::percent(
120+
$percentage = Percentage::fromFractionAndTotal(
121121
$this->getNumTestedClasses(),
122122
$this->getNumClasses(),
123-
$asString
124123
);
124+
125+
if ($asString) {
126+
return $percentage->asString();
127+
}
128+
129+
return $percentage->asFloat();
125130
}
126131

127132
/**
@@ -131,11 +136,16 @@ public function getTestedClassesPercent(bool $asString = true)
131136
*/
132137
public function getTestedTraitsPercent(bool $asString = true)
133138
{
134-
return Util::percent(
139+
$percentage = Percentage::fromFractionAndTotal(
135140
$this->getNumTestedTraits(),
136141
$this->getNumTraits(),
137-
$asString
138142
);
143+
144+
if ($asString) {
145+
return $percentage->asString();
146+
}
147+
148+
return $percentage->asFloat();
139149
}
140150

141151
/**
@@ -145,11 +155,16 @@ public function getTestedTraitsPercent(bool $asString = true)
145155
*/
146156
public function getTestedClassesAndTraitsPercent(bool $asString = true)
147157
{
148-
return Util::percent(
158+
$percentage = Percentage::fromFractionAndTotal(
149159
$this->getNumTestedClassesAndTraits(),
150160
$this->getNumClassesAndTraits(),
151-
$asString
152161
);
162+
163+
if ($asString) {
164+
return $percentage->asString();
165+
}
166+
167+
return $percentage->asFloat();
153168
}
154169

155170
/**
@@ -159,11 +174,16 @@ public function getTestedClassesAndTraitsPercent(bool $asString = true)
159174
*/
160175
public function getTestedFunctionsPercent(bool $asString = true)
161176
{
162-
return Util::percent(
177+
$percentage = Percentage::fromFractionAndTotal(
163178
$this->getNumTestedFunctions(),
164179
$this->getNumFunctions(),
165-
$asString
166180
);
181+
182+
if ($asString) {
183+
return $percentage->asString();
184+
}
185+
186+
return $percentage->asFloat();
167187
}
168188

169189
/**
@@ -173,11 +193,16 @@ public function getTestedFunctionsPercent(bool $asString = true)
173193
*/
174194
public function getTestedMethodsPercent(bool $asString = true)
175195
{
176-
return Util::percent(
196+
$percentage = Percentage::fromFractionAndTotal(
177197
$this->getNumTestedMethods(),
178198
$this->getNumMethods(),
179-
$asString
180199
);
200+
201+
if ($asString) {
202+
return $percentage->asString();
203+
}
204+
205+
return $percentage->asFloat();
181206
}
182207

183208
/**
@@ -187,11 +212,16 @@ public function getTestedMethodsPercent(bool $asString = true)
187212
*/
188213
public function getTestedFunctionsAndMethodsPercent(bool $asString = true)
189214
{
190-
return Util::percent(
215+
$percentage = Percentage::fromFractionAndTotal(
191216
$this->getNumTestedFunctionsAndMethods(),
192217
$this->getNumFunctionsAndMethods(),
193-
$asString
194218
);
219+
220+
if ($asString) {
221+
return $percentage->asString();
222+
}
223+
224+
return $percentage->asFloat();
195225
}
196226

197227
/**
@@ -201,11 +231,16 @@ public function getTestedFunctionsAndMethodsPercent(bool $asString = true)
201231
*/
202232
public function getLineExecutedPercent(bool $asString = true)
203233
{
204-
return Util::percent(
234+
$percentage = Percentage::fromFractionAndTotal(
205235
$this->getNumExecutedLines(),
206236
$this->getNumExecutableLines(),
207-
$asString
208237
);
238+
239+
if ($asString) {
240+
return $percentage->asString();
241+
}
242+
243+
return $percentage->asFloat();
209244
}
210245

211246
/**

‎src/Percentage.php‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?php declare(strict_types=1);
2+
/*
3+
* This file is part of phpunit/php-code-coverage.
4+
*
5+
* (c) Sebastian Bergmann <sebastian@phpunit.de>
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
namespace SebastianBergmann\CodeCoverage;
11+
12+
final class Percentage
13+
{
14+
/**
15+
* @var float
16+
*/
17+
private $fraction;
18+
19+
/**
20+
* @var float
21+
*/
22+
private $total;
23+
24+
public static function fromFractionAndTotal(float $fraction, float $total): self
25+
{
26+
return new self($fraction, $total);
27+
}
28+
29+
private function __construct(float $fraction, float $total)
30+
{
31+
$this->fraction = $fraction;
32+
$this->total = $total;
33+
}
34+
35+
public function asFloat(): float
36+
{
37+
if ($this->total > 0) {
38+
return (float) ($this->fraction / $this->total) * 100;
39+
}
40+
41+
return 100.0;
42+
}
43+
44+
public function asString(): string
45+
{
46+
if ($this->total > 0) {
47+
return \sprintf('%01.2F%%', $this->asFloat());
48+
}
49+
50+
return '';
51+
}
52+
53+
public function asFixedWidthString(): string
54+
{
55+
if ($this->total > 0) {
56+
return \sprintf('%6.2F%%', $this->asFloat());
57+
}
58+
59+
return '';
60+
}
61+
}

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

Lines changed: 34 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace SebastianBergmann\CodeCoverage\Report\Html;
1111

1212
use SebastianBergmann\CodeCoverage\Node\File as FileNode;
13-
use SebastianBergmann\CodeCoverage\Util;
13+
use SebastianBergmann\CodeCoverage\Percentage;
1414
use SebastianBergmann\Template\Template;
1515

1616
/**
@@ -117,17 +117,26 @@ protected function renderTraitOrClassItems(array $items, Template $template, Tem
117117
if ($item['executableLines'] > 0) {
118118
$numClasses = 1;
119119
$numTestedClasses = $numTestedMethods == $numMethods ? 1 : 0;
120-
$linesExecutedPercentAsString = Util::percent(
120+
$linesExecutedPercentAsString = Percentage::fromFractionAndTotal(
121121
$item['executedLines'],
122-
$item['executableLines'],
123-
true
124-
);
122+
$item['executableLines']
123+
)->asString();
125124
} else {
126125
$numClasses = 'n/a';
127126
$numTestedClasses = 'n/a';
128127
$linesExecutedPercentAsString = 'n/a';
129128
}
130129

130+
$testedMethodsPercentage = Percentage::fromFractionAndTotal(
131+
$numTestedMethods,
132+
$numMethods
133+
);
134+
135+
$testedClassesPercentage = Percentage::fromFractionAndTotal(
136+
$numTestedMethods === $numMethods ? 1 : 0,
137+
1
138+
);
139+
131140
$buffer .= $this->renderItemTemplate(
132141
$template,
133142
[
@@ -136,32 +145,17 @@ protected function renderTraitOrClassItems(array $items, Template $template, Tem
136145
'numTestedClasses' => $numTestedClasses,
137146
'numMethods' => $numMethods,
138147
'numTestedMethods' => $numTestedMethods,
139-
'linesExecutedPercent' => Util::percent(
148+
'linesExecutedPercent' => Percentage::fromFractionAndTotal(
140149
$item['executedLines'],
141150
$item['executableLines'],
142-
false
143-
),
151+
)->asFloat(),
144152
'linesExecutedPercentAsString' => $linesExecutedPercentAsString,
145153
'numExecutedLines' => $item['executedLines'],
146154
'numExecutableLines' => $item['executableLines'],
147-
'testedMethodsPercent' => Util::percent(
148-
$numTestedMethods,
149-
$numMethods
150-
),
151-
'testedMethodsPercentAsString' => Util::percent(
152-
$numTestedMethods,
153-
$numMethods,
154-
true
155-
),
156-
'testedClassesPercent' => Util::percent(
157-
$numTestedMethods == $numMethods ? 1 : 0,
158-
1
159-
),
160-
'testedClassesPercentAsString' => Util::percent(
161-
$numTestedMethods == $numMethods ? 1 : 0,
162-
1,
163-
true
164-
),
155+
'testedMethodsPercent' => $testedMethodsPercentage->asFloat(),
156+
'testedMethodsPercentAsString' => $testedMethodsPercentage->asString(),
157+
'testedClassesPercent' => $testedClassesPercentage->asFloat(),
158+
'testedClassesPercentAsString' => $testedClassesPercentage->asString(),
165159
'crap' => $item['crap'],
166160
]
167161
);
@@ -209,6 +203,16 @@ protected function renderFunctionOrMethodItem(Template $template, array $item, s
209203
}
210204
}
211205

206+
$executedLinesPercentage = Percentage::fromFractionAndTotal(
207+
$item['executedLines'],
208+
$item['executableLines']
209+
);
210+
211+
$testedMethodsPercentage = Percentage::fromFractionAndTotal(
212+
$numTestedMethods,
213+
1
214+
);
215+
212216
return $this->renderItemTemplate(
213217
$template,
214218
[
@@ -221,26 +225,12 @@ protected function renderFunctionOrMethodItem(Template $template, array $item, s
221225
),
222226
'numMethods' => $numMethods,
223227
'numTestedMethods' => $numTestedMethods,
224-
'linesExecutedPercent' => Util::percent(
225-
$item['executedLines'],
226-
$item['executableLines']
227-
),
228-
'linesExecutedPercentAsString' => Util::percent(
229-
$item['executedLines'],
230-
$item['executableLines'],
231-
true
232-
),
228+
'linesExecutedPercent' => $executedLinesPercentage->asFloat(),
229+
'linesExecutedPercentAsString' => $executedLinesPercentage->asString(),
233230
'numExecutedLines' => $item['executedLines'],
234231
'numExecutableLines' => $item['executableLines'],
235-
'testedMethodsPercent' => Util::percent(
236-
$numTestedMethods,
237-
1
238-
),
239-
'testedMethodsPercentAsString' => Util::percent(
240-
$numTestedMethods,
241-
1,
242-
true
243-
),
232+
'testedMethodsPercent' => $testedMethodsPercentage->asFloat(),
233+
'testedMethodsPercentAsString' => $testedMethodsPercentage->asString(),
244234
'crap' => $item['crap'],
245235
]
246236
);

0 commit comments

Comments
 (0)