wip

Author: jmikola

src/MongoDB/BulkWriteCommandResult.stub.php

@@ -30,9 +30,9 @@ final public function getUpdateResults(): ?\MongoDB\BSON\Document {}
 
     final public function getDeleteResults(): ?\MongoDB\BSON\Document {}
 
-    final public function getWriteErrors(): ?\MongoDB\BSON\Document {}
+    final public function getWriteErrors(): array {}
 
-    final public function getWriteConcernErrors(): ?\MongoDB\BSON\PackedArray {}
+    final public function getWriteConcernErrors(): array {}
 
     final public function getErrorReply(): ?\MongoDB\BSON\Document {}
 

src/phongo_execute.c

@@ -371,17 +371,20 @@ bool phongo_execute_bulkwritecommand(zval* manager, php_phongo_bulkwritecommand_
 	if (bw_ret.exc) {
 		success = false;
 		bson_error_t error = { 0 };
+		const bson_t *error_reply = NULL;
+
+		error_reply = mongoc_bulkwriteexception_errorreply(bw_ret.exc);
 
 		// Check if there is a top-level error
 		if (mongoc_bulkwriteexception_error(bw_ret.exc, &error)) {
-			phongo_throw_exception_from_bson_error_t_and_reply(&error, mongoc_bulkwriteexception_errorreply(bw_ret.exc));
+			phongo_throw_exception_from_bson_error_t_and_reply(&error, error_reply);
 		}
 
 		/* Unlike mongoc_bulk_operation_execute, mongoc_bulkwrite_execute may
 		 * report COMMAND_INVALID_ARG alongside a partial result (CDRIVER-5842).
-		 * If there is no result, we can throw InvalidArgumentException without
-		 * proxying it behind a BulkWriteException. */
-		if (!bw_ret.res && error.domain == MONGOC_ERROR_COMMAND && error.code == MONGOC_ERROR_COMMAND_INVALID_ARG) {
+		 * If there is no result and error_reply, throw InvalidArgumentException
+		 * without proxying it behind a BulkWriteException. */
+		if (!bw_ret.res && !error_reply && error.domain == MONGOC_ERROR_COMMAND && error.code == MONGOC_ERROR_COMMAND_INVALID_ARG) {
 			// TODO: Do we care about other mongoc_bulkwriteexception_t fields?
 			goto cleanup;
 		}