Skip to content

add php 7.4 support (update jms serializer v3 + phpUnit) + fix issue 41 (conflicts resolved)#65

Merged
baev merged 5 commits into
allure-framework:masterfrom
remorhaz:master
Jan 21, 2021
Merged

add php 7.4 support (update jms serializer v3 + phpUnit) + fix issue 41 (conflicts resolved)#65
baev merged 5 commits into
allure-framework:masterfrom
remorhaz:master

Conversation

@remorhaz

@remorhaz remorhaz commented Jan 18, 2021

Copy link
Copy Markdown
Contributor

An attempt to resolve conflicts in abandoned PR #54.

Comment thread composer.json
"require-dev": {
"phpunit/phpunit": "^4.0.0"
"phpunit/phpunit": "^7.5.15",
"symfony/mime": "^5"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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 baev merged commit ef44a9d into allure-framework:master Jan 21, 2021
@baev

baev commented Jan 21, 2021

Copy link
Copy Markdown
Member

@remorhaz thanks!

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