[HttpClient] revert bad logic around JSON_THROW_ON_ERROR #31871
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
nicolas-grekas
commented
Jun 5, 2019
| @@ -148,7 +148,7 @@ public function toArray(bool $throw = true): array | |||
| } | |||
|
|
|||
| try { | |||
| $content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0)); | |||
| $content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0)); | |||
There was a problem hiding this comment.
the added \ should allow the compiler to inline the check :)
fabpot
approved these changes
Jun 5, 2019
|
Thank you @nicolas-grekas. |
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
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.
Same as #31869, reverts #31861