Merge 3.10.x up into 4.3.x #6809
Merged
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
* 3.9.x: PHPStan 2.1.1 (doctrine#6690) PHPUnit 9.6.22 (doctrine#6691) Bump doctrine/.github from 6.0.0 to 7.1.0 (doctrine#6649) Bump doctrine/.github from 5.3.0 to 6.0.0 (doctrine#6642)
Merge 3.9.x up into 3.10.x
Merge 3.9.x up into 3.10.x
* 3.9.x: bugfix: deallocate mysqli prepared statement (doctrine#6681)
| Q | A |------------- | ----------- | Type | improvement | Fixed issues | N/A #### Summary We'd like to flag the the doctrine/cache package as abandoned which means it needs to disappear from the list of mandatory dependencies of DBAL. In DBAL 3.9, the doctrine/cache classes are used for deprecated code paths only. Note: This change could break downstream projects if they rely on DBAL installing the Cache package for them.
Merge 3.9.x up into 3.10.x
Merge 3.9.x up into 3.10.x
greg0ire
commented
Feb 24, 2025
| - "pdo_sqlite" | ||
| include: | ||
| - os: "ubuntu-20.04" | ||
| php-version: "8.1" | ||
| dependencies: "lowest" | ||
| extension: "pdo_sqlite" | ||
| - os: "ubuntu-22.04" | ||
| php-version: "8.1" | ||
| php-version: "8.4" |
There was a problem hiding this comment.
Both conflicts in this file emanate from #6740
I'm not sure if this is the right conflict resolution or if I should stick with 8.1 here.
There was a problem hiding this comment.
I think 8.4 is the right choice as #6740 made this change. IIRC, I resoved it the same when I merged it to 4.2.x.
morozov
approved these changes
Feb 24, 2025
SenseException
approved these changes
Feb 24, 2025
I think Grégoire will push it directely, since there's already a merge commit. Hence the draft status. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.