Optimized Model/JsonResource::toJson (#6963)

hyperf · Jul 22, 2024 · ce2b2b7 · ce2b2b7
1 parent 4653e6c
commit ce2b2b7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Model/Model.php b/src/Model/Model.php
@@ -25,6 +25,7 @@
 use Hyperf\Database\Query\Builder as QueryBuilder;
 use Hyperf\Stringable\Str;
 use Hyperf\Stringable\StrCache;
+use JsonException;
 use JsonSerializable;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\EventDispatcher\StoppableEventInterface;
@@ -889,10 +890,10 @@ public function toArray(): array
      */
     public function toJson($options = 0)
     {
-        $json = json_encode($this->jsonSerialize(), $options);
-
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            throw JsonEncodingException::forModel($this, json_last_error_msg());
+        try {
+            $json = json_encode($this->jsonSerialize(), $options | JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            throw JsonEncodingException::forModel($this, $e->getMessage());
         }
 
         return $json;