Merge branch 'patch-1' of https://github.com/sylwit/framework into sy…

…lwit-patch-1
laravel · Nov 2, 2016 · 9667bcb · 9667bcb
2 parents d818fec + c9f0d05
commit 9667bcb
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -2414,10 +2414,18 @@ public function setIncrementing($value)
      *
      * @param  int  $options
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     public function toJson($options = 0)
     {
-        return json_encode($this->jsonSerialize(), $options);
+        $json = json_encode($this->jsonSerialize(), $options);
+
+        if (JSON_ERROR_NONE !== json_last_error()) {
+            throw new InvalidArgumentException(json_last_error_msg());
+        }
+
+        return $json;
     }
 
     /**