Merge pull request #111

Author: jmikola

src/bson.c

@@ -807,7 +807,7 @@ PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *
 
 				break;
 			} else if (instanceof_function(Z_OBJCE_P(data), php_phongo_type_ce TSRMLS_CC)) {
-				phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s cannot be serialized as a root element", Z_OBJCE_P(data)->name);
+				phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", php_phongo_type_ce->name, Z_OBJCE_P(data)->name);
 
 				break;
 			}

tests/bson/bson-fromPHP_error-003.phpt

@@ -34,21 +34,21 @@ foreach ($tests as $document) {
 <?php exit(0); ?>
 --EXPECTF--
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-UnknownType cannot be serialized as a root element
+%S\BSON\Type instance UnknownType cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\Binary cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\Binary cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\Javascript cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\Javascript cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\MinKey cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\MinKey cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\MaxKey cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\MaxKey cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\ObjectID cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\ObjectID cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\Regex cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\Regex cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\Timestamp cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\Timestamp cannot be serialized as a root element
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-%S\BSON\UTCDateTime cannot be serialized as a root element
+%S\BSON\Type instance %S\BSON\UTCDateTime cannot be serialized as a root element
 ===DONE===