Dec 28, 2013 · Nov 23, 2013 · Dec 28, 2013 · Dec 28, 2013
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
 -----

 * added `$context` support for XMLEncoder.
 * [DEPRECATION] JsonEncode and JsonDecode where modified to throw
   an exception if error found. No need for get*Error() functions

 2.3.0
 -----
diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php

 namespace Symfony\Component\Serializer\Encoder;

 use Symfony\Component\Serializer\Exception\UnexpectedValueException;

 /**
 * Defines the interface of decoders
 *
     * phpdoc comment.
     *
     * @return mixed
     *
     * @throws UnexpectedValueException
     */
    public function decode($data, $format, array $context = array());

diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php

 namespace Symfony\Component\Serializer\Encoder;

 use Symfony\Component\Serializer\Exception\UnexpectedValueException;

 /**
 * Defines the interface of encoders
 *
     * @param array  $context options that normalizers/encoders have access to.
     *
     * @return scalar
     *
     * @throws UnexpectedValueException
     */
    public function encode($data, $format, array $context = array());

diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php

 namespace Symfony\Component\Serializer\Encoder;

 use Symfony\Component\Serializer\Exception\UnexpectedValueException;

 /**
 * Decodes JSON data
 *
    private $recursionDepth;

    private $lastError = JSON_ERROR_NONE;

    protected $serializer;

    /**
     *
     * @return integer
     *
     * @deprecated decode() throws an exception if error found
     * @see http://php.net/manual/en/function.json-last-error.php json_last_error
     */
    public function getLastError()
     *
     * @return mixed
     *
     * @throws UnexpectedValueException
     *
     * @see http://php.net/json_decode json_decode
     */
    public function decode($data, $format, array $context = array())
            $decodedData = json_decode($data, $associative, $recursionDepth);
        }

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

        return $decodedData;
    }
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php

 namespace Symfony\Component\Serializer\Encoder;

 use Symfony\Component\Serializer\Exception\UnexpectedValueException;

 /**
 * Encodes JSON data
 *
    }

    /**
     * Returns the last encoding error (if any)
     * Returns the last encoding error (if any).
     *
     * @return integer
     *
     * @deprecated encode() throws an exception if error found
     * @see http://php.net/manual/en/function.json-last-error.php json_last_error
     */
    public function getLastError()
        $context = $this->resolveContext($context);

        $encodedJson = json_encode($data, $context['json_encode_options']);
        $this->lastError = json_last_error();

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

        return $encodedJson;
    }
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
    }

    /**
     *
     * Returns the last encoding error (if any)
     *
     * @return integer
     *
     * @deprecated JsonEncode throws exception if an error is found
     */
    public function getLastEncodingError()
    {
        return $this->encodingImpl->getLastError();
    }

    /**
     *
     * Returns the last decoding error (if any)
     *
     * @return integer
     *
     * @deprecated JsonDecode throws exception if an error is found
     */
    public function getLastDecodingError()
    {
    {
        return self::FORMAT === $format;
    }

    /**
     * Resolves json_last_error message
     *
     * @return string
     */
    public static function getLastErrorMessage()
    {
        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';
            case JSON_ERROR_STATE_MISMATCH:
                return 'Underflow or the modes mismatch';
            case JSON_ERROR_CTRL_CHAR:
                return 'Unexpected control character found';
            case JSON_ERROR_SYNTAX:
                return 'Syntax error, malformed JSON';
            case JSON_ERROR_UTF8:
                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
            default:
                return 'Unknown error';
        }
    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,8 @@ CHANGELOG
		-----

		* added `$context` support for XMLEncoder.
		* [DEPRECATION] JsonEncode and JsonDecode where modified to throw
		an exception if error found. No need for get*Error() functions

		2.3.0
		-----
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,8 @@

		namespace Symfony\Component\Serializer\Encoder;

		use Symfony\Component\Serializer\Exception\UnexpectedValueException;

		/**
		* Defines the interface of decoders
		*
Expand All		@@ -31,6 +33,8 @@ interface DecoderInterface
		* phpdoc comment.
		*
		* @return mixed
		*
		* @throws UnexpectedValueException
		*/
		public function decode($data, $format, array $context = array());

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,19 +37,25 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
		}

		/**
		*
		* Returns the last encoding error (if any)
		*
		* @return integer
		*
		* @deprecated JsonEncode throws exception if an error is found
		*/
		public function getLastEncodingError()
		{
		return $this->encodingImpl->getLastError();
		}

		/**
		*
		* Returns the last decoding error (if any)
		*
		* @return integer
		*
		* @deprecated JsonDecode throws exception if an error is found
		*/
		public function getLastDecodingError()
		{
Expand DownExpand Up		@@ -87,4 +93,31 @@ public function supportsDecoding($format)
		{
		return self::FORMAT === $format;
		}

		/**
		* Resolves json_last_error message
		*
		* @return string
		*/
		public static function getLastErrorMessage()
		{
		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';
		case JSON_ERROR_STATE_MISMATCH:
		return 'Underflow or the modes mismatch';
		case JSON_ERROR_CTRL_CHAR:
		return 'Unexpected control character found';
		case JSON_ERROR_SYNTAX:
		return 'Syntax error, malformed JSON';
		case JSON_ERROR_UTF8:
		return 'Malformed UTF-8 characters, possibly incorrectly encoded';
		default:
		return 'Unknown error';
		}
		}
		}