[Encryption] Fix query option min/max type for exported encrypted fields map #915
Conversation
This file contains hidden or 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
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a type mismatch issue in the MongoDB encryption fields map dump command where query options (min/max) for encrypted fields were being automatically converted to incorrect BSON types by the PHP driver.
- Corrects BSON type conversion for
longanddecimalfield types in query options - Switches from relaxed to canonical extended JSON to preserve original type information
- Ensures min/max query option types match their corresponding field types
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
GromNaN
commented
Aug 26, 2025
GromNaN
merged commit 235b64d
into
doctrine:feature/queryable-encryption
15 checks passed
jmikola
reviewed
Aug 28, 2025
| // The min/max query options must have the same type as the field. | ||
| // But the PHP driver always convert to "int" or "float" when the value fit in the range | ||
| foreach ($encryptedFieldsMap as $ns => $encryptedFields) { | ||
| $fields = json_decode(PackedArray::fromPHP($encryptedFields['fields'])->toCanonicalExtendedJSON(), true); |
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.
When running the command
bin/console doctrine:mongodb:encryption:dump-fields-mapthe min/max option of field query must match the field type.But when we read the field map from the collection metadata, the
longvalues are automatically converted toint.In this PR, in manipulate the exported extends JSON to ensure the option value has the expected type.
Same issue as doctrine/mongodb-odm#2805