PHPC-274: Fix zval_to_bson() encoding of BSON\Serializable objects #40
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It is really difficult to understand the effect of this change in the modified test case. |
| } | ||
| zval_to_bson(retval, flags, &child, NULL TSRMLS_CC); | ||
| bson_append_document_end(bson, &child); | ||
| return; |
There was a problem hiding this comment.
For PHPC-275: this conditional and the preceding (!obj_data) conditional (when zend_call_method() fails) are the relevant changes for the bson-encode_error-002.phpt test case.
|
The attached |
jmikola
force-pushed
the
phpc-274
branch
2 times, most recently
from
13bd5ba to
2cc2ecc
Compare
| tmp_ht->nApplyCount++; | ||
| } | ||
| if (Z_TYPE_P(obj_data) != IS_ARRAY) { | ||
| phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Expected %s() to return an array, %s given", BSON_SERIALIZE_FUNC_NAME, zend_get_type_by_const(Z_TYPE_P(obj_data))); |
There was a problem hiding this comment.
This should be an UnexpectedValueException.
There was a problem hiding this comment.
Change this to UnexpectedValueException please
|
lgtm |
Previously, only BSON\Persistable objects were handled.
This also refactors the handling to be consistent with zval_to_bson().
jmikola
added a commit
that referenced
this pull request
May 4, 2015
PHPC-274: Fix zval_to_bson() encoding of BSON\Serializable objects
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, only BSON\Persistable objects were handled.