Merge branch 'phpc-1419'

* phpc-1419:
  PHPC-1419: Expose error labels from getMore responses

Author: alcaeus

src/MongoDB/Cursor.c

@@ -126,11 +126,12 @@ static void php_phongo_cursor_iterator_move_forward(zend_object_iterator* iter T
 		php_phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
 	} else {
 		bson_error_t error = { 0 };
+		const bson_t* doc = NULL;
 
-		if (mongoc_cursor_error(cursor->cursor, &error)) {
+		if (mongoc_cursor_error_document(cursor->cursor, &error, &doc)) {
 			/* Intentionally not destroying the cursor as it will happen
 			 * naturally now that there are no more results */
-			phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
+			phongo_throw_exception_from_bson_error_t_and_reply(&error, doc TSRMLS_CC);
 		}
 	}
 

tests/cursor/bug1419-001.phpt

@@ -0,0 +1,44 @@
+--TEST--
+PHPC-1419: error labels from getMore are not exposed
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongoc_crypto(); ?>
+<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_server_version('<', '4.1.11'); ?>
+<?php skip_if_not_clean(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+
+// Select a specific server for future operations to avoid mongos switching in sharded clusters
+$server = $manager->selectServer(new \MongoDB\Driver\ReadPreference('primary'));
+
+$bulk = new MongoDB\Driver\BulkWrite;
+$bulk->insert(['_id' => 1]);
+$bulk->insert(['_id' => 2]);
+$bulk->insert(['_id' => 3]);
+$manager->executeBulkWrite(NS, $bulk);
+
+$cursor = $server->executeQuery(NS, new \MongoDB\Driver\Query([], ['batchSize' => 1]));
+$iterator = new IteratorIterator($cursor);
+
+configureTargetedFailPoint(
+    $server,
+    'failCommand',
+    [ 'times' => 1] ,
+    [ 'errorCode' => 280, 'failCommands' => ['getMore'] ]
+);
+
+try {
+    $iterator->next();
+} catch (\MongoDB\Driver\Exception\ServerException $e) {
+    var_dump($e->hasErrorLabel('NonResumableChangeStreamError'));
+}
+
+?>
+===DONE===
+--EXPECT--
+bool(true)
+===DONE===