Skip to content

Merge 3.5.x into 4.0.x #5811

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

Merged
merged 15 commits into from
Nov 6, 2022
Merged

Merge 3.5.x into 4.0.x #5811

merged 15 commits into from
Nov 6, 2022

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Nov 6, 2022

I've reverted #5795 during the merge.

morozov and others added 15 commits October 22, 2022 10:19
This reverts commit 68576ab.
This change needs to be done on the major branch, as it breaks
documented functionality (the mariadb- prefix), and functionality relied
upon (passing 8 or 8.0 as a version number).
Revert "Clean up MySQL version detection logic"
I think this is what prevents this page from appearing in the table of
contents.
* phpstan/phpstan 1.8.11
* phpunit/phpunit 9.5.26
* psalm/plugin-phpunit 0.18.0
* 3.5.x:
  PHPStan 1.9.1
  Bump dev tools
  Remove unwanted suffix
  Fix typo
  Run tests with MariaDB 10.9
  Revert "Clean up MySQL version detection logic"
  Update project metadata
@derrabus derrabus requested a review from greg0ire November 6, 2022 17:43
@derrabus derrabus merged commit 0f2d257 into doctrine:4.0.x Nov 6, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 7, 2023
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.

4 participants