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

Merge 2.5 onto master #3718

Merged
merged 8 commits into from
Sep 13, 2020
Merged

Merge 2.5 onto master #3718

merged 8 commits into from
Sep 13, 2020

Conversation

soyuka
Copy link
Member

@soyuka soyuka commented Sep 13, 2020

Mainly fixes tests / ci

GregoireHebert and others added 5 commits September 1, 2020 09:47
* fix: restore coverage

* Fix phpstan

* Remove php-code-coverage dependency

* Support multiple phpunit version ArraySubset

Co-authored-by: soyuka <soyuka@users.noreply.github.com>
@soyuka soyuka merged commit 32249e9 into api-platform:master Sep 13, 2020
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.

None yet

4 participants