Fix JsonMatches for [] and {} #2938
Merged
Conversation
This file contains 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
This commit fixes sebastianbergmann#2919 (assertJsonStringEqualsJsonString empty object matches empty array). We had a problem where JsonMatches would report that the JSON string '{}' matches the JSON string '[]'. This bug was due to the fact that Json::canonicalize() was converting JSON strings to PHP arrays. In a PHP array, there is no difference between an empty associative array and an empty indexed array, so Json::canonicalize() did not distinguish between them either. The solution we apply here is to deserialize JSON into objects (rather than associative arrays) so that PHP _can_ distinguish between an empty object and an empty array. If the object is not empty, we still ultimately convert it to an associative array so we can sort its keys.
Codecov Report
@@ Coverage Diff @@
## master #2938 +/- ##
============================================
+ Coverage 79.86% 79.86% +<.01%
- Complexity 2822 2824 +2
============================================
Files 107 107
Lines 7438 7440 +2
============================================
+ Hits 5940 5942 +2
Misses 1498 1498
Continue to review full report at Codecov.
|
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.
This commit fixes #2919 (assertJsonStringEqualsJsonString empty object
matches empty array).
We had a problem where JsonMatches would report that the JSON string
'{}' matches the JSON string '[]'. This bug was due to the fact that
Json::canonicalize() was converting JSON strings to PHP arrays. In a PHP
array, there is no difference between an empty associative array and an
empty indexed array, so Json::canonicalize() did not distinguish between
them either. The solution we apply here is to deserialize JSON into
objects (rather than associative arrays) so that PHP can distinguish
between an empty object and an empty array. If the object is not empty,
we still ultimately convert it to an associative array so we can sort
its keys.