ClientEncryption::rewrapManyDataKey options are nullable

Author: jmikola

src/MongoDB/ClientEncryption.c

@@ -402,7 +402,7 @@ static PHP_METHOD(MongoDB_Driver_ClientEncryption, rewrapManyDataKey)
 	PHONGO_PARSE_PARAMETERS_START(1, 2)
 	PHONGO_PARAM_ARRAY_OR_OBJECT(zfilter)
 	Z_PARAM_OPTIONAL
-	Z_PARAM_ARRAY(options)
+	Z_PARAM_ARRAY_OR_NULL(options)
 	PHONGO_PARSE_PARAMETERS_END();
 
 	php_phongo_zval_to_bson(zfilter, PHONGO_BSON_NONE, &filter, NULL);

src/MongoDB/ClientEncryption.stub.php

@@ -70,10 +70,10 @@ final public function getKeys(): \MongoDB\Driver\Cursor {}
     final public function removeKeyAltName(\MongoDB\BSON\Binary $keyId, string $keyAltName): ?object {}
 
 #if PHP_VERSION_ID >= 80000
-    final public function rewrapManyDataKey(array|object $filter, array $options = []): object {}
+    final public function rewrapManyDataKey(array|object $filter, ?array $options = null): object {}
 #else
     /** @param array|object $filter */
-    final public function rewrapManyDataKey($filter, array $options = []): object {}
+    final public function rewrapManyDataKey($filter, ?array $options = null): object {}
 #endif
 
     final public function __wakeup(): void {}

src/MongoDB/ClientEncryption_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9b64f6db2b6c568fb134f8512968262b25ab0e78 */
+ * Stub hash: 706125ea8c95ec1b3720909c8351585e03aa4836 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MongoDB_Driver_ClientEncryption___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 0)
@@ -61,14 +61,14 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_MongoDB_Driver_ClientEncryption_rewrapManyDataKey, 0, 1, IS_OBJECT, 0)
 	ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_OBJECT, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #if !(PHP_VERSION_ID >= 80000)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_MongoDB_Driver_ClientEncryption_rewrapManyDataKey, 0, 1, IS_OBJECT, 0)
 	ZEND_ARG_INFO(0, filter)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 

tests/clientEncryption/clientEncryption-rewrapManyDataKey-003.phpt

@@ -0,0 +1,31 @@
+--TEST--
+MongoDB\Driver\ClientEncryption::rewrapManyDataKey() accepts null for $options
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongocrypt(); ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_server_version('<', '4.2'); ?>
+<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
+--FILE--
+<?php
+
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = create_test_manager();
+
+$clientEncryption = $manager->createClientEncryption([
+  'keyVaultNamespace' => CSFLE_KEY_VAULT_NS,
+  'kmsProviders' => ['local' => ['key' => new MongoDB\BSON\Binary(CSFLE_LOCAL_KEY, 0)]],
+]);
+
+var_dump($clientEncryption->rewrapManyDataKey(['_id' => 'no-matching-key'], null));
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(stdClass)#%d (%d) {
+  ["bulkWriteResult"]=>
+  NULL
+}
+===DONE===