-
-
Notifications
You must be signed in to change notification settings - Fork 505
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.
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
Merge 2.2.x into 2.3.x #2350
Merged
+372
−68
Merged
Merge 2.2.x into 2.3.x #2350
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
887a62e
Fix locking when ClassMetadata is unserialized
buffcode a97aab0
Test serialization of lock/version fields
buffcode cbe6a2f
Merge pull request #2281 from buffcode/patch-3
malarzm b243e4b
Update working-with-objects.rst
b7a35e4
Merge pull request #2285 from jeeiex/patch-1
malarzm 5a0af40
Update storage-strategies.rst
f8b40c8
Merge pull request #2286 from jeeiex/patch-2
SenseException 1276c9c
Fix invalid strict comparison when validating mappings
alcaeus a88db3e
Merge pull request #2290 from alcaeus/fix-metadata-validation
malarzm 8069ded
Correctly handle write concern specified in defaultCommitOptions (#2294)
ossinkine 841221b
Fix documentation for uploadFromFile
rrajkomar 6c0b48a
Merge pull request #2284 from rrajkomar/patch-1
malarzm a3efe06
Fix mapping of the nullable option for XML driver
wuchen90 6e42eed
Merge pull request #2297 from wuchen90/fix-xml-nullable
malarzm 05c9a25
Fix query preparation when in elemMatch (#2299)
alcaeus 4984784
Fix preparation of $elemMatch operators in queries (#2298)
alcaeus 18d9ac7
Fix using null values in partial filter expressions (#2300)
alcaeus 5ca00af
Fix errors with nullable typed associations (#2302)
alcaeus f225a0c
Allow mixed value in $not operator (#2307)
franmomu ccf26d9
[2.2] Fix builds (#2319)
alcaeus 5aa06c0
Fix wrong handling for nullable fields in upsert and update (#2318)
alcaeus f20b3cd
Fix handling of upserts during scheduling for deletion (#2334)
webmozart 85d2b9f
Fix wrong assertion (#2335)
alcaeus f013d11
Merge branch '2.2.x' into merge-2.2.x-into-2.3.x
alcaeus 0abe370
Remove psalm-baseline.xml
alcaeus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<files psalm-version="4.7.3@38c452ae584467e939d55377aaf83b5a26f19dd1"> | ||
<file src="lib/Doctrine/ODM/MongoDB/DocumentManager.php"> | ||
<ParamNameMismatch occurrences="8"> | ||
<code>$document</code> | ||
<code>$document</code> | ||
<code>$document</code> | ||
<code>$document</code> | ||
<code>$document</code> | ||
<code>$document</code> | ||
<code>$documentName</code> | ||
<code>$documentName</code> | ||
</ParamNameMismatch> | ||
</file> | ||
<file src="lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php"> | ||
<ParamNameMismatch occurrences="2"> | ||
<code>$fieldName</code> | ||
<code>$fieldName</code> | ||
</ParamNameMismatch> | ||
</file> | ||
<file src="lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php"> | ||
<ParamNameMismatch occurrences="1"> | ||
<code>$value</code> | ||
</ParamNameMismatch> | ||
</file> | ||
<file src="lib/Doctrine/ODM/MongoDB/Query/QueryExpressionVisitor.php"> | ||
<ParamNameMismatch occurrences="1"> | ||
<code>$compositeExpr</code> | ||
</ParamNameMismatch> | ||
</file> | ||
</files> |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤔 I think I fixed these
ParamNameMismatch
some time ago (in2.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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll recreate the baseline and see what happens.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would remove it if it is not needed and add it when we need it.