Skip to content

PHPC-410: Make BSON exception message consistent with HHVM #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2015
Merged

PHPC-410: Make BSON exception message consistent with HHVM #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
18 changes: 9 additions & 9 deletions tests/bson/bson-fromPHP_error-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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===