8000 [Serializer] error handling inconsistencies fixed in the serializer decoders by rodrigodiez · Pull Request #9586 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Serializer] error handling inconsistencies fixed in the serializer decoders #9586

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 14 commits into from
Closed

[Serializer] error handling inconsistencies fixed in the serializer decoders #9586

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1404c36
Json encoder classes now throws UnexpectedValueException as XML classes
Nov 23, 2013
ef32d3c
Error methods and properties removed
Nov 23, 2013
a329358
Fixed return value
Nov 23, 2013
30c80cb
No error parameter needed to get proper message
Nov 23, 2013
0d9f16f
Error message variable removed, message is now returned directly
Nov 23, 2013
ad8a50f
BC break reverted
Nov 23, 2013
31b94b0
Use statement on interface for exception
Nov 23, 2013
0c380b6
default value managed last
Nov 23, 2013
3d2e7ff
Deprecation documented
Nov 23, 2013
0574236
Reverted some changes
Nov 23, 2013
ebf1ece
Use statement on EncoderInterface for exception
Nov 23, 2013
e50b0f4
Break statements removed. Return is used
Nov 23, 2013
76fd6cb
Fixed CHANGELOG deprecation message
Nov 23, 2013
8e87d01
Deprecated phpdoc fixes
Nov 23, 2013
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
Next Next commit
Reverted some changes
  • Loading branch information
Rodrigo Díez Villamuera committed Nov 23, 2013
commit 05742368c11ecf66834e20bdc4da65a93b490a6e
2 changes: 1 addition & 1 deletion src/Symfony/Component/Serializer/Encoder/JsonDecode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function decode($data, $format, array $context = array())
}

if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
$message = JsonEncoder::getErrorMessage($this->lastError);
$message = JsonEncoder::getLastErrorMessage();
throw new UnexpectedValueException($message);
}

Expand Down
10 changes: 6 additions & 4 deletions src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,15 @@ public function supportsDecoding($format)
/**
* Resolves json_last_error message
*
* @param $error
*
* @return string
*/
public static function getErrorMessage($error)
public static function getLastErrorMessage()
{
switch ($error) {
if (function_exists('json_last_error_msg')) {
return json_last_error_msg();
}

switch (json_last_error()) {
case JSON_ERROR_DEPTH:
return 'Maximum stack depth exceeded';
break;
Expand Down
0