PHPC-2104: ClientEncryption::QUERY_TYPE_EQUALITY is a string (#1334)

* Define additional constants in mongocrypt-export.h

* PHPC-2104: ClientEncryption::QUERY_TYPE_EQUALITY is a string

Downstream change since MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY was changed to a string type.

Bumps libmongocrypt submodule to 1.5.0-rc2. Related to this bump, mongocrypt.h is no longer generated.

Bumps libmongoc submodule to 1.22-dev.

Author: jmikola

config.m4

@@ -495,7 +495,6 @@ if test "$PHP_MONGODB" != "no"; then
 
       AC_CONFIG_FILES([
         ${ac_config_dir}/src/libmongocrypt/src/mongocrypt-config.h
-        ${ac_config_dir}/src/libmongocrypt/src/mongocrypt.h
       ])
     fi
   fi

config.w32

@@ -313,12 +313,6 @@ if (PHP_MONGODB != "no") {
       configure_module_dirname + "/src/libmongocrypt/src/mongocrypt-config.h",
       mongocrypt_opts
     );
-
-    mongodb_generate_header(
-      configure_module_dirname + "/src/libmongocrypt/src/mongocrypt.h.in",
-      configure_module_dirname + "/src/libmongocrypt/src/mongocrypt.h",
-      mongocrypt_opts
-    );
   } else if (PHP_MONGODB_CLIENT_SIDE_ENCRYPTION != "no") {
     // No SSL library found, we can't enable libmongocrypt
     WARNING("mongodb libmongocrypt support not enabled, crypto libs not found");

src/LIBMONGOCRYPT_VERSION_CURRENT

@@ -1 +1 @@
-1.5.0-rc1
+1.5.0-rc2

src/LIBMONGOC_VERSION_CURRENT

@@ -1 +1 @@
-1.22.0-beta0
+1.11.1-20220624+git711df87d6f

src/MongoDB/ClientEncryption.c

@@ -211,7 +211,7 @@ 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_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);
+	zend_declare_class_constant_string(php_phongo_clientencryption_ce, ZEND_STRL("QUERY_TYPE_EQUALITY"), MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY);
 } /* }}} */
 
 #ifdef MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION
@@ -538,7 +538,16 @@ 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"));
+		char*     querytype;
+		int       plen;
+		zend_bool pfree;
+
+		querytype = php_array_fetch_string(options, "queryType", &plen, &pfree);
+		mongoc_client_encryption_encrypt_opts_set_query_type(opts, querytype);
+
+		if (pfree) {
+			efree(querytype);
+		}
 	}
 
 	return opts;

src/libmongoc

@@ -1,7 +1,16 @@
 #ifndef MONGOCRYPT_EXPORT_H
 #define MONGOCRYPT_EXPORT_H
 
+/* This file would typically be generated by libmongocrypt's CMake build process
+ * so it must exist when building libmongocrypt as a submodule via Autotools. We
+ * need only ensure this file exists and expected constants are defined, since
+ * libmongocrypt APIs will not actually be exported.
+ *
+ * See: https://cmake.org/cmake/help/latest/module/GenerateExportHeader.html */
 #define MONGOCRYPT_EXPORT
 #define MONGOCRYPT_NO_EXPORT
+#define MONGOCRYPT_DEPRECATED
+#define MONGOCRYPT_DEPRECATED_EXPORT
+#define MONGOCRYPT_DEPRECATED_NO_EXPORT
 
 #endif /* MONGOCRYPT_EXPORT_H */

src/libmongocrypt

@@ -17,5 +17,5 @@ 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)
+string(8) "equality"
 ===DONE===