@@ -76,16 +76,16 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
76
76
$classMethods++;
77
77
$classStatements += $method['executableLines'];
78
78
$coveredClassStatements += $method['executedLines'];
79
+
79
80
if ($method['coverage'] == 100) {
80
81
$coveredMethods++;
81
82
}
82
83
83
84
$methodCount = 0;
84
- for ($i = $method['startLine'];
85
- $i <= $method['endLine'];
86
- $i++) {
87
- if (isset($coverage[$i]) && ($coverage[$i] !== null)) {
88
- $methodCount = max($methodCount, count($coverage[$i]));
85
+
86
+ foreach (range($method['startLine'], $method['endLine']) as $line) {
87
+ if (isset($coverage[$line]) && ($coverage[$line] !== null)) {
88
+ $methodCount = max($methodCount, count($coverage[$line]));
89
89
}
90
90
}
91
91
@@ -144,22 +144,9 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
144
144
$xmlMetrics->setAttribute('conditionals', 0);
145
145
$xmlMetrics->setAttribute('coveredconditionals', 0);
146
146
$xmlMetrics->setAttribute('statements', $classStatements);
147
- $xmlMetrics->setAttribute(
148
- 'coveredstatements',
149
- $coveredClassStatements
150
- );
151
- $xmlMetrics->setAttribute(
152
- 'elements',
153
- $classMethods +
154
- $classStatements
155
- /* + conditionals */
156
- );
157
- $xmlMetrics->setAttribute(
158
- 'coveredelements',
159
- $coveredMethods +
160
- $coveredClassStatements
161
- /* + coveredconditionals */
162
- );
147
+ $xmlMetrics->setAttribute('coveredstatements', $coveredClassStatements);
148
+ $xmlMetrics->setAttribute('elements', $classMethods + $classStatements /* + conditionals */);
149
+ $xmlMetrics->setAttribute('coveredelements', $coveredMethods + $coveredClassStatements /* + coveredconditionals */);
163
150
$xmlClass->appendChild($xmlMetrics);
164
151
}
165
152
@@ -207,30 +194,13 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
207
194
$xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
208
195
$xmlMetrics->setAttribute('classes', $item->getNumClassesAndTraits());
209
196
$xmlMetrics->setAttribute('methods', $item->getNumMethods());
210
- $xmlMetrics->setAttribute(
211
- 'coveredmethods',
212
- $item->getNumTestedMethods()
213
- );
197
+ $xmlMetrics->setAttribute('coveredmethods', $item->getNumTestedMethods());
214
198
$xmlMetrics->setAttribute('conditionals', 0);
215
199
$xmlMetrics->setAttribute('coveredconditionals', 0);
216
- $xmlMetrics->setAttribute(
217
- 'statements',
218
- $item->getNumExecutableLines()
219
- );
220
- $xmlMetrics->setAttribute(
221
- 'coveredstatements',
222
- $item->getNumExecutedLines()
223
- );
224
- $xmlMetrics->setAttribute(
225
- 'elements',
226
- $item->getNumMethods() + $item->getNumExecutableLines()
227
- /* + conditionals */
228
- );
229
- $xmlMetrics->setAttribute(
230
- 'coveredelements',
231
- $item->getNumTestedMethods() + $item->getNumExecutedLines()
232
- /* + coveredconditionals */
233
- );
200
+ $xmlMetrics->setAttribute('statements', $item->getNumExecutableLines());
201
+ $xmlMetrics->setAttribute('coveredstatements', $item->getNumExecutedLines());
202
+ $xmlMetrics->setAttribute('elements', $item->getNumMethods() + $item->getNumExecutableLines() /* + conditionals */);
203
+ $xmlMetrics->setAttribute('coveredelements', $item->getNumTestedMethods() + $item->getNumExecutedLines() /* + coveredconditionals */);
234
204
$xmlFile->appendChild($xmlMetrics);
235
205
236
206
if ($namespace == 'global') {
@@ -255,46 +225,27 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
255
225
$xmlMetrics->setAttribute('files', count($report));
256
226
$xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
257
227
$xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
258
- $xmlMetrics->setAttribute(
259
- 'classes',
260
- $report->getNumClassesAndTraits()
261
- );
228
+ $xmlMetrics->setAttribute('classes', $report->getNumClassesAndTraits());
262
229
$xmlMetrics->setAttribute('methods', $report->getNumMethods());
263
- $xmlMetrics->setAttribute(
264
- 'coveredmethods',
265
- $report->getNumTestedMethods()
266
- );
230
+ $xmlMetrics->setAttribute('coveredmethods', $report->getNumTestedMethods());
267
231
$xmlMetrics->setAttribute('conditionals', 0);
268
232
$xmlMetrics->setAttribute('coveredconditionals', 0);
269
- $xmlMetrics->setAttribute(
270
- 'statements',
271
- $report->getNumExecutableLines()
272
- );
273
- $xmlMetrics->setAttribute(
274
- 'coveredstatements',
275
- $report->getNumExecutedLines()
276
- );
277
- $xmlMetrics->setAttribute(
278
- 'elements',
279
- $report->getNumMethods() + $report->getNumExecutableLines()
280
- /* + conditionals */
281
- );
282
- $xmlMetrics->setAttribute(
283
- 'coveredelements',
284
- $report->getNumTestedMethods() + $report->getNumExecutedLines()
285
- /* + coveredconditionals */
286
- );
287
-
233
+ $xmlMetrics->setAttribute('statements', $report->getNumExecutableLines());
234
+ $xmlMetrics->setAttribute('coveredstatements', $report->getNumExecutedLines());
235
+ $xmlMetrics->setAttribute('elements', $report->getNumMethods() + $report->getNumExecutableLines() /* + conditionals */);
236
+ $xmlMetrics->setAttribute('coveredelements', $report->getNumTestedMethods() + $report->getNumExecutedLines() /* + coveredconditionals */);
288
237
$xmlProject->appendChild($xmlMetrics);
289
238
239
+ $buffer = $xmlDocument->saveXML();
240
+
290
241
if ($target !== null) {
291
242
if (!is_dir(dirname($target))) {
292
243
mkdir(dirname($target), 0777, true);
293
244
}
294
245
295
- return $xmlDocument->save($target);
296
- } else {
297
- return $xmlDocument->saveXML();
246
+ file_put_contents($target, $buffer);
298
247
}
248
+
249
+ return $buffer;
299
250
}
300
251
}
0 commit comments