Merge branch 'v1.16'

alcaeus · alcaeus · commit 7e2adf0e98c1 · 2023-08-04T12:39:54.000+02:00
* v1.16: PHPC-2268: Remove duplicate call to bson_iter_key (#1452) Update to libmongoc 1.24.2 (#1448)
diff --git a/src/BSON/Iterator.c b/src/BSON/Iterator.c
@@ -154,7 +154,7 @@ static PHP_METHOD(MongoDB_BSON_Iterator, key)
 		return;
 	}
 
-	RETURN_STRING(bson_iter_key(&intern->iter));
+	RETURN_STRING(key);
 }
 
 static PHP_METHOD(MongoDB_BSON_Iterator, next)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static PHP_METHOD(MongoDB_BSON_Iterator, key)`
`154`	`154`	`return;`
`155`	`155`	`}`
`156`	`156`
`157`		`- RETURN_STRING(bson_iter_key(&intern->iter));`
	`157`	`+ RETURN_STRING(key);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`static PHP_METHOD(MongoDB_BSON_Iterator, next)`