Changed to ignore fields with unsupported types, and upgraded test cases.

Author: derickr

src/bson.c

@@ -131,16 +131,8 @@ static bool php_phongo_bson_visit_binary(const bson_iter_t *iter ARG_UNUSED, con
 
 static bool php_phongo_bson_visit_undefined(const bson_iter_t *iter, const char *key, void *data) /* {{{ */
 {
-	zval *retval = PHONGO_BSON_STATE_ZCHILD(data);
-
 	mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Detected unsupported BSON type 0x06 (undefined) for fieldname \"%s\"", key);
 
-	if (((php_phongo_bson_state *)data)->is_visiting_array) {
-		add_next_index_null(retval);
-	} else {
-		add_assoc_null(retval, key);
-	}
-
 	return false;
 } /* }}} */
 
@@ -292,16 +284,8 @@ static bool php_phongo_bson_visit_regex(const bson_iter_t *iter ARG_UNUSED, cons
 
 static bool php_phongo_bson_visit_symbol(const bson_iter_t *iter, const char *key, size_t symbol_len, const char *symbol, void *data) /* {{{ */
 {
-	zval *retval = PHONGO_BSON_STATE_ZCHILD(data);
-
 	mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Detected unsupported BSON type 0x0E (symbol) for fieldname \"%s\"", key);
 
-	if (((php_phongo_bson_state *)data)->is_visiting_array) {
-		add_next_index_null(retval);
-	} else {
-		add_assoc_null(retval, key);
-	}
-
 	return false;
 } /* }}} */
 
@@ -337,16 +321,8 @@ static bool php_phongo_bson_visit_code(const bson_iter_t *iter ARG_UNUSED, const
 
 static bool php_phongo_bson_visit_dbpointer(const bson_iter_t *iter, const char *key, size_t collection_len, const char *collection, const bson_oid_t *oid, void *data) /* {{{ */
 {
-	zval *retval = PHONGO_BSON_STATE_ZCHILD(data);
-
 	mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Detected unsupported BSON type 0x0C (DBPointer) for fieldname \"%s\"", key);
 
-	if (((php_phongo_bson_state *)data)->is_visiting_array) {
-		add_next_index_null(retval);
-	} else {
-		add_assoc_null(retval, key);
-	}
-
 	return false;
 } /* }}} */
 

tests/bson/bson-toPHP_error-005.phpt

@@ -1,39 +1,30 @@
 --TEST--
-MongoDB\BSON\toPHP(): BSON decoding exceptions for unsupported BSON types
+MongoDB\BSON\toPHP(): BSON decoding ignores unsupported BSON types
 --FILE--
 <?php
-
-require_once __DIR__ . '/../utils/tools.php';
-
 $tests = [
     pack('VCa*xx', 10, 0x06, 'foo'), // undefined
     pack('VCa*xVa*xx12x', 37, 0x0C, 'foo', 11, 'collection'), // DBPointer
     pack('VCa*xVa*xx', 18, 0x0E, 'foo', 4, 'bar'), // symbol
 ];
 
-ini_set("mongodb.debug", "stdout");
+ini_set('mongodb.debug', 'stdout');
 foreach ($tests as $bson) {
-	var_dump(toPHP($bson));
+	var_dump(MongoDB\BSON\toPHP($bson));
 }
-ini_set("mongodb.debug", "off");
+ini_set('mongodb.debug', 'off');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "foo"
 object(stdClass)#%d (%d) {
-  ["foo"]=>
-  NULL
 }
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x0C (DBPointer) for fieldname "foo"
 object(stdClass)#%d (%d) {
-  ["foo"]=>
-  NULL
 }
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x0E (symbol) for fieldname "foo"
 object(stdClass)#%d (%d) {
-  ["foo"]=>
-  NULL
 }
 ===DONE===

tests/bson/bson-toPHP_error-006.phpt

@@ -1,10 +1,8 @@
 --TEST--
-MongoDB\BSON\toPHP(): BSON decoding throws multiple exceptions
+MongoDB\BSON\toPHP(): BSON decoding shows multiple warnings
 --FILE--
 <?php
 
-require_once __DIR__ . '/../utils/tools.php';
-
 $tests = [
     // two undefined fields in root document
     pack('VCa*xCa*xx', 13, 0x06, 'u1', 0x06, 'u2'),
@@ -18,66 +16,45 @@ $tests = [
     pack('VCa*xVCa*xxCa*xVCa*xxx', 31, 0x03, 'e1', 9, 0x06, 'u1', 0x03, 'e2', 9, 0x06, 'u2'),
 ];
 
-ini_set("mongodb.debug", "stdout");
+ini_set('mongodb.debug', 'stdout');
 foreach ($tests as $bson) {
-    var_dump(toPHP($bson));
+	var_dump(MongoDB\BSON\toPHP($bson));
 }
-ini_set("mongodb.debug", "off");
-
+ini_set('mongodb.debug', 'off');
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u1"
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u2"
 object(stdClass)#%d (%d) {
-  ["u1"]=>
-  NULL
-  ["u2"]=>
-  NULL
 }
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u1"
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x0E (symbol) for fieldname "s1"
 object(stdClass)#%d (%d) {
-  ["u1"]=>
-  NULL
-  ["s1"]=>
-  NULL
 }
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u1"
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u2"
 object(stdClass)#%d (%d) {
-  ["u1"]=>
-  NULL
   ["e1"]=>
-  object(stdClass)#%d (%d) {
-    ["u2"]=>
-    NULL
+  object(stdClass)#%d (0) {
   }
 }
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u1"
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u2"
 object(stdClass)#%d (%d) {
   ["e1"]=>
-  object(stdClass)#%d (%d) {
-    ["u1"]=>
-    NULL
+  object(stdClass)#%d (0) {
   }
-  ["u2"]=>
-  NULL
 }
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u1"
 [%s] PHONGO-BSON: WARNING > Detected unsupported BSON type 0x06 (undefined) for fieldname "u2"
-object(stdClass)#3 (%d) {
+object(stdClass)#%d (%d) {
   ["e1"]=>
-  object(stdClass)#%d (%d) {
-    ["u1"]=>
-    NULL
+  object(stdClass)#%d (0) {
   }
   ["e2"]=>
-  object(stdClass)#%d (%d) {
-    ["u2"]=>
-    NULL
+  object(stdClass)#%d (0) {
   }
 }
 ===DONE===