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

Manually merge 2.11.x into 3.0.x #4023

Merged
merged 20 commits into from
May 24, 2020
Merged

Manually merge 2.11.x into 3.0.x #4023

merged 20 commits into from
May 24, 2020

Conversation

greg0ire
Copy link
Member

@greg0ire greg0ire commented May 24, 2020

Not related to #3977 , but it is best to do it beforehand IMO

greg0ire and others added 20 commits May 8, 2020 14:21
This exclude rule is here because of a false positive that has been
fixed since slevomat/coding-standard 6.1.2
We are calling them in uppercase since 64939c3
Let RetryableException extend from the Throwable interface to prevent errors in Psalm if catching it
Extend RetryableException from Throwable interface
allow using multiple connections for CLI commands
For UTF-8: SQLSTATE[HY000] [2019] Unknown character set
Fix character for mysql driver example
This makes it consistent with doctrine-bundle command
Deprecated Connection::project(), Statement::errorCode() and errorInfo()
@greg0ire greg0ire changed the title 3.0.x Manually merge 2.11.x into 3.0.x May 24, 2020
@greg0ire greg0ire requested a review from morozov May 24, 2020 09:42
@greg0ire greg0ire merged commit 54a6f7b into doctrine:3.0.x May 24, 2020
@greg0ire greg0ire self-assigned this May 24, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants