-
Notifications
You must be signed in to change notification settings - Fork 208
PHPC-1681 Support parsing $uuid as extended JSON representation for subtype 4 binary #1208
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
Merged
Merged
Changes from all commits
Commits
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 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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.18.0-20210317+git7b143c65af | ||
| 1.18.0-20210326+git203e6b9e26 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Binary type: $uuid wrong type | ||
| --DESCRIPTION-- | ||
| Generated by scripts/convert-bson-corpus-tests.php | ||
|
|
||
| DO NOT EDIT THIS FILE | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__ . '/../utils/tools.php'; | ||
|
|
||
| throws(function() { | ||
| fromJSON('{"x" : { "$uuid" : { "data" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4"}}}'); | ||
| }, 'MongoDB\Driver\Exception\UnexpectedValueException'); | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| OK: Got MongoDB\Driver\Exception\UnexpectedValueException | ||
| ===DONE=== |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Binary type: $uuid invalid value--too short | ||
| --DESCRIPTION-- | ||
| Generated by scripts/convert-bson-corpus-tests.php | ||
|
|
||
| DO NOT EDIT THIS FILE | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__ . '/../utils/tools.php'; | ||
|
|
||
| throws(function() { | ||
| fromJSON('{"x" : { "$uuid" : "73ffd264-44b3-90e8-e7d1dfc035d4"}}'); | ||
| }, 'MongoDB\Driver\Exception\UnexpectedValueException'); | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| OK: Got MongoDB\Driver\Exception\UnexpectedValueException | ||
| ===DONE=== |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Binary type: $uuid invalid value--too long | ||
| --DESCRIPTION-- | ||
| Generated by scripts/convert-bson-corpus-tests.php | ||
|
|
||
| DO NOT EDIT THIS FILE | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__ . '/../utils/tools.php'; | ||
|
|
||
| throws(function() { | ||
| fromJSON('{"x" : { "$uuid" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4-789e4"}}'); | ||
| }, 'MongoDB\Driver\Exception\UnexpectedValueException'); | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| OK: Got MongoDB\Driver\Exception\UnexpectedValueException | ||
| ===DONE=== |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Binary type: $uuid invalid value--misplaced hyphens | ||
| --DESCRIPTION-- | ||
| Generated by scripts/convert-bson-corpus-tests.php | ||
|
|
||
| DO NOT EDIT THIS FILE | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__ . '/../utils/tools.php'; | ||
|
|
||
| throws(function() { | ||
| fromJSON('{"x" : { "$uuid" : "73ff-d26444b-34c6-990e8e-7d1dfc035d4"}}'); | ||
| }, 'MongoDB\Driver\Exception\UnexpectedValueException'); | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| OK: Got MongoDB\Driver\Exception\UnexpectedValueException | ||
| ===DONE=== |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Binary type: $uuid invalid value--too many hyphens | ||
| --DESCRIPTION-- | ||
| Generated by scripts/convert-bson-corpus-tests.php | ||
|
|
||
| DO NOT EDIT THIS FILE | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__ . '/../utils/tools.php'; | ||
|
|
||
| throws(function() { | ||
| fromJSON('{"x" : { "$uuid" : "----d264-44b3-4--9-90e8-e7d1dfc0----"}}'); | ||
| }, 'MongoDB\Driver\Exception\UnexpectedValueException'); | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| OK: Got MongoDB\Driver\Exception\UnexpectedValueException | ||
| ===DONE=== |
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --TEST-- | ||
| Binary type: $type query operator (conflicts with legacy $binary form with $type field) | ||
| --DESCRIPTION-- | ||
| Generated by scripts/convert-bson-corpus-tests.php | ||
|
|
||
| DO NOT EDIT THIS FILE | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__ . '/../utils/tools.php'; | ||
|
|
||
| $canonicalBson = hex2bin('180000000378001000000010247479706500020000000000'); | ||
| $canonicalExtJson = '{"x" : { "$type" : {"$numberInt": "2"}}}'; | ||
|
|
||
| // Canonical BSON -> Native -> Canonical BSON | ||
| echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; | ||
|
|
||
| // Canonical BSON -> Canonical extJSON | ||
| echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; | ||
|
|
||
| // Canonical extJSON -> Canonical BSON | ||
| echo bin2hex(fromJSON($canonicalExtJson)), "\n"; | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| 180000000378001000000010247479706500020000000000 | ||
| {"x":{"$type":{"$numberInt":"2"}}} | ||
| 180000000378001000000010247479706500020000000000 | ||
| ===DONE=== |
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.
This reminded me of DRIVERS-1552. I'll trust this is correct, since that issue hasn't been discussed since I reported it.