Manually merge 2.12.x into 3.0.x #4381
Merged
+72
−123
Conversation
This file contains 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
[2.12] PHP 8 compatibility
It has support for PHP8.
That test will get remove in next major release, and requires too much maintenance.
Jobs that use other versions of PHP are temporarily removed so that it's easier to focus and iterate.
This leverages a new feature of shivammathur/setup-php that allows to fail the build if an extension or tool fails to install.
Move the logic out of the assertion
My IDE was telling me I was trying to catch a non-existent exception, however it's clear by digging down a level that the Exception is throw by this class, so this simply annotates that. Perhaps this should catch it and throw a QueryException?
Test the newest version, the oldest version, and versions for which we have version-specific code. This is based on platform classes that have a version number in their name.
Psalm fails on release commits
Fail on extension / tool installation failure
…ption-annotation Adds exception thrown by execute() method
…-jobs Reduce number of build jobs
Configuration should not be internal
morozov
requested changes
Oct 22, 2020
composer.json
Outdated
| @@ -31,7 +31,8 @@ | |||
| {"name": "Jonathan Wage", "email": "jonwage@gmail.com"} | |||
| ], | |||
| "require": { | |||
| "php": "^7.3 || ^8.0", | |||
| "php": "^7.3 || ^8", | |||
| "ext-pdo": "*", | |||
There was a problem hiding this comment.
This should be reverted. The change in the first line is non-essential, the addition of the second line is wrong.
There was a problem hiding this comment.
Wrong second line for 3.0 or does this also affect 2.12?
There was a problem hiding this comment.
Only wrong for 3.0.x (#2958).
src/Query/QueryBuilder.php
Outdated
| @@ -3,6 +3,7 @@ | |||
| namespace Doctrine\DBAL\Query; | |||
|
|
|||
| use Doctrine\DBAL\Connection; | |||
| use Doctrine\DBAL\Driver\ResultStatement; | |||
There was a problem hiding this comment.
Indeed, and it's weird phpcs does not complain about this 🤔
morozov
approved these changes
Oct 22, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.