Merge 2.2.x into 2.3.x #2350
Merged
Merge 2.2.x into 2.3.x #2350
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Caching / unserializing ClassMetadata broke locking functionality Fixes doctrine#2278
Fix locking when ClassMetadata is unserialized
Detach doc text from code block
Update working-with-objects.rst
Update storage-strategies.rst
Fix invalid strict comparison when validating mappings
Fix documentation for uploadFromFile
Fix mapping of the nullable option for XML driver
* Fix initialising nullable associations * Fix error when merging documents with uninitialised typed properties
…#2318) * Comprehensively test nullable behaviour for embedOne Co-authored-by: wuchen90 <wu.chen@agriconomie.com> * Fix handling of nullable fields for upsert Co-authored-by: wuchen90 <wu.chen@agriconomie.com>
* Fix handling of upserts during scheduling for deletion * Added test
This was uncovered by Psalm testing when merging 2.2.x up into 2.3.x.
* 2.2.x: Fix wrong assertion (doctrine#2335) Fix handling of upserts during scheduling for deletion (doctrine#2334) Fix wrong handling for nullable fields in upsert and update (doctrine#2318) [2.2] Fix builds (doctrine#2319) Allow mixed value in $not operator (doctrine#2307) Fix errors with nullable typed associations (doctrine#2302) Fix using null values in partial filter expressions (doctrine#2300) Fix preparation of $elemMatch operators in queries (doctrine#2298) Fix query preparation when in elemMatch (doctrine#2299) Fix mapping of the nullable option for XML driver Fix documentation for uploadFromFile Correctly handle write concern specified in defaultCommitOptions (doctrine#2294) Fix invalid strict comparison when validating mappings Update storage-strategies.rst Update working-with-objects.rst Test serialization of lock/version fields Fix locking when ClassMetadata is unserialized
franmomu
reviewed
Aug 2, 2021
psalm.xml
Outdated
| @@ -6,6 +6,7 @@ | |||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |||
| xmlns="https://getpsalm.org/schema/config" | |||
| xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" | |||
| errorBaseline="psalm-baseline.xml" | |||
There was a problem hiding this comment.
🤔 I think I fixed these ParamNameMismatch some time ago (in 2.3.x), probably this is not needed.
This is what I don't like about ignoring issues in the psalm baseline, that it doesn't complain about non existing ignored issues.
There was a problem hiding this comment.
I'll recreate the baseline and see what happens.
There was a problem hiding this comment.
See f995aad - this now has an empty baseline. Do you want me to drop the file and config?
There was a problem hiding this comment.
I would remove it if it is not needed and add it when we need it.
franmomu
approved these changes
Aug 5, 2021
f995aad to
0abe370
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should also allow me to finally fix the required build config for protected branches.