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

Bugfix/issue 965 #966

Merged
merged 9 commits into from Apr 4, 2018

Conversation

Projects
None yet
1 participant
@DavidCramer
Copy link
Member

commented Apr 3, 2018

  • Resync develop to master
  • Fix incompatible DateTIme extension
  • Fix failing unit tests in PHPUnit 5.7+

@lukecarbis between phpunit 4.6 and 5.7, the way exceptions are tested is changing. this is part of the issue why it started to fail when testing trigger_error().

Fixes #965

Luke Carbis and others added some commits Mar 15, 2017

Luke Carbis
Luke Carbis

@DavidCramer DavidCramer requested a review from lukecarbis Apr 3, 2018

@DavidCramer DavidCramer changed the title Bugfix/issue 965 [WIP] Bugfix/issue 965 Apr 3, 2018

@DavidCramer DavidCramer changed the title [WIP] Bugfix/issue 965 Bugfix/issue 965 Apr 4, 2018

@DavidCramer DavidCramer merged commit 71e926f into develop Apr 4, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@lukecarbis lukecarbis deleted the bugfix/issue-965 branch Apr 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.