Skip to content

Manually merge 3.0.x into master#3857

Merged
morozov merged 35 commits intodoctrine:masterfrom
morozov:master
Jan 29, 2020
Merged

Manually merge 3.0.x into master#3857
morozov merged 35 commits intodoctrine:masterfrom
morozov:master

Conversation

@morozov
Copy link
Copy Markdown
Member

@morozov morozov commented Jan 29, 2020

Q A
Type improvement
BC Break no

morozov and others added 30 commits December 30, 2019 10:52
… avoid having to replicate the \PDOStatement interface in ResultStatement
Use a wrapped PDO Statement instead of a custom class for `pdo_sqlsrv` since `PDOSqlsrv\Statement` doesn't extend `PDOStatement` anymore.
Backport PDO-related changes from master to 3.0.x
Added builds against PHP nightly on Travis
Rename andX() / orX() methods
First parameter of ExpressionBuilder::and/or() mandatory
@morozov morozov requested review from Ocramius and greg0ire January 29, 2020 18:41
@morozov morozov added this to the 4.0.0 milestone Jan 29, 2020
@morozov morozov merged commit 43819af into doctrine:master Jan 29, 2020
@morozov morozov self-assigned this Jan 29, 2020
@morozov morozov removed this from the 4.0.0 milestone Aug 15, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants