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

Add PHP 7.2 into the mix #210

Merged
merged 4 commits into from Oct 24, 2017

Conversation

raphaelstolt
Copy link
Contributor

Added PHP 7.2 support and also eased the AppVeyor configuration. Both for the generated configuration files as well for the own repository configurations.

@raphaelstolt raphaelstolt force-pushed the php7.2-addition branch 3 times, most recently from 63eda28 to 66646ee Compare October 11, 2017 20:57
@raphaelstolt
Copy link
Contributor Author

raphaelstolt commented Oct 11, 2017

Currently the Travis CI build for 7.2 fails due to errors raised in the phpunit/phpunit and mockery/mockery dependencies.

If Composer would install them in ^6.0 and ^1.0 this problem should be solved; not quite sure how to achieve this.

@raphaelstolt raphaelstolt force-pushed the php7.2-addition branch 14 times, most recently from dc562bb to 1c2dea8 Compare October 11, 2017 22:37
@jonathantorres
Copy link
Owner

Maybe allow the build to fail on travis until php 7.2 is released?

@raphaelstolt
Copy link
Contributor Author

raphaelstolt commented Oct 12, 2017

That would make the build green; but we're still having a dependency problem. Builds against e.g. 7.0 should also use phpunit/phpunit:^6.0 and mockery/mockery:^1.0; which doesn't happen currently.

Maybe we should introduce version branches like described here?

@jonathantorres
Copy link
Owner

I see, what is your recommendation? to create an 1.* branch and then bump to 2.0 which will be in the master branch?

@raphaelstolt
Copy link
Contributor Author

Yes we should create a 1.* branch which should include support for PHP 5.6 up to 7.2 which is allowed to fail builds for 7.2 and lives until 5.6 goes EOL (31 Dec 2018). Than we should create a 2.* branch which should only support 7.* versions and might become the new master branch.

Not quite sure if new features added in the 2.* branch should also go into the 1.* branch because this will require some extra work. This decision is entirely up to you. 😇

Also related to this is issue #211, for which I could send a PR later today.

@raphaelstolt raphaelstolt force-pushed the php7.2-addition branch 2 times, most recently from a2bd08e to 223466b Compare October 16, 2017 17:27
@jonathantorres
Copy link
Owner

jonathantorres commented Oct 17, 2017

Sounds good!

  • I'll create the 1.* branch for the next release (which will be 1.6). This one will support php 5.6 and later. But no new features will be added here, only bugfixes/patches.
  • The master branch will hold the next mayor version (2.0), this one will support php 7.0 and later. New features should be submitted here.
  • If somebody complains (don't think that would happen) about the removal of php 5.4 and 5.5, I don't mind adding support for it on the 1.* branch.

Let me know your thoughts, thanks again!

@raphaelstolt raphaelstolt force-pushed the php7.2-addition branch 5 times, most recently from 338d528 to 4790742 Compare October 17, 2017 16:42
@jonathantorres jonathantorres merged commit 184c546 into jonathantorres:master Oct 24, 2017
@raphaelstolt raphaelstolt deleted the php7.2-addition branch October 25, 2017 04:51
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

2 participants