Merge 4.3.x into 5.0.x #7007
Merged
Merge 4.3.x into 5.0.x #7007
+91
−12
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
Add the latest LTS version of MariaDB. <!-- Fill in the relevant information below to help triage your pull request. --> | Q | A |------------- | ----------- | Type | improvement | Fixed issues | N/A #### Summary Improve the CI to cover newer versions of MariaDB 11.8+. https://mariadb.org/about/#maintenance-policy
| Q | A |------------- | ----------- | Type | improvement | Fixed issues | N/A #### Summary MySQL 9.3 is the latest release. We should test against it.
…octrine#6344) <!-- Fill in the relevant information below to help triage your pull request. --> | Q | A |------------- | ----------- | Type | improvement | Fixed issues | <!-- use #NUM format to reference an issue --> #### Summary Allow to pass IPv6 address of postgres server in URI notation (`[ff:aa:...]`). When the host is passed in URI format to `host` parameter of `pg_connect` it will fail because it then tries to resolve it as when it was a real host name. Instead just pass the IP address to the `hostaddr` parameter. Signed-off-by: Ferdinand Thiessen <[email protected]> Co-authored-by: Alexander M. Turek <[email protected]>
* phpstan/phpstan (2.1.1 => 2.1.17) * phpunit/phpunit (9.6.22 => 9.6.23) * squizlabs/php_codesniffer (3.12.0 => 3.13.1)
* 3.9.x: Bump dev tools (doctrine#7002) fix(PgSQL): Allow to pass IPv6 address in URI notation for postgres (doctrine#6344) Run tests on MySQL 9.3 instead of 9.1 (doctrine#7001) CI MariaDB: add 11.8 (doctrine#6991)
* 3.9.x: Bump dev tools (doctrine#7002) fix(PgSQL): Allow to pass IPv6 address in URI notation for postgres (doctrine#6344) Run tests on MySQL 9.3 instead of 9.1 (doctrine#7001) CI MariaDB: add 11.8 (doctrine#6991)
* 4.2.x: Ignore new PHPStan errors Bump dev tools (doctrine#7002) fix(PgSQL): Allow to pass IPv6 address in URI notation for postgres (doctrine#6344) Run tests on MySQL 9.3 instead of 9.1 (doctrine#7001) CI MariaDB: add 11.8 (doctrine#6991)
* 3.10.x:
| Q | A |------------- | ----------- | Type | improvement | Fixed issues | N/A #### Summary MariaDB 10.5 community edition will be EOL next week and enterprise support will end next month. I believe we don't want to keep on supporting this release in DBAL 5, so we might as well deprecate the support now. see https://mariadb.org/about/#maintenance-policy
* 4.3.x: phpunit/phpunit (11.5.15 => 11.5.23) (doctrine#7006) Deprecate support for MariaDB 10.5 (doctrine#7000) Fix new and previously ignored PHPStan errors Ignore new PHPStan errors Bump dev tools (doctrine#7002) fix(PgSQL): Allow to pass IPv6 address in URI notation for postgres (doctrine#6344) Run tests on MySQL 9.3 instead of 9.1 (doctrine#7001) CI MariaDB: add 11.8 (doctrine#6991)
morozov
reviewed
Jun 17, 2025
Comment on lines
+46
to
+48
| /** @var UnqualifiedNamedObjectSet<Column> $columns */ | ||
| $columns = new UnqualifiedNamedObjectSet(); | ||
| $this->columns = $columns; |
There was a problem hiding this comment.
Why do we want to complicate our code instead of just suppressing a false positive error? Never mind, it's already implemented in #7005, we're just merging this up.
There was a problem hiding this comment.
After the latest PHPStan update, suppressing the error did not work anymore. You can revert d2b297e and see for yourself. I seems as if PHPStan now prefers the assignment in the constructor over the property's doc block. 😓
morozov
approved these changes
Jun 17, 2025
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.