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

Manual merge of 2.10.x into 2.11.x #4022

Merged
merged 37 commits into from
May 28, 2020
Merged

Manual merge of 2.10.x into 2.11.x #4022

merged 37 commits into from
May 28, 2020

Conversation

greg0ire
Copy link
Member

No description provided.

@greg0ire greg0ire mentioned this pull request May 24, 2020
Merged
16 tasks
@greg0ire greg0ire requested a review from morozov May 25, 2020 16:32
@morozov
Copy link
Member

morozov commented May 25, 2020

No, I mean the up-merge and #3977.

@greg0ire
Copy link
Member Author

greg0ire commented May 25, 2020 •
edited
Loading

Oh right, because it's a merge up of #3977 . It's #3977 + changes necessary to make it pass on 2.11.x I won't push it without also pushing #3977 itself though (and the 2 other merges up)

@morozov
Copy link
Member

morozov commented May 25, 2020

Okay. Then should we merge #3977 first? Is it ready for review?

@greg0ire
Copy link
Member Author

@morozov all 4 PRs are ready, don't merge any of them , just approve if they look ok. The plan is described in the TODO list

morozov and others added 23 commits May 26, 2020 22:07
@morozov
Ignore all violations of the LowercasePHPFunctions sniff in SQLSrvSta…
41fb43e 
…tement
@morozov
Merge pull request doctrine#4031 from morozov/ignore-sqlsrv-case
2348831 
Ignore all violations of the LowercasePHPFunctions sniff in SQLSrvStatement
@greg0ire
Document actual types
f4c43d5
@greg0ire
Install phpunit plugin for Psalm
9a617ed
@greg0ire
Make return type verified and accurate
96d5bcc
@greg0ire
Update phpunit
a8c772d 
The latest version is easier to understand for static analyzers.
@greg0ire
Improve phpdoc
befc59a
@greg0ire
Remove uneeded key
69cf6c4
@greg0ire
Use list
8f7ea52 
It is more simple and more accurate
@greg0ire
Use shortcut
99b542a
@greg0ire
Suppress deliberate error
633f9e3 
We are testing what happens when providing the wrong type.
@greg0ire
Use TrimMode::UNSPECIFIED over null
f2a0ab7 
The method signature does not allow null.
@greg0ire
Pass the right type of argument
014ac9c
@greg0ire
Ignore issues when testing with deliberate
cede6ec
@greg0ire
Make sure to pass in a string
76fc010 
Not all RDBMS have a concept of database, apparently (see SQLAnywhere).
Those who do not should pass in a string to stay compatible with the
signature.
@greg0ire
Document platform
7c0e1ba
@greg0ire
Add missing return type declarations
dc8d2f3
@greg0ire
Document null as a possible type
05fcd8c
@greg0ire
Update PHPStorm stubs
464f150 
That alone fixes 6 issues found by Psalm
@greg0ire
Use the appropriate notation for generators
3a86a6b
@greg0ire
Document property
49bd008
@greg0ire
Address deprecation
a6af579
@greg0ire
Account for columnar expected result
ca5aceb 
This is what is expected with FETCH_COLUMN
greg0ire added 14 commits May 27, 2020 22:29
@greg0ire
Fix wrong phpdoc
580d139
@greg0ire
Suppress InvalidArgument error
682012f 
This is precisely what we are testing here.
@greg0ire
Use an empty string instead of null
fa71f7f 
See vimeo/psalm#3224
@greg0ire
Use level 6
7fc2268
@greg0ire
Address warning from PHPUnit
9d73084 
This hack is temporary and should be removed on 3.0.x
@greg0ire
Describe return type accurately
487b00f 
This return type is conditional to $params['wrapperClass']. Luckily,
recent versions of Psalm allow documenting it properly.
See vimeo/psalm#3277

Note that phpstan is not able to understand this yet, but still attempts
to, hence the extra ignore rules.
@greg0ire
Add contract for createPlatform()'s return type
1a4f23f
@greg0ire
Add missing use statement
3fa5b3e
@greg0ire
Use valid arguments
b0523e0
@greg0ire
Update psalm
b00a2e3
@greg0ire
Avoid mocking inexistent classes
9f9629c 
It confuses both Psalm and PHPStan, and involves complicated mocking.
@greg0ire
Ignore error about Connection::lastInsertId()
1bc66b3 
The php docs are not very clear about that one.
@greg0ire
Merge pull request doctrine#3977 from greg0ire/psalm-6
9f2e25c 
Psalm 6
@greg0ire
Merge remote-tracking branch 'origin/2.10.x' into 2.11.x
ce21834
@greg0ire greg0ire changed the title Manual merge of 2.10.x + #3977 into 2.11.x Manual merge of 2.10.x into 2.11.x May 27, 2020
@greg0ire
Copy link
Member Author

@morozov please approve this one (no additional commits here)

@greg0ire greg0ire merged commit ce21834 into doctrine:2.11.x May 28, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 3, 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.
2 participants
@greg0ire @morozov