Refactor

Author: sebastianbergmann

src/CodeCoverage.php

@@ -138,14 +138,14 @@ final class CodeCoverage
      */
     public function __construct(Driver $driver = null, Filter $filter = null)
     {
-        if ($driver === null) {
-            $driver = $this->selectDriver();
-        }
-
         if ($filter === null) {
             $filter = new Filter;
         }
 
+        if ($driver === null) {
+            $driver = $this->selectDriver($filter);
+        }
+
         $this->driver = $driver;
         $this->filter = $filter;
 
@@ -878,7 +878,7 @@ private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed):
     /**
      * @throws RuntimeException
      */
-    private function selectDriver(): Driver
+    private function selectDriver(Filter $filter): Driver
     {
         $runtime = new Runtime;
 
@@ -891,7 +891,7 @@ private function selectDriver(): Driver
         }
 
         if ($runtime->hasXdebug()) {
-            return new Xdebug;
+            return new Xdebug($filter);
         }
 
         throw new RuntimeException('No code coverage driver available');

src/Driver/Xdebug.php

@@ -9,6 +9,7 @@
  */
 namespace SebastianBergmann\CodeCoverage\Driver;
 
+use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\RuntimeException;
 
 /**
@@ -23,10 +24,15 @@ final class Xdebug implements Driver
      */
     private $cacheNumLines = [];
 
+    /**
+     * @var Filter
+     */
+    private $filter;
+
     /**
      * @throws RuntimeException
      */
-    public function __construct()
+    public function __construct(Filter $filter = null)
     {
         if (!\extension_loaded('xdebug')) {
             throw new RuntimeException('This driver requires Xdebug');
@@ -35,6 +41,12 @@ public function __construct()
         if (!\ini_get('xdebug.coverage_enable')) {
             throw new RuntimeException('xdebug.coverage_enable=On has to be set in php.ini');
         }
+
+        if ($filter === null) {
+            $filter = new Filter;
+        }
+
+        $this->filter = $filter;
     }
 
     /**
@@ -66,13 +78,15 @@ private function cleanup(array $data): array
         foreach (\array_keys($data) as $file) {
             unset($data[$file][0]);
 
-            if (\strpos($file, 'xdebug://debug-eval') !== 0 && \file_exists($file)) {
-                $numLines = $this->getNumberOfLinesInFile($file);
+            if (!$this->filter->isFile($file)) {
+                continue;
+            }
+
+            $numLines = $this->getNumberOfLinesInFile($file);
 
-                foreach (\array_keys($data[$file]) as $line) {
-                    if ($line > $numLines) {
-                        unset($data[$file][$line]);
-                    }
+            foreach (\array_keys($data[$file]) as $line) {
+                if ($line > $numLines) {
+                    unset($data[$file][$line]);
                 }
             }
         }