Manager constructor should check if URI or client creation fails

If the URI cannot be parsed, we should throw an InvalidArgumentException. Failing to initialize the client from a valid URI can remain a RuntimeException.

Author: jmikola

php_phongo.c

@@ -1504,6 +1504,10 @@ mongoc_uri_t *php_phongo_make_uri(const char *uri_string, bson_t *options TSRMLS
 	uri = mongoc_uri_new(uri_string);
 	MONGOC_DEBUG("Connection string: '%s'", uri_string);
 
+	if (!uri) {
+		return NULL;
+	}
+
 	if (options && bson_iter_init(&iter, options)) {
 		while (bson_iter_next (&iter)) {
 			const char *key = bson_iter_key(&iter);
@@ -1621,7 +1625,7 @@ mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zval *dri
 	client = mongoc_client_new_from_uri(uri);
 
 	if (!client) {
-		RETURN(false);
+		RETURN(NULL);
 	}
 
 

src/MongoDB/Manager.c

@@ -81,17 +81,24 @@ PHP_METHOD(Manager, __construct)
 		zval_to_bson(options, PHONGO_BSON_NONE, &bson_options, NULL TSRMLS_CC);
 	}
 
-	uri = php_phongo_make_uri (uri_string, &bson_options TSRMLS_CC);
-	if (uri) {
-		intern->client = php_phongo_make_mongo_client(uri, driverOptions TSRMLS_CC);
-		mongoc_uri_destroy(uri);
-	} else {
-		phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "%s", "Failed to parse MongoDB URI");
+	if (!(uri = php_phongo_make_uri(uri_string, &bson_options TSRMLS_CC))) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Failed to parse MongoDB URI: '%s'", uri_string);
+		bson_destroy(&bson_options);
+
+		return;
 	}
+
+	intern->client = php_phongo_make_mongo_client(uri, driverOptions TSRMLS_CC);
+	mongoc_uri_destroy(uri);
+
 	if (!intern->client) {
-		phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "%s", "Failed to create Manager from URI");
+		phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to create Manager from URI: '%s'", uri_string);
+		bson_destroy(&bson_options);
+
+		return;
 	}
 
+	bson_destroy(&bson_options);
 }
 /* }}} */
 /* {{{ proto MongoDB\Driver\Cursor Manager::executeCommand(string $db, MongoDB\Driver\Command $command[, MongoDB\Driver\ReadPreference $readPreference = null])