Skip to content

Update to allow PHPUnit 4 or 5 #2

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

Merged
merged 1 commit into from
Oct 28, 2015
Merged

Conversation

jimlind
Copy link
Contributor

@jimlind jimlind commented Oct 13, 2015

Allow PHPUnit 4 or 5.
Update ReadMe.

@jimlind jimlind mentioned this pull request Oct 13, 2015
@malkusch
Copy link
Member

Could you please squash the PR into one commit?

@@ -17,8 +17,8 @@
"psr-4": {"phpmock\\phpunit\\": "classes/"}
},
"require": {
"php": ">=5.5",
"phpunit/phpunit": "^4.0.0",
"php": ">=5.6",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should can still >=5.5 imo

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added already a follow up commit 3897310 to support PHP-5.5 again. I just wait for a squash of this PR and would add PHP-5.5 back.

@jimlind jimlind force-pushed the PHPUnit-5.0 branch 2 times, most recently from 725d508 to e252991 Compare October 27, 2015 14:03
Update Docs.
Leave support for PHP 5.5
@jimlind
Copy link
Contributor Author

jimlind commented Oct 27, 2015

Squashed per @malkusch.
Allow PHP 5.5 per @samsonasik.

Waiting on CI to pass.

@malkusch malkusch merged commit 512da39 into php-mock:master Oct 28, 2015
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.

4 participants