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 3.7.x into 4.0.x #6121

Merged
merged 11 commits into from
Aug 8, 2023
Merged

Merge 3.7.x into 4.0.x #6121

merged 11 commits into from
Aug 8, 2023

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Aug 8, 2023

No description provided.

derrabus and others added 11 commits July 25, 2023 02:10
Fix self deprecation from getCustomSchemaOptions
|      Q       |   A
|------------- | -----------
| Type         | improvement
| Fixed issues | N/A

#### Summary

Apparently, the stubs for `db2_num_rows()` were changed upstream. I'm
ignoring the error for now, maybe we can fix it on 3.7.x if we feel like
it's worth doing.
#### Summary

A typo fix and a space fix
* 3.6.x:
  Run tests with MySQL 8.1 (doctrine#6118)
  Fix a typo and a space (doctrine#6119)
  PHPStan 1.10.26 (doctrine#6116)
  Fix self deprecation
* 3.7.x:
  Run tests with MySQL 8.1 (doctrine#6118)
  Sync MariaDB support strategy with upstream (doctrine#6110)
  Fix a typo and a space (doctrine#6119)
  PHPStan 1.10.26 (doctrine#6116)
  Fix self deprecation
  Pin Slevomat Coding Standard
@derrabus derrabus merged commit 6b76e92 into doctrine:4.0.x Aug 8, 2023
68 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 8, 2024
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