comparison vendor/symfony/serializer/Encoder/JsonDecode.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

  * file that was distributed with this source code.
  */
 
 namespace Symfony\Component\Serializer\Encoder;
 
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 
 /**
  * Decodes JSON data.
  *
  * @author Sander Coolen <[e-mail]>
  */
 class JsonDecode implements DecoderInterface
 {
-    /**
-     * Specifies if the returned result should be an associative array or a nested stdClass object hierarchy.
-     *
-     * @var bool
-     */
+    protected $serializer;
+
     private $associative;
-
-    /**
-     * Specifies the recursion depth.
-     *
-     * @var int
-     */
     private $recursionDepth;
-
-    private $lastError = JSON_ERROR_NONE;
-
-    protected $serializer;
 
     /**
      * Constructs a new JsonDecode instance.
      *
      * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy

      * json_decode_options: integer
      *      Specifies additional options as per documentation for json_decode. Only supported with PHP 5.4.0 and higher
      *
      * @return mixed
      *
-     * @throws UnexpectedValueException
+     * @throws NotEncodableValueException
      *
      * @see http://php.net/json_decode json_decode
      */
     public function decode($data, $format, array $context = array())
     {

         $recursionDepth = $context['json_decode_recursion_depth'];
         $options = $context['json_decode_options'];
 
         $decodedData = json_decode($data, $associative, $recursionDepth, $options);
 
-        if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(json_last_error_msg());
+        if (JSON_ERROR_NONE !== json_last_error()) {
+            throw new NotEncodableValueException(json_last_error_msg());
         }
 
         return $decodedData;
     }
 

     }
 
     /**
      * Merges the default options of the Json Decoder with the passed context.
      *
-     * @param array $context
-     *
      * @return array
      */
     private function resolveContext(array $context)
     {
         $defaultOptions = array(