Manually merge 3.0.x into master #3904

morozov · 2020-03-18T00:11:50Z

Q	A
Type	improvement
BC Break	no

Fix DebugStack#queries docblock type

…hema name (eg "812pp") also simplifies the code and now exactly matches postgresql search rules

Fix JOIN with no condition bug

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

…ntation Fix docblock typos in DriverManager docs

Fix unquoted stmt fragments backslash escaping

Fixed the QueryBuilder::setMaxResults() signature to accept NULL

…olution [pg] fix getting table information if search_path contains escaped schema name

See https://www.postgresql.org/support/versioning/ See https://mariadb.com/kb/en/mariadb-server/

Fix broken build

When a Docker version of the build is available, use it.

PHP 7.4 has stable versions now.

Hopefully it will work more reliably.

It seems to be enabled by default.

They are no longer supported by their vendors, but until we do support them, we should continue testing them.

Use Docker consistently

Make sure that the $types array has the same keys $params

Updated documentation for QueryBuilder::execute() return value type

Bump version to 2.11.0-DEV

Drop support for PHP 7.2

Manually merge 2.11.x into 3.0.x

Upgrade PHPUnit to 9.0

morozov · 2020-03-18T00:23:01Z

@greg0ire please do not auto-merge. There's already a merge commit that we can use.

morozov · 2020-03-18T01:07:28Z

~~In order to address the build failure, we need to deprecate the usage of the platforms like Postrgres 9.2, etc in 2.11.x (#3855) and drop their support in 3.0.x.~~

Actually, let's do this after the merge in #3906. I don't want to resolve the same conflicts again. For now, I just removed the PostrgreSQL 9.2 and 9.3 build jobs in the merge commit.

greg0ire · 2020-03-18T06:59:30Z

Oh right I merged #3902, shouldn't have. I should know this, I do it all the time on the Sonata repos 🤦‍♂️

greg0ire · 2020-03-18T08:25:39Z

IIRC we can use draft PRs to shield ourselves from my stupidity 🙂

morozov · 2020-03-18T15:12:22Z

@greg0ire IIRC the draft PRs had problems with Travis integration. In any event, this is no WIP and can be reviewed.

greg0ire · 2020-03-18T16:59:57Z

@greg0ire IIRC the draft PRs had problems with Travis integration. In any event, this is no WIP and can be reviewed.

I remember issues too at the beginning. Will try on Sonata several times and let you know.

morozov and others added 30 commits January 4, 2020 05:19

Bump version to 2.10.2-DEV

96cda30

Fix DebugStack#queries docblock type

77a394d

Fix DebugStack#queries docblock type (doctrine#3812)

d49d68f

Fix DebugStack#queries docblock type

fixed unqualified table name of fk constraints when using schemas

a525610

Merge branch 'bpo/2.10/doctrine#3790' into 2.10

e5d1edc

[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

Fix JOIN with no condition bug

22b5494

Merge pull request doctrine#3832 from BenMorel/join-no-on

d6992ae

Fix JOIN with no condition bug

Fixed the QueryBuilder::setMaxResults() signature to accept NULL

9b7246a

A test case for issue doctrine#3640

b253361

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix regex for escaped literals

bcf78d5

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Fix the documentation of the driver option

c12db80

Merge pull request doctrine#3834 from CHItA/fix-driver-manager-docume…

4343e06

…ntation Fix docblock typos in DriverManager docs

Merge pull request doctrine#3843 from morozov/bpo/2.10/doctrine#3772

c763d6b

Fix unquoted stmt fragments backslash escaping

Merge pull request doctrine#3842 from morozov/bpo/2.10/doctrine#3840

4d44646

Fixed the QueryBuilder::setMaxResults() signature to accept NULL

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

Allow add previous exception in ConversionException

9a214ff

Add missed end of comment

c3286d8

Switching Travis CI builds to Ubuntu Xenial Xerus

354524f

Stop testing unsupported versions

5c858c4

See https://www.postgresql.org/support/versioning/ See https://mariadb.com/kb/en/mariadb-server/

Merge pull request doctrine#3883 from greg0ire/troubleshoot-apt-issue

96d10bd

Fix broken build

Merge remote-tracking branch 'origin/2.10' into 2.10.x

514dddd

Use Docker consistently

8ed87e1

When a Docker version of the build is available, use it.

Stop using snapshot image

7475993

PHP 7.4 has stable versions now.

Replace external health check with native one

765432a

Hopefully it will work more reliably.

Refactor MySQL and MariaDB run in a single script

e7aef4e

Do not enable docker explicitely

6e5fbcb

It seems to be enabled by default.

Synchronize the number of code coverage runs

398f23e

Continue testing unsupported versions

6e505de

They are no longer supported by their vendors, but until we do support them, we should continue testing them.

Merge pull request doctrine#3884 from greg0ire/use-docker-for-all-rdbms

f089a93

Use Docker consistently

morozov and others added 14 commits March 15, 2020 21:31

Merge pull request doctrine#3894 from morozov/issues/2897

0f17482

Make sure that the $types array has the same keys $params

Updated documentation for QueryBuilder::execute() return value type

68f0d99

Merge pull request doctrine#3896 from morozov/issues/3603

d7f2292

Updated documentation for QueryBuilder::execute() return value type

Merge branch '2.10.x' into 2.11.x

e82ad5d

Bump version to 2.11.0-DEV

3de9903

Drop support for PHP 7.2

17b0def

Merge pull request doctrine#3898 from morozov/2.11.0-dev

3b0e942

Bump version to 2.11.0-DEV

Merge pull request doctrine#3900 from morozov/issues/3899

02d3c61

Drop support for PHP 7.2

Merge branch '2.11.x' into 3.0.x

a9df163

Merge pull request doctrine#3902 from morozov/3.0.x

ad96d88

Manually merge 2.11.x into 3.0.x

VersionAwarePlatformDriver now extends Driver

c5a7b92

PingableConnection and ServerInfoAwareConnection now extend Connection

59dffec

Updated PHPUnit to 9.0

a44d34e

Merge pull request doctrine#3903 from morozov/phpunit-9.0

133ce49

Upgrade PHPUnit to 9.0

morozov added the Merge Up label Mar 18, 2020

morozov added the WIP label Mar 18, 2020

Merge branch '3.0.x'

01143c9

morozov force-pushed the master branch from 5b7b3cb to 01143c9 Compare March 18, 2020 03:35

morozov removed the WIP label Mar 18, 2020

morozov requested a review from greg0ire March 18, 2020 03:37

greg0ire approved these changes Mar 18, 2020

View reviewed changes

morozov merged commit 01143c9 into doctrine:master Mar 18, 2020

morozov self-assigned this Mar 18, 2020

github-actions bot locked as resolved and limited conversation to collaborators Aug 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Manually merge 3.0.x into master #3904

Manually merge 3.0.x into master #3904

morozov commented Mar 18, 2020

morozov commented Mar 18, 2020

morozov commented Mar 18, 2020 •

edited

Loading

greg0ire commented Mar 18, 2020

greg0ire commented Mar 18, 2020

morozov commented Mar 18, 2020

greg0ire commented Mar 18, 2020

Manually merge 3.0.x into master #3904

Manually merge 3.0.x into master #3904

Conversation

morozov commented Mar 18, 2020

morozov commented Mar 18, 2020

morozov commented Mar 18, 2020 • edited Loading

greg0ire commented Mar 18, 2020

greg0ire commented Mar 18, 2020

morozov commented Mar 18, 2020

greg0ire commented Mar 18, 2020

morozov commented Mar 18, 2020 •

edited

Loading