Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The rebasing didn't work as I thought it would on the previous PR so I just cherry-picked the commits against a correct branch.
Original message
This is a (possible) fix for the PHPUnit issue sebastianbergmann/phpunit#4664
I've added the suggestion by @krakjoe (link) and some tests to cover this part of the code.
I've run the tests on the PHPUnit locally on the latest branch to check if anything broke, and the existing tests passed. I guess this should be tested a bit thoroughly.
When I ran the tests on the PHPUnit repo and put the breakpoint to inspect the result of merging the settings with
getCurrentSettings
method in theAbstractPhpProcess.php
file inside thegetCommand
method I could see my xdebug settings correctly parsed, so I think there should be no breaks.I had to add the updated code manually inside the vendor file to test this because I got a composer error when trying to use my branch instead of the v6 for the
php-code-coverage
package.This is the image of the breakpoint and part of the
$settings
array:I'd love to have somebody test it a bit more just to be sure.
Oh and I'd love to add a co-authored commit for @krakjoe but I'm not sure what the no-reply email is 馃檲 I can update the commit message to add it once I find out the correct email 馃檪