Merge branch '8.5' into 9.5

Author: sebastianbergmann

ChangeLog-8.5.md

@@ -12,6 +12,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 ### Fixed
 
 * [#4840](https://github.com/sebastianbergmann/phpunit/pull/4840): TestDox prettifying for class names does not correctly handle diacritics
+* [#4846](https://github.com/sebastianbergmann/phpunit/pull/4846): Composer proxy script is not ignored
 
 ## [8.5.21] - 2021-09-25
 

src/Util/GlobalState.php

@@ -11,6 +11,7 @@
 
 use function array_keys;
 use function array_reverse;
+use function array_shift;
 use function defined;
 use function get_defined_constants;
 use function get_included_files;
@@ -23,6 +24,8 @@
 use function serialize;
 use function sprintf;
 use function strpos;
+use function strtr;
+use function substr;
 use function var_export;
 use Closure;
 
@@ -68,7 +71,12 @@ public static function processIncludedFilesAsString(array $files): string
         }
 
         // Do not process bootstrap script
-        unset($files[0]);
+        array_shift($files);
+
+        // If bootstrap script was a Composer bin proxy, skip the second entry as well
+        if (substr(strtr($files[0], '\\', '/'), -24) === '/phpunit/phpunit/phpunit') {
+            array_shift($files);
+        }
 
         foreach (array_reverse($files) as $file) {
             if (!empty($GLOBALS['__PHPUNIT_ISOLATION_EXCLUDE_LIST']) &&