Fix json-encoding when JSON_THROW_ON_ERROR is used #31869
Merged
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
62bd762 to
1b3741f
Compare
1b3741f to
d18f42c
Compare
This was referenced Jun 5, 2019
stof
approved these changes
Jun 5, 2019
fabpot
approved these changes
Jun 5, 2019
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Jun 5, 2019
…s-grekas) This PR was merged into the 3.4 branch. Discussion ---------- Fix json-encoding when JSON_THROW_ON_ERROR is used | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - As hinted in #31860 by @lt Commits ------- d18f42c Fix json-encoding when JSON_THROW_ON_ERROR is used
fabpot
added a commit
that referenced
this pull request
Jun 5, 2019
…nicolas-grekas) This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] revert bad logic around JSON_THROW_ON_ERROR | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Same as #31869, reverts #31861 Commits ------- 846116e [HttpClient] revert bad logic around JSON_THROW_ON_ERROR
Merged
nicolas-grekas
added a commit
that referenced
this pull request
Jun 28, 2019
This PR was merged into the 3.4 branch. Discussion ---------- Catch JsonException and rethrow in JsonEncode | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | adjustment to implementation of previous PRs for issue #31447 | License | MIT | Doc PR | not applicable PR #31860 provided handling of PHP 7.3 `JSON_THROW_ON_ERROR` behavior in the various `JsonEncode` and related classes/methods. PR #31869 adjusted that. In particular, it adjusted ` src/Symfony/Component/Serializer/Encoder/JsonDecode.php` so that it catches any `JsonException` and re-throws it as `NotEncodableValueException`. That preserves the previous behavior of `JsonDecode:decode` - it always throws `NotEncodableValueException` when something goes wrong. IMO `JsonEncode:encode` needs the same logic. At the moment, if a caller specifies `JSON_THROW_ON_ERROR` then the method can throw `JsonException`, but actually the "standard" for `JsonEncode:encode` is that it throws `NotEncodableValueException` Adjust `JsonEncode:encode` to catch `JsonException` and rethrow it as `NotEncodableValueException` Commits ------- 9c76790 Catch JsonException and rethrow in JsonEncode
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.
As hinted in #31860 by @lt