Skip to content

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

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.

Sign up for GitHub

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

Merged
baev merged 5 commits into from
Jan 21, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee00951
add php 7 4 support (update jms serializer + phpUnit)
medliii Mar 1, 2020
1760e91
fix cr
medliii Mar 3, 2020
8a1f9a8
Conflicts resolved
remorhaz Jan 18, 2021
03c00f7
Requiring symfony/mime to run tests without breaking BC
remorhaz Jan 18, 2021
ff8e8de
Removed support for non-existing yet version 4 of jms/serializer
remorhaz Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
nbproject
vendor/*
composer.phar
/composer.lock
11 changes: 6 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
},
"require": {
"php": ">=5.4.0",
"jms/serializer": "^0.16 || ^1.0",
"ramsey/uuid": "^3.0 || ^4.0",
"symfony/http-foundation": "^2.0 || ^3.0 || ^4.0 || ^5.0"
"jms/serializer": "^0.16 | ^1 | ^3",
"ramsey/uuid": "^3 | ^4",
"symfony/http-foundation": "^2 | ^3 | ^4 | ^5"
},
"require-dev": {
"phpunit/phpunit": "^4.0.0"
"phpunit/phpunit": "^7.5.15",
"symfony/mime": "^5"

@remorhaz remorhaz Jan 18, 2021

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.

},
"autoload": {
"psr-0": {
Expand All @@ -31,7 +32,7 @@
},
"scripts": {
"test": [
"phpunit test"
"vendor/bin/phpunit test"
]
}
}
Loading