Skip to content
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.

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

[HttpClient] revert bad logic around JSON_THROW_ON_ERROR #31871

Merged
merged 1 commit into from Jun 5, 2019

Conversation

Projects
None yet
3 participants
@nicolas-grekas
Copy link
Member

commented Jun 5, 2019

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

@nicolas-grekas nicolas-grekas added this to the 4.3 milestone 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));

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Jun 5, 2019

Author Member

the added \ should allow the compiler to inline the check :)

@fabpot

fabpot approved these changes Jun 5, 2019

@fabpot

This comment has been minimized.

Copy link
Member

commented Jun 5, 2019

Thank you @nicolas-grekas.

@fabpot fabpot merged commit 846116e into symfony:4.3 Jun 5, 2019

1 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
fabbot.io Your code looks good.
Details

fabpot added a commit that referenced this pull request Jun 5, 2019

bug #31871 [HttpClient] revert bad logic around JSON_THROW_ON_ERROR (…
…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

@nicolas-grekas nicolas-grekas deleted the nicolas-grekas:fix-json-enc43 branch Jun 5, 2019

@fabpot fabpot referenced this pull request Jun 6, 2019

Merged

Release v4.3.1 #31901

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.