PHPC-990: Strict type validation for boolean URI options (#1713)

* Note that mongoc_uri_option_is_int32 includes int64 options

* Test invalid types for more int32 and string URI options

Author: jmikola

UPGRADE-2.0.md

@@ -38,3 +38,6 @@ UPGRADE FROM 1.x to 2.0
    `allowPartialResults` instead), `maxScan`, `modifiers` (use alternative
    top-level options instead), `oplogReplay`, and `snapshot`. Support for
    negative `limit` values has been removed (use `singleBatch` instead).
+ * The `MongoDB\Driver\Manager` constructor now throws if the URI options array
+   includes a non-boolean value for an option expecting a boolean. This behavior
+   is now consistent with validation for other option types.

src/phongo_client.c

@@ -143,17 +143,23 @@ static bool php_phongo_apply_options_to_uri(mongoc_uri_t* uri, bson_t* options)
 		}
 
 		if (mongoc_uri_option_is_bool(key)) {
-			/* The option's type is not validated because bson_iter_as_bool() is
-			 * used to cast the value to a boolean. Validation may be introduced
-			 * in PHPC-990. */
-			if (!mongoc_uri_set_option_as_bool(uri, key, bson_iter_as_bool(&iter))) {
+			if (!BSON_ITER_HOLDS_BOOL(&iter)) {
+				PHONGO_URI_INVALID_TYPE(iter, "boolean");
+				return false;
+			}
+
+			if (!mongoc_uri_set_option_as_bool(uri, key, bson_iter_bool(&iter))) {
 				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Failed to parse \"%s\" URI option", key);
 				return false;
 			}
 
 			continue;
 		}
 
+		/* Note: mongoc_uri_option_is_int32 also accepts int64 options, but
+		 * BSON_ITER_HOLDS_INT32 would reject a 64-bit value. This is not a
+		 * problem as MONGOC_URI_WTIMEOUTMS is the only 64-bit option and it is
+		 * handled explicitly in php_phongo_apply_wc_options_to_uri. */
 		if (mongoc_uri_option_is_int32(key)) {
 			if (!BSON_ITER_HOLDS_INT32(&iter)) {
 				PHONGO_URI_INVALID_TYPE(iter, "32-bit integer");