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 #4216

Merged
merged 14 commits into from
Aug 20, 2020
Merged

Manually merge 2.11.x into 3.0.x #4216

merged 14 commits into from
Aug 20, 2020

Conversation

morozov
Copy link
Member

@morozov morozov commented Aug 19, 2020

Apart from the merge up, the following changes have been made:

  1. Use empty string instead of NULL for mysqli SSL parameters by default. This issue is only reproducible on 2.11.x because of the combination of Simplify Driver::connect() signature #4081 that uses strict types for the new Secure initializer and Test MySQLi connection via TLS on Travis #4209 that enables testing via SSL on Travis.
  2. Revert the accidental rename of the driverOptions connection parameter (previously handled in the wrapper Connection) to driver_options (currently handled in Driver implementations) made in Simplify Driver::connect() signature #4081.

@morozov morozov merged commit 79c34f7 into doctrine:3.0.x Aug 20, 2020
@morozov morozov self-assigned this Aug 27, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants