Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HHVM Fixes (Take 3 - The Working Version) #274

Merged
merged 2 commits into from
Feb 17, 2014
Merged

HHVM Fixes (Take 3 - The Working Version) #274

merged 2 commits into from
Feb 17, 2014

Conversation

GrahamCampbell
Copy link
Contributor

Is this any better?

@GrahamCampbell GrahamCampbell mentioned this pull request Feb 17, 2014
@wouterj
Copy link
Contributor

wouterj commented Feb 17, 2014

You don't need to create a new pr each time, just push new commits into the brsmch and the pr will be updated

@GrahamCampbell
Copy link
Contributor Author

I want to have them all as separate different pulls so either one can easily be merged at each state.

@davedevelopment
Copy link
Collaborator

👍 for me

@GrahamCampbell
Copy link
Contributor Author

I'll do a take 4 with:

        "phpunit/phpunit": "4.0.*@dev",
        "phpunit/php-code-coverage": "2.0.*@dev",
        "phpunit/phpunit-mock-objects": "2.0.*@dev"

@davedevelopment
Copy link
Collaborator

@GrahamCampbell honestly don't worry about it! Like I say, it may make it more difficult for others to contribute, it's better to keep it simple.

@GrahamCampbell
Copy link
Contributor Author

Too late now. :P

@davedevelopment
Copy link
Collaborator

Nevermind. Could you just push a note in the README where we explain how to run the tests, just to make it clear to run vendor/bin/phpunit and I'll merge this.

@GrahamCampbell
Copy link
Contributor Author

I don't know about anyone else, but I develop on windows, and I have vendor/bin in my PATH. I'll add a notice in the readme about testing...

@davedevelopment
Copy link
Collaborator

I have vendor/bin in my path, but only for directories I whitelist, it can be a bit of a security risk.

@GrahamCampbell
Copy link
Contributor Author

Sure thing. I've updated the contributing guide. How does that look?

davedevelopment added a commit that referenced this pull request Feb 17, 2014
@davedevelopment davedevelopment merged commit 49ed541 into mockery:master Feb 17, 2014
@davedevelopment
Copy link
Collaborator

Good enough for me (as you can tell by the spelling and typos, I'm not a hard sell with docs :)

Thanks for this.

@GrahamCampbell
Copy link
Contributor Author

Great. :)

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.

None yet

3 participants