[PhpUnitBridge] Also search for composer.phar in git root folder #34188
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -99,6 +99,7 @@ | |||
| $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') | |||
| || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`)) | |||
| || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`)) | |||
| || file_exists($COMPOSER = rtrim(`git rev-parse --show-toplevel 2> /dev/null`).DIRECTORY_SEPARATOR.'composer.phar') | |||
There was a problem hiding this comment.
we should use NUL instead of /dev/null on Windows
There was a problem hiding this comment.
In dfd1f18 NUL is used if '\\' === DIRECTORY_SEPARATOR
dfd1f18 to
97fd204
Compare
|
Thank you @MaPePeR. |
nicolas-grekas
added a commit
that referenced
this pull request
Nov 5, 2019
…t folder (MaPePeR) This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] Also search for composer.phar in git root folder | Q | A | ------------- | --- | Branch? | 4.4 for features | Bug fix? | kindof | New feature? | addition to existing feature | Deprecations? | no | Tickets | Related: #26637 (comment) | License | MIT When you don't have a system `composer` installation, but a `composer.phar` in the project folder, you cannot use the `simple-phpunit` script from a subfolder of the project with e.g. `../vendor/bin/simple-phpunit`. This change also searches for the `composer.phar` in the current git root folder if it was not found at any other places to increase the likelihood of it being found. Commits ------- 97fd204 [PhpUnitBridge] Also search for composer.phar in git root folder
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When you don't have a system
composerinstallation, but acomposer.pharin the project folder, you cannot use thesimple-phpunitscript from a subfolder of the project with e.g.../vendor/bin/simple-phpunit.This change also searches for the
composer.pharin the current git root folder if it was not found at any other places to increase the likelihood of it being found.