Manual merge of 2.11.x into 3.0.x #4057
Merged
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
This will allow for subsequent fetches in different modes.
Additional changes based on the discussion in doctrine#4007
The links in convertException gives 404, i'm not 100% if I updated them correct, or if the e.g. should be update to 8.0 already. https://dev.mysql.com/doc/refman/8.0/en/server-error-reference.html https://dev.mysql.com/doc/refman/8.0/en/client-error-reference.html
@link in convertException gives 404
Introduce Statement::fetchFirstColumn()
Update doctrine/coding-standard to 8.0
Integrate with Codecov
Make caching layer not rely on closeCursor()
pcov is fast enough for this to be acceptable.
…ional-on-travis Report coverage unconditionally on Travis
Replace forward-compatible ResultStatement interfaces with Result
Codecov Report
@@ Coverage Diff @@
## 3.0.x #4057 +/- ##
========================================
Coverage ? 78.01%
Complexity ? 4616
========================================
Files ? 181
Lines ? 11579
Branches ? 0
========================================
Hits ? 9033
Misses ? 2546
Partials ? 0 Continue to review full report at Codecov.
|
greg0ire
approved these changes
Jun 8, 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.
Found issues:
ResultStatementin the upgrade notes, it doesn't annotate the class itself as deprecated (to be fixed in2.11.xand up-merged).dbal/UPGRADE.md
Lines 7 to 9 in 3cfb57d
dbal/lib/Doctrine/DBAL/Driver/ResultStatement.php
Lines 8 to 11 in 3cfb57d
SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperatorsniff had to be disabled during the up-merge since it forces the code to be incompatible with PHP 7.3.