PHPC-1545: Require object or array type for "kmsProviders" option #1089
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
|
That’s what I get for just skimming over comments. I’ll also apply those for other options in this PR 👍 |
jmikola
approved these changes
Jan 30, 2020
| @@ -2907,8 +2917,8 @@ static mongoc_client_encryption_opts_t* phongo_clientencryption_opts_from_zval(m | |||
| zval* kms_providers = php_array_fetchc(options, "kmsProviders"); | |||
| bson_t bson_providers = BSON_INITIALIZER; | |||
|
|
|||
| if (Z_TYPE_P(kms_providers) != IS_ARRAY) { | |||
| phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"kmsProviders\" encryption option to be an array"); | |||
| if (Z_TYPE_P(kms_providers) != IS_ARRAY && Z_TYPE_P(kms_providers) != IS_OBJECT) { | |||
There was a problem hiding this comment.
Ah, I forgot we were already checking for an array type here. Good to know both instances of "kmsProviders" handling are consistent now!
| @@ -0,0 +1,36 @@ | |||
| --TEST-- | |||
| MongoDB\Driver\ClientEncryption::__construct() with invalid option types | |||
There was a problem hiding this comment.
Shouldn't this be a test for Manager::createClientEncryption() since the constructor is disabled? I see this is clientEncryption-ctor-error-002.phpt, so perhaps move all of those over to the Manager name.
There was a problem hiding this comment.
Ah, yes. Those were left over from when I initially built this with a public constructor. I moved them to the manager folder and renamed them accordingly.
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.
https://jira.mongodb.org/browse/PHPC-1545