Add support for HHVM in the getting of the PHP executable #9583
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
|
This PR should be opened against 2.2, not master |
|
@JoelMarcey that's great to see HHVM support, thanks ! |
| @@ -33,6 +33,11 @@ public function __construct() | |||
| */ | |||
| public function find() | |||
| { | |||
| // HHVM support | |||
| if (($hhvm = getenv("PHP_BINARY")) !== false) { | |||
There was a problem hiding this comment.
Please fix the coding standard as @hhamon suggested.
There was a problem hiding this comment.
I think a check on defined('HHVM_VERSION') should be added, to avoid checking this env variable on non-HHVM setup (where the PHP_BINARY constant should have precedence).
|
closing in favor of #9882 |
fabpot
added a commit
that referenced
this pull request
Dec 29, 2013
…fabpot) This PR was merged into the 2.3 branch. Discussion ---------- Add support for HHVM in the getting of the PHP executable | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Same as #9583 but with CS fixed, on 2.3, and with an added safeguard to only change the current behavior for HHVM. Check for a PHP_BINARY environment variable before using the pre-defined PHP_BINARY constant. HHVM has an explicit hhvm binary and a wrapper to mimic php functionality. We were running into issues with tests that ran in their own process where using the hhvm binary does not handle php code sent to it via stdin very well. We get "Nothing to do...pass file" exceptions. Unfortunately, the PHP_BINARY is always set to the explicit binary (the php wrapper is basically a symlink to the explicit binary). So, we thought about adding a check for a PHP_BINARY environment variable as the first choice when getting the PHP binary. Commits ------- 876482f [Process] fixed HHVM support 539de17 Add support for HHVM in the getting of the PHP executable
|
Thanks all for the code update and getting this into master. cc: @ptarjan |
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.
Check for a PHP_BINARY environment variable before using the pre-defined PHP_BINARY constant.
HHVM has an explicit hhvm binary and a wrapper to mimic php functionality. We were running into issues with tests that ran in their own process where using the hhvm binary does not handle php code sent to it via stdin very well. We get "Nothing to do...pass file" exceptions. Unfortunately, the PHP_BINARY is always set to the explicit binary (the php wrapper is basically a symlink to the explicit binary). So, we thought about adding a check for a PHP_BINARY environment variable as the first choice when getting the PHP binary.