PHPC-887: Throw for unexpected readPreference URI option type

Author: 7snovic

php_phongo.c

@@ -1111,23 +1111,29 @@ static bool php_phongo_apply_rp_options_to_uri(mongoc_uri_t *uri, bson_t *option
 		mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
 	}
 
-	if (bson_iter_init_find_case(&iter, options, MONGOC_URI_READPREFERENCE) && BSON_ITER_HOLDS_UTF8(&iter)) {
-		const char *str = bson_iter_utf8(&iter, NULL);
+	if (bson_iter_init_find_case(&iter, options, MONGOC_URI_READPREFERENCE)) {
+		const char *key = bson_iter_key(&iter);
+		if (BSON_ITER_HOLDS_UTF8(&iter)) {
+			const char *str = bson_iter_utf8(&iter, NULL);
 
-		if (0 == strcasecmp("primary", str)) {
-			mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY);
-		} else if (0 == strcasecmp("primarypreferred", str)) {
-			mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY_PREFERRED);
-		} else if (0 == strcasecmp("secondary", str)) {
-			mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY);
-		} else if (0 == strcasecmp("secondarypreferred", str)) {
-			mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
-		} else if (0 == strcasecmp("nearest", str)) {
-			mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_NEAREST);
-		} else {
-			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Unsupported readPreference value: '%s'", str);
-			mongoc_read_prefs_destroy(new_rp);
+			if (0 == strcasecmp("primary", str)) {
+				mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY);
+			} else if (0 == strcasecmp("primarypreferred", str)) {
+				mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY_PREFERRED);
+			} else if (0 == strcasecmp("secondary", str)) {
+				mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY);
+			} else if (0 == strcasecmp("secondarypreferred", str)) {
+				mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
+			} else if (0 == strcasecmp("nearest", str)) {
+				mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_NEAREST);
+			} else {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Unsupported %s value: '%s'", key, str);
+				mongoc_read_prefs_destroy(new_rp);
 
+				return false;
+			}
+		} else {
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "%s URI option expected to be string", key);
 			return false;
 		}
 	}