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.

Sign up for GitHub

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

Jump to bottom

Manually merge 2.11.x into 3.0.x #4300

Merged
merged 16 commits into from
Sep 26, 2020
Merged

Manually merge 2.11.x into 3.0.x #4300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
685f24b
Merge pull request #4271 from greg0ire/explanation-on-implicit-indexes
greg0ire Sep 20, 2020
0d4e1a8
Release 2.11.0
morozov Sep 20, 2020
5d22823
Bump version to 2.11.1-DEV
morozov Sep 20, 2020
7ca934c
Fix phpdoc of deprecated
qdequippe Sep 22, 2020
8557a32
Restore PDOStatement::quote() for backward compatibility
morozov Sep 22, 2020
0325f42
Fix BC break
BenMorel Sep 22, 2020
e8b14b5
Merge pull request #4286 from BenMorel/fix-bc-break
morozov Sep 23, 2020
b9cb735
Merge pull request #4285 from qdequippe/patch-1
morozov Sep 23, 2020
e90de0c
Deprecated the Abstraction\Result interface
morozov Sep 23, 2020
6ff72e4
Merge pull request #4287 from morozov/issues/4281
greg0ire Sep 24, 2020
2d09772
Merge pull request #4291 from morozov/deprecate-result-interface-subt…
morozov Sep 25, 2020
35c778b
Fix 2nd/3rd parameter not allowed for PDO::FETCH_COLUMN
BenMorel Jul 19, 2020
787c141
Merge pull request #4173 from BenMorel/2.10.x-fix-third-parameter
morozov Sep 25, 2020
e06d0bb
Fix ExceptionTest::testConnectionExceptionSqLite() on macOS
morozov Sep 26, 2020
f099856
Merge pull request #4297 from morozov/exception-test-macos
morozov Sep 26, 2020
5b9a194
Merge branch '2.11.x' into 3.0.x
morozov Sep 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions UPGRADE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,10 @@ Please use other database client applications for import, e.g.:

# Upgrade to 2.11

## Deprecated `Abstraction\Result`

The usage of the `Doctrine\DBAL\Abstraction\Result` interface is deprecated. In DBAL 3.0, the statement result at the wrapper level will be represented by the `Doctrine\DBAL\Result` class.

## Deprecated the functionality of dropping client connections when dropping a database

The corresponding `getDisallowDatabaseConnectionsSQL()` and `getCloseActiveDatabaseConnectionsSQL` methods
Expand Down
2 changes: 2 additions & 0 deletions src/Abstraction/Result.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
/**
* Abstraction-level statement execution result. Provides additional methods on top
* of the driver-level interface.
*
* @deprecated
*/
interface Result extends DriverResult
{
Expand Down