PHPC-2148: Prohibit masterKey without provider for rewrapManyDataKey

Author: jmikola

src/MongoDB/ClientEncryption.c

@@ -414,6 +414,11 @@ static PHP_METHOD(MongoDB_Driver_ClientEncryption, rewrapManyDataKey)
 			goto cleanup;
 		}
 
+		if (!provider) {
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "The \"masterKey\" option should not be specified without \"provider\"");
+			goto cleanup;
+		}
+
 		masterkey = bson_new();
 		php_phongo_zval_to_bson(zmasterkey, PHONGO_BSON_NONE, masterkey, NULL);
 

tests/clientEncryption/clientEncryption-rewrapManyDataKey_error-002.phpt

@@ -0,0 +1,30 @@
+--TEST--
+MongoDB\Driver\ClientEncryption::rewrapManyDataKey() masterKey option requires provider
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongocrypt(); ?>
+<?php skip_if_not_live(); ?>
+<?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)]],
+]);
+
+echo throws(function () use ($clientEncryption) {
+    $clientEncryption->rewrapManyDataKey([], ['masterKey' => []]);
+}, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+The "masterKey" option should not be specified without "provider"
+===DONE===