Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Merge 0.3 branch and revert BC commits#6

Merged
jmikola merged 7 commits intomasterfrom
revert-0.3-compat
Jul 31, 2014
Merged

Merge 0.3 branch and revert BC commits#6
jmikola merged 7 commits intomasterfrom
revert-0.3-compat

Conversation

@jmikola
Copy link
Member

@jmikola jmikola commented Jul 31, 2014

This reverts some of the changes implemented in #4 for the 0.3 branch. It leaves the PHP binary detection, since that improves HHVM test compatibility.

clue and others added 7 commits July 31, 2014 14:29
This improves support for HHVM by ensuring we use the HHVM binary for child processes and invoke it with the "--php" command line option.
This reverts commit 28b5337.

Conflicts:
	composer.json
	tests/AbstractProcessTest.php
jmikola added a commit that referenced this pull request Jul 31, 2014
Merge 0.3 branch and revert BC commits
@jmikola jmikola merged commit a18219d into master Jul 31, 2014
@jmikola jmikola deleted the revert-0.3-compat branch July 31, 2014 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants