Merge pull request #15 from zf1s/composer2-compat-win

partikus · web-flow · commit be847a623155 · 2022-11-27T20:40:28.000+01:00
fixes circular dependency issue at zf1s/zf1 when composer2 is used (on windows)
diff --git 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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public static function getIncludedFilesAsString()`
`201`	`201`	`// Do not process bootstrap script - composer v2 compatibility`
`202`	`202`	`// https://github.com/composer/composer/issues/10387#issuecomment-1002942296`
`203`	`203`	`// https://github.com/sebastianbergmann/phpunit/pull/4846`
`204`		`- while (strpos($files[0], 'bin/phpunit') !== false) {`
	`204`	`+ while (strpos($files[0], 'bin' . DIRECTORY_SEPARATOR . 'phpunit') !== false) {`
`205`	`205`	`array_shift($files);`
`206`	`206`	`}`
`207`	`207`