8000 [JsonResponse] Silent only JSON errors by GromNaN · Pull Request #11418 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[JsonResponse] Silent only JSON errors #11418

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

[JsonResponse] Silent only JSON errors #11418

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd0f798
[HttpFoundation] Silent only JSON errors
GromNaN Jul 18, 2014
6e8c7fc
Catch exceptions to restore the error handler
GromNaN Jul 18, 2014
a4a8535
Fix JsonSerializable namespace
GromNaN Jul 18, 2014
c2a1a5b
Clear json_last_error
GromNaN Sep 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Clear json_last_error
  • Loading branch information
@GromNaN
GromNaN committed Sep 15, 2014
commit c2a1a5b0918eb9d904877b68f69054bfe70a0c1a
3 changes: 3 additions & 0 deletions src/Symfony/Component/HttpFoundation/JsonResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public function setData($data = array())
});

try {
// Clear json_last_error()
json_encode(null);

$this->data = json_encode($data, $this->encodingOptions);

restore_error_handler();
Expand Down
5 changes: 3 additions & 2 deletions src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,9 @@ public function testSetContent()
}

/**
* @expectedException PHPUnit_Framework_Error_Warning
* @expectedExceptionMessage This error is expected
* @expectedException Exception
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The warning is converted to an exception by PHPUnit.

* @expectedExceptionMessage Failed calling Symfony\Component\HttpFoundation\Tests\JsonSerializableObject::jsonSerialize()
* @link http://php.net/manual/en/jsonserializable.jsonserialize.php#114688
*/
public function testSetContentJsonSerializeError()
{
Expand Down
0