add php 7.4 support (update jms serializer v3 + phpUnit) + fix issue 41 (conflicts resolved)#65
Merged
baev merged 5 commits intoallure-framework:masterfrom Jan 21, 2021
remorhaz:master
Merged
add php 7.4 support (update jms serializer v3 + phpUnit) + fix issue 41 (conflicts resolved)#65baev merged 5 commits intoallure-framework:masterfrom remorhaz:master
baev merged 5 commits intoallure-framework:masterfrom
remorhaz:master
Conversation
remorhaz
commented
Jan 18, 2021
| "require-dev": { | ||
| "phpunit/phpunit": "^4.0.0" | ||
| "phpunit/phpunit": "^7.5.15", | ||
| "symfony/mime": "^5" |
Contributor
Author
There was a problem hiding this comment.
Workaround for a problem I've talked about in issue #61. After merging this request I'm going to make PR to solve it.
baev
approved these changes
Jan 21, 2021
Member
|
@remorhaz thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
An attempt to resolve conflicts in abandoned PR #54.