PHPC-2146: Refactor typemap struct and BSON encoding/decoding of zvals

src/BSON/Javascript.c

@@ -94,7 +94,7 @@ HashTable* php_phongo_javascript_get_properties_hash(phongo_compat_object_handle
 			php_phongo_bson_state state;
 
 			PHONGO_BSON_INIT_STATE(state);
-			if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->scope), intern->scope->len, &state)) {
+			if (!php_phongo_bson_to_zval_ex(intern->scope, &state)) {
 				zval_ptr_dtor(&state.zchild);
 				goto failure;
 			}
@@ -194,7 +194,7 @@ static PHP_METHOD(MongoDB_BSON_Javascript, getScope)
 
 		PHONGO_BSON_INIT_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->scope), intern->scope->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(intern->scope, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}
@@ -220,7 +220,7 @@ static PHP_METHOD(MongoDB_BSON_Javascript, jsonSerialize)
 		php_phongo_bson_state state;
 
 		PHONGO_BSON_INIT_STATE(state);
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->scope), intern->scope->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(intern->scope, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}
@@ -244,7 +244,7 @@ static PHP_METHOD(MongoDB_BSON_Javascript, serialize)
 	PHONGO_PARSE_PARAMETERS_NONE();
 
 	if (intern->scope && intern->scope->len) {
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->scope), intern->scope->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(intern->scope, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}

src/BSON/functions.c

@@ -65,7 +65,7 @@ PHP_FUNCTION(toPHP)
 		return;
 	}
 
-	if (!php_phongo_bson_to_zval_ex((const unsigned char*) data, data_len, &state)) {
+	if (!php_phongo_bson_data_to_zval_ex((const unsigned char*) data, data_len, &state)) {
 		zval_ptr_dtor(&state.zchild);
 		php_phongo_bson_typemap_dtor(&state.map);
 		RETURN_NULL();

src/MongoDB/BulkWrite.c

@@ -40,9 +40,9 @@ static void php_phongo_bulkwrite_extract_id(bson_t* doc, zval** return_value)
 	php_phongo_bson_state state;
 
 	PHONGO_BSON_INIT_STATE(state);
-	state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+	state.map.root.type = PHONGO_TYPEMAP_NATIVE_ARRAY;
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(doc, &state)) {
 		goto cleanup;
 	}
 
@@ -632,7 +632,7 @@ static HashTable* php_phongo_bulkwrite_get_debug_info(phongo_compat_object_handl
 	if (intern->let) {
 		zval zv;
 
-		if (!php_phongo_bson_to_zval(bson_get_data(intern->let), intern->let->len, &zv)) {
+		if (!php_phongo_bson_to_zval(intern->let, &zv)) {
 			zval_ptr_dtor(&zv);
 			goto done;
 		}

src/MongoDB/ClientEncryption.c

@@ -40,15 +40,15 @@ static void phongo_clientencryption_create_datakey(php_phongo_clientencryption_t
 static void phongo_clientencryption_encrypt(php_phongo_clientencryption_t* clientencryption, zval* zvalue, zval* zciphertext, zval* options);
 static void phongo_clientencryption_decrypt(php_phongo_clientencryption_t* clientencryption, zval* zciphertext, zval* zvalue);
 
-#define RETVAL_BSON_T(reply)                                                             \
-	do {                                                                                 \
-		php_phongo_bson_state state;                                                     \
-		PHONGO_BSON_INIT_STATE(state);                                                   \
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(&(reply)), (reply).len, &state)) { \
-			zval_ptr_dtor(&state.zchild);                                                \
-			goto cleanup;                                                                \
-		}                                                                                \
-		RETVAL_ZVAL(&state.zchild, 0, 1);                                                \
+#define RETVAL_BSON_T(reply)                                 \
+	do {                                                     \
+		php_phongo_bson_state state;                         \
+		PHONGO_BSON_INIT_STATE(state);                       \
+		if (!php_phongo_bson_to_zval_ex(&(reply), &state)) { \
+			zval_ptr_dtor(&state.zchild);                    \
+			goto cleanup;                                    \
+		}                                                    \
+		RETVAL_ZVAL(&state.zchild, 0, 1);                    \
 	} while (0)
 
 #define RETVAL_OPTIONAL_BSON_T(reply) \

src/MongoDB/Command.c

@@ -156,7 +156,7 @@ static HashTable* php_phongo_command_get_debug_info(phongo_compat_object_handler
 	if (intern->bson) {
 		zval zv;
 
-		if (!php_phongo_bson_to_zval(bson_get_data(intern->bson), intern->bson->len, &zv)) {
+		if (!php_phongo_bson_to_zval(intern->bson, &zv)) {
 			zval_ptr_dtor(&zv);
 			goto done;
 		}

src/MongoDB/Cursor.c

@@ -90,7 +90,7 @@ static PHP_METHOD(MongoDB_Driver_Cursor, setTypeMap)
 	if (restore_current_element && mongoc_cursor_current(intern->cursor)) {
 		const bson_t* doc = mongoc_cursor_current(intern->cursor);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &intern->visitor_data)) {
+		if (!php_phongo_bson_to_zval_ex(doc, &intern->visitor_data)) {
 			php_phongo_cursor_free_current(intern);
 		}
 	}
@@ -223,7 +223,7 @@ static PHP_METHOD(MongoDB_Driver_Cursor, next)
 	}
 
 	if (mongoc_cursor_next(intern->cursor, &doc)) {
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &intern->visitor_data)) {
+		if (!php_phongo_bson_to_zval_ex(doc, &intern->visitor_data)) {
 			/* Free invalid result, but don't return as we want to free the
 			 * session if the intern is exhausted. */
 			php_phongo_cursor_free_current(intern);
@@ -278,7 +278,7 @@ static PHP_METHOD(MongoDB_Driver_Cursor, rewind)
 	doc = mongoc_cursor_current(intern->cursor);
 
 	if (doc) {
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &intern->visitor_data)) {
+		if (!php_phongo_bson_to_zval_ex(doc, &intern->visitor_data)) {
 			/* Free invalid result, but don't return as we want to free the
 			 * session if the intern is exhausted. */
 			php_phongo_cursor_free_current(intern);

src/MongoDB/Monitoring/CommandFailedEvent.c

@@ -94,7 +94,7 @@ static PHP_METHOD(MongoDB_Driver_Monitoring_CommandFailedEvent, getReply)
 
 	PHONGO_PARSE_PARAMETERS_NONE();
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->reply), intern->reply->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->reply, &state)) {
 		zval_ptr_dtor(&state.zchild);
 		return;
 	}
@@ -223,7 +223,7 @@ static HashTable* php_phongo_commandfailedevent_get_debug_info(phongo_compat_obj
 	sprintf(operation_id, "%" PRIu64, intern->operation_id);
 	ADD_ASSOC_STRING(&retval, "operationId", operation_id);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->reply), intern->reply->len, &reply_state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->reply, &reply_state)) {
 		zval_ptr_dtor(&reply_state.zchild);
 		goto done;
 	}

src/MongoDB/Monitoring/CommandStartedEvent.c

@@ -44,7 +44,7 @@ static PHP_METHOD(MongoDB_Driver_Monitoring_CommandStartedEvent, getCommand)
 
 	PHONGO_PARSE_PARAMETERS_NONE();
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->command), intern->command->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->command, &state)) {
 		zval_ptr_dtor(&state.zchild);
 		return;
 	}
@@ -202,7 +202,7 @@ static HashTable* php_phongo_commandstartedevent_get_debug_info(phongo_compat_ob
 	*is_temp = 1;
 	array_init_size(&retval, 6);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->command), intern->command->len, &command_state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->command, &command_state)) {
 		zval_ptr_dtor(&command_state.zchild);
 		goto done;
 	}

src/MongoDB/Monitoring/CommandSucceededEvent.c

@@ -82,7 +82,7 @@ static PHP_METHOD(MongoDB_Driver_Monitoring_CommandSucceededEvent, getReply)
 
 	PHONGO_PARSE_PARAMETERS_NONE();
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->reply), intern->reply->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->reply, &state)) {
 		zval_ptr_dtor(&state.zchild);
 		return;
 	}
@@ -204,7 +204,7 @@ static HashTable* php_phongo_commandsucceededevent_get_debug_info(phongo_compat_
 	sprintf(operation_id, "%" PRIu64, intern->operation_id);
 	ADD_ASSOC_STRING(&retval, "operationId", operation_id);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->reply), intern->reply->len, &reply_state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->reply, &reply_state)) {
 		zval_ptr_dtor(&reply_state.zchild);
 		goto done;
 	}

src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c

@@ -66,7 +66,7 @@ static PHP_METHOD(MongoDB_Driver_Monitoring_ServerHeartbeatSucceededEvent, getRe
 
 	PHONGO_PARSE_PARAMETERS_NONE();
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->reply), intern->reply->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->reply, &state)) {
 		zval_ptr_dtor(&state.zchild);
 		return;
 	}
@@ -126,7 +126,7 @@ static HashTable* php_phongo_serverheartbeatsucceededevent_get_debug_info(phongo
 	ADD_ASSOC_LONG_EX(&retval, "port", intern->host.port);
 	ADD_ASSOC_BOOL_EX(&retval, "awaited", intern->awaited);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(intern->reply), intern->reply->len, &reply_state)) {
+	if (!php_phongo_bson_to_zval_ex(intern->reply, &reply_state)) {
 		zval_ptr_dtor(&reply_state.zchild);
 		goto done;
 	}

src/MongoDB/Query.c

@@ -471,7 +471,7 @@ static HashTable* php_phongo_query_get_debug_info(phongo_compat_object_handler_t
 	if (intern->filter) {
 		zval zv;
 
-		if (!php_phongo_bson_to_zval(bson_get_data(intern->filter), intern->filter->len, &zv)) {
+		if (!php_phongo_bson_to_zval(intern->filter, &zv)) {
 			zval_ptr_dtor(&zv);
 			goto done;
 		}
@@ -484,7 +484,7 @@ static HashTable* php_phongo_query_get_debug_info(phongo_compat_object_handler_t
 	if (intern->opts) {
 		zval zv;
 
-		if (!php_phongo_bson_to_zval(bson_get_data(intern->opts), intern->opts->len, &zv)) {
+		if (!php_phongo_bson_to_zval(intern->opts, &zv)) {
 			zval_ptr_dtor(&zv);
 			goto done;
 		}

src/MongoDB/ReadPreference.c

@@ -341,7 +341,7 @@ static PHP_METHOD(MongoDB_Driver_ReadPreference, getHedge)
 
 		PHONGO_BSON_INIT_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(hedge), hedge->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(hedge, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}
@@ -412,7 +412,7 @@ static PHP_METHOD(MongoDB_Driver_ReadPreference, getTagSets)
 
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(tags), tags->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(tags, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}
@@ -458,9 +458,9 @@ static HashTable* php_phongo_readpreference_get_properties_hash(phongo_compat_ob
 		/* Use PHONGO_TYPEMAP_NATIVE_ARRAY for the root type since tags is an
 		 * array; however, inner documents and arrays can use the default. */
 		PHONGO_BSON_INIT_STATE(state);
-		state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+		state.map.root.type = PHONGO_TYPEMAP_NATIVE_ARRAY;
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(tags), tags->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(tags, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			goto done;
 		}
@@ -483,7 +483,7 @@ static HashTable* php_phongo_readpreference_get_properties_hash(phongo_compat_ob
 
 		PHONGO_BSON_INIT_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(hedge), hedge->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(hedge, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			goto done;
 		}
@@ -540,7 +540,7 @@ static PHP_METHOD(MongoDB_Driver_ReadPreference, serialize)
 
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(tags), tags->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(tags, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}
@@ -557,7 +557,7 @@ static PHP_METHOD(MongoDB_Driver_ReadPreference, serialize)
 
 		PHONGO_BSON_INIT_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(hedge), hedge->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(hedge, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			return;
 		}

src/MongoDB/Server.c

@@ -257,7 +257,7 @@ static PHP_METHOD(MongoDB_Driver_Server, getTags)
 			PHONGO_BSON_INIT_DEBUG_STATE(state);
 			bson_iter_document(&iter, &len, &bytes);
 
-			if (!php_phongo_bson_to_zval_ex(bytes, len, &state)) {
+			if (!php_phongo_bson_data_to_zval_ex(bytes, len, &state)) {
 				/* Exception should already have been thrown */
 				zval_ptr_dtor(&state.zchild);
 				mongoc_server_description_destroy(sd);
@@ -316,7 +316,7 @@ static PHP_METHOD(MongoDB_Driver_Server, getInfo)
 
 	PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(hello_response), hello_response->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(hello_response, &state)) {
 		/* Exception should already have been thrown */
 		zval_ptr_dtor(&state.zchild);
 		goto cleanup;
@@ -640,7 +640,7 @@ bool php_phongo_server_to_zval(zval* retval, mongoc_client_t* client, mongoc_ser
 
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 		bson_iter_document(&iter, &len, &bytes);
-		if (!php_phongo_bson_to_zval_ex(bytes, len, &state)) {
+		if (!php_phongo_bson_data_to_zval_ex(bytes, len, &state)) {
 			/* Exception already thrown */
 			zval_ptr_dtor(&state.zchild);
 			return false;
@@ -666,7 +666,7 @@ bool php_phongo_server_to_zval(zval* retval, mongoc_client_t* client, mongoc_ser
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 		handshake_response = mongoc_server_description_hello_response(handshake_sd);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(handshake_response), handshake_response->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(handshake_response, &state)) {
 			/* Exception already thrown */
 			mongoc_server_description_destroy(handshake_sd);
 			zval_ptr_dtor(&state.zchild);
@@ -680,7 +680,7 @@ bool php_phongo_server_to_zval(zval* retval, mongoc_client_t* client, mongoc_ser
 
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(hello_response), hello_response->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(hello_response, &state)) {
 			/* Exception already thrown */
 			zval_ptr_dtor(&state.zchild);
 			return false;

src/MongoDB/ServerDescription.c

@@ -67,7 +67,7 @@ static PHP_METHOD(MongoDB_Driver_ServerDescription, getHelloResponse)
 
 	PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(helloResponse), helloResponse->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(helloResponse, &state)) {
 		/* Exception should already have been thrown */
 		zval_ptr_dtor(&state.zchild);
 		return;
@@ -214,7 +214,7 @@ HashTable* php_phongo_serverdescription_get_properties_hash(phongo_compat_object
 
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(hello_response), hello_response->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(hello_response, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			goto done;
 		}

src/MongoDB/Session.c

@@ -226,7 +226,7 @@ static PHP_METHOD(MongoDB_Driver_Session, getClusterTime)
 		RETURN_NULL();
 	}
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(cluster_time), cluster_time->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(cluster_time, &state)) {
 		/* Exception should already have been thrown */
 		zval_ptr_dtor(&state.zchild);
 		return;
@@ -251,7 +251,7 @@ static PHP_METHOD(MongoDB_Driver_Session, getLogicalSessionId)
 
 	lsid = mongoc_client_session_get_lsid(intern->client_session);
 
-	if (!php_phongo_bson_to_zval_ex(bson_get_data(lsid), lsid->len, &state)) {
+	if (!php_phongo_bson_to_zval_ex(lsid, &state)) {
 		/* Exception should already have been thrown */
 		zval_ptr_dtor(&state.zchild);
 		return;
@@ -602,7 +602,7 @@ static HashTable* php_phongo_session_get_debug_info(phongo_compat_object_handler
 
 		PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-		if (!php_phongo_bson_to_zval_ex(bson_get_data(lsid), lsid->len, &state)) {
+		if (!php_phongo_bson_to_zval_ex(lsid, &state)) {
 			zval_ptr_dtor(&state.zchild);
 			goto done;
 		}
@@ -618,7 +618,7 @@ static HashTable* php_phongo_session_get_debug_info(phongo_compat_object_handler
 
 			PHONGO_BSON_INIT_DEBUG_STATE(state);
 
-			if (!php_phongo_bson_to_zval_ex(bson_get_data(cluster_time), cluster_time->len, &state)) {
+			if (!php_phongo_bson_to_zval_ex(cluster_time, &state)) {
 				zval_ptr_dtor(&state.zchild);
 				goto done;
 			}

src/MongoDB/WriteConcernError.c

@@ -158,7 +158,7 @@ zend_bool phongo_writeconcernerror_init(zval* return_value, bson_t* bson)
 
 		bson_iter_document(&iter, &len, &data);
 
-		if (!php_phongo_bson_to_zval(data, len, &intern->info)) {
+		if (!php_phongo_bson_data_to_zval(data, len, &intern->info)) {
 			zval_ptr_dtor(&intern->info);
 			ZVAL_UNDEF(&intern->info);
 

src/MongoDB/WriteError.c

@@ -173,7 +173,7 @@ zend_bool phongo_writeerror_init(zval* return_value, bson_t* bson)
 
 		bson_iter_document(&iter, &len, &data);
 
-		if (!php_phongo_bson_to_zval(data, len, &intern->info)) {
+		if (!php_phongo_bson_data_to_zval(data, len, &intern->info)) {
 			zval_ptr_dtor(&intern->info);
 			ZVAL_UNDEF(&intern->info);