Merge pull request #1087

Author: alcaeus

config.m4

@@ -153,6 +153,7 @@ if test "$PHP_MONGODB" != "no"; then
     src/MongoDB/Exception/CommandException.c \
     src/MongoDB/Exception/ConnectionException.c \
     src/MongoDB/Exception/ConnectionTimeoutException.c \
+    src/MongoDB/Exception/EncryptionException.c \
     src/MongoDB/Exception/Exception.c \
     src/MongoDB/Exception/ExecutionTimeoutException.c \
     src/MongoDB/Exception/InvalidArgumentException.c \

config.w32

@@ -91,7 +91,7 @@ if (PHP_MONGODB != "no") {
   ADD_SOURCES(configure_module_dirname + "/src", "bson.c bson-encode.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/BSON", "Binary.c BinaryInterface.c DBPointer.c Decimal128.c Decimal128Interface.c Int64.c Javascript.c JavascriptInterface.c MaxKey.c MaxKeyInterface.c MinKey.c MinKeyInterface.c ObjectId.c ObjectIdInterface.c Persistable.c Regex.c RegexInterface.c Serializable.c Symbol.c Timestamp.c TimestampInterface.c Type.c Undefined.c Unserializable.c UTCDateTime.c UTCDateTimeInterface.c functions.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c ClientEncryption.c Command.c Cursor.c CursorId.c CursorInterface.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c Session.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
-  ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "AuthenticationException.c BulkWriteException.c CommandException.c ConnectionException.c ConnectionTimeoutException.c Exception.c ExecutionTimeoutException.c InvalidArgumentException.c LogicException.c RuntimeException.c ServerException.c SSLConnectionException.c UnexpectedValueException.c WriteException.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "AuthenticationException.c BulkWriteException.c CommandException.c ConnectionException.c ConnectionTimeoutException.c EncryptionException.c Exception.c ExecutionTimeoutException.c InvalidArgumentException.c LogicException.c RuntimeException.c ServerException.c SSLConnectionException.c UnexpectedValueException.c WriteException.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Monitoring", "CommandFailedEvent.c CommandStartedEvent.c CommandSubscriber.c CommandSucceededEvent.c Subscriber.c functions.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/common", PHP_MONGODB_COMMON_SOURCES, "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/libbson/src/bson", PHP_MONGODB_BSON_SOURCES, "mongodb");

php_phongo.c

@@ -136,10 +136,16 @@ zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t
 	MONGOC_ERROR("Resolving unknown phongo error domain: %d", domain);
 	return php_phongo_runtimeexception_ce;
 }
-zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code)
+zend_class_entry* phongo_exception_from_mongoc_domain(mongoc_error_domain_t domain, mongoc_error_code_t code)
 {
-	if (domain == MONGOC_ERROR_CLIENT && code == MONGOC_ERROR_CLIENT_AUTHENTICATE) {
-		return php_phongo_authenticationexception_ce;
+	if (domain == MONGOC_ERROR_CLIENT) {
+		if (code == MONGOC_ERROR_CLIENT_AUTHENTICATE) {
+			return php_phongo_authenticationexception_ce;
+		}
+
+		if (code == MONGOC_ERROR_CLIENT_INVALID_ENCRYPTION_ARG) {
+			return php_phongo_invalidargumentexception_ce;
+		}
 	}
 
 	if (domain == MONGOC_ERROR_COMMAND && code == MONGOC_ERROR_COMMAND_INVALID_ARG) {
@@ -174,6 +180,10 @@ zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_d
 		return php_phongo_connectionexception_ce;
 	}
 
+	if (domain == MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION) {
+		return php_phongo_encryptionexception_ce;
+	}
+
 	return php_phongo_runtimeexception_ce;
 }
 void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char* format, ...)
@@ -3728,6 +3738,7 @@ PHP_MINIT_FUNCTION(mongodb)
 	php_phongo_bulkwriteexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_commandexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_connectiontimeoutexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);
+	php_phongo_encryptionexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_executiontimeoutexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_invalidargumentexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_logicexception_init_ce(INIT_FUNC_ARGS_PASSTHRU);

php_phongo_classes.h

@@ -315,6 +315,7 @@ extern zend_class_entry* php_phongo_invalidargumentexception_ce;
 extern zend_class_entry* php_phongo_connectionexception_ce;
 extern zend_class_entry* php_phongo_authenticationexception_ce;
 extern zend_class_entry* php_phongo_sslconnectionexception_ce;
+extern zend_class_entry* php_phongo_encryptionexception_ce;
 extern zend_class_entry* php_phongo_executiontimeoutexception_ce;
 extern zend_class_entry* php_phongo_connectiontimeoutexception_ce;
 extern zend_class_entry* php_phongo_writeexception_ce;
@@ -405,6 +406,7 @@ extern void php_phongo_bulkwriteexception_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_commandexception_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_connectionexception_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_connectiontimeoutexception_init_ce(INIT_FUNC_ARGS);
+extern void php_phongo_encryptionexception_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_exception_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_executiontimeoutexception_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_invalidargumentexception_init_ce(INIT_FUNC_ARGS);

src/MongoDB/Exception/EncryptionException.c

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014-2020 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <php.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "phongo_compat.h"
+#include "php_phongo.h"
+
+zend_class_entry* php_phongo_encryptionexception_ce;
+
+/* {{{ MongoDB\Driver\Exception\EncryptionException function entries */
+static zend_function_entry php_phongo_encryptionexception_me[] = {
+	PHP_FE_END
+};
+/* }}} */
+
+void php_phongo_encryptionexception_init_ce(INIT_FUNC_ARGS) /* {{{ */
+{
+	zend_class_entry ce;
+
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "EncryptionException", php_phongo_encryptionexception_me);
+#if PHP_VERSION_ID >= 70000
+	php_phongo_encryptionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce);
+#else
+	php_phongo_encryptionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
+#endif
+} /* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */

tests/manager/manager-ctor-auto_encryption-error-001.phpt

@@ -16,17 +16,17 @@ $tests = [
 foreach ($tests as $driverOptions) {
     echo throws(function() use ($driverOptions) {
         $manager = new MongoDB\Driver\Manager(null, [], ['autoEncryption' => $driverOptions]);
-    }, 'MongoDB\Driver\Exception\RuntimeException'), "\n\n";
+    }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n\n";
 }
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-OK: Got MongoDB\Driver\Exception\RuntimeException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Key vault namespace option required
 
-OK: Got MongoDB\Driver\Exception\RuntimeException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 KMS providers option required
 
 ===DONE===