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

Backport 7.4 support to 1.6.x branch #196

Merged
merged 7 commits into from
Jul 30, 2019
Merged

Backport 7.4 support to 1.6.x branch #196

merged 7 commits into from
Jul 30, 2019

Conversation

allejo
Copy link
Member

@allejo allejo commented Jul 29, 2019

Follow up on #195, this PR backports PRs #189 and #172 to the v1.x branch.

The master branch has had work done in the unit tests over a period of time to upgrade it from PHPUnit 4.5 to 8. Since the v1.x branch isn't one we're looking to maintain, I see no reason to dedicate time to updating the unit tests. So, this PR includes some terrible hacks needed to get the v1.x branch successfully tested all the way from 5.3 up until 7.4. This means we can perform all our testing without having to touch our minimum PHP version in a point release and still test all the versions we support.

7.4 support is incredibly trivial for this library, but testing all the versions we support is the difficult part, hence this larger PR.

The composer.lock file has been removed in this branch so composer can automatically pick between PHPUnit 4.8 for PHP <= 5.5 and PHPUnit 5.7 for PHP >= 5.6.

@allejo allejo requested a review from a team July 29, 2019 05:57
Copy link
Contributor

@jaapio jaapio left a comment

Choose a reason for hiding this comment

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

Looks good to me, I kind of like the hack you did to make the impact of the changes smaller. We can remove this in the future if we want to. And it shows the minimal changes to get this library working for php 7.4 👍

I had just a few notes which are not blocking for me, but things we might consider to change in a follow up PR.

.travis.yml Outdated Show resolved Hide resolved
@jaapio
Copy link
Contributor

jaapio commented Jul 30, 2019

I would give this a go!

@allejo allejo merged commit b4dd949 into bovigo:v1.x Jul 30, 2019
@allejo allejo deleted the v1.x-php-53-74-testing branch July 30, 2019 15:12
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.

3 participants