Merge branch '8.3'

sebastianbergmann · Sep 7, 2019 · f2d371f · f2d371f
2 parents c2fa2fc + 3d7c49b
commit f2d371f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
-/build export-ignore
-/tools export-ignore
+/.docker    export-ignore
+/build      export-ignore
+/tools      export-ignore
 
 *.php diff=php
 
diff --git a/ChangeLog-8.3.md b/ChangeLog-8.3.md
@@ -9,6 +9,7 @@ All notable changes of the PHPUnit 8.3 release series are documented in this fil
 * Fixed [#3745](https://github.com/sebastianbergmann/phpunit/issues/3745): Performance degradation with test doubles
 * Fixed [#3801](https://github.com/sebastianbergmann/phpunit/issues/3801): Class constant as default parameter is undefined
 * Fixed [#3807](https://github.com/sebastianbergmann/phpunit/pull/3807): Fixed message of exception raised by `MockBuilder::addMethods()`
+* Fixed [#3834](https://github.com/sebastianbergmann/phpunit/issues/3834): Trailing slash breaks code coverage on Windows
 
 ## [8.3.4] - 2019-08-11
 

diff --git a/src/Util/XdebugFilterScriptGenerator.php b/src/Util/XdebugFilterScriptGenerator.php
@@ -56,7 +56,11 @@ private function getWhitelistItems(array $filterData): array
                 $path = \realpath($directory['path']);
 
                 if (\is_string($path)) {
-                    $files[] = \sprintf('%s/', $path);
+                    $files[] = \sprintf(
+                        '%s%s',
+                        $path,
+                        \DIRECTORY_SEPARATOR
+                    );
                 }
             }
         }