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 #3902

Merged
merged 43 commits into from
Mar 17, 2020
Merged

Manually merge 2.11.x into 3.0.x #3902

merged 43 commits into from
Mar 17, 2020

Conversation

morozov
Copy link
Member

@morozov morozov commented Mar 17, 2020

Q A
Type improvement
BC Break no

morozov and others added 30 commits January 4, 2020 05:19
@morozov
Bump version to 2.10.2-DEV
96cda30
@ostrolucky
Fix DebugStack#queries docblock type
77a394d
@ostrolucky
Fix DebugStack#queries docblock type (doctrine#3812)
d49d68f 
Fix DebugStack#queries docblock type
@morozov
fixed unqualified table name of fk constraints when using schemas
a525610
@morozov
Merge branch 'bpo/2.10/doctrine#3790' into 2.10
e5d1edc
@linniksa
[pg] fix getting table information if search_path contains escaped sc…
eff166f 
…hema name (eg "812pp")

also simplifies the code and now exactly matches postgresql search rules
@BenMorel
Fix JOIN with no condition bug
22b5494
@morozov
Merge pull request doctrine#3832 from BenMorel/join-no-on
d6992ae 
Fix JOIN with no condition bug
@morozov
Fixed the QueryBuilder::setMaxResults() signature to accept NULL
9b7246a
@rullzer @morozov
A test case for issue doctrine#3640
b253361 
Signed-off-by: Roeland Jago Douma <[email protected]>
@ChristophWurst @morozov
Fix regex for escaped literals
bcf78d5 
Signed-off-by: Christoph Wurst <[email protected]>
@CHItA
Fix the documentation of the driver option
c12db80
@morozov
Merge pull request doctrine#3834 from CHItA/fix-driver-manager-docume…
4343e06 
…ntation

Fix docblock typos in DriverManager docs
@morozov
Merge pull request doctrine#3843 from morozov/bpo/2.10/doctrine#3772
c763d6b 
Fix unquoted stmt fragments backslash escaping
@morozov
Merge pull request doctrine#3842 from morozov/bpo/2.10/doctrine#3840
4d44646 
Fixed the QueryBuilder::setMaxResults() signature to accept NULL
@morozov
Merge pull request doctrine#3821 from linniksa/fix-pg-search-path-res…
a0e2373 
…olution

[pg] fix getting table information if search_path contains escaped schema name
@peter-gribanov
Allow add previous exception in ConversionException
9a214ff
@andrew-demb
Add missed end of comment
c3286d8
@morozov @greg0ire
Switching Travis CI builds to Ubuntu Xenial Xerus
354524f
@greg0ire
Stop testing unsupported versions
5c858c4 
See https://www.postgresql.org/support/versioning/
See https://mariadb.com/kb/en/mariadb-server/
@greg0ire
Merge pull request doctrine#3883 from greg0ire/troubleshoot-apt-issue
96d10bd 
Fix broken build
@greg0ire
Merge remote-tracking branch 'origin/2.10' into 2.10.x
514dddd
@greg0ire
Use Docker consistently
8ed87e1 
When a Docker version of the build is available, use it.
@greg0ire
Stop using snapshot image
7475993 
PHP 7.4 has stable versions now.
@greg0ire
Replace external health check with native one
765432a 
Hopefully it will work more reliably.
@greg0ire
Refactor MySQL and MariaDB run in a single script
e7aef4e
@greg0ire
Do not enable docker explicitely
6e5fbcb 
It seems to be enabled by default.
@greg0ire
Synchronize the number of code coverage runs
398f23e
@greg0ire
Continue testing unsupported versions
6e505de 
They are no longer supported by their vendors, but until we do support
them, we should continue testing them.
@greg0ire
Merge pull request doctrine#3884 from greg0ire/use-docker-for-all-rdbms
f089a93 
Use Docker consistently
greg0ire and others added 13 commits February 29, 2020 21:54
@greg0ire
Display badges for current branch
1715948
@greg0ire
Remove column about develop
b8e2c28 
This branch seems to have been removed.
@greg0ire
Merge pull request doctrine#3878 from andrew-demb/patch-1
66bb687 
Add missed end of comment
@morozov
Merge pull request doctrine#3886 from greg0ire/update-readme
d67347c 
Update readme
@greg0ire
Merge pull request doctrine#3222 from peter-gribanov/PreviousConversi…
9e880d9 
…onException

Allow add previous exception in ConversionException
@morozov
Make sure that the $types array has the same keys $params
21512f9 
This will allow to omit parameters with unspecified types
@morozov
Merge pull request doctrine#3894 from morozov/issues/2897
0f17482 
Make sure that the $types array has the same keys $params
@morozov
Updated documentation for QueryBuilder::execute() return value type
68f0d99
@greg0ire
Merge pull request doctrine#3896 from morozov/issues/3603
d7f2292 
Updated documentation for QueryBuilder::execute() return value type
@morozov
Merge branch '2.10.x' into 2.11.x
e82ad5d
@morozov
Bump version to 2.11.0-DEV
3de9903
@greg0ire
Merge pull request doctrine#3898 from morozov/2.11.0-dev
3b0e942 
Bump version to 2.11.0-DEV
@morozov
Merge branch '2.11.x' into 3.0.x
a9df163
@morozov morozov requested a review from greg0ire March 17, 2020 15:59
@morozov
Copy link
Member Author

morozov commented Mar 17, 2020

@greg0ire there was a huge merge conflict in .travis.yml: on the one hand, we reworked the builds to use docker containers in 2.10.x; on the other, we added builds against PHP nightly in 3.0.x (that eventually would need to use docker containers as well).

greg0ire
greg0ire approved these changes Mar 17, 2020
View reviewed changes
Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Travis pipeline looks sane :)

@greg0ire greg0ire merged commit ad96d88 into doctrine:3.0.x Mar 17, 2020
@morozov morozov deleted the 3.0.x branch March 17, 2020 18:44
@greg0ire greg0ire mentioned this pull request Mar 18, 2020
Merged
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@greg0ire greg0ire greg0ire approved these changes

Assignees

@greg0ire greg0ire

Labels
Merge Up
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@morozov @greg0ire @ostrolucky @linniksa @BenMorel @rullzer @ChristophWurst @CHItA @peter-gribanov @andrew-demb