From ca6e99a0929c846f2fabcae1df76b04cfe74a459 Mon Sep 17 00:00:00 2001 From: Maciej Holyszko <14310995+falkenhawk@users.noreply.github.com> Date: Sun, 27 Nov 2022 18:16:44 +0100 Subject: [PATCH] fixes circular dependency issue at zf1s/zf1 when composer2 is used followup to #7 - make the fix platform-agnostic (i.e. unstuck `@runInSeparateProcess` tests on windows) --- PHPUnit/Util/GlobalState.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPUnit/Util/GlobalState.php b/PHPUnit/Util/GlobalState.php index f55ab9b4366..08457fd89ed 100644 --- a/PHPUnit/Util/GlobalState.php +++ b/PHPUnit/Util/GlobalState.php @@ -201,7 +201,7 @@ public static function getIncludedFilesAsString() // Do not process bootstrap script - composer v2 compatibility // https://github.com/composer/composer/issues/10387#issuecomment-1002942296 // https://github.com/sebastianbergmann/phpunit/pull/4846 - while (strpos($files[0], 'bin/phpunit') !== false) { + while (strpos($files[0], 'bin' . DIRECTORY_SEPARATOR . 'phpunit') !== false) { array_shift($files); }