PHPC-2092: ClientEncryption options for queryable encryption

Several new constants for these options have been introduced.

Author: jmikola

src/MongoDB/ClientEncryption.c

@@ -189,6 +189,9 @@ void php_phongo_clientencryption_init_ce(INIT_FUNC_ARGS) /* {{{ */
 
 	zend_declare_class_constant_string(php_phongo_clientencryption_ce, ZEND_STRL("AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC"), MONGOC_AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC);
 	zend_declare_class_constant_string(php_phongo_clientencryption_ce, ZEND_STRL("AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM"), MONGOC_AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM);
+	zend_declare_class_constant_string(php_phongo_clientencryption_ce, ZEND_STRL("ALGORITHM_INDEXED"), MONGOC_ENCRYPT_ALGORITHM_INDEXED);
+	zend_declare_class_constant_string(php_phongo_clientencryption_ce, ZEND_STRL("ALGORITHM_UNINDEXED"), MONGOC_ENCRYPT_ALGORITHM_UNINDEXED);
+	zend_declare_class_constant_long(php_phongo_clientencryption_ce, ZEND_STRL("QUERY_TYPE_EQUALITY"), MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY);
 } /* }}} */
 
 #ifdef MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION
@@ -463,6 +466,10 @@ static mongoc_client_encryption_encrypt_opts_t* phongo_clientencryption_encrypt_
 		return opts;
 	}
 
+	if (php_array_existsc(options, "contentionFactor")) {
+		mongoc_client_encryption_encrypt_opts_set_contention_factor(opts, php_array_fetch_long(options, "contentionFactor"));
+	}
+
 	if (php_array_existsc(options, "keyId")) {
 		bson_value_t keyid = { 0 };
 
@@ -503,6 +510,10 @@ static mongoc_client_encryption_encrypt_opts_t* phongo_clientencryption_encrypt_
 		}
 	}
 
+	if (php_array_existsc(options, "queryType")) {
+		mongoc_client_encryption_encrypt_opts_set_query_type(opts, php_array_fetch_long(options, "queryType"));
+	}
+
 	return opts;
 
 cleanup:

tests/clientEncryption/clientEncryption-constants.phpt

@@ -5,11 +5,17 @@ MongoDB\Driver\ClientEncryption constants
 
 var_dump(MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC);
 var_dump(MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM);
+var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED);
+var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_UNINDEXED);
+var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_EQUALITY);
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 string(43) "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
 string(36) "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+string(7) "Indexed"
+string(9) "Unindexed"
+int(0)
 ===DONE===