Remove json utils methods and json custom exception

ruflin · Dec 7, 2022 · aadaed2 · aadaed2
1 parent 512f731
commit aadaed2
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 172 deletions.
diff --git a/src/Bulk/Action.php b/src/Bulk/Action.php
@@ -4,7 +4,6 @@
 
 use Elastica\Bulk;
 use Elastica\Index;
-use Elastica\JSON;
 
 class Action
 {
@@ -47,7 +46,7 @@ public function __construct(string $opType = self::OP_TYPE_INDEX, array $metadat
 
     public function __toString(): string
     {
-        $string = JSON::stringify($this->getActionMetadata(), \JSON_FORCE_OBJECT).Bulk::DELIMITER;
+        $string = \json_encode($this->getActionMetadata(), \JSON_FORCE_OBJECT | \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR).Bulk::DELIMITER;
 
         if ($this->hasSource()) {
             $source = $this->getSource();
@@ -61,7 +60,7 @@ public function __toString(): string
                 }
                 $string .= '{"doc": '.$source['doc'].$docAsUpsert.'}';
             } else {
-                $string .= JSON::stringify($source, \JSON_UNESCAPED_UNICODE);
+                $string .= \json_encode($source, \JSON_UNESCAPED_UNICODE | \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR);
             }
             $string .= Bulk::DELIMITER;
         }

diff --git a/src/Exception/JSONParseException.php b/src/Exception/JSONParseException.php
diff --git a/src/Exception/PartialShardFailureException.php b/src/Exception/PartialShardFailureException.php
@@ -2,7 +2,6 @@
 
 namespace Elastica\Exception;
 
-use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
 
@@ -21,6 +20,6 @@ public function __construct(Request $request, Response $response)
         parent::__construct($request, $response);
 
         $shardsStatistics = $response->getShardsStatistics();
-        $this->message = JSON::stringify($shardsStatistics);
+        $this->message = \json_encode($shardsStatistics, \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR);
     }
 }
diff --git a/src/JSON.php b/src/JSON.php
diff --git a/src/Multi/Search.php b/src/Multi/Search.php
@@ -3,7 +3,6 @@
 namespace Elastica\Multi;
 
 use Elastica\Client;
-use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Search as BaseSearch;
 
@@ -161,8 +160,8 @@ protected function _getSearchData(BaseSearch $search): string
         // Keep other query options as part of the search body
         $queryOptions = \array_diff_key($search->getOptions(), \array_flip(self::$HEADER_OPTIONS));
 
-        $data = JSON::stringify($header)."\n";
-        $data .= JSON::stringify($query->toArray() + $queryOptions)."\n";
+        $data = \json_encode($header, \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR)."\n";
+        $data .= \json_encode($query->toArray() + $queryOptions, \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR)."\n";
 
         return $data;
     }

diff --git a/src/Request.php b/src/Request.php
@@ -50,7 +50,7 @@ public function __construct(string $path, string $method = self::GET, $data = []
 
     public function __toString(): string
     {
-        return JSON::stringify($this->toArray());
+        return \json_encode($this->toArray(), \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR);
     }
 
     /**

diff --git a/src/Response.php b/src/Response.php
@@ -350,9 +350,9 @@ private function getResponseString()
         }
         try {
             if ($this->getJsonBigintConversion()) {
-                $response = JSON::parse($response, true, 512, \JSON_BIGINT_AS_STRING);
+                $response = \json_decode($response, true, flags: \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
             } else {
-                $response = JSON::parse($response);
+                $response = $response = \json_decode($response, true, flags: \JSON_THROW_ON_ERROR);
             }
         } catch (\JsonException $e) {
             // leave response as is if parse fails

diff --git a/src/Transport/Guzzle.php b/src/Transport/Guzzle.php
@@ -6,7 +6,6 @@
 use Elastica\Exception\Connection\GuzzleException;
 use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
-use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
 use Elastica\Util;
@@ -201,7 +200,7 @@ protected function _getActionPath(Request $request): string
     private function streamFor($data): StreamInterface
     {
         if (\is_array($data)) {
-            $data = JSON::stringify($data, \JSON_UNESCAPED_UNICODE);
+            $data = \json_encode($data, \JSON_UNESCAPED_UNICODE | \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR);
         }
 
         return \class_exists(Psr7\Utils::class)

diff --git a/src/Transport/Http.php b/src/Transport/Http.php
@@ -6,7 +6,6 @@
 use Elastica\Exception\ConnectionException;
 use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
-use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
 use Elastica\Util;
@@ -128,7 +127,7 @@ public function exec(Request $request, array $params): Response
             }
 
             if (\is_array($data)) {
-                $content = JSON::stringify($data, \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES);
+                $content = \json_encode($data, \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES | \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR);
             } else {
                 $content = $data;
 

diff --git a/src/Transport/HttpAdapter.php b/src/Transport/HttpAdapter.php
@@ -5,7 +5,6 @@
 use Elastica\Connection;
 use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
-use Elastica\JSON;
 use Elastica\Request as ElasticaRequest;
 use Elastica\Response;
 use Elastica\Response as ElasticaResponse;
@@ -109,7 +108,7 @@ protected function _createHttpAdapterRequest(ElasticaRequest $elasticaRequest, C
             }
 
             if (\is_array($data)) {
-                $body = JSON::stringify($data, \JSON_UNESCAPED_UNICODE);
+                $body = \json_encode($data, \JSON_UNESCAPED_UNICODE | \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR);
             } else {
                 $body = $data;
             }

diff --git a/src/Transport/NullTransport.php b/src/Transport/NullTransport.php
@@ -2,7 +2,6 @@
 
 namespace Elastica\Transport;
 
-use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
 
@@ -73,7 +72,7 @@ public function generateDefaultResponse(array $params): Response
             'params' => $params,
         ];
 
-        return new Response(JSON::stringify($response));
+        return new Response(\json_encode($response, \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR));
     }
 
     /**

diff --git a/src/Util.php b/src/Util.php
@@ -245,7 +245,7 @@ public static function convertRequestToCurlCommand(Request $request)
 
         $data = $request->getData();
         if (!empty($data)) {
-            $message .= ' -d \''.JSON::stringify($data).'\'';
+            $message .= ' -d \''.\json_encode($data, \JSON_PRESERVE_ZERO_FRACTION | \JSON_THROW_ON_ERROR).'\'';
         }
 
         return $message;

diff --git a/tests/Exception/JSONParseExceptionTest.php b/tests/Exception/JSONParseExceptionTest.php
diff --git a/tests/Exception/PartialShardFailureExceptionTest.php b/tests/Exception/PartialShardFailureExceptionTest.php
@@ -4,7 +4,6 @@
 
 use Elastica\Document;
 use Elastica\Exception\PartialShardFailureException;
-use Elastica\JSON;
 use Elastica\Query;
 use Elastica\ResultSet\DefaultBuilder;
 
@@ -61,7 +60,7 @@ public function testPartialFailure(): void
             $resultSet = $builder->buildResultSet($e->getResponse(), $query);
             $this->assertCount(0, $resultSet->getResults());
 
-            $message = JSON::parse($e->getMessage());
+            $message = \json_decode($e->getMessage(), true, flags: \JSON_THROW_ON_ERROR);
             $this->assertArrayHasKey('failures', $message, 'Failures are absent');
             $this->assertGreaterThan(0, \count($message['failures']), 'Failures are empty');
         }

diff --git a/tests/JSONTest.php b/tests/JSONTest.php