moved prepary body method to HttpCypherFormatter (#2)

* moved prepary body method to HttpCypherFormatter

* ran php-cs-fixer

Author: transistive

src/Formatter/HttpCypherFormatter.php

@@ -16,8 +16,12 @@
 use Ds\Map;
 use Ds\Vector;
 use InvalidArgumentException;
+use JsonException;
 use Laudis\Neo4j\Databags\Neo4jError;
+use Laudis\Neo4j\Databags\RequestData;
+use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Databags\StatementStatistics;
+use stdClass;
 
 /**
  * @psalm-type CypherStats = array{
@@ -130,4 +134,28 @@ private function buildResult(array $result): Vector
 
         return $tbr;
     }
+
+    /**
+     * @param iterable<Statement> $statements
+     *
+     * @throws JsonException
+     */
+    public function prepareBody(iterable $statements, RequestData $config): string
+    {
+        $tbr = [];
+        foreach ($statements as $statement) {
+            $st = [
+                'statement' => $statement->getText(),
+                'resultDataContents' => ['ROW'],
+                'includeStats' => $config->includeStats(),
+            ];
+            $parameters = $statement->getParameters();
+            $st['parameters'] = $parameters === [] ? new stdClass() : $parameters;
+            $tbr[] = $st;
+        }
+
+        return json_encode([
+            'statements' => $tbr,
+        ], JSON_THROW_ON_ERROR);
+    }
 }

src/HttpDriver/RequestFactory.php

@@ -13,8 +13,6 @@
 
 namespace Laudis\Neo4j\HttpDriver;
 
-use function json_encode;
-use const JSON_THROW_ON_ERROR;
 use JsonException;
 use Laudis\Neo4j\Contracts\ClientInterface;
 use Laudis\Neo4j\Databags\RequestData;
@@ -23,7 +21,6 @@
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use stdClass;
 
 final class RequestFactory
 {
@@ -62,7 +59,7 @@ private function createRequest(RequestData $data, string $method, string $body =
      */
     public function pushToTransaction(RequestData $data, int $transactionId, iterable $statements): RequestInterface
     {
-        $body = $this->prepareBody($statements, $data);
+        $body = $this->formatter->prepareBody($statements, $data);
         $endpoint = $data->getEndpoint().'/'.$transactionId;
 
         return $this->createRequest($data->withEndpoint($endpoint), 'POST', $body);
@@ -75,7 +72,7 @@ public function pushToTransaction(RequestData $data, int $transactionId, iterabl
      */
     public function post(RequestData $data, iterable $statements): RequestInterface
     {
-        $body = $this->prepareBody($statements, $data);
+        $body = $this->formatter->prepareBody($statements, $data);
 
         return $this->createRequest($data, 'POST', $body);
     }
@@ -84,28 +81,4 @@ public function delete(RequestData $data): RequestInterface
     {
         return $this->createRequest($data, 'DELETE');
     }
-
-    /**
-     * @param iterable<Statement> $statements
-     *
-     * @throws JsonException
-     */
-    private function prepareBody(iterable $statements, RequestData $config): string
-    {
-        $tbr = [];
-        foreach ($statements as $statement) {
-            $st = [
-                'statement' => $statement->getText(),
-                'resultDataContents' => ['ROW'],
-                'includeStats' => $config->includeStats(),
-            ];
-            $parameters = $statement->getParameters();
-            $st['parameters'] = $parameters === [] ? new stdClass() : $parameters;
-            $tbr[] = $st;
-        }
-
-        return json_encode([
-            'statements' => $tbr,
-        ], JSON_THROW_ON_ERROR);
-    }
 }