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

Merge 3.0.x into 3.1.x #4482

Merged
merged 39 commits into from
Jan 14, 2021
Merged

Merge 3.0.x into 3.1.x #4482

merged 39 commits into from
Jan 14, 2021

Conversation

greg0ire
Copy link
Member

No description provided.

morozov and others added 30 commits November 14, 2020 12:26
@morozov
Release 2.12.1
adce7a9
@morozov
Bump version to 2.12.2-DEV
faf8ddd
@morozov
Update documentation after the 3.0.0 release
51bd65b
@morozov
Merge pull request #4435 from morozov/update-readme
996ab03 
Update documentation after the 3.0.0 release
@simPod
Upgrade phpstan and psalm
1a5be85
@morozov
Merge pull request #4412 from simPod/upgrade
79cba0b 
Upgrade phpstan and psalm
@morozov
Replace DriverManager::$_driverMap with a constant
47aaf42
@morozov
Refactor DriverManager::_checkParams()
9eedbe9
@morozov
Handle connection password as optional in OracleSchemaManager
97ef20c
@morozov
Handle connection driver parameter as optional in PrimaryReadReplicaC…
70793ec 
…onnection
@morozov
Connection database name cannot be NULL
930b906
@morozov
Do not rely on optional parameters in SqliteSchemaManager
2e88bef
@morozov
Document the shape of the connection parameters array
de5464d
@duncan3dc
Ensure the default is declared in the same statement for new columns
caf5c0f
@morozov
Merge pull request #4447 from duncan3dc/sql-server-add-column-default
2d1f747 
Ensure the default is declared in the same statement for new columns
@morozov
Merge pull request #4449 from morozov/params-shape
4b46ecd 
Document the shape of the connection parameters array
@morozov
Merge branch '2.12.x' into 3.0.x
bd5fc0d
@kishore-hariram @morozov
No need of comma
c098382
@morozov
Merge pull request #3682 from kikilass/master
ecadac4 
No need of comma
@morozov
Remove unmaintained branches from the project metadata
a7b5f09
@morozov
Merge pull request #4453 from morozov/remove-unmaintained-branches
98233ab 
Remove unmaintained branches from the project metadata
@trusek @morozov
MSSQL adds a redundant ORDER BY clause when with subquery with ORDER BY
7aac084
@morozov
Merge pull request #4438 from trusek/2.12.x
5a7befb 
#4437 MSSQL adds a redundant ORDER BY clause when with subquery with …
@greeflas @morozov
Fix and improve docs
a0b82ff
@morozov
Merge pull request #4260 from greeflas/fix_docs
373c24d 
Fix and improve docs
@beberlei
Add note about lost connections to UPGRADE guide.
2119044
@greg0ire
Merge pull request #4457 from beberlei/LostConnectionHint
7f6acbb 
Add note about lost connections to UPGRADE guide.
@nicwortel
Use the ramsey/composer-install action to install dependencies
4fb1862 
Follow-up of doctrine/.github#16.
@greg0ire
Merge pull request #4463 from nicwortel/ramsey-composer-install
4211e3c 
Use the ramsey/composer-install action to install dependencies
@morozov
Update PHPUnit to 9.5
f5984e1
morozov and others added 9 commits December 13, 2020 12:13
@morozov
Merge pull request #4466 from morozov/phpunit-9.5
5ffd105 
Update PHPUnit to 9.5
@nicwortel
Remove composer.lock from version control
b40e327 
See https://github.com/orgs/doctrine/projects/7#card-50248076.
@nicwortel
Require the exact versions of development tools
02fbb3d 
This prevents randomly failing builds in case one of the dependencies releases
an unintentional BC break.
See https://github.com/doctrine/dbal/pull/4464/files#r542180416 for more
information.
@greg0ire
Merge pull request #4464 from nicwortel/remove-composer-lock
ce3421e 
Remove composer.lock from version control
@greg0ire
Merge remote-tracking branch 'origin/2.12.x' into 3.0.x
78d4590
@greg0ire
Document possibly null property as such
d01c726
@greg0ire
Remove redundant casts
2f16c00
@greg0ire
Upgrade Psalm to 4.3.2
8acf030
@greg0ire
Ignore false positive
db6f73c 
$matchesCount cannot be false because false > 0 is false
@greg0ire greg0ire requested a review from morozov January 14, 2021 13:40
@greg0ire greg0ire mentioned this pull request Jan 14, 2021
Closed
@greg0ire greg0ire merged commit f77e731 into 3.1.x Jan 14, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@morozov morozov morozov approved these changes

Assignees
No one assigned
Labels
Merge Up
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@greg0ire @morozov @simPod @duncan3dc @kishore-hariram @trusek @greeflas @beberlei @nicwortel