Skip to content

Manually merge 2.11.x into 3.0.x#4063

Merged
greg0ire merged 5 commits intodoctrine:3.0.xfrom
greg0ire:3.0.x
Jun 11, 2020
Merged

Manually merge 2.11.x into 3.0.x#4063
greg0ire merged 5 commits intodoctrine:3.0.xfrom
greg0ire:3.0.x

Conversation

@greg0ire
Copy link
Copy Markdown
Member

@greg0ire greg0ire commented Jun 11, 2020

No description provided.

beberlei and others added 4 commits June 9, 2020 12:13
@beberlei
[doctrineGH-4052] Deprecate MasterSlaveConnection and rename to Prima…
071824e 
…ryReplicaConnection
@beberlei
Merge pull request doctrine#4054 from beberlei/doctrineGH-4052-Primar…
7047798 
…yReplicaConnection

[doctrineGH-4052] Deprecate MasterSlaveConnection and rename to PrimaryReplicaConnection
@morozov
Deprecated platform-specific portability mode constants
f198104
@morozov
Merge pull request doctrine#4061 from morozov/deprecate-portability-p…
0c8528e 
…latform-constants

Deprecated platform-specific portability mode constants
@greg0ire greg0ire mentioned this pull request Jun 11, 2020
Merged
@greg0ire greg0ire force-pushed the 3.0.x branch 2 times, most recently from 16b782a to a40d438 Compare June 11, 2020 06:37
@greg0ire greg0ire closed this Jun 11, 2020
@greg0ire greg0ire reopened this Jun 11, 2020
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 11, 2020 •
edited
Loading

Codecov Report

Merging #4063 into 3.0.x will decrease coverage by 0.02%.
The diff coverage is 75.46%.

Impacted file tree graph

@@             Coverage Diff              @@
##              3.0.x    #4063      +/-   ##
============================================
- Coverage     78.27%   78.25%   -0.03%     
- Complexity     4588     4604      +16     
============================================
  Files           188      190       +2     
  Lines         11527    11585      +58     
============================================
+ Hits           9023     9066      +43     
- Misses         2504     2519      +15
Impacted Files Coverage Δ Complexity Δ
src/Connections/PrimaryReadReplicaConnection.php 68.10% <68.10%> (ø) 46.00 <46.00> (?)
src/Connections/MasterSlaveConnection.php 66.66% <90.90%> (+0.31%) 11.00 <5.00> (-30.00) ⬆️
src/DriverManager.php 93.61% <100.00%> (+0.35%) 43.00 <0.00> (+3.00)
src/Portability/Connection.php 100.00% <100.00%> (+5.12%) 12.00 <0.00> (-6.00) ⬆️
src/Portability/OptimizeFlags.php 100.00% <100.00%> (ø) 3.00 <3.00> (?)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update be5e93e...a2fcaee. Read the comment docs.

morozov
morozov requested changes Jun 11, 2020
View reviewed changes
@greg0ire greg0ire requested a review from morozov June 11, 2020 17:36
@greg0ire greg0ire merged commit a2fcaee into doctrine:3.0.x Jun 11, 2020
@morozov
Copy link
Copy Markdown
Member

morozov commented Jun 11, 2020

Thanks, @greg0ire!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 2, 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.

4 participants

@greg0ire @codecov-commenter @morozov @beberlei