Merge branch '7.5' into 8.3

sebastianbergmann · Sep 7, 2019 · 3d7c49b · 3d7c49b
2 parents 0b17c1f + 002c0e2
commit 3d7c49b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
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
+                    );
                 }
             }
         }