Skip to content

Commit bf167c0

Browse files
sebastianbergmannsebastianbergmann
committed
Refactor.
1 parent ec02e6b commit bf167c0

File tree

2 files changed

+74
-113
lines changed

2 files changed

+74
-113
lines changed

‎PHP/CodeCoverage.php‎

Lines changed: 27 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ public function append(array $data, $id = NULL, array $filterGroups = array('DEF
226226
}
227227

228228
foreach (array_keys($data) as $filename) {
229-
if ((!defined('PHP_CODECOVERAGE_TESTSUITE') &&
229+
if (!$this->filter->isFile($filename) ||
230+
(!defined('PHP_CODECOVERAGE_TESTSUITE') &&
230231
strpos($filename, dirname(__FILE__)) === 0) ||
231232
substr($filename, -17) == 'Text/Template.php' ||
232233
substr($filename, -17) == 'File/Iterator.php' ||
@@ -242,21 +243,7 @@ public function append(array $data, $id = NULL, array $filterGroups = array('DEF
242243
}
243244
}
244245

245-
$newFiles = array_diff_key($data, $this->coveredFiles);
246-
247-
if (count($newFiles) > 0) {
248-
$dead = $this->getLinesByStatus($newFiles, -2);
249-
$executable = $this->getLinesByStatus($newFiles, array(-1, 1));
250-
251-
foreach (array_keys($newFiles) as $filename) {
252-
$this->coveredFiles[$filename] = TRUE;
253-
}
254-
} else {
255-
$dead = array();
256-
$executable = array();
257-
}
258-
259-
unset($newFiles);
246+
$raw = $data;
260247

261248
// Apply @covers filtering.
262249
if ($id instanceof PHPUnit_Framework_TestCase) {
@@ -288,13 +275,12 @@ public function append(array $data, $id = NULL, array $filterGroups = array('DEF
288275
$this->tests[$id] = $status;
289276
}
290277

291-
$this->data[$id] = array(
292-
'executed' => $this->getLinesByStatus($data, 1),
293-
'dead' => $dead,
294-
'executable' => $executable
278+
$this->coveredFiles = array_unique(
279+
array_merge($this->coveredFiles, array_keys($data))
295280
);
296281

297-
$this->summary = array();
282+
$this->data[$id] = array('filtered' => $data, 'raw' => $raw);
283+
$this->summary = array();
298284
}
299285
}
300286

@@ -321,8 +307,8 @@ public function merge(PHP_CodeCoverage $that)
321307
}
322308
}
323309

324-
$this->coveredFiles = array_merge(
325-
$this->coveredFiles, $that->coveredFiles
310+
$this->coveredFiles = array_unique(
311+
array_merge($this->coveredFiles, $that->coveredFiles)
326312
);
327313

328314
$this->summary = array();
@@ -351,37 +337,31 @@ public function getSummary()
351337
}
352338

353339
foreach ($this->data as $test => $coverage) {
354-
foreach ($coverage['executed'] as $file => $lines) {
340+
foreach ($coverage['filtered'] as $file => $lines) {
355341
foreach ($lines as $line => $flag) {
356-
if (!isset($this->summary[$file][$line][0])) {
357-
$this->summary[$file][$line] = array();
358-
}
359-
360-
if (isset($this->tests[$test])) {
361-
$status = $this->tests[$test];
362-
} else {
363-
$status = NULL;
342+
if ($flag == 1) {
343+
if (!isset($this->summary[$file][$line][0])) {
344+
$this->summary[$file][$line] = array();
345+
}
346+
347+
if (isset($this->tests[$test])) {
348+
$status = $this->tests[$test];
349+
} else {
350+
$status = NULL;
351+
}
352+
353+
$this->summary[$file][$line][] = array(
354+
'id' => $test, 'status' => $status
355+
);
364356
}
365-
366-
$this->summary[$file][$line][] = array(
367-
'id' => $test, 'status' => $status
368-
);
369357
}
370358
}
371359

372-
foreach ($coverage['executable'] as $file => $lines) {
360+
foreach ($coverage['raw'] as $file => $lines) {
373361
foreach ($lines as $line => $flag) {
374-
if ($flag == -1 &&
362+
if ($flag != 1 &&
375363
!isset($this->summary[$file][$line][0])) {
376-
$this->summary[$file][$line] = -1;
377-
}
378-
}
379-
}
380-
381-
foreach ($coverage['dead'] as $file => $lines) {
382-
foreach ($lines as $line => $flag) {
383-
if (!isset($this->summary[$file][$line][0])) {
384-
$this->summary[$file][$line] = -2;
364+
$this->summary[$file][$line] = $flag;
385365
}
386366
}
387367
}
@@ -457,44 +437,6 @@ public function setPromoteGlobals($flag)
457437
$this->promoteGlobals = $flag;
458438
}
459439

460-
/**
461-
* Filters lines by status.
462-
*
463-
* @param array $data
464-
* @param array|integer $status
465-
* @return array
466-
*/
467-
protected function getLinesByStatus(array $data, $status)
468-
{
469-
if (!is_array($status)) {
470-
$status = array($status);
471-
}
472-
473-
$isFileCache = array();
474-
$result = array();
475-
$status = array_flip($status);
476-
477-
foreach ($data as $file => $coverage) {
478-
if (!isset($isFileCache[$file])) {
479-
$isFileCache[$file] = $this->filter->isFile($file);
480-
}
481-
482-
if (!$isFileCache[$file]) {
483-
continue;
484-
}
485-
486-
$result[$file] = array();
487-
488-
foreach ($coverage as $line => $_status) {
489-
if (isset($status[$_status])) {
490-
$result[$file][$line] = $_status;
491-
}
492-
}
493-
}
494-
495-
return $result;
496-
}
497-
498440
/**
499441
* Processes whitelisted files that are not covered.
500442
*/

‎Tests/PHP/CodeCoverageTest.php‎

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -206,70 +206,89 @@ public function testClear()
206206
* @covers PHP_CodeCoverage::start
207207
* @covers PHP_CodeCoverage::stop
208208
* @covers PHP_CodeCoverage::append
209-
* @covers PHP_CodeCoverage::getLinesByStatus
210209
*/
211210
public function testCollect()
212211
{
213212
$this->assertAttributeEquals(
214213
array(
215214
'BankAccountTest::testBalanceIsInitiallyZero' => array(
216-
'executed' => array(
217-
TEST_FILES_PATH . 'BankAccount.php' => array(
218-
8 => 1
215+
'filtered' => array(
216+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
217+
8 => 1,
218+
9 => -2
219219
)
220220
),
221-
'dead' => array(
222-
TEST_FILES_PATH . 'BankAccount.php' => array(
223-
9 => -2,
224-
25 => -2,
225-
32 => -2
226-
)
227-
),
228-
'executable' => array(
229-
TEST_FILES_PATH . 'BankAccount.php' => array(
230-
8 => 1,
221+
'raw' => array(
222+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
223+
8 => 1,
224+
9 => -2,
231225
13 => -1,
232226
14 => -1,
233227
15 => -1,
234228
16 => -1,
235229
18 => -1,
236230
22 => -1,
237231
24 => -1,
232+
25 => -2,
238233
29 => -1,
239-
31 => -1
234+
31 => -1,
235+
32 => -2
240236
)
241237
)
242238
),
243239
'BankAccountTest::testBalanceCannotBecomeNegative' => array(
244-
'executed' => array(
245-
TEST_FILES_PATH . 'BankAccount.php' => array(
240+
'filtered' => array(
241+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
246242
29 => 1
247243
)
248244
),
249-
'dead' => array(),
250-
'executable' => array()
245+
'raw' => array(
246+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
247+
8 => 1,
248+
13 => 1,
249+
16 => 1,
250+
29 => 1
251+
)
252+
)
251253
),
252254
'BankAccountTest::testBalanceCannotBecomeNegative2' => array(
253-
'executed' => array(
254-
TEST_FILES_PATH . 'BankAccount.php' => array(
255+
'filtered' => array(
256+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
255257
22 => 1
256258
)
257259
),
258-
'dead' => array(),
259-
'executable' => array()
260+
'raw' => array(
261+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
262+
8 => 1,
263+
13 => 1,
264+
16 => 1,
265+
22 => 1
266+
)
267+
)
260268
),
261269
'BankAccountTest::testDepositWithdrawMoney' => array(
262-
'executed' => array(
263-
TEST_FILES_PATH . 'BankAccount.php' => array(
264-
8 => 1,
270+
'filtered' => array(
271+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
272+
8 => 1,
265273
22 => 1,
266274
24 => 1,
267275
29 => 1,
268276
31 => 1
269277
)
270278
),
271-
'dead' => array(),
272-
'executable' => array()
279+
'raw' => array(
280+
'/usr/local/src/code-coverage/Tests/_files/BankAccount.php' => array(
281+
8 => 1,
282+
13 => 1,
283+
14 => 1,
284+
15 => 1,
285+
18 => 1,
286+
22 => 1,
287+
24 => 1,
288+
29 => 1,
289+
31 => 1
290+
)
291+
)
273292
)
274293
),
275294
'data',

0 commit comments

Comments
 (0)