PHPC-410: object_to_bson() should encode non-stdClass objects

Author: jmikola

src/bson.c

@@ -599,15 +599,7 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
 {
 	bson_t child;
 
-	if (Z_TYPE_P(object) != IS_OBJECT || instanceof_function(Z_OBJCE_P(object), zend_standard_class_def TSRMLS_CC)) {
-		mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding as-if was stdclass");
-		bson_append_document_begin(bson, key, key_len, &child);
-		zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
-		bson_append_document_end(bson, &child);
-		return;
-	}
-
-	if (instanceof_function(Z_OBJCE_P(object), php_phongo_type_ce TSRMLS_CC)) {
+	if (Z_TYPE_P(object) == IS_OBJECT && instanceof_function(Z_OBJCE_P(object), php_phongo_type_ce TSRMLS_CC)) {
 		if (instanceof_function(Z_OBJCE_P(object), php_phongo_serializable_ce TSRMLS_CC)) {
 			zval *obj_data = NULL;
 			bson_t child;
@@ -718,9 +710,9 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
 		}
 	}
 
-	/* Even if we don't know how to encode the object, ensure that we at least
-	 * create an empty BSON document. */
+	mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding document");
 	bson_append_document_begin(bson, key, key_len, &child);
+	zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
 	bson_append_document_end(bson, &child);
 }
 void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char *key, long key_len, int entry_type, zval *entry TSRMLS_DC)

tests/bson/bson-fromPHP-002.phpt

@@ -0,0 +1,30 @@
+--TEST--
+BSON\fromPHP(): Encoding non-Persistable objects as a document
+--INI--
+date.timezone=America/Los_Angeles
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+use MongoDB\BSON as BSON;
+
+require_once __DIR__ . "/../utils/basic.inc";
+
+class MyDocument {
+    private $foo = 1;
+    protected $bar = 2;
+    public $baz = 3;
+}
+
+$s = fromPHP(new MyDocument);
+echo "Test ", toJSON($s), "\n";
+hex_dump($s);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+Test { "foo" : 1, "bar" : 2, "baz" : 3 }
+     0 : 20 00 00 00 10 66 6f 6f 00 01 00 00 00 10 62 61  [ ....foo......ba]
+    10 : 72 00 02 00 00 00 10 62 61 7a 00 03 00 00 00 00  [r......baz......]
+===DONE===

tests/bson/bson-fromPHP-003.phpt

@@ -0,0 +1,48 @@
+--TEST--
+BSON\fromPHP(): Encoding non-Persistable objects as a document field value
+--INI--
+date.timezone=America/Los_Angeles
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+use MongoDB\BSON as BSON;
+
+require_once __DIR__ . "/../utils/basic.inc";
+
+class MyDocument {
+    private $foo = 1;
+    protected $bar = 2;
+    public $baz = 3;
+}
+
+$tests = array(
+    array(new BSON\UTCDateTime('1416445411987')),
+    array('x' => new BSON\UTCDateTime('1416445411987')),
+    array(new MyDocument),
+    array('x' => new MyDocument),
+);
+
+foreach ($tests as $document) {
+    $s = fromPHP($document);
+    echo "Test ", toJSON($s), "\n";
+    hex_dump($s);
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+Test { "0" : { "$date" : 1416445411987 } }
+     0 : 10 00 00 00 09 30 00 93 c2 b9 ca 49 01 00 00 00  [.....0.....I....]
+Test { "x" : { "$date" : 1416445411987 } }
+     0 : 10 00 00 00 09 78 00 93 c2 b9 ca 49 01 00 00 00  [.....x.....I....]
+Test { "0" : { "foo" : 1, "bar" : 2, "baz" : 3 } }
+     0 : 28 00 00 00 03 30 00 20 00 00 00 10 66 6f 6f 00  [(....0. ....foo.]
+    10 : 01 00 00 00 10 62 61 72 00 02 00 00 00 10 62 61  [.....bar......ba]
+    20 : 7a 00 03 00 00 00 00 00                          [z.......]
+Test { "x" : { "foo" : 1, "bar" : 2, "baz" : 3 } }
+     0 : 28 00 00 00 03 78 00 20 00 00 00 10 66 6f 6f 00  [(....x. ....foo.]
+    10 : 01 00 00 00 10 62 61 72 00 02 00 00 00 10 62 61  [.....bar......ba]
+    20 : 7a 00 03 00 00 00 00 00                          [z.......]
+===DONE===

tests/bson/bson-utcdatetime-001.phpt

@@ -51,8 +51,8 @@ Test#1 { "0" : { "$date" : 1416445411987 } }
 string(37) "{ "0" : { "$date" : 1416445411987 } }"
 string(37) "{ "0" : { "$date" : 1416445411987 } }"
 bool(true)
-Test#2 { "0" : {  } }
-string(14) "{ "0" : {  } }"
-string(14) "{ "0" : {  } }"
+Test#2 { "0" : { "date" : "2014-11-20 01:03:31.987%r(0+)%r", "timezone_type" : 1, "timezone" : "+00:00" } }
+string(98) "{ "0" : { "date" : "2014-11-20 01:03:31.987%r(0+)%r", "timezone_type" : 1, "timezone" : "+00:00" } }"
+string(98) "{ "0" : { "date" : "2014-11-20 01:03:31.987%r(0+)%r", "timezone_type" : 1, "timezone" : "+00:00" } }"
 bool(false)
 ===DONE===