PHPC-267; _id generated on embedded document

Author: bjori

src/bson.c

@@ -837,7 +837,7 @@ PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *
 			key_len = bson_uint32_to_string(index, (const char **)&key, numbuf, sizeof(numbuf));
 		}
 
-		phongo_bson_append(bson, flags, key, key_len, Z_TYPE_PP(entry), *entry TSRMLS_CC);
+		phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, key, key_len, Z_TYPE_PP(entry), *entry TSRMLS_CC);
 	}
 
 	if (flags & PHONGO_BSON_ADD_ID) {

tests/bson/bson-generate-document-id.phpt

@@ -0,0 +1,74 @@
+--TEST--
+_id should only be generated for top-level document, not embedded docs
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(STANDALONE);
+
+$manager->executeInsert(NS, array('_id' => 1, 'x' => 1));
+$manager->executeInsert(NS, array('_id' => 2, 'x' => 1));
+
+$user = array(
+    "username" => "bob",
+    "address" => array(
+        "street" => "Main St.",
+        "city" => "New York",
+    ),
+);
+
+$bulk = new MongoDB\Driver\BulkWrite();
+$user["_id"] = $bulk->insert($user);
+$result = $manager->executeBulkWrite(NS, $bulk);
+
+echo "Dumping inserted user document with injected _id:\n";
+var_dump($user);
+
+$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array("_id" => $user["_id"])));
+
+echo "\nDumping fetched user document:\n";
+$array = $cursor->toArray();
+var_dump($array[0]);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Dumping inserted user document with injected _id:
+array(3) {
+  ["username"]=>
+  string(3) "bob"
+  ["address"]=>
+  array(2) {
+    ["street"]=>
+    string(8) "Main St."
+    ["city"]=>
+    string(8) "New York"
+  }
+  ["_id"]=>
+  object(BSON\ObjectID)#%d (%d) {
+    ["oid"]=>
+    string(24) "%s"
+  }
+}
+
+Dumping fetched user document:
+array(3) {
+  ["_id"]=>
+  object(BSON\ObjectID)#%d (%d) {
+    ["oid"]=>
+    string(24) "%s"
+  }
+  ["username"]=>
+  string(3) "bob"
+  ["address"]=>
+  object(stdClass)#%d (%d) {
+    ["street"]=>
+    string(8) "Main St."
+    ["city"]=>
+    string(8) "New York"
+  }
+}
+===DONE===