Skip to content

Commit 9ca9ee5

Browse files
Refactor.
1 parent 1e0358f commit 9ca9ee5

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

PHP/CodeCoverage.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,18 @@ public function append(array $data, $id = NULL)
178178
throw new InvalidArgumentException;
179179
}
180180

181+
$dir = dirname(__FILE__);
182+
183+
foreach (array_keys($data) as $file) {
184+
if (strpos($file, $dir) === 0 ||
185+
substr($file, -17) == 'File/Iterator.php' ||
186+
substr($file, -25) == 'File/Iterator/Factory.php') {
187+
unset($data[$file]);
188+
}
189+
}
190+
191+
unset($dir, $file);
192+
181193
// Process files that are covered for the first time.
182194
$newFiles = array_diff_key($data, $this->coveredFiles);
183195

PHP/CodeCoverage/Driver.php

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
*/
4545

4646
/**
47-
* Abstract base class for code coverage drivers.
47+
* Interface for code coverage drivers.
4848
*
4949
* @category PHP
5050
* @package CodeCoverage
@@ -55,34 +55,18 @@
5555
* @link http://github.com/sebastianbergmann/php-code-coverage
5656
* @since Class available since Release 1.0.0
5757
*/
58-
abstract class PHP_CodeCoverage_Driver
58+
interface PHP_CodeCoverage_Driver
5959
{
60-
/**
61-
* @param array $codeCoverage
62-
*/
63-
protected function filter(&$codeCoverage)
64-
{
65-
$dir = dirname(dirname(__FILE__));
66-
67-
foreach (array_keys($codeCoverage) as $file) {
68-
if (strpos($file, $dir) === 0 ||
69-
substr($file, -17) == 'File/Iterator.php' ||
70-
substr($file, -25) == 'File/Iterator/Factory.php') {
71-
unset($codeCoverage[$file]);
72-
}
73-
}
74-
}
75-
7660
/**
7761
* Start collection of code coverage information.
7862
*/
79-
abstract public function start();
63+
public function start();
8064

8165
/**
8266
* Stop collection of code coverage information.
8367
*
8468
* @return array
8569
*/
86-
abstract public function stop();
70+
public function stop();
8771
}
8872
?>

PHP/CodeCoverage/Driver/Xdebug.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* @link http://github.com/sebastianbergmann/php-code-coverage
5858
* @since Class available since Release 1.0.0
5959
*/
60-
class PHP_CodeCoverage_Driver_Xdebug extends PHP_CodeCoverage_Driver
60+
class PHP_CodeCoverage_Driver_Xdebug implements PHP_CodeCoverage_Driver
6161
{
6262
/**
6363
* Start collection of code coverage information.
@@ -77,8 +77,6 @@ public function stop()
7777
$codeCoverage = xdebug_get_code_coverage();
7878
xdebug_stop_code_coverage();
7979

80-
$this->filter($codeCoverage);
81-
8280
return $codeCoverage;
8381
}
8482
}

0 commit comments

Comments
 (0)