Merge 2.13.x into 3.1.x #4632
Merged
Merge 2.13.x into 3.1.x #4632
Conversation
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
[doctrineGH-4613] Use utf8mb4 instead of utf8 for testing connection charset
Display metrics of 3.1 instead of 3.0
Support Doctrine Cache 2
* 2.13.x: Support Doctrine Cache 2 Display metrics of 3.1 instead of 3.0 [doctrineGH-4613] Use utf8mb4 instead of utf8 for testing connection charset
This was referenced May 2, 2021
morozov
approved these changes
May 3, 2021
Member
|
Thanks, @derrabus! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR proposes to merge the latest changes of the 2.13.x branch into 3.1.x. While resolving conflicts, I've bumped Symfony Cache to 5.2 because we don't need to support PHP 7.1 anymore and to match the constraint on 3.2.x.
Replaces #4630.