Merge branch 'master' into feature/path-coverage

Author: sebastianbergmann

src/CodeCoverage/Driver/Xdebug.php

@@ -87,7 +87,7 @@ private function cleanup(array $data)
                 unset($data[$file]['lines'][0]);
             }
 
-            if (file_exists($file)) {
+            if ($file != "xdebug://debug-eval" && file_exists($file)) {
                 $numLines = $this->getNumberOfLinesInFile($file);
 
                 foreach (array_keys($data[$file]['lines']) as $line) {

src/CodeCoverage/Report/HTML.php

@@ -138,7 +138,7 @@ private function copyFiles($target)
     {
         $dir = $this->getDirectory($target . 'css');
         copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
-        copy($this->templatePath . 'css/nv.d3.css', $dir . 'nv.d3.css');
+        copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
         copy($this->templatePath . 'css/style.css', $dir . 'style.css');
 
         $dir = $this->getDirectory($target . 'fonts');
@@ -151,7 +151,7 @@ private function copyFiles($target)
         $dir = $this->getDirectory($target . 'js');
         copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
         copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
-        copy($this->templatePath . 'js/holder.js', $dir . 'holder.js');
+        copy($this->templatePath . 'js/holder.min.js', $dir . 'holder.min.js');
         copy($this->templatePath . 'js/html5shiv.min.js', $dir . 'html5shiv.min.js');
         copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
         copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');